diff --git a/app/build.gradle b/app/build.gradle
index e6be6592..b8e3e801 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -112,7 +112,7 @@ dependencies {
         transitive = true
     }
 
-    compile('com.afollestad:material-cab:0.1.8@aar') {
+    compile('com.afollestad:material-cab:0.1.9@aar') {
         transitive = true
     }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 623b4ce7..33ee0e68 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
     <application
         android:name=".App"
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="${appName}"
         android:supportsRtl="true"
         android:theme="@style/Theme.Phonograph.Light"
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
index 13633ad8..55204058 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
@@ -1,5 +1,6 @@
 package com.kabouzeid.gramophone.adapter;
 
+import android.graphics.PorterDuff;
 import android.os.Build;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
@@ -11,7 +12,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.PopupMenu;
 
-import com.kabouzeid.appthemehelper.ThemeStore;
 import com.kabouzeid.appthemehelper.util.ATHUtil;
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.adapter.base.AbsMultiSelectAdapter;
@@ -28,7 +28,6 @@ import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.model.smartplaylist.AbsSmartPlaylist;
 import com.kabouzeid.gramophone.util.MusicUtil;
 import com.kabouzeid.gramophone.util.NavigationUtil;
-import com.kabouzeid.gramophone.util.Util;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -106,11 +105,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
         }
 
         if (holder.image != null) {
-            holder.image.setImageDrawable(Util.getTintedDrawable(
-                    activity,
-                    getIconRes(playlist),
-                    ATHUtil.resolveColor(activity, R.attr.iconColor, ThemeStore.textColorSecondary(activity))
-            ));
+            holder.image.setImageResource(getIconRes(playlist));
         }
     }
 
@@ -118,7 +113,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
         if (playlist instanceof AbsSmartPlaylist) {
             return ((AbsSmartPlaylist) playlist).iconRes;
         }
-        return playlist.id == favoritePlaylistId ? R.drawable.ic_favorite_white_24dp : R.drawable.ic_queue_music_white_24dp;
+        return playlist.id == favoritePlaylistId ? R.drawable.ic_favorite_black_24dp : R.drawable.ic_queue_music_black_24dp;
     }
 
     @Override
@@ -198,6 +193,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
             if (image != null) {
                 int iconPadding = activity.getResources().getDimensionPixelSize(R.dimen.list_item_image_icon_padding);
                 image.setPadding(iconPadding, iconPadding, iconPadding, iconPadding);
+                image.setColorFilter(ATHUtil.resolveColor(activity, R.attr.iconColor), PorterDuff.Mode.SRC_IN);
             }
 
             if (menu != null) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ShuffleButtonSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ShuffleButtonSongAdapter.java
index bbdb1301..f0b41b1b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ShuffleButtonSongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ShuffleButtonSongAdapter.java
@@ -87,7 +87,7 @@ public class ShuffleButtonSongAdapter extends SongAdapter {
                 final int padding = activity.getResources().getDimensionPixelSize(R.dimen.default_item_margin) / 2;
                 holder.image.setPadding(padding, padding, padding, padding);
                 holder.image.setColorFilter(accentColor);
-                holder.image.setImageResource(R.drawable.ic_shuffle_white_24dp);
+                holder.image.setImageResource(R.drawable.ic_shuffle_black_24dp);
             }
             if (holder.separator != null) {
                 holder.separator.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java b/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java
index fda46630..88259e2a 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java
@@ -61,7 +61,7 @@ public class WidgetMedium extends AppWidgetProvider {
     public static void updateWidgetsPlayState(@NonNull final Context context, boolean isPlaying) {
         if (widgetLayout == null)
             widgetLayout = new RemoteViews(context.getPackageName(), R.layout.widget_medium);
-        int playPauseRes = isPlaying ? R.drawable.ic_pause_dark_36dp : R.drawable.ic_play_arrow_dark_36dp;
+        int playPauseRes = isPlaying ? R.drawable.ic_pause_black_24dp : R.drawable.ic_play_arrow_black_24dp;
         widgetLayout.setImageViewResource(R.id.button_toggle_play_pause, playPauseRes);
         updateWidgets(context);
     }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java
index 68580d75..a6b2a2c2 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java
@@ -13,18 +13,15 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
-import android.support.v4.content.ContextCompat;
 import android.widget.RemoteViews;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.target.Target;
-import com.kabouzeid.appthemehelper.util.ColorUtil;
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.glide.SongGlideRequest;
 import com.kabouzeid.gramophone.glide.palette.BitmapPaletteWrapper;
@@ -131,7 +128,7 @@ public class PlayingNotificationHelper {
         notificationLayoutBig.setOnClickPendingIntent(R.id.action_quit,
                 retrievePlaybackActions(4));
 
-        notificationLayoutBig.setImageViewResource(R.id.action_play_pause, getPlayPauseRes(isDark));
+//        notificationLayoutBig.setImageViewResource(R.id.action_play_pause, getPlayPauseRes(isDark));
     }
 
     private void setUpPlaybackActions() {
@@ -144,7 +141,7 @@ public class PlayingNotificationHelper {
         notificationLayout.setOnClickPendingIntent(R.id.action_prev,
                 retrievePlaybackActions(3));
 
-        notificationLayout.setImageViewResource(R.id.action_play_pause, getPlayPauseRes(isDark));
+//        notificationLayout.setImageViewResource(R.id.action_play_pause, getPlayPauseRes(isDark));
     }
 
     private PendingIntent retrievePlaybackActions(final int which) {
@@ -215,7 +212,7 @@ public class PlayingNotificationHelper {
             bgColor = Color.TRANSPARENT;
         }
         setBackgroundColor(bgColor);
-        setDarkNotificationContent(bgColor == Color.TRANSPARENT ? Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP : ColorUtil.isColorLight(bgColor));
+//        setDarkNotificationContent(bgColor == Color.TRANSPARENT ? Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP : ColorUtil.isColorLight(bgColor));
 
         if (notification != null) {
             notificationManager.notify(notificationId, notification);
@@ -238,44 +235,44 @@ public class PlayingNotificationHelper {
         if (notification == null) {
             updateNotification();
         }
-        int playPauseRes = getPlayPauseRes(isDark);
-        if (notificationLayout != null) {
-            notificationLayout.setImageViewResource(R.id.action_play_pause, playPauseRes);
-        }
-        if (notificationLayoutBig != null) {
-            notificationLayoutBig.setImageViewResource(R.id.action_play_pause, playPauseRes);
-        }
+//        int playPauseRes = getPlayPauseRes(isDark);
+//        if (notificationLayout != null) {
+//            notificationLayout.setImageViewResource(R.id.action_play_pause, playPauseRes);
+//        }
+//        if (notificationLayoutBig != null) {
+//            notificationLayoutBig.setImageViewResource(R.id.action_play_pause, playPauseRes);
+//        }
         if (notification != null) {
             notificationManager.notify(notificationId, notification);
         }
     }
 
-    private void setDarkNotificationContent(boolean dark) {
-        isDark = dark;
+//    private void setDarkNotificationContent(boolean dark) {
+//        isDark = dark;
+//
+//        if (notificationLayout != null && notificationLayoutBig != null) {
+//            int darkContentColor = ContextCompat.getColor(service, R.color.primary_text_default_material_light);
+//            int darkContentSecondaryColor = ContextCompat.getColor(service, R.color.secondary_text_default_material_light);
+//            int contentColor = ContextCompat.getColor(service, R.color.primary_text_default_material_dark);
+//            int contentSecondaryColor = ContextCompat.getColor(service, R.color.secondary_text_default_material_dark);
+//
+//            notificationLayout.setTextColor(R.id.title, dark ? darkContentColor : contentColor);
+//            notificationLayout.setTextColor(R.id.text, dark ? darkContentSecondaryColor : contentSecondaryColor);
+//            notificationLayout.setImageViewResource(R.id.action_prev, dark ? R.drawable.ic_skip_previous_dark_36dp : R.drawable.ic_skip_previous_white_36dp);
+//            notificationLayout.setImageViewResource(R.id.action_play_pause, getPlayPauseRes(dark));
+//            notificationLayout.setImageViewResource(R.id.action_next, dark ? R.drawable.ic_skip_next_dark_36dp : R.drawable.ic_skip_next_white_36dp);
+//
+//            notificationLayoutBig.setTextColor(R.id.title, dark ? darkContentColor : contentColor);
+//            notificationLayoutBig.setTextColor(R.id.text, dark ? darkContentSecondaryColor : contentSecondaryColor);
+//            notificationLayoutBig.setTextColor(R.id.text2, dark ? darkContentSecondaryColor : contentSecondaryColor);
+//            notificationLayoutBig.setImageViewResource(R.id.action_prev, dark ? R.drawable.ic_skip_previous_dark_36dp : R.drawable.ic_skip_previous_white_36dp);
+//            notificationLayoutBig.setImageViewResource(R.id.action_play_pause, getPlayPauseRes(dark));
+//            notificationLayoutBig.setImageViewResource(R.id.action_next, dark ? R.drawable.ic_skip_next_dark_36dp : R.drawable.ic_skip_next_white_36dp);
+//            notificationLayoutBig.setImageViewResource(R.id.action_quit, dark ? R.drawable.ic_close_dark_24dp : R.drawable.ic_close_white_24dp);
+//        }
+//    }
 
-        if (notificationLayout != null && notificationLayoutBig != null) {
-            int darkContentColor = ContextCompat.getColor(service, R.color.primary_text_default_material_light);
-            int darkContentSecondaryColor = ContextCompat.getColor(service, R.color.secondary_text_default_material_light);
-            int contentColor = ContextCompat.getColor(service, R.color.primary_text_default_material_dark);
-            int contentSecondaryColor = ContextCompat.getColor(service, R.color.secondary_text_default_material_dark);
-
-            notificationLayout.setTextColor(R.id.title, dark ? darkContentColor : contentColor);
-            notificationLayout.setTextColor(R.id.text, dark ? darkContentSecondaryColor : contentSecondaryColor);
-            notificationLayout.setImageViewResource(R.id.action_prev, dark ? R.drawable.ic_skip_previous_dark_36dp : R.drawable.ic_skip_previous_white_36dp);
-            notificationLayout.setImageViewResource(R.id.action_play_pause, getPlayPauseRes(dark));
-            notificationLayout.setImageViewResource(R.id.action_next, dark ? R.drawable.ic_skip_next_dark_36dp : R.drawable.ic_skip_next_white_36dp);
-
-            notificationLayoutBig.setTextColor(R.id.title, dark ? darkContentColor : contentColor);
-            notificationLayoutBig.setTextColor(R.id.text, dark ? darkContentSecondaryColor : contentSecondaryColor);
-            notificationLayoutBig.setTextColor(R.id.text2, dark ? darkContentSecondaryColor : contentSecondaryColor);
-            notificationLayoutBig.setImageViewResource(R.id.action_prev, dark ? R.drawable.ic_skip_previous_dark_36dp : R.drawable.ic_skip_previous_white_36dp);
-            notificationLayoutBig.setImageViewResource(R.id.action_play_pause, getPlayPauseRes(dark));
-            notificationLayoutBig.setImageViewResource(R.id.action_next, dark ? R.drawable.ic_skip_next_dark_36dp : R.drawable.ic_skip_next_white_36dp);
-            notificationLayoutBig.setImageViewResource(R.id.action_quit, dark ? R.drawable.ic_close_dark_24dp : R.drawable.ic_close_white_24dp);
-        }
-    }
-
-    private int getPlayPauseRes(boolean dark) {
-        return isPlaying ? (dark ? R.drawable.ic_pause_dark_36dp : R.drawable.ic_pause_white_36dp) : (dark ? R.drawable.ic_play_arrow_dark_36dp : R.drawable.ic_play_arrow_white_36dp);
-    }
+//    private int getPlayPauseRes(boolean dark) {
+//        return isPlaying ? (dark ? R.drawable.ic_pause_dark_36dp : R.drawable.ic_pause_white_36dp) : (dark ? R.drawable.ic_play_arrow_dark_36dp : R.drawable.ic_play_arrow_white_36dp);
+//    }
 }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/AbsSmartPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/AbsSmartPlaylist.java
index 8a89f8c3..dab7b26f 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/AbsSmartPlaylist.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/AbsSmartPlaylist.java
@@ -25,7 +25,7 @@ public abstract class AbsSmartPlaylist extends Playlist {
 
     public AbsSmartPlaylist() {
         super();
-        this.iconRes = R.drawable.ic_queue_music_white_24dp;
+        this.iconRes = R.drawable.ic_queue_music_black_24dp;
     }
 
     public abstract ArrayList<Song> getSongs(Context context);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/HistoryPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/HistoryPlaylist.java
index 02cc93c3..6466b96a 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/HistoryPlaylist.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/HistoryPlaylist.java
@@ -17,7 +17,7 @@ import java.util.ArrayList;
 public class HistoryPlaylist extends AbsSmartPlaylist {
 
     public HistoryPlaylist(@NonNull Context context) {
-        super(context.getString(R.string.history), R.drawable.ic_access_time_white_24dp);
+        super(context.getString(R.string.history), R.drawable.ic_access_time_black_24dp);
     }
 
     @NonNull
diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java
index f3772c0f..0019207e 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java
@@ -17,7 +17,7 @@ import java.util.ArrayList;
 public class LastAddedPlaylist extends AbsSmartPlaylist {
 
     public LastAddedPlaylist(@NonNull Context context) {
-        super(context.getString(R.string.last_added), R.drawable.ic_queue_white_24dp);
+        super(context.getString(R.string.last_added), R.drawable.ic_library_add_black_24dp);
     }
 
     @NonNull
diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/MyTopTracksPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/MyTopTracksPlaylist.java
index 444debf1..b674b2ae 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/MyTopTracksPlaylist.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/MyTopTracksPlaylist.java
@@ -17,7 +17,7 @@ import java.util.ArrayList;
 public class MyTopTracksPlaylist extends AbsSmartPlaylist {
 
     public MyTopTracksPlaylist(@NonNull Context context) {
-        super(context.getString(R.string.my_top_tracks), R.drawable.ic_trending_up_white_24dp);
+        super(context.getString(R.string.my_top_tracks), R.drawable.ic_trending_up_black_24dp);
     }
 
     @NonNull
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
index 4894d265..cd2d09c1 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
@@ -296,7 +296,7 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
         if (cab != null && cab.isActive()) cab.finish();
         cab = new MaterialCab(this, R.id.cab_stub)
                 .setMenu(menuRes)
-                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+                .setCloseDrawableRes(R.drawable.ic_close_black_24dp)
                 .setBackgroundColor(PhonographColorUtil.shiftBackgroundColorForLightText(getPaletteColor()))
                 .start(new MaterialCab.Callback() {
                     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
index 58ec3e2e..ed9d5073 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
@@ -382,7 +382,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
         if (cab != null && cab.isActive()) cab.finish();
         cab = new MaterialCab(this, R.id.cab_stub)
                 .setMenu(menuRes)
-                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+                .setCloseDrawableRes(R.drawable.ic_close_black_24dp)
                 .setBackgroundColor(PhonographColorUtil.shiftBackgroundColorForLightText(getPaletteColor()))
                 .start(new MaterialCab.Callback() {
                     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
index 9a821cbd..fadd01f9 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
@@ -179,7 +179,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
         int primaryColor = ThemeStore.primaryColor(this);
         appbar.setBackgroundColor(primaryColor);
         toolbar.setBackgroundColor(primaryColor);
-        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
+        toolbar.setNavigationIcon(R.drawable.ic_menu_black_24dp);
         setTitle(getResources().getString(R.string.app_name));
         setSupportActionBar(toolbar);
     }
@@ -544,7 +544,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
         if (cab != null && cab.isActive()) cab.finish();
         cab = new MaterialCab(this, R.id.cab_stub)
                 .setMenu(menu)
-                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+                .setCloseDrawableRes(R.drawable.ic_close_black_24dp)
                 .setBackgroundColor(PhonographColorUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor(this)))
                 .start(callback);
         return cab;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
index d0ca8ef7..a527f26b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
@@ -193,7 +193,7 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme
         if (cab != null && cab.isActive()) cab.finish();
         cab = new MaterialCab(this, R.id.cab_stub)
                 .setMenu(menu)
-                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+                .setCloseDrawableRes(R.drawable.ic_close_black_24dp)
                 .setBackgroundColor(PhonographColorUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor(this)))
                 .start(callback);
         return cab;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/intro/AppIntroActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/intro/AppIntroActivity.java
index 7bf75fcd..b04603c5 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/intro/AppIntroActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/intro/AppIntroActivity.java
@@ -43,7 +43,7 @@ public class AppIntroActivity extends com.heinrichreimersoftware.materialintro.a
             addSlide(new PhonographSimpleSlide.Builder()
                     .title(R.string.label_storage)
                     .description(R.string.storage_permission_explaination)
-                    .image(R.drawable.ic_folder_web)
+                    .image(R.drawable.ic_folder_black_24dp)
                     .background(R.color.md_indigo_500)
                     .backgroundDark(R.color.md_indigo_600)
                     .build());
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlaybackControlsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlaybackControlsFragment.java
index cc82b7d6..c49292c0 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlaybackControlsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlaybackControlsFragment.java
@@ -167,9 +167,9 @@ public class PlaybackControlsFragment extends Fragment implements MusicServiceEv
         TintHelper.setTintAuto(playPauseFab, fabColor, true);
 
         updatePlayPauseDrawableState(false);
-        // Note: set the drawable AFTER TintHelper.setTintAuto() is called
+        // Note: set the drawable AFTER TintHelper.setTintAuto() was called
         playPauseFab.setImageDrawable(playerFabPlayPauseDrawable);
-        playPauseFab.getDrawable().mutate().setColorFilter(MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(fabColor)), PorterDuff.Mode.SRC_IN);
+        playPauseFab.setColorFilter(MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(fabColor)), PorterDuff.Mode.SRC_IN);
         playPauseFab.setOnClickListener(new PlayPauseButtonOnClickHandler());
         playPauseFab.post(new Runnable() {
             @Override
@@ -224,9 +224,7 @@ public class PlaybackControlsFragment extends Fragment implements MusicServiceEv
     }
 
     private void updatePrevNextColor() {
-        nextButton.setImageResource(R.drawable.ic_skip_next_white_36dp);
         nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
-        prevButton.setImageResource(R.drawable.ic_skip_previous_white_36dp);
         prevButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
     }
 
@@ -243,11 +241,9 @@ public class PlaybackControlsFragment extends Fragment implements MusicServiceEv
     private void updateShuffleState() {
         switch (MusicPlayerRemote.getShuffleMode()) {
             case MusicService.SHUFFLE_MODE_SHUFFLE:
-                shuffleButton.setImageResource(R.drawable.ic_shuffle_white_36dp);
                 shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
                 break;
             default:
-                shuffleButton.setImageResource(R.drawable.ic_shuffle_white_36dp);
                 shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
                 break;
         }
@@ -266,15 +262,15 @@ public class PlaybackControlsFragment extends Fragment implements MusicServiceEv
     private void updateRepeatState() {
         switch (MusicPlayerRemote.getRepeatMode()) {
             case MusicService.REPEAT_MODE_NONE:
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_36dp);
+                repeatButton.setImageResource(R.drawable.ic_repeat_black_24dp);
                 repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
                 break;
             case MusicService.REPEAT_MODE_ALL:
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_36dp);
+                repeatButton.setImageResource(R.drawable.ic_repeat_black_24dp);
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
                 break;
             case MusicService.REPEAT_MODE_THIS:
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_36dp);
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_black_24dp);
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
                 break;
         }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
index 3f2e8c74..2dd78b9e 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
@@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.ui.fragments.player;
 import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
@@ -194,7 +195,7 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
 
     private void setUpPlayerToolbar() {
         toolbar.inflateMenu(R.menu.menu_player);
-        toolbar.setNavigationIcon(R.drawable.ic_close_white_24dp);
+        toolbar.setNavigationIcon(R.drawable.ic_close_black_24dp);
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -228,7 +229,7 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
 
     private void updateIsFavorite() {
         boolean isFavorite = MusicUtil.isFavorite(getActivity(), MusicPlayerRemote.getCurrentSong());
-        int res = isFavorite ? R.drawable.ic_favorite_white_24dp : R.drawable.ic_favorite_outline_white_24dp;
+        int res = isFavorite ? R.drawable.ic_favorite_black_24dp : R.drawable.ic_favorite_border_black_24dp;
 
         Drawable favoriteIcon = TintHelper.createTintedDrawable(ContextCompat.getDrawable(getActivity(), res), ToolbarContentTintHelper.toolbarContentColor(getActivity(), Color.TRANSPARENT));
         toolbar.getMenu().findItem(R.id.action_toggle_favorite)
@@ -385,7 +386,8 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
             currentSongViewHolder.separator.setVisibility(View.VISIBLE);
             currentSongViewHolder.shortSeparator.setVisibility(View.GONE);
             currentSongViewHolder.image.setScaleType(ImageView.ScaleType.CENTER);
-            currentSongViewHolder.image.setImageDrawable(Util.getTintedDrawable(fragment.getActivity(), R.drawable.ic_volume_up_white_24dp, ATHUtil.resolveColor(fragment.getActivity(), R.attr.iconColor, ThemeStore.textColorSecondary(fragment.getActivity()))));
+            currentSongViewHolder.image.setColorFilter(ATHUtil.resolveColor(fragment.getActivity(), R.attr.iconColor, ThemeStore.textColorSecondary(fragment.getActivity())), PorterDuff.Mode.SRC_IN);
+            currentSongViewHolder.image.setImageResource(R.drawable.ic_volume_up_black_24dp);
             currentSongViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/views/IconImageView.java b/app/src/main/java/com/kabouzeid/gramophone/views/IconImageView.java
new file mode 100644
index 00000000..14e92b9b
--- /dev/null
+++ b/app/src/main/java/com/kabouzeid/gramophone/views/IconImageView.java
@@ -0,0 +1,34 @@
+package com.kabouzeid.gramophone.views;
+
+import android.content.Context;
+import android.graphics.PorterDuff;
+import android.support.v7.widget.AppCompatImageView;
+import android.util.AttributeSet;
+
+import com.kabouzeid.appthemehelper.util.ATHUtil;
+import com.kabouzeid.gramophone.R;
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
+public class IconImageView extends AppCompatImageView {
+    public IconImageView(Context context) {
+        super(context);
+        init(context);
+    }
+
+    public IconImageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public IconImageView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context);
+    }
+
+    private void init(Context context) {
+        if (context == null) return;
+        setColorFilter(ATHUtil.resolveColor(context, R.attr.iconColor), PorterDuff.Mode.SRC_IN);
+    }
+}
diff --git a/app/src/main/res/drawable-hdpi/ic_access_time_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_access_time_white_24dp.png
deleted file mode 100644
index 4e90aabd..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_access_time_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_album_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_album_white_24dp.png
deleted file mode 100644
index 7f6fb801..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_album_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_attach_money_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_attach_money_white_24dp.png
deleted file mode 100644
index 7a60257e..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_attach_money_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_audiotrack_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_audiotrack_white_24dp.png
deleted file mode 100644
index 33b9e293..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_audiotrack_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_book_open_variant_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_book_open_variant_white_24dp.png
deleted file mode 100644
index e5d4e216..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_book_open_variant_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_bug_report_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_bug_report_white_24dp.png
deleted file mode 100644
index ce6a4ba1..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_bug_report_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_checkbox_marked_circle_outline_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_checkbox_marked_circle_outline_white_24dp.png
deleted file mode 100644
index d8ec2d08..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_checkbox_marked_circle_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_close_dark_24dp.png b/app/src/main/res/drawable-hdpi/ic_close_dark_24dp.png
deleted file mode 100644
index 27bf91d0..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_close_dark_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png
deleted file mode 100644
index 0fd15563..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 5e89821e..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_description_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_description_white_24dp.png
deleted file mode 100644
index 7eeb86ef..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_description_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_done_white_24dp.png
deleted file mode 100644
index f42a0e2d..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_done_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_drag_vertical_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_drag_vertical_white_24dp.png
deleted file mode 100644
index f234c583..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_drag_vertical_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_equalizer_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_equalizer_white_24dp.png
deleted file mode 100644
index 7ffb8d17..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_equalizer_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_favorite_outline_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_favorite_outline_white_24dp.png
deleted file mode 100644
index 2906eff5..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_favorite_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_favorite_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_favorite_white_24dp.png
deleted file mode 100644
index 35e88ec6..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_favorite_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_flag_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_flag_white_24dp.png
deleted file mode 100644
index 3876b03c..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_flag_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_folder_white_24dp.png
deleted file mode 100644
index 41c7e958..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_folder_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_github_circle_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_github_circle_white_24dp.png
deleted file mode 100644
index ce905000..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_github_circle_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_google_circles_communities_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_google_circles_communities_white_24dp.png
deleted file mode 100644
index fe0da8c4..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_google_circles_communities_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_google_circles_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_google_circles_white_24dp.png
deleted file mode 100644
index 3dd1c738..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_google_circles_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_help_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_help_white_24dp.png
deleted file mode 100644
index dd05e71e..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_help_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_history_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_history_white_24dp.png
deleted file mode 100644
index 4b06ddee..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_history_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png
deleted file mode 100644
index 0932c17c..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_up_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_up_white_24dp.png
deleted file mode 100644
index a0861f59..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_up_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png
deleted file mode 100644
index 8962cbd9..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_my_library_music_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_my_library_music_white_24dp.png
deleted file mode 100644
index d40efdea..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_my_library_music_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_pause_dark_36dp.png b/app/src/main/res/drawable-hdpi/ic_pause_dark_36dp.png
deleted file mode 100644
index d64691ef..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_pause_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_pause_white_36dp.png b/app/src/main/res/drawable-hdpi/ic_pause_white_36dp.png
deleted file mode 100644
index ea4357b9..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_pause_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_person_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_person_white_24dp.png
deleted file mode 100644
index 05d4ef67..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_person_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_play_arrow_dark_36dp.png b/app/src/main/res/drawable-hdpi/ic_play_arrow_dark_36dp.png
deleted file mode 100644
index 95b0df12..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_play_arrow_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png b/app/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png
deleted file mode 100644
index da31b445..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_play_circle_fill_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_play_circle_fill_white_24dp.png
deleted file mode 100644
index 1fb6dbaa..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_play_circle_fill_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_play_shopping_bag_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_play_shopping_bag_white_24dp.png
deleted file mode 100644
index 85a5f883..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_play_shopping_bag_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_playlist_add_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_playlist_add_white_24dp.png
deleted file mode 100644
index e466600a..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_playlist_add_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_queue_music_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_queue_music_white_24dp.png
deleted file mode 100644
index 50db8e83..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_queue_music_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_queue_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_queue_white_24dp.png
deleted file mode 100644
index 7efdfab6..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_queue_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_repeat_off_white_36dp.png b/app/src/main/res/drawable-hdpi/ic_repeat_off_white_36dp.png
deleted file mode 100644
index 1b83e734..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_repeat_off_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_repeat_one_white_36dp.png b/app/src/main/res/drawable-hdpi/ic_repeat_one_white_36dp.png
deleted file mode 100644
index 3840d9ea..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_repeat_one_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_repeat_white_36dp.png b/app/src/main/res/drawable-hdpi/ic_repeat_white_36dp.png
deleted file mode 100644
index a08d785b..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_repeat_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
deleted file mode 100644
index ca774e84..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png
deleted file mode 100644
index ecbe37b8..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_shuffle_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_shuffle_white_24dp.png
deleted file mode 100644
index e7cea329..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_shuffle_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_shuffle_white_36dp.png b/app/src/main/res/drawable-hdpi/ic_shuffle_white_36dp.png
deleted file mode 100644
index 75a5f3ce..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_shuffle_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_skip_next_dark_36dp.png b/app/src/main/res/drawable-hdpi/ic_skip_next_dark_36dp.png
deleted file mode 100644
index 4705f7d3..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_skip_next_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_skip_next_white_36dp.png b/app/src/main/res/drawable-hdpi/ic_skip_next_white_36dp.png
deleted file mode 100644
index cbfb262d..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_skip_next_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_skip_previous_dark_36dp.png b/app/src/main/res/drawable-hdpi/ic_skip_previous_dark_36dp.png
deleted file mode 100644
index f57637ef..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_skip_previous_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_skip_previous_white_36dp.png b/app/src/main/res/drawable-hdpi/ic_skip_previous_white_36dp.png
deleted file mode 100644
index 39d15055..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_skip_previous_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_trending_up_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_trending_up_white_24dp.png
deleted file mode 100644
index 07ada8a9..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_trending_up_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_twitter_box_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_twitter_box_white_24dp.png
deleted file mode 100644
index 55c1cfe1..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_twitter_box_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_volume_up_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_volume_up_white_24dp.png
deleted file mode 100644
index d51ec451..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_volume_up_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_web_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_web_white_24dp.png
deleted file mode 100644
index 5c3aa950..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_web_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_access_time_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_access_time_white_24dp.png
deleted file mode 100644
index c25b7a9e..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_access_time_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_album_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_album_white_24dp.png
deleted file mode 100644
index 64b4c9c4..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_album_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_attach_money_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_attach_money_white_24dp.png
deleted file mode 100644
index bd77896a..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_attach_money_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_audiotrack_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_audiotrack_white_24dp.png
deleted file mode 100644
index 2f26b3db..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_audiotrack_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_book_open_variant_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_book_open_variant_white_24dp.png
deleted file mode 100644
index 89677e04..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_book_open_variant_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_bug_report_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_bug_report_white_24dp.png
deleted file mode 100644
index 2bbb4e29..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_bug_report_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_checkbox_marked_circle_outline_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_checkbox_marked_circle_outline_white_24dp.png
deleted file mode 100644
index 1f4969a0..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_checkbox_marked_circle_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_close_dark_24dp.png b/app/src/main/res/drawable-mdpi/ic_close_dark_24dp.png
deleted file mode 100644
index ed5e2d92..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_close_dark_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png
deleted file mode 100644
index e80681ae..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 8d48b838..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_description_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_description_white_24dp.png
deleted file mode 100644
index 51a8ac3c..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_description_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_done_white_24dp.png
deleted file mode 100644
index e91f9048..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_done_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_drag_vertical_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_drag_vertical_white_24dp.png
deleted file mode 100644
index aca0945b..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_drag_vertical_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_equalizer_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_equalizer_white_24dp.png
deleted file mode 100644
index e5bb7312..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_equalizer_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_favorite_outline_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_favorite_outline_white_24dp.png
deleted file mode 100644
index 4db75034..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_favorite_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_favorite_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_favorite_white_24dp.png
deleted file mode 100644
index d2db6632..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_favorite_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_flag_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_flag_white_24dp.png
deleted file mode 100644
index 7af6a1fe..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_flag_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_folder_white_24dp.png
deleted file mode 100644
index 87bff32f..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_folder_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_github_circle_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_github_circle_white_24dp.png
deleted file mode 100644
index ca168c1c..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_github_circle_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_google_circles_communities_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_google_circles_communities_white_24dp.png
deleted file mode 100644
index 4c55f3df..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_google_circles_communities_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_google_circles_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_google_circles_white_24dp.png
deleted file mode 100644
index 566b1a2f..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_google_circles_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_help_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_help_white_24dp.png
deleted file mode 100644
index 9e628e0b..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_help_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_history_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_history_white_24dp.png
deleted file mode 100644
index cdc5ac0a..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_history_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png
deleted file mode 100644
index 03cf044b..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_up_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_up_white_24dp.png
deleted file mode 100644
index c735c8ca..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_up_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png
deleted file mode 100644
index c62db8c8..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_my_library_music_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_my_library_music_white_24dp.png
deleted file mode 100644
index a053747c..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_my_library_music_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_pause_dark_36dp.png b/app/src/main/res/drawable-mdpi/ic_pause_dark_36dp.png
deleted file mode 100644
index 847a4803..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_pause_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_pause_white_36dp.png b/app/src/main/res/drawable-mdpi/ic_pause_white_36dp.png
deleted file mode 100644
index 418c664c..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_pause_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_person_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_person_white_24dp.png
deleted file mode 100644
index fb642b9a..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_person_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_play_arrow_dark_36dp.png b/app/src/main/res/drawable-mdpi/ic_play_arrow_dark_36dp.png
deleted file mode 100644
index e5708d20..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_play_arrow_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png b/app/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png
deleted file mode 100644
index fbdf1da0..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_play_circle_fill_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_play_circle_fill_white_24dp.png
deleted file mode 100644
index b8b28474..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_play_circle_fill_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_play_shopping_bag_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_play_shopping_bag_white_24dp.png
deleted file mode 100644
index 922b313b..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_play_shopping_bag_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_playlist_add_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_playlist_add_white_24dp.png
deleted file mode 100644
index a86bc505..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_playlist_add_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_queue_music_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_queue_music_white_24dp.png
deleted file mode 100644
index 5b78371d..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_queue_music_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_queue_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_queue_white_24dp.png
deleted file mode 100644
index 1aeb991a..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_queue_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_repeat_off_white_36dp.png b/app/src/main/res/drawable-mdpi/ic_repeat_off_white_36dp.png
deleted file mode 100644
index 4149dc54..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_repeat_off_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_repeat_one_white_36dp.png b/app/src/main/res/drawable-mdpi/ic_repeat_one_white_36dp.png
deleted file mode 100644
index c437d4bb..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_repeat_one_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_repeat_white_36dp.png b/app/src/main/res/drawable-mdpi/ic_repeat_white_36dp.png
deleted file mode 100644
index 937354ca..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_repeat_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png
deleted file mode 100644
index 7b6c0040..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png
deleted file mode 100644
index 976f0178..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_shuffle_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_shuffle_white_24dp.png
deleted file mode 100644
index 1b8351cf..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_shuffle_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_shuffle_white_36dp.png b/app/src/main/res/drawable-mdpi/ic_shuffle_white_36dp.png
deleted file mode 100644
index e7cea329..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_shuffle_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_skip_next_dark_36dp.png b/app/src/main/res/drawable-mdpi/ic_skip_next_dark_36dp.png
deleted file mode 100644
index b83769c8..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_skip_next_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_skip_next_white_36dp.png b/app/src/main/res/drawable-mdpi/ic_skip_next_white_36dp.png
deleted file mode 100644
index 893cf2c6..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_skip_next_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_skip_previous_dark_36dp.png b/app/src/main/res/drawable-mdpi/ic_skip_previous_dark_36dp.png
deleted file mode 100644
index 28076e6e..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_skip_previous_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_skip_previous_white_36dp.png b/app/src/main/res/drawable-mdpi/ic_skip_previous_white_36dp.png
deleted file mode 100644
index b5395b6a..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_skip_previous_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_trending_up_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_trending_up_white_24dp.png
deleted file mode 100644
index a8590be5..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_trending_up_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_twitter_box_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_twitter_box_white_24dp.png
deleted file mode 100644
index e306dc50..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_twitter_box_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_volume_up_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_volume_up_white_24dp.png
deleted file mode 100644
index 49dc0b86..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_volume_up_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_web_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_web_white_24dp.png
deleted file mode 100644
index 3f044475..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_web_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-nodpi/example_appwidget_preview.png b/app/src/main/res/drawable-nodpi/example_appwidget_preview.png
deleted file mode 100644
index 894b069a..00000000
Binary files a/app/src/main/res/drawable-nodpi/example_appwidget_preview.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_access_time_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_access_time_white_24dp.png
deleted file mode 100644
index e7c496e4..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_access_time_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_album_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_album_white_24dp.png
deleted file mode 100644
index c6f3f30b..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_album_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_attach_money_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_attach_money_white_24dp.png
deleted file mode 100644
index 1cf4a924..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_attach_money_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_audiotrack_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_audiotrack_white_24dp.png
deleted file mode 100644
index dc67379d..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_audiotrack_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_book_open_variant_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_book_open_variant_white_24dp.png
deleted file mode 100644
index 1b6b41c6..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_book_open_variant_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_bug_report_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_bug_report_white_24dp.png
deleted file mode 100644
index 5ce17aab..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_bug_report_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_checkbox_marked_circle_outline_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_checkbox_marked_circle_outline_white_24dp.png
deleted file mode 100644
index 101e2a3c..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_checkbox_marked_circle_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_close_dark_24dp.png b/app/src/main/res/drawable-xhdpi/ic_close_dark_24dp.png
deleted file mode 100644
index 5d4758fc..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_close_dark_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
deleted file mode 100644
index 76e07f09..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 3c9e1718..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_description_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_description_white_24dp.png
deleted file mode 100644
index f9c580c0..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_description_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png
deleted file mode 100644
index e5024472..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_drag_vertical_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_drag_vertical_white_24dp.png
deleted file mode 100644
index 1c0e89e6..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_drag_vertical_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_equalizer_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_equalizer_white_24dp.png
deleted file mode 100644
index d206fe34..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_equalizer_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_favorite_outline_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_favorite_outline_white_24dp.png
deleted file mode 100644
index a2247bde..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_favorite_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_favorite_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_favorite_white_24dp.png
deleted file mode 100644
index aa5d340d..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_favorite_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_flag_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_flag_white_24dp.png
deleted file mode 100644
index f9f15612..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_flag_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png
deleted file mode 100644
index e62bf080..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_github_circle_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_github_circle_white_24dp.png
deleted file mode 100644
index 4574c68f..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_github_circle_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_google_circles_communities_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_google_circles_communities_white_24dp.png
deleted file mode 100644
index 5604ae0d..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_google_circles_communities_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_google_circles_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_google_circles_white_24dp.png
deleted file mode 100644
index 52baf365..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_google_circles_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_help_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_help_white_24dp.png
deleted file mode 100644
index 37a27a54..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_help_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_history_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_history_white_24dp.png
deleted file mode 100644
index edf287c9..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_history_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png
deleted file mode 100644
index 33ec308a..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_up_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_up_white_24dp.png
deleted file mode 100644
index 0008f33b..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_up_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png
deleted file mode 100644
index 36859f09..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_my_library_music_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_my_library_music_white_24dp.png
deleted file mode 100644
index 75c3ada0..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_my_library_music_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_pause_dark_36dp.png b/app/src/main/res/drawable-xhdpi/ic_pause_dark_36dp.png
deleted file mode 100644
index 9b5198fe..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_pause_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png b/app/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png
deleted file mode 100644
index 500cb7bf..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_person_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_person_white_24dp.png
deleted file mode 100644
index d02d0ba5..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_person_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_play_arrow_dark_36dp.png b/app/src/main/res/drawable-xhdpi/ic_play_arrow_dark_36dp.png
deleted file mode 100644
index 6fc333ab..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_play_arrow_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png b/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png
deleted file mode 100644
index 1eb926d2..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_play_circle_fill_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_play_circle_fill_white_24dp.png
deleted file mode 100644
index 475274e8..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_play_circle_fill_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_play_shopping_bag_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_play_shopping_bag_white_24dp.png
deleted file mode 100644
index 5e7107cc..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_play_shopping_bag_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_playlist_add_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_playlist_add_white_24dp.png
deleted file mode 100644
index aa874a65..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_playlist_add_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_queue_music_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_queue_music_white_24dp.png
deleted file mode 100644
index 44a35a7b..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_queue_music_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_queue_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_queue_white_24dp.png
deleted file mode 100644
index 6ab40bc4..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_queue_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_repeat_off_white_36dp.png b/app/src/main/res/drawable-xhdpi/ic_repeat_off_white_36dp.png
deleted file mode 100644
index 009f7a6e..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_repeat_off_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_repeat_one_white_36dp.png b/app/src/main/res/drawable-xhdpi/ic_repeat_one_white_36dp.png
deleted file mode 100644
index 37b32931..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_repeat_one_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_repeat_white_36dp.png b/app/src/main/res/drawable-xhdpi/ic_repeat_white_36dp.png
deleted file mode 100644
index 2b86832d..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_repeat_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
deleted file mode 100644
index 9911572f..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png
deleted file mode 100644
index 7dbedd66..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_shuffle_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_shuffle_white_24dp.png
deleted file mode 100644
index de074c2f..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_shuffle_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_shuffle_white_36dp.png b/app/src/main/res/drawable-xhdpi/ic_shuffle_white_36dp.png
deleted file mode 100644
index e79444c4..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_shuffle_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_next_dark_36dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_next_dark_36dp.png
deleted file mode 100644
index 88ff0c1b..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_skip_next_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_next_white_36dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_next_white_36dp.png
deleted file mode 100644
index fa85f189..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_skip_next_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_previous_dark_36dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_previous_dark_36dp.png
deleted file mode 100644
index 1ec17572..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_skip_previous_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_36dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_36dp.png
deleted file mode 100644
index d5347eec..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_trending_up_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_trending_up_white_24dp.png
deleted file mode 100644
index ecb316ff..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_trending_up_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_twitter_box_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_twitter_box_white_24dp.png
deleted file mode 100644
index f1bdeee0..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_twitter_box_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_volume_up_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_volume_up_white_24dp.png
deleted file mode 100644
index 2b9d72d3..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_volume_up_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_web_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_web_white_24dp.png
deleted file mode 100644
index 95c16843..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_web_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_access_time_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_access_time_white_24dp.png
deleted file mode 100644
index 266ca418..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_access_time_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_album_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_album_white_24dp.png
deleted file mode 100644
index 3e455dfb..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_album_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_attach_money_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_attach_money_white_24dp.png
deleted file mode 100644
index 8b77603b..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_attach_money_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_audiotrack_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_audiotrack_white_24dp.png
deleted file mode 100644
index 37dc5110..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_audiotrack_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_book_open_variant_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_book_open_variant_white_24dp.png
deleted file mode 100644
index f2d1910b..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_book_open_variant_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_bug_report_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_bug_report_white_24dp.png
deleted file mode 100644
index b98a7e9c..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_bug_report_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_checkbox_marked_circle_outline_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_checkbox_marked_circle_outline_white_24dp.png
deleted file mode 100644
index d948a7c2..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_checkbox_marked_circle_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_dark_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_close_dark_24dp.png
deleted file mode 100644
index 214fe359..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_close_dark_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
deleted file mode 100644
index 0eb9d8b0..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 5d2e8ea3..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_description_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_description_white_24dp.png
deleted file mode 100644
index 0e802589..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_description_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png
deleted file mode 100644
index f801e7ab..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_black_24dp.xml b/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_black_24dp.xml
new file mode 100644
index 00000000..7779e9a9
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M9,3H11V5H9V3M13,3H15V5H13V3M9,7H11V9H9V7M13,7H15V9H13V7M9,11H11V13H9V11M13,11H15V13H13V11M9,15H11V17H9V15M13,15H15V17H13V15M9,19H11V21H9V19M13,19H15V21H13V19Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_24dp.png
deleted file mode 100644
index 48e221b8..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_equalizer_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_equalizer_white_24dp.png
deleted file mode 100644
index 92496bc4..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_equalizer_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_favorite_outline_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_favorite_outline_white_24dp.png
deleted file mode 100644
index e79a2fb9..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_favorite_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_favorite_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_favorite_white_24dp.png
deleted file mode 100644
index 1de4e583..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_favorite_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_flag_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_flag_white_24dp.png
deleted file mode 100644
index 26935301..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_flag_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png
deleted file mode 100644
index 01171f54..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_github_circle_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_github_circle_white_24dp.png
deleted file mode 100644
index 05bccca0..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_github_circle_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_google_circles_communities_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_google_circles_communities_white_24dp.png
deleted file mode 100644
index 7e1c90b3..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_google_circles_communities_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_google_circles_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_google_circles_white_24dp.png
deleted file mode 100644
index 2bd6b5f9..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_google_circles_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_help_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_help_white_24dp.png
deleted file mode 100644
index 78cf5a23..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_help_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png
deleted file mode 100644
index 773917c7..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png
deleted file mode 100644
index f8e64ad7..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_up_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_up_white_24dp.png
deleted file mode 100644
index c079c59c..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_up_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png
deleted file mode 100644
index 1a510982..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_my_library_music_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_my_library_music_white_24dp.png
deleted file mode 100644
index 35c4edcc..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_my_library_music_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause_dark_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_pause_dark_36dp.png
deleted file mode 100644
index 906446df..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_pause_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png
deleted file mode 100644
index 60798c76..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_person_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_person_white_24dp.png
deleted file mode 100644
index 7239d88d..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_person_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_dark_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_dark_36dp.png
deleted file mode 100644
index 5f6f8803..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png
deleted file mode 100644
index ad5a0ef5..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_24dp.png
deleted file mode 100644
index 2e4df6eb..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_shopping_bag_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_shopping_bag_white_24dp.png
deleted file mode 100644
index f2741a19..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_play_shopping_bag_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_playlist_add_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_playlist_add_white_24dp.png
deleted file mode 100644
index 82e0ee1f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_playlist_add_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_queue_music_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_queue_music_white_24dp.png
deleted file mode 100644
index 15d7528e..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_queue_music_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_queue_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_queue_white_24dp.png
deleted file mode 100644
index 844e8c4e..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_queue_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_repeat_off_white_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_repeat_off_white_36dp.png
deleted file mode 100644
index 42ab374b..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_repeat_off_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_repeat_one_white_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_repeat_one_white_36dp.png
deleted file mode 100644
index 39f6ce94..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_repeat_one_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_repeat_white_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_repeat_white_36dp.png
deleted file mode 100644
index 98eb67c9..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_repeat_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
deleted file mode 100644
index dabeff64..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png
deleted file mode 100644
index 8b1e31df..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_shuffle_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_shuffle_white_24dp.png
deleted file mode 100644
index e79444c4..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_shuffle_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_shuffle_white_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_shuffle_white_36dp.png
deleted file mode 100644
index 939077c0..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_shuffle_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_next_dark_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_next_dark_36dp.png
deleted file mode 100644
index 5fecc468..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_skip_next_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_next_white_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_next_white_36dp.png
deleted file mode 100644
index ac38e6d4..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_skip_next_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_dark_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_previous_dark_36dp.png
deleted file mode 100644
index b0ebffb2..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_36dp.png
deleted file mode 100644
index fbb27ab3..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_trending_up_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_trending_up_white_24dp.png
deleted file mode 100644
index 3bf0adca..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_trending_up_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_twitter_box_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_twitter_box_white_24dp.png
deleted file mode 100644
index c6e831b0..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_twitter_box_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_volume_up_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_volume_up_white_24dp.png
deleted file mode 100644
index 58fc6772..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_volume_up_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_web_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_web_white_24dp.png
deleted file mode 100644
index 15fa5d96..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_web_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_access_time_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_access_time_white_24dp.png
deleted file mode 100644
index b812470e..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_access_time_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_album_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_album_white_24dp.png
deleted file mode 100644
index 6a3408a5..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_album_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_attach_money_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_attach_money_white_24dp.png
deleted file mode 100644
index 57de5bb8..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_attach_money_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_audiotrack_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_audiotrack_white_24dp.png
deleted file mode 100644
index 74b0274a..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_audiotrack_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_book_open_variant_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_book_open_variant_white_24dp.png
deleted file mode 100644
index 6ed32ea6..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_book_open_variant_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bug_report_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_bug_report_white_24dp.png
deleted file mode 100644
index 5d714c56..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_bug_report_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_check_white_96dp.png b/app/src/main/res/drawable-xxxhdpi/ic_check_white_96dp.png
deleted file mode 100644
index 5dba3bb8..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_check_white_96dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_checkbox_marked_circle_outline_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_checkbox_marked_circle_outline_white_24dp.png
deleted file mode 100644
index fdd58427..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_checkbox_marked_circle_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_close_dark_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_close_dark_24dp.png
deleted file mode 100644
index a6e4fccd..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_close_dark_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
deleted file mode 100644
index 7b2a480a..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index e7b2514d..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_description_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_description_white_24dp.png
deleted file mode 100644
index 8c44818f..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_description_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_done_white_24dp.png
deleted file mode 100755
index 87892840..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_done_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_drag_vertical_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_drag_vertical_white_24dp.png
deleted file mode 100644
index 38a3dc3f..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_drag_vertical_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_equalizer_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_equalizer_white_24dp.png
deleted file mode 100644
index a7335db7..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_equalizer_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_favorite_outline_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_favorite_outline_white_24dp.png
deleted file mode 100644
index f58165d9..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_favorite_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_favorite_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_favorite_white_24dp.png
deleted file mode 100644
index 5868c34b..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_favorite_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_flag_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_flag_white_24dp.png
deleted file mode 100644
index 6c57703c..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_flag_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_folder_web.png b/app/src/main/res/drawable-xxxhdpi/ic_folder_web.png
deleted file mode 100644
index ba79cecc..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_folder_web.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png
deleted file mode 100644
index d812acb0..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_github_circle_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_github_circle_white_24dp.png
deleted file mode 100644
index 096f5413..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_github_circle_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_google_circles_communities_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_google_circles_communities_white_24dp.png
deleted file mode 100644
index 6ae095e0..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_google_circles_communities_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_google_circles_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_google_circles_white_24dp.png
deleted file mode 100644
index e6bb6b7c..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_google_circles_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_help_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_help_white_24dp.png
deleted file mode 100644
index b87397b3..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_help_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_history_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_history_white_24dp.png
deleted file mode 100644
index 68f446bc..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_history_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_info_outline_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_info_outline_white_24dp.png
deleted file mode 100644
index cb42f367..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_info_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_24dp.png
deleted file mode 100644
index 27403f79..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png
deleted file mode 100644
index c15d6346..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_my_library_music_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_my_library_music_white_24dp.png
deleted file mode 100644
index 715aaa18..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_my_library_music_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pause_dark_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_pause_dark_36dp.png
deleted file mode 100644
index 73339397..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_pause_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pause_white_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_pause_white_36dp.png
deleted file mode 100644
index 4b4daad4..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_pause_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.png
deleted file mode 100644
index f6b0ddcd..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_dark_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_dark_36dp.png
deleted file mode 100644
index bbae7d47..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png
deleted file mode 100644
index 4ee72e52..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_circle_fill_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_circle_fill_white_24dp.png
deleted file mode 100644
index 6d1eca46..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_play_circle_fill_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_shopping_bag_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_shopping_bag_white_24dp.png
deleted file mode 100644
index 53ee6421..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_play_shopping_bag_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_playlist_add_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_playlist_add_white_24dp.png
deleted file mode 100644
index ae4cdc5b..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_playlist_add_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_queue_music_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_queue_music_white_24dp.png
deleted file mode 100644
index ae058bb4..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_queue_music_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_queue_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_queue_white_24dp.png
deleted file mode 100644
index cffe4fa8..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_queue_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_repeat_off_white_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_repeat_off_white_36dp.png
deleted file mode 100644
index 59b70a15..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_repeat_off_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_repeat_one_white_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_repeat_one_white_36dp.png
deleted file mode 100644
index dce40914..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_repeat_one_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_repeat_white_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_repeat_white_36dp.png
deleted file mode 100644
index db9e2230..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_repeat_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png
deleted file mode 100644
index c4efc1b3..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png
deleted file mode 100644
index 31df7fcb..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shuffle_off_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_shuffle_off_white_24dp.png
deleted file mode 100644
index dd7e71d0..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_shuffle_off_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shuffle_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_shuffle_white_24dp.png
deleted file mode 100644
index da327b9f..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_shuffle_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shuffle_white_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_shuffle_white_36dp.png
deleted file mode 100644
index 69348d5f..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_shuffle_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_dark_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_next_dark_36dp.png
deleted file mode 100644
index 1a4ed909..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_36dp.png
deleted file mode 100644
index a84f3422..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_dark_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_dark_36dp.png
deleted file mode 100644
index 3c07e3c4..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_dark_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_white_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_white_36dp.png
deleted file mode 100644
index d2e06a92..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_white_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_trending_up_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_trending_up_white_24dp.png
deleted file mode 100644
index 834787a4..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_trending_up_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_twitter_box_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_twitter_box_white_24dp.png
deleted file mode 100644
index 5b08d1c1..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_twitter_box_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_volume_up_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_volume_up_white_24dp.png
deleted file mode 100644
index 90112928..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_volume_up_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_web_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_web_white_24dp.png
deleted file mode 100644
index d3837be4..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_web_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_access_time_black_24dp.xml b/app/src/main/res/drawable/ic_access_time_black_24dp.xml
new file mode 100644
index 00000000..c0ecd8dc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_access_time_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_assignment_turned_in_black_24dp.xml b/app/src/main/res/drawable/ic_assignment_turned_in_black_24dp.xml
new file mode 100644
index 00000000..1b87ba3f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_assignment_turned_in_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM10,17l-4,-4 1.41,-1.41L10,14.17l6.59,-6.59L18,9l-8,8z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_bug_report_black_24dp.xml b/app/src/main/res/drawable/ic_bug_report_black_24dp.xml
new file mode 100644
index 00000000..206702ff
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bug_report_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_card_giftcard_black_24dp.xml b/app/src/main/res/drawable/ic_card_giftcard_black_24dp.xml
new file mode 100644
index 00000000..65acd125
--- /dev/null
+++ b/app/src/main/res/drawable/ic_card_giftcard_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,6h-2.18c0.11,-0.31 0.18,-0.65 0.18,-1 0,-1.66 -1.34,-3 -3,-3 -1.05,0 -1.96,0.54 -2.5,1.35l-0.5,0.67 -0.5,-0.68C10.96,2.54 10.05,2 9,2 7.34,2 6,3.34 6,5c0,0.35 0.07,0.69 0.18,1L4,6c-1.11,0 -1.99,0.89 -1.99,2L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM15,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM9,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM20,19L4,19v-2h16v2zM20,14L4,14L4,8h5.08L7,10.83 8.62,12 11,8.76l1,-1.36 1,1.36L15.38,12 17,10.83 14.92,8L20,8v6z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_close_black_24dp.xml b/app/src/main/res/drawable/ic_close_black_24dp.xml
new file mode 100644
index 00000000..f50fd991
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_delete_black_24dp.xml b/app/src/main/res/drawable/ic_delete_black_24dp.xml
new file mode 100644
index 00000000..962e0337
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_description_black_24dp.xml b/app/src/main/res/drawable/ic_description_black_24dp.xml
new file mode 100644
index 00000000..a30bc6ca
--- /dev/null
+++ b/app/src/main/res/drawable/ic_description_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_done_black_24dp.xml b/app/src/main/res/drawable/ic_done_black_24dp.xml
new file mode 100644
index 00000000..bda675f1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_done_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_expand_less_black_24dp.xml b/app/src/main/res/drawable/ic_expand_less_black_24dp.xml
new file mode 100644
index 00000000..2648fbba
--- /dev/null
+++ b/app/src/main/res/drawable/ic_expand_less_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_favorite_black_24dp.xml b/app/src/main/res/drawable/ic_favorite_black_24dp.xml
new file mode 100644
index 00000000..17cea927
--- /dev/null
+++ b/app/src/main/res/drawable/ic_favorite_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_favorite_border_black_24dp.xml b/app/src/main/res/drawable/ic_favorite_border_black_24dp.xml
new file mode 100644
index 00000000..feccba74
--- /dev/null
+++ b/app/src/main/res/drawable/ic_favorite_border_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_flag_black_24dp.xml b/app/src/main/res/drawable/ic_flag_black_24dp.xml
new file mode 100644
index 00000000..5f358e8d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flag_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M14.4,6L14,4H5v17h2v-7h5.6l0.4,2h7V6z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_folder_black_24dp.xml b/app/src/main/res/drawable/ic_folder_black_24dp.xml
new file mode 100644
index 00000000..a0243c28
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_github_circle.xml b/app/src/main/res/drawable/ic_github_circle.xml
new file mode 100644
index 00000000..bfd548da
--- /dev/null
+++ b/app/src/main/res/drawable/ic_github_circle.xml
@@ -0,0 +1,10 @@
+<!-- drawable/ic_github_circlecle.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_google_circles_communities.xml b/app/src/main/res/drawable/ic_google_circles_communities.xml
new file mode 100644
index 00000000..26447870
--- /dev/null
+++ b/app/src/main/res/drawable/ic_google_circles_communities.xml
@@ -0,0 +1,10 @@
+<!-- drawable/ic_google_circles_communities.xmlxml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M15,12C13.89,12 13,12.89 13,14A2,2 0 0,0 15,16A2,2 0 0,0 17,14C17,12.89 16.1,12 15,12M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M14,9C14,7.89 13.1,7 12,7C10.89,7 10,7.89 10,9A2,2 0 0,0 12,11A2,2 0 0,0 14,9M9,12A2,2 0 0,0 7,14A2,2 0 0,0 9,16A2,2 0 0,0 11,14C11,12.89 10.1,12 9,12Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_google_plus.xml b/app/src/main/res/drawable/ic_google_plus.xml
new file mode 100644
index 00000000..0ba434db
--- /dev/null
+++ b/app/src/main/res/drawable/ic_google_plus.xml
@@ -0,0 +1,10 @@
+<!-- drawable/ic_google_pluslus.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M23,11H21V9H19V11H17V13H19V15H21V13H23M8,11V13.4H12C11.8,14.4 10.8,16.4 8,16.4C5.6,16.4 3.7,14.4 3.7,12C3.7,9.6 5.6,7.6 8,7.6C9.4,7.6 10.3,8.2 10.8,8.7L12.7,6.9C11.5,5.7 9.9,5 8,5C4.1,5 1,8.1 1,12C1,15.9 4.1,19 8,19C12,19 14.7,16.2 14.7,12.2C14.7,11.7 14.7,11.4 14.6,11H8Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_help_black_24dp.xml b/app/src/main/res/drawable/ic_help_black_24dp.xml
new file mode 100644
index 00000000..b1d7a2cf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_help_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_info_outline_black_24dp.xml b/app/src/main/res/drawable/ic_info_outline_black_24dp.xml
new file mode 100644
index 00000000..9c51a4ff
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info_outline_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_library_add_black_24dp.xml b/app/src/main/res/drawable/ic_library_add_black_24dp.xml
new file mode 100644
index 00000000..6cef0c20
--- /dev/null
+++ b/app/src/main/res/drawable/ic_library_add_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6zM20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM19,11h-4v4h-2v-4L9,11L9,9h4L13,5h2v4h4v2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_library_music_black_24dp.xml b/app/src/main/res/drawable/ic_library_music_black_24dp.xml
new file mode 100644
index 00000000..6046503f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_library_music_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,7h-3v5.5c0,1.38 -1.12,2.5 -2.5,2.5S10,13.88 10,12.5s1.12,-2.5 2.5,-2.5c0.57,0 1.08,0.19 1.5,0.51L14,5h4v2zM4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_black_24dp.xml b/app/src/main/res/drawable/ic_menu_black_24dp.xml
new file mode 100644
index 00000000..8a6004bd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_vert_black_24dp.xml b/app/src/main/res/drawable/ic_more_vert_black_24dp.xml
new file mode 100644
index 00000000..7b7f1955
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_vert_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_open_in_browser_black_24dp.xml b/app/src/main/res/drawable/ic_open_in_browser_black_24dp.xml
new file mode 100644
index 00000000..97d25109
--- /dev/null
+++ b/app/src/main/res/drawable/ic_open_in_browser_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,4L5,4c-1.11,0 -2,0.9 -2,2v12c0,1.1 0.89,2 2,2h4v-2L5,18L5,8h14v10h-4v2h4c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.89,-2 -2,-2zM12,10l-4,4h3v6h2v-6h3l-4,-4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_pause_black_24dp.xml b/app/src/main/res/drawable/ic_pause_black_24dp.xml
new file mode 100644
index 00000000..53b5e6a9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pause_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_person_black_24dp.xml b/app/src/main/res/drawable/ic_person_black_24dp.xml
new file mode 100644
index 00000000..55495d5a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_person_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow_black_24dp.xml b/app/src/main/res/drawable/ic_play_arrow_black_24dp.xml
new file mode 100644
index 00000000..dbe3ec66
--- /dev/null
+++ b/app/src/main/res/drawable/ic_play_arrow_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8,5v14l11,-7z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml b/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml
new file mode 100644
index 00000000..f30f2955
--- /dev/null
+++ b/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M14,10L2,10v2h12v-2zM14,6L2,6v2h12L14,6zM18,14v-4h-2v4h-4v2h4v4h2v-4h4v-2h-4zM2,16h8v-2L2,14v2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_queue_music_black_24dp.xml b/app/src/main/res/drawable/ic_queue_music_black_24dp.xml
new file mode 100644
index 00000000..f6a97cf3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_queue_music_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15,6L3,6v2h12L15,6zM15,10L3,10v2h12v-2zM3,16h8v-2L3,14v2zM17,6v8.18c-0.31,-0.11 -0.65,-0.18 -1,-0.18 -1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3L19,8h3L22,6h-5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_repeat_black_24dp.xml b/app/src/main/res/drawable/ic_repeat_black_24dp.xml
new file mode 100644
index 00000000..a10f3b45
--- /dev/null
+++ b/app/src/main/res/drawable/ic_repeat_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_repeat_one_black_24dp.xml b/app/src/main/res/drawable/ic_repeat_one_black_24dp.xml
new file mode 100644
index 00000000..91ccc513
--- /dev/null
+++ b/app/src/main/res/drawable/ic_repeat_one_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4zM13,15L13,9h-1l-2,1v1h1.5v4L13,15z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_restore_black_24dp.xml b/app/src/main/res/drawable/ic_restore_black_24dp.xml
new file mode 100644
index 00000000..d9f75ea6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_restore_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_black_24dp.xml
new file mode 100644
index 00000000..7c0394bb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_shuffle_black_24dp.xml b/app/src/main/res/drawable/ic_shuffle_black_24dp.xml
new file mode 100644
index 00000000..5b8ccd9b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shuffle_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10.59,9.17L5.41,4 4,5.41l5.17,5.17 1.42,-1.41zM14.5,4l2.04,2.04L4,18.59 5.41,20 17.96,7.46 20,9.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_skip_next_black_24dp.xml b/app/src/main/res/drawable/ic_skip_next_black_24dp.xml
new file mode 100644
index 00000000..eae4da1b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_skip_next_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_skip_previous_black_24dp.xml b/app/src/main/res/drawable/ic_skip_previous_black_24dp.xml
new file mode 100644
index 00000000..abb9944f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_skip_previous_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_star_black_24dp.xml b/app/src/main/res/drawable/ic_star_black_24dp.xml
new file mode 100644
index 00000000..a2ebf353
--- /dev/null
+++ b/app/src/main/res/drawable/ic_star_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_trending_up_black_24dp.xml b/app/src/main/res/drawable/ic_trending_up_black_24dp.xml
new file mode 100644
index 00000000..c00c42e4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_trending_up_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16,6l2.29,2.29 -4.88,4.88 -4,-4L2,16.59 3.41,18l6,-6 4,4 6.3,-6.29L22,12V6z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_volume_up_black_24dp.xml b/app/src/main/res/drawable/ic_volume_up_black_24dp.xml
new file mode 100644
index 00000000..2ee5bce4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_volume_up_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z" />
+</vector>
diff --git a/app/src/main/res/drawable/twitter.xml b/app/src/main/res/drawable/twitter.xml
new file mode 100644
index 00000000..0dd8628a
--- /dev/null
+++ b/app/src/main/res/drawable/twitter.xml
@@ -0,0 +1,10 @@
+<!-- drawable/twitter.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M22.46,6C21.69,6.35 20.86,6.58 20,6.69C20.88,6.16 21.56,5.32 21.88,4.31C21.05,4.81 20.13,5.16 19.16,5.36C18.37,4.5 17.26,4 16,4C13.65,4 11.73,5.92 11.73,8.29C11.73,8.63 11.77,8.96 11.84,9.27C8.28,9.09 5.11,7.38 3,4.79C2.63,5.42 2.42,6.16 2.42,6.94C2.42,8.43 3.17,9.75 4.33,10.5C3.62,10.5 2.96,10.3 2.38,10C2.38,10 2.38,10 2.38,10.03C2.38,12.11 3.86,13.85 5.82,14.24C5.46,14.34 5.08,14.39 4.69,14.39C4.42,14.39 4.15,14.36 3.89,14.31C4.43,16 6,17.26 7.89,17.29C6.43,18.45 4.58,19.13 2.56,19.13C2.22,19.13 1.88,19.11 1.54,19.07C3.44,20.29 5.7,21 8.12,21C16,21 20.33,14.46 20.33,8.79C20.33,8.6 20.33,8.42 20.32,8.23C21.16,7.63 21.88,6.87 22.46,6Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml
index 2fe4e85c..6965f950 100644
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -1,4 +1,5 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -52,7 +53,7 @@
                         android:inputType="text|textCapWords"
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        android:textColor="@color/primary_text_default_material_dark" />
+                        android:textColor="@color/ate_primary_text_dark" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -142,10 +143,9 @@
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/play_pause_fab"
         style="@style/PlayPauseFab"
-        android:layout_gravity="bottom|right|end"
+        android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin_top_left_right"
-        android:src="@drawable/ic_done_white_24dp"
-        tools:ignore="RtlHardcoded" />
+        app:srcCompat="@drawable/ic_done_black_24dp" />
 
 </FrameLayout>
 
diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml
index 78ad8410..7569ff06 100644
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -1,4 +1,5 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -50,7 +51,7 @@
                         android:inputType="text|textCapWords"
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        android:textColor="@color/primary_text_default_material_dark" />
+                        android:textColor="@color/ate_primary_text_dark" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -68,7 +69,7 @@
                         android:inputType="text|textCapWords"
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        android:textColor="@color/primary_text_default_material_dark" />
+                        android:textColor="@color/ate_primary_text_dark" />
                 </android.support.design.widget.TextInputLayout>
 
             </LinearLayout>
@@ -173,10 +174,9 @@
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/play_pause_fab"
         style="@style/PlayPauseFab"
-        android:layout_gravity="bottom|right|end"
+        android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin_top_left_right"
-        android:src="@drawable/ic_done_white_24dp"
-        tools:ignore="RtlHardcoded" />
+        app:srcCompat="@drawable/ic_done_black_24dp" />
 
 </FrameLayout>
 
diff --git a/app/src/main/res/layout/card_about_app.xml b/app/src/main/res/layout/card_about_app.xml
index 0f89b519..b2bdc364 100644
--- a/app/src/main/res/layout/card_about_app.xml
+++ b/app/src/main/res/layout/card_about_app.xml
@@ -24,7 +24,7 @@
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_launcher"
+                android:src="@drawable/icon_web"
                 tools:ignore="ContentDescription" />
 
             <TextView
@@ -49,13 +49,11 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp">
 
-            <ImageView
+            <com.kabouzeid.gramophone.views.IconImageView
                 android:id="@+id/icon_info"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_info_outline_white_24dp"
-                android:tint="?attr/iconColor"
-                android:tintMode="src_in"
+                app:srcCompat="@drawable/ic_info_outline_black_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
@@ -96,13 +94,11 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp">
 
-            <ImageView
+            <com.kabouzeid.gramophone.views.IconImageView
                 android:id="@+id/icon_changelog"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_history_white_24dp"
-                android:tint="?attr/iconColor"
-                android:tintMode="src_in"
+                app:srcCompat="@drawable/ic_restore_black_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
@@ -129,13 +125,11 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp">
 
-            <ImageView
+            <com.kabouzeid.gramophone.views.IconImageView
                 android:id="@+id/icon_intro"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_book_open_variant_white_24dp"
-                android:tint="?attr/iconColor"
-                android:tintMode="src_in"
+                app:srcCompat="@drawable/ic_assignment_turned_in_black_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
@@ -162,13 +156,11 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp">
 
-            <ImageView
+            <com.kabouzeid.gramophone.views.IconImageView
                 android:id="@+id/icon_licenses"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_description_white_24dp"
-                android:tint="?attr/iconColor"
-                android:tintMode="src_in"
+                app:srcCompat="@drawable/ic_description_black_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
diff --git a/app/src/main/res/layout/card_author.xml b/app/src/main/res/layout/card_author.xml
index f092ff72..05805a2f 100644
--- a/app/src/main/res/layout/card_author.xml
+++ b/app/src/main/res/layout/card_author.xml
@@ -37,13 +37,11 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp">
 
-            <ImageView
+            <com.kabouzeid.gramophone.views.IconImageView
                 android:id="@+id/icon_author"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_person_white_24dp"
-                android:tint="?attr/iconColor"
-                android:tintMode="src_in"
+                app:srcCompat="@drawable/ic_person_black_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
@@ -82,13 +80,11 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp">
 
-            <ImageView
+            <com.kabouzeid.gramophone.views.IconImageView
                 android:id="@+id/icon_google_plus"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_google_circles_white_24dp"
-                android:tint="?attr/iconColor"
-                android:tintMode="src_in"
+                app:srcCompat="@drawable/ic_google_plus"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
@@ -115,13 +111,11 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp">
 
-            <ImageView
+            <com.kabouzeid.gramophone.views.IconImageView
                 android:id="@+id/icon_twitter"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_twitter_box_white_24dp"
-                android:tint="?attr/iconColor"
-                android:tintMode="src_in"
+                app:srcCompat="@drawable/twitter"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
@@ -148,13 +142,11 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp">
 
-            <ImageView
+            <com.kabouzeid.gramophone.views.IconImageView
                 android:id="@+id/icon_github"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_github_circle_white_24dp"
-                android:tint="?attr/iconColor"
-                android:tintMode="src_in"
+                app:srcCompat="@drawable/ic_github_circle"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
@@ -181,13 +173,11 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp">
 
-            <ImageView
+            <com.kabouzeid.gramophone.views.IconImageView
                 android:id="@+id/icon_website"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_web_white_24dp"
-                android:tint="?attr/iconColor"
-                android:tintMode="src_in"
+                app:srcCompat="@drawable/ic_open_in_browser_black_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
diff --git a/app/src/main/res/layout/card_support_development.xml b/app/src/main/res/layout/card_support_development.xml
index 608a0822..917ec41c 100644
--- a/app/src/main/res/layout/card_support_development.xml
+++ b/app/src/main/res/layout/card_support_development.xml
@@ -38,13 +38,11 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp">
 
-            <ImageView
+            <com.kabouzeid.gramophone.views.IconImageView
                 android:id="@+id/icon_bug_report"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_bug_report_white_24dp"
-                android:tint="?attr/iconColor"
-                android:tintMode="src_in"
+                app:srcCompat="@drawable/ic_bug_report_black_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
@@ -83,13 +81,11 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp">
 
-            <ImageView
+            <com.kabouzeid.gramophone.views.IconImageView
                 android:id="@+id/icon_google_plus_community"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_google_circles_communities_white_24dp"
-                android:tint="?attr/iconColor"
-                android:tintMode="src_in"
+                app:srcCompat="@drawable/ic_google_circles_communities"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
@@ -128,13 +124,11 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp">
 
-            <ImageView
+            <com.kabouzeid.gramophone.views.IconImageView
                 android:id="@+id/icon_flag"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_flag_white_24dp"
-                android:tint="?attr/iconColor"
-                android:tintMode="src_in"
+                app:srcCompat="@drawable/ic_flag_black_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
@@ -173,13 +167,11 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp">
 
-            <ImageView
+            <com.kabouzeid.gramophone.views.IconImageView
                 android:id="@+id/icon_rate"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_play_shopping_bag_white_24dp"
-                android:tint="?attr/iconColor"
-                android:tintMode="src_in"
+                app:srcCompat="@drawable/ic_star_black_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
@@ -218,13 +210,11 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp">
 
-            <ImageView
+            <com.kabouzeid.gramophone.views.IconImageView
                 android:id="@+id/icon_donate"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_attach_money_white_24dp"
-                android:tint="?attr/iconColor"
-                android:tintMode="src_in"
+                app:srcCompat="@drawable/ic_card_giftcard_black_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml
index 39b5fc56..74cb5bf6 100644
--- a/app/src/main/res/layout/fragment_mini_player.xml
+++ b/app/src/main/res/layout/fragment_mini_player.xml
@@ -4,9 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="@dimen/mini_player_height"
+    android:background="?cardBackgroundColor"
     android:clickable="true"
     android:focusable="false"
-    android:background="?cardBackgroundColor"
     android:transitionName="@string/transition_mini_player"
     tools:ignore="UnusedAttribute">
 
@@ -17,16 +17,14 @@
         android:layout_height="match_parent"
         android:orientation="horizontal">
 
-        <ImageView
+        <com.kabouzeid.gramophone.views.IconImageView
             android:id="@+id/mini_player_image"
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_gravity="center_vertical"
             android:layout_margin="16dp"
             android:scaleType="centerCrop"
-            android:src="@drawable/ic_keyboard_arrow_up_white_24dp"
-            android:tint="?attr/iconColor"
-            android:tintMode="src_in"
+            app:srcCompat="@drawable/ic_expand_less_black_24dp"
             tools:ignore="ContentDescription" />
 
         <TextView
@@ -42,7 +40,7 @@
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
-        <ImageView
+        <com.kabouzeid.gramophone.views.IconImageView
             android:id="@+id/mini_player_play_pause_button"
             android:layout_width="40dp"
             android:layout_height="40dp"
diff --git a/app/src/main/res/layout/fragment_playback_controls.xml b/app/src/main/res/layout/fragment_playback_controls.xml
index 1ba21567..1df9a245 100644
--- a/app/src/main/res/layout/fragment_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_playback_controls.xml
@@ -68,7 +68,8 @@
             android:background="?attr/roundSelector"
             android:padding="22dp"
             android:scaleType="fitCenter"
-            android:src="@drawable/ic_skip_previous_white_36dp" />
+            app:srcCompat="@drawable/ic_skip_previous_black_24dp"
+            tools:ignore="MissingPrefix" />
 
         <ImageButton
             android:id="@+id/player_next_button"
@@ -82,7 +83,8 @@
             android:background="?attr/roundSelector"
             android:padding="22dp"
             android:scaleType="fitCenter"
-            android:src="@drawable/ic_skip_next_white_36dp" />
+            app:srcCompat="@drawable/ic_skip_next_black_24dp"
+            tools:ignore="MissingPrefix" />
 
         <ImageButton
             android:id="@+id/player_repeat_button"
@@ -96,7 +98,8 @@
             android:background="?attr/roundSelector"
             android:padding="22dp"
             android:scaleType="fitCenter"
-            android:src="@drawable/ic_repeat_white_36dp" />
+            app:srcCompat="@drawable/ic_repeat_black_24dp"
+            tools:ignore="MissingPrefix" />
 
         <ImageButton
             android:id="@+id/player_shuffle_button"
@@ -110,7 +113,8 @@
             android:background="?attr/roundSelector"
             android:padding="22dp"
             android:scaleType="fitCenter"
-            android:src="@drawable/ic_shuffle_white_36dp" />
+            app:srcCompat="@drawable/ic_shuffle_black_24dp"
+            tools:ignore="MissingPrefix" />
 
         <Space
             android:id="@+id/dummy_fab"
diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml
index ff3f1c80..200137f7 100644
--- a/app/src/main/res/layout/item_grid.xml
+++ b/app/src/main/res/layout/item_grid.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_margin="2dp"
     android:foreground="?attr/rectSelector">
 
@@ -53,9 +54,9 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:paddingBottom="68dp"
-        android:src="@drawable/ic_check_white_96dp"
+        app:srcCompat="@drawable/ic_done_black_24dp"
         android:tint="?android:colorBackground"
         android:visibility="gone"
-        tools:ignore="ContentDescription" />
+        tools:ignore="ContentDescription,MissingPrefix" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index 5f63fc9a..4cff827f 100644
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -3,17 +3,18 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="72dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:foreground="?attr/rectSelector"
     tools:ignore="UnusedAttribute">
 
-    <ImageView
+    <com.kabouzeid.gramophone.views.IconImageView
         android:id="@+id/drag_view"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical|start"
         android:layout_marginLeft="-8dp"
         android:layout_marginStart="-8dp"
-        android:src="@drawable/ic_drag_vertical_white_24dp"
+        app:srcCompat="@drawable/ic_drag_vertical_black_24dp"
         android:tint="?attr/iconColor"
         android:visibility="gone"
         android:tintMode="src_in"
@@ -84,7 +85,7 @@
                 android:textColor="?android:textColorSecondary" />
         </LinearLayout>
 
-        <ImageView
+        <com.kabouzeid.gramophone.views.IconImageView
             android:id="@+id/menu"
             style="@style/OverFlowButton"
             android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/layout/item_list_single_row.xml b/app/src/main/res/layout/item_list_single_row.xml
index 96fbf1e6..e028d11e 100644
--- a/app/src/main/res/layout/item_list_single_row.xml
+++ b/app/src/main/res/layout/item_list_single_row.xml
@@ -3,19 +3,18 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="64dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:foreground="?attr/rectSelector"
     tools:ignore="UnusedAttribute">
 
-    <ImageView
+    <com.kabouzeid.gramophone.views.IconImageView
         android:id="@+id/drag_view"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical|start"
         android:layout_marginLeft="-8dp"
         android:layout_marginStart="-8dp"
-        android:src="@drawable/ic_drag_vertical_white_24dp"
-        android:tint="?attr/iconColor"
-        android:tintMode="src_in"
+        app:srcCompat="@drawable/ic_drag_vertical_black_24dp"
         android:visibility="gone"
         tools:ignore="ContentDescription" />
 
@@ -69,7 +68,7 @@
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
-        <ImageView
+        <com.kabouzeid.gramophone.views.IconImageView
             android:id="@+id/menu"
             style="@style/OverFlowButton"
             android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/layout/notification.xml b/app/src/main/res/layout/notification.xml
index 37d1bbe4..2f329614 100644
--- a/app/src/main/res/layout/notification.xml
+++ b/app/src/main/res/layout/notification.xml
@@ -20,9 +20,9 @@
     android:layout_width="match_parent"
     android:layout_height="64dp">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout android:id="@+id/root"
+        xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/root"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#00000000"
@@ -30,8 +30,8 @@
         android:orientation="horizontal"
         tools:ignore="UselessParent">
 
-        <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/icon_group"
+        <FrameLayout android:id="@+id/icon_group"
+            xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="@dimen/notification_large_icon_width"
             android:layout_height="@dimen/notification_large_icon_height"
             android:layout_weight="0">
@@ -91,9 +91,9 @@
             android:orientation="horizontal"
             tools:ignore="UnusedAttribute">
             <!-- media buttons will be added here -->
-            <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/action_prev"
+            <ImageButton android:id="@+id/action_prev"
                 style="@style/Widget.AppCompat.Button.Borderless"
+                xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="2dp"
@@ -103,12 +103,11 @@
                 android:gravity="center"
                 android:padding="8dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_skip_previous_white_36dp"
                 tools:ignore="ContentDescription" />
 
-            <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/action_play_pause"
+            <ImageButton android:id="@+id/action_play_pause"
                 style="@style/Widget.AppCompat.Button.Borderless"
+                xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="2dp"
@@ -118,12 +117,11 @@
                 android:gravity="center"
                 android:padding="8dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_play_arrow_white_36dp"
                 tools:ignore="ContentDescription" />
 
-            <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/action_next"
+            <ImageButton android:id="@+id/action_next"
                 style="@style/Widget.AppCompat.Button.Borderless"
+                xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="2dp"
@@ -133,7 +131,6 @@
                 android:gravity="center"
                 android:padding="8dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_skip_next_white_36dp"
                 tools:ignore="ContentDescription" />
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/notification_big.xml b/app/src/main/res/layout/notification_big.xml
index 94304c7f..8e31ce27 100644
--- a/app/src/main/res/layout/notification_big.xml
+++ b/app/src/main/res/layout/notification_big.xml
@@ -47,7 +47,6 @@
             android:layout_marginRight="2dp"
             android:layout_marginTop="2dp"
             android:background="@drawable/notification_selector"
-            android:src="@drawable/ic_close_white_24dp"
             tools:ignore="ContentDescription" />
 
         <LinearLayout
@@ -124,7 +123,6 @@
                 android:gravity="center"
                 android:padding="8dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_skip_previous_white_36dp"
                 tools:ignore="ContentDescription" />
 
             <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
@@ -139,7 +137,6 @@
                 android:gravity="center"
                 android:padding="8dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_play_arrow_white_36dp"
                 tools:ignore="ContentDescription" />
 
             <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
@@ -154,7 +151,6 @@
                 android:gravity="center"
                 android:padding="8dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_skip_next_white_36dp"
                 tools:ignore="ContentDescription" />
         </LinearLayout>
     </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_medium.xml b/app/src/main/res/layout/widget_medium.xml
index 94b84b8b..70ee9b2e 100644
--- a/app/src/main/res/layout/widget_medium.xml
+++ b/app/src/main/res/layout/widget_medium.xml
@@ -30,24 +30,21 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/notification_selector"
-                android:src="@drawable/ic_skip_previous_dark_36dp" />
+                android:background="@drawable/notification_selector" />
 
             <ImageButton
                 android:id="@+id/button_toggle_play_pause"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/notification_selector"
-                android:src="@drawable/ic_play_arrow_dark_36dp" />
+                android:background="@drawable/notification_selector" />
 
             <ImageButton
                 android:id="@+id/button_next"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/notification_selector"
-                android:src="@drawable/ic_skip_next_dark_36dp" />
+                android:background="@drawable/notification_selector" />
 
         </LinearLayout>
 
@@ -68,7 +65,7 @@
                 android:gravity="center_vertical"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                android:textColor="@color/primary_text_default_material_light" />
+                android:textColor="@color/ate_primary_text_light" />
 
             <TextView
                 android:id="@+id/song_secondary_information"
@@ -78,7 +75,7 @@
                 android:gravity="center_vertical"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                android:textColor="@color/secondary_text_default_material_light" />
+                android:textColor="@color/ate_primary_text_light" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/menu/menu_album_detail.xml b/app/src/main/res/menu/menu_album_detail.xml
index 035ab981..6d07fb9b 100644
--- a/app/src/main/res/menu/menu_album_detail.xml
+++ b/app/src/main/res/menu/menu_album_detail.xml
@@ -4,7 +4,7 @@
     tools:context="com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity">
 
     <item
-        android:icon="@drawable/ic_shuffle_white_24dp"
+        android:icon="@drawable/ic_shuffle_black_24dp"
         android:id="@+id/action_shuffle_album"
         android:title="@string/action_shuffle_album"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/menu_artist_detail.xml b/app/src/main/res/menu/menu_artist_detail.xml
index c4432093..33832ec4 100644
--- a/app/src/main/res/menu/menu_artist_detail.xml
+++ b/app/src/main/res/menu/menu_artist_detail.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_shuffle_artist"
-        android:icon="@drawable/ic_shuffle_white_24dp"
+        android:icon="@drawable/ic_shuffle_black_24dp"
         android:title="@string/action_shuffle_artist"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml b/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml
index f9fa21ff..54a9fecd 100644
--- a/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml
+++ b/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml
@@ -4,13 +4,13 @@
 
     <item
         android:id="@+id/action_add_to_playlist"
-        android:icon="@drawable/ic_playlist_add_white_24dp"
+        android:icon="@drawable/ic_playlist_add_black_24dp"
         android:title="@string/action_add_to_playlist"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_add_to_current_playing"
-        android:icon="@drawable/ic_queue_white_24dp"
+        android:icon="@drawable/ic_library_add_black_24dp"
         android:title="@string/action_add_to_playing_queue"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_drawer.xml b/app/src/main/res/menu/menu_drawer.xml
index 48664d49..01daf0cb 100644
--- a/app/src/main/res/menu/menu_drawer.xml
+++ b/app/src/main/res/menu/menu_drawer.xml
@@ -6,12 +6,12 @@
         android:checkableBehavior="single">
         <item
             android:id="@+id/nav_library"
-            android:icon="@drawable/ic_my_library_music_white_24dp"
+            android:icon="@drawable/ic_library_music_black_24dp"
             android:title="@string/library" />
         <item
             android:enabled="false"
             android:id="@+id/nav_folders"
-            android:icon="@drawable/ic_folder_white_24dp"
+            android:icon="@drawable/ic_folder_black_24dp"
             android:title="Folders (soon)" />
     </group>
 
@@ -20,15 +20,15 @@
         android:checkableBehavior="none">
         <item
             android:id="@+id/support_development"
-            android:icon="@drawable/ic_favorite_white_24dp"
+            android:icon="@drawable/ic_favorite_black_24dp"
             android:title="@string/support_development" />
         <item
             android:id="@+id/nav_settings"
-            android:icon="@drawable/ic_settings_white_24dp"
+            android:icon="@drawable/ic_settings_black_24dp"
             android:title="@string/action_settings" />
         <item
             android:id="@+id/nav_about"
-            android:icon="@drawable/ic_help_white_24dp"
+            android:icon="@drawable/ic_help_black_24dp"
             android:title="@string/action_about" />
     </group>
 
diff --git a/app/src/main/res/menu/menu_media_selection.xml b/app/src/main/res/menu/menu_media_selection.xml
index f5da42f8..bf2c0c48 100644
--- a/app/src/main/res/menu/menu_media_selection.xml
+++ b/app/src/main/res/menu/menu_media_selection.xml
@@ -4,19 +4,19 @@
 
     <item
         android:id="@+id/action_add_to_playlist"
-        android:icon="@drawable/ic_playlist_add_white_24dp"
+        android:icon="@drawable/ic_playlist_add_black_24dp"
         android:title="@string/action_add_to_playlist"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_add_to_current_playing"
-        android:icon="@drawable/ic_queue_white_24dp"
+        android:icon="@drawable/ic_library_add_black_24dp"
         android:title="@string/action_add_to_playing_queue"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_delete_from_disk"
-        android:icon="@drawable/ic_delete_white_24dp"
+        android:icon="@drawable/ic_delete_black_24dp"
         android:title="@string/action_delete_from_device"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_player.xml b/app/src/main/res/menu/menu_player.xml
index a308099d..596048b9 100644
--- a/app/src/main/res/menu/menu_player.xml
+++ b/app/src/main/res/menu/menu_player.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/action_toggle_favorite"
-        android:icon="@drawable/ic_favorite_outline_white_24dp"
+        android:icon="@drawable/ic_favorite_border_black_24dp"
         android:title="@string/action_add_to_favorites"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_playlist_detail.xml b/app/src/main/res/menu/menu_playlist_detail.xml
index e74968f6..2f7551c0 100644
--- a/app/src/main/res/menu/menu_playlist_detail.xml
+++ b/app/src/main/res/menu/menu_playlist_detail.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_shuffle_playlist"
-        android:icon="@drawable/ic_shuffle_white_24dp"
+        android:icon="@drawable/ic_shuffle_black_24dp"
         android:title="@string/action_shuffle_playlist"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_playlists_selection.xml b/app/src/main/res/menu/menu_playlists_selection.xml
index 2ab37d2d..ed3f62a1 100644
--- a/app/src/main/res/menu/menu_playlists_selection.xml
+++ b/app/src/main/res/menu/menu_playlists_selection.xml
@@ -4,19 +4,19 @@
 
     <item
         android:id="@+id/action_add_to_playlist"
-        android:icon="@drawable/ic_playlist_add_white_24dp"
+        android:icon="@drawable/ic_playlist_add_black_24dp"
         android:title="@string/action_add_to_playlist"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_add_to_current_playing"
-        android:icon="@drawable/ic_queue_white_24dp"
+        android:icon="@drawable/ic_library_add_black_24dp"
         android:title="@string/action_add_to_playing_queue"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_delete_playlist"
-        android:icon="@drawable/ic_delete_white_24dp"
+        android:icon="@drawable/ic_delete_black_24dp"
         android:title="@string/delete_playlists_title"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_playlists_songs_selection.xml b/app/src/main/res/menu/menu_playlists_songs_selection.xml
index 0de0c9a3..121c4c8f 100644
--- a/app/src/main/res/menu/menu_playlists_songs_selection.xml
+++ b/app/src/main/res/menu/menu_playlists_songs_selection.xml
@@ -4,19 +4,19 @@
 
     <item
         android:id="@+id/action_add_to_playlist"
-        android:icon="@drawable/ic_playlist_add_white_24dp"
+        android:icon="@drawable/ic_playlist_add_black_24dp"
         android:title="@string/action_add_to_playlist"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_add_to_current_playing"
-        android:icon="@drawable/ic_queue_white_24dp"
+        android:icon="@drawable/ic_library_add_black_24dp"
         android:title="@string/action_add_to_playing_queue"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_remove_from_playlist"
-        android:icon="@drawable/ic_delete_white_24dp"
+        android:icon="@drawable/ic_delete_black_24dp"
         android:title="@string/action_remove_from_playlist"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_launcher.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_launcher.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 95e0c7d1..2e1366a6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -11,9 +11,7 @@
     <style name="Theme.Phonograph.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title" />
 
     <style name="OverFlowButton">
-        <item name="srcCompat">@drawable/abc_ic_menu_overflow_material</item>
-        <item name="android:tint">?attr/iconColor</item>
-        <item name="android:tintMode" tools:ignore="NewApi">src_in</item>
+        <item name="srcCompat">@drawable/ic_more_vert_black_24dp</item>
         <item name="android:layout_margin">8dp</item>
         <item name="android:layout_width">48dp</item>
         <item name="android:layout_height">48dp</item>