diff --git a/app/src/main/res/drawable-hdpi/unknown_album_large.png b/app/src/main/res/drawable-hdpi/unknown_album_large.png
deleted file mode 100644
index f5d008c..0000000
Binary files a/app/src/main/res/drawable-hdpi/unknown_album_large.png and /dev/null differ
diff --git a/app/src/main/res/drawable-v21/notification_divider.xml b/app/src/main/res/drawable-v21/notification_divider.xml
deleted file mode 100644
index 7678614..0000000
--- a/app/src/main/res/drawable-v21/notification_divider.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<size android:width="1dip" />
-	<solid android:color="@android:color/darker_gray" />
-</shape>
diff --git a/app/src/main/res/drawable-v21/notification_media_fastforward.xml b/app/src/main/res/drawable-v21/notification_media_fastforward.xml
deleted file mode 100644
index 8acaada..0000000
--- a/app/src/main/res/drawable-v21/notification_media_fastforward.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/lightElement" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
-</vector>
diff --git a/app/src/main/res/drawable-v21/notification_media_rewind.xml b/app/src/main/res/drawable-v21/notification_media_rewind.xml
deleted file mode 100644
index 5f91b27..0000000
--- a/app/src/main/res/drawable-v21/notification_media_rewind.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/lightElement" android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/actionbar_download.xml b/app/src/main/res/drawable/actionbar_download.xml
deleted file mode 100644
index 8e2d62e..0000000
--- a/app/src/main/res/drawable/actionbar_download.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/actionbar_media_backward.xml b/app/src/main/res/drawable/actionbar_media_backward.xml
deleted file mode 100644
index 9d66f8e..0000000
--- a/app/src/main/res/drawable/actionbar_media_backward.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/actionbar_media_fastforward.xml b/app/src/main/res/drawable/actionbar_media_fastforward.xml
deleted file mode 100644
index 65138dd..0000000
--- a/app/src/main/res/drawable/actionbar_media_fastforward.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/actionbar_media_forward.xml b/app/src/main/res/drawable/actionbar_media_forward.xml
deleted file mode 100644
index cedb671..0000000
--- a/app/src/main/res/drawable/actionbar_media_forward.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/actionbar_media_pause.xml b/app/src/main/res/drawable/actionbar_media_pause.xml
deleted file mode 100644
index 572af19..0000000
--- a/app/src/main/res/drawable/actionbar_media_pause.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/actionbar_media_rewind.xml b/app/src/main/res/drawable/actionbar_media_rewind.xml
deleted file mode 100644
index 32bf021..0000000
--- a/app/src/main/res/drawable/actionbar_media_rewind.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/actionbar_media_start.xml b/app/src/main/res/drawable/actionbar_media_start.xml
deleted file mode 100644
index c394f20..0000000
--- a/app/src/main/res/drawable/actionbar_media_start.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M8,5v14l11,-7z"/>
-</vector>
diff --git a/app/src/main/res/drawable/actionbar_media_stop.xml b/app/src/main/res/drawable/actionbar_media_stop.xml
deleted file mode 100644
index 3ba1b59..0000000
--- a/app/src/main/res/drawable/actionbar_media_stop.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M6,6h12v12H6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/actionbar_radio.xml b/app/src/main/res/drawable/actionbar_radio.xml
deleted file mode 100644
index 3c7b88a..0000000
--- a/app/src/main/res/drawable/actionbar_radio.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" 
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" android:pathData="M3.24,6.15C2.51,6.43 2,7.17 2,8v12c0,1.1 0.89,2 2,2h16c1.11,0 2,-0.9 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2L8.3,6l8.26,-3.34L15.88,1 3.24,6.15zM7,20c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM20,12h-2v-2h-2v2L4,12L4,8h16v4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/actionbar_shuffle.xml b/app/src/main/res/drawable/actionbar_shuffle.xml
deleted file mode 100644
index 19aab05..0000000
--- a/app/src/main/res/drawable/actionbar_shuffle.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/actionbar_element_color" 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/card_rounded_corners_black.xml b/app/src/main/res/drawable/card_rounded_corners_black.xml
deleted file mode 100644
index f6df0f8..0000000
--- a/app/src/main/res/drawable/card_rounded_corners_black.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/background_material_dark" />
-    <corners android:radius="@dimen/Card.Radius" />
-    <padding
-        android:bottom="0dip"
-        android:left="0dip"
-        android:right="0dip"
-        android:top="0dip" />
-</shape>
diff --git a/app/src/main/res/drawable/card_rounded_corners_dark.xml b/app/src/main/res/drawable/card_rounded_corners_dark.xml
deleted file mode 100644
index 0c3172b..0000000
--- a/app/src/main/res/drawable/card_rounded_corners_dark.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/black" />
-    <corners android:radius="@dimen/Card.Radius" />
-    <padding
-        android:bottom="0dip"
-        android:left="0dip"
-        android:right="0dip"
-        android:top="0dip" />
-</shape>
diff --git a/app/src/main/res/drawable/card_rounded_corners_light.xml b/app/src/main/res/drawable/card_rounded_corners_light.xml
deleted file mode 100644
index e82d4bd..0000000
--- a/app/src/main/res/drawable/card_rounded_corners_light.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/white" />
-    <corners android:radius="@dimen/Card.Radius" />
-    <padding
-        android:bottom="0dip"
-        android:left="0dip"
-        android:right="0dip"
-        android:top="0dip" />
-</shape>
diff --git a/app/src/main/res/drawable/ic_action_bookmark.xml b/app/src/main/res/drawable/ic_action_bookmark.xml
deleted file mode 100644
index 61f9134..0000000
--- a/app/src/main/res/drawable/ic_action_bookmark.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/darkElement" android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_action_playback_speed.xml b/app/src/main/res/drawable/ic_action_playback_speed.xml
deleted file mode 100644
index 3196707..0000000
--- a/app/src/main/res/drawable/ic_action_playback_speed.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/darkElement" 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_action_rating_bad.xml b/app/src/main/res/drawable/ic_action_rating_bad.xml
deleted file mode 100644
index 904fa36..0000000
--- a/app/src/main/res/drawable/ic_action_rating_bad.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M15,3L6,3c-0.83,0 -1.54,0.5 -1.84,1.22l-3.02,7.05c-0.09,0.23 -0.14,0.47 -0.14,0.73v1.91l0.01,0.01L1,14c0,1.1 0.9,2 2,2h6.31l-0.95,4.57 -0.03,0.32c0,0.41 0.17,0.79 0.44,1.06L9.83,23l6.59,-6.59c0.36,-0.36 0.58,-0.86 0.58,-1.41L17,5c0,-1.1 -0.9,-2 -2,-2zM19,3v12h4L23,3h-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_action_rating_bad_selected.xml b/app/src/main/res/drawable/ic_action_rating_bad_selected.xml
deleted file mode 100644
index 72a99e6..0000000
--- a/app/src/main/res/drawable/ic_action_rating_bad_selected.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M15,3L6,3c-0.83,0 -1.54,0.5 -1.84,1.22l-3.02,7.05c-0.09,0.23 -0.14,0.47 -0.14,0.73v1.91l0.01,0.01L1,14c0,1.1 0.9,2 2,2h6.31l-0.95,4.57 -0.03,0.32c0,0.41 0.17,0.79 0.44,1.06L9.83,23l6.59,-6.59c0.36,-0.36 0.58,-0.86 0.58,-1.41L17,5c0,-1.1 -0.9,-2 -2,-2zM19,3v12h4L23,3h-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_action_rating_good.xml b/app/src/main/res/drawable/ic_action_rating_good.xml
deleted file mode 100644
index 2ced033..0000000
--- a/app/src/main/res/drawable/ic_action_rating_good.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-1.91l-0.01,-0.01L23,10z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_action_rating_good_selected.xml b/app/src/main/res/drawable/ic_action_rating_good_selected.xml
deleted file mode 100644
index d9acf75..0000000
--- a/app/src/main/res/drawable/ic_action_rating_good_selected.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-1.91l-0.01,-0.01L23,10z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_action_song.xml b/app/src/main/res/drawable/ic_action_song.xml
deleted file mode 100644
index 69f0a3a..0000000
--- a/app/src/main/res/drawable/ic_action_song.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_admin.xml b/app/src/main/res/drawable/ic_menu_admin.xml
deleted file mode 100644
index dfd6eea..0000000
--- a/app/src/main/res/drawable/ic_menu_admin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M16.5,12c1.38,0 2.49,-1.12 2.49,-2.5S17.88,7 16.5,7C15.12,7 14,8.12 14,9.5s1.12,2.5 2.5,2.5zM9,11c1.66,0 2.99,-1.34 2.99,-3S10.66,5 9,5C7.34,5 6,6.34 6,8s1.34,3 3,3zM16.5,14c-1.83,0 -5.5,0.92 -5.5,2.75L11,19h11v-2.25c0,-1.83 -3.67,-2.75 -5.5,-2.75zM9,13c-2.33,0 -7,1.17 -7,3.5L2,19h7v-2.25c0,-0.85 0.33,-2.34 2.37,-3.47C10.5,13.1 9.66,13 9,13z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_bookmark.xml b/app/src/main/res/drawable/ic_menu_bookmark.xml
deleted file mode 100644
index f2b3c90..0000000
--- a/app/src/main/res/drawable/ic_menu_bookmark.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_bookmark_selected.xml b/app/src/main/res/drawable/ic_menu_bookmark_selected.xml
deleted file mode 100644
index feb16ed..0000000
--- a/app/src/main/res/drawable/ic_menu_bookmark_selected.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_chat.xml b/app/src/main/res/drawable/ic_menu_chat.xml
deleted file mode 100644
index 80291f8..0000000
--- a/app/src/main/res/drawable/ic_menu_chat.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM6,9h12v2L6,11L6,9zM14,14L6,14v-2h8v2zM18,8L6,8L6,6h12v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_chat_send.xml b/app/src/main/res/drawable/ic_menu_chat_send.xml
deleted file mode 100644
index 71f6548..0000000
--- a/app/src/main/res/drawable/ic_menu_chat_send.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_podcast.xml b/app/src/main/res/drawable/ic_menu_podcast.xml
deleted file mode 100644
index 3fecd4a..0000000
--- a/app/src/main/res/drawable/ic_menu_podcast.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M12,1c-4.97,0 -9,4.03 -9,9v7c0,1.66 1.34,3 3,3h3v-8H5v-2c0,-3.87 3.13,-7 7,-7s7,3.13 7,7v2h-4v8h3c1.66,0 3,-1.34 3,-3v-7c0,-4.97 -4.03,-9 -9,-9z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_radio.xml b/app/src/main/res/drawable/ic_menu_radio.xml
deleted file mode 100644
index c68033b..0000000
--- a/app/src/main/res/drawable/ic_menu_radio.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" 
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M3.24,6.15C2.51,6.43 2,7.17 2,8v12c0,1.1 0.89,2 2,2h16c1.11,0 2,-0.9 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2L8.3,6l8.26,-3.34L15.88,1 3.24,6.15zM7,20c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM20,12h-2v-2h-2v2L4,12L4,8h16v4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_share.xml b/app/src/main/res/drawable/ic_menu_share.xml
deleted file mode 100644
index c9ab44e..0000000
--- a/app/src/main/res/drawable/ic_menu_share.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/element_color" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_social_person.xml b/app/src/main/res/drawable/ic_social_person.xml
deleted file mode 100644
index 82858bc..0000000
--- a/app/src/main/res/drawable/ic_social_person.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="126dp" android:tint="@color/lightPrimary"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="126dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <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_toggle_played.xml b/app/src/main/res/drawable/ic_toggle_played.xml
deleted file mode 100644
index e9cc1e0..0000000
--- a/app/src/main/res/drawable/ic_toggle_played.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:alpha="0.5" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_toggle_star.xml b/app/src/main/res/drawable/ic_toggle_star.xml
deleted file mode 100644
index 85c045c..0000000
--- a/app/src/main/res/drawable/ic_toggle_star.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <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_toggle_star_outline.xml b/app/src/main/res/drawable/ic_toggle_star_outline.xml
deleted file mode 100644
index 3fc251d..0000000
--- a/app/src/main/res/drawable/ic_toggle_star_outline.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_toggle_star_outline_dark.xml b/app/src/main/res/drawable/ic_toggle_star_outline_dark.xml
deleted file mode 100644
index ddd3427..0000000
--- a/app/src/main/res/drawable/ic_toggle_star_outline_dark.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:alpha="0.8" android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <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_toggle_star_outline_light.xml b/app/src/main/res/drawable/ic_toggle_star_outline_light.xml
deleted file mode 100644
index d81d1e4..0000000
--- a/app/src/main/res/drawable/ic_toggle_star_outline_light.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:alpha="0.5" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <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/stat_notify_playing.xml b/app/src/main/res/drawable/stat_notify_playing.xml
deleted file mode 100644
index e135a55..0000000
--- a/app/src/main/res/drawable/stat_notify_playing.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M8,5v14l11,-7z"/>
-</vector>
diff --git a/app/src/main/res/drawable/stat_notify_sync.xml b/app/src/main/res/drawable/stat_notify_sync.xml
deleted file mode 100644
index c8e706e..0000000
--- a/app/src/main/res/drawable/stat_notify_sync.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/darkElement" android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/widget_media_fastforward.xml b/app/src/main/res/drawable/widget_media_fastforward.xml
deleted file mode 100644
index da07bd3..0000000
--- a/app/src/main/res/drawable/widget_media_fastforward.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/darkElement" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
-</vector>
diff --git a/app/src/main/res/layout/notification.xml b/app/src/main/res/layout/notification.xml
deleted file mode 100644
index 1433b21..0000000
--- a/app/src/main/res/layout/notification.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="horizontal">
-
-    <ImageView
-        android:id="@+id/notification_image"
-        android:layout_width="64.0dip"
-        android:layout_height="64.0dip"
-        android:layout_weight="0.0"
-        android:gravity="center" />
-
-    <LinearLayout
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingLeft="11.0dip">
-
-        <TextView
-            android:id="@+id/notification_title"
-            style="@style/NotificationText.Title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:ellipsize="marquee"
-            android:focusable="true"
-            android:singleLine="true" />
-
-        <TextView
-            android:id="@+id/notification_artist"
-            style="@style/NotificationText.Content"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:scrollHorizontally="true" />
-
-        <TextView
-            android:id="@+id/notification_album"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
-    </LinearLayout>
-
-    <ImageButton
-        android:id="@+id/control_previous"
-        style="@style/NotificationButton"
-        app:srcCompat="@drawable/notification_media_backward" />
-
-    <ImageButton
-        android:id="@+id/control_pause"
-        style="@style/NotificationButton"
-        android:layout_width="54dip"
-        android:padding="0dip"
-        app:srcCompat="@drawable/notification_media_pause" />
-
-    <ImageButton
-        android:id="@+id/control_next"
-        style="@style/NotificationButton"
-        app:srcCompat="@drawable/notification_media_forward" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/notification_expanded.xml b/app/src/main/res/layout/notification_expanded.xml
deleted file mode 100644
index 0350ee2..0000000
--- a/app/src/main/res/layout/notification_expanded.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="fill_parent"
-    android:layout_height="128dp"
-    android:orientation="horizontal">
-
-    <ImageView
-        android:id="@+id/notification_image"
-        android:layout_width="128dp"
-        android:layout_height="128dp"
-        android:gravity="center" />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        android:paddingLeft="11.0dip">
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/notification_title"
-                style="@style/NotificationText.Title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left|center_vertical"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:focusable="true"
-                android:singleLine="true" />
-
-            <ImageButton
-                android:id="@+id/notification_close"
-                style="@style/NotificationButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                app:srcCompat="@drawable/notification_close"
-                android:visibility="invisible" />
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/notification_artist"
-            style="@style/NotificationText.Content"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:scrollHorizontally="true" />
-
-        <TextView
-            android:id="@+id/notification_album"
-            style="@style/NotificationText.Content"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:paddingBottom="10dp"
-            android:scrollHorizontally="true" />
-
-        <ImageView
-            style="@style/NotificationDivider"
-            android:layout_width="fill_parent"
-            android:layout_height="1dp" />
-
-        <LinearLayout
-            style="@style/NotificationLayoutDivider"
-            android:layout_width="fill_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:orientation="horizontal"
-            android:showDividers="middle">
-
-            <ImageButton
-                android:id="@+id/control_previous"
-                style="@style/NotificationButton.Expanded"
-                app:srcCompat="@drawable/notification_media_backward" />
-
-            <ImageButton
-                android:id="@+id/control_pause"
-                style="@style/NotificationButton.Expanded"
-                app:srcCompat="@drawable/notification_media_pause" />
-
-            <ImageButton
-                android:id="@+id/control_next"
-                style="@style/NotificationButton.Expanded"
-                app:srcCompat="@drawable/notification_media_forward" />
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index abe538e..722ac6a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,5 +11,4 @@
     <color name="black">#000000</color>
     <color name="darkElement">#CCFFFFFF</color>
 
-    <color name="nowPlayingShadow">#44000000</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 25ca90c..d0027ab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -95,7 +95,6 @@
     <string name="download.playerstate_downloading">Downloading - %s</string>
     <string name="download.playerstate_mobile_disabled">Waiting for WiFi network to download</string>
     <string name="download.playerstate_buffering">Buffering</string>
-    <string name="download.playerstate_playing_shuffle">Shuffle mode</string>
     <string name="download.menu_show_album">Show Album</string>
     <string name="download.menu_remove_all">Remove all</string>
     <string name="download.menu_shuffle">Shuffle</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6c89aa2..6fb71f5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,32 +19,6 @@
         <item name="background">?attr/selectableItemBackgroundBorderless</item>
     </style>
 
-    <style name="NotificationButton.ExpandedBase">
-        <item name="android:padding">2dip</item>
-        <item name="background">?attr/selectableItemBackgroundBorderless</item>
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">fill_parent</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:layout_gravity">center</item>
-        <item name="android:scaleType">fitCenter</item>
-    </style>
-
-    <style name="NotificationButton.Expanded" parent="@style/NotificationButton.ExpandedBase">
-        <item name="android:padding">10dip</item>
-    </style>
-
-    <style name="NotificationText.Title" parent="@android:style/TextAppearance.Material.Notification.Title" />
-
-    <style name="NotificationText.Content" parent="@android:style/TextAppearance.Material.Notification" />
-
-    <style name="NotificationLayoutDivider">
-        <item name="divider">@drawable/notification_divider</item>
-    </style>
-
-    <style name="NotificationDivider">
-        <item name="background">@drawable/notification_divider</item>
-    </style>
-
     <style name="MoreButton" parent="@style/BasicButton">
         <item name="android:paddingRight">2dp</item>
     </style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 5c579ab..f053c51 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -147,10 +147,6 @@
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
-    <style name="DarkSpinnerItem" parent="Widget.AppCompat.TextView.SpinnerItem">
-        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
-    </style>
-
     <style name="LightActionMode" parent="@style/Widget.AppCompat.ActionMode">
         <item name="titleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse</item>
         <item name="subtitleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse</item>