diff --git a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
index be6cf82..ba9dd4c 100644
--- a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
+++ b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
@@ -482,7 +482,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
                 item.setChecked(true);
             }
         }
-        drawerHeaderToggle.setImageResource(R.drawable.main_select_server_dark);
+        drawerHeaderToggle.setImageResource(R.drawable.main_select_server);
 
         showingTabs = true;
     }
@@ -499,7 +499,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
             }
         }
         drawerList.getMenu().setGroupCheckable(MENU_GROUP_SERVER, true, true);
-        drawerHeaderToggle.setImageResource(R.drawable.main_select_tabs_dark);
+        drawerHeaderToggle.setImageResource(R.drawable.main_select_tabs);
 
         showingTabs = false;
     }
diff --git a/app/src/main/java/net/nullsum/audinaut/provider/AudinautWidgetProvider.java b/app/src/main/java/net/nullsum/audinaut/provider/AudinautWidgetProvider.java
index f1df0bb..407cca0 100644
--- a/app/src/main/java/net/nullsum/audinaut/provider/AudinautWidgetProvider.java
+++ b/app/src/main/java/net/nullsum/audinaut/provider/AudinautWidgetProvider.java
@@ -239,9 +239,9 @@ public class AudinautWidgetProvider extends AppWidgetProvider {
 
         // Set correct drawable for pause state
         if (playing) {
-            views.setImageViewResource(R.id.control_play, R.drawable.media_pause_dark);
+            views.setImageViewResource(R.id.control_play, R.drawable.widget_media_pause);
         } else {
-            views.setImageViewResource(R.id.control_play, R.drawable.media_start_dark);
+            views.setImageViewResource(R.id.control_play, R.drawable.widget_media_start);
         }
 
         // Set the cover art
diff --git a/app/src/main/java/net/nullsum/audinaut/util/Notifications.java b/app/src/main/java/net/nullsum/audinaut/util/Notifications.java
index fdf5fc6..fd6bf06 100644
--- a/app/src/main/java/net/nullsum/audinaut/util/Notifications.java
+++ b/app/src/main/java/net/nullsum/audinaut/util/Notifications.java
@@ -148,19 +148,19 @@ public final class Notifications {
         boolean persistent = Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_PERSISTENT_NOTIFICATION, false);
         if (persistent) {
             if (expanded) {
-                rv.setImageViewResource(R.id.control_pause, playing ? R.drawable.notification_pause : R.drawable.notification_start);
+                rv.setImageViewResource(R.id.control_pause, playing ? R.drawable.notification_media_pause : R.drawable.notification_media_start);
 
-                rv.setImageViewResource(R.id.control_previous, R.drawable.notification_backward);
-                rv.setImageViewResource(R.id.control_next, R.drawable.notification_forward);
+                rv.setImageViewResource(R.id.control_previous, R.drawable.notification_media_backward);
+                rv.setImageViewResource(R.id.control_next, R.drawable.notification_media_forward);
             } else {
-                rv.setImageViewResource(R.id.control_previous, playing ? R.drawable.notification_pause : R.drawable.notification_start);
-                rv.setImageViewResource(R.id.control_pause, R.drawable.notification_forward);
+                rv.setImageViewResource(R.id.control_previous, playing ? R.drawable.notification_media_pause : R.drawable.notification_media_start);
+                rv.setImageViewResource(R.id.control_pause, R.drawable.notification_media_forward);
                 rv.setImageViewResource(R.id.control_next, R.drawable.notification_close);
             }
         } else {
             // Necessary for switching back since it appears to re-use the same layout
-            rv.setImageViewResource(R.id.control_previous, R.drawable.notification_backward);
-            rv.setImageViewResource(R.id.control_next, R.drawable.notification_forward);
+            rv.setImageViewResource(R.id.control_previous, R.drawable.notification_media_backward);
+            rv.setImageViewResource(R.id.control_next, R.drawable.notification_media_forward);
         }
 
         // Create actions for media buttons
diff --git a/app/src/main/java/net/nullsum/audinaut/view/SongView.java b/app/src/main/java/net/nullsum/audinaut/view/SongView.java
index 72a27f3..35939fe 100644
--- a/app/src/main/java/net/nullsum/audinaut/view/SongView.java
+++ b/app/src/main/java/net/nullsum/audinaut/view/SongView.java
@@ -177,9 +177,9 @@ public class SongView extends UpdateView2<MusicDirectory.Entry, Boolean> {
                 moreButton.setImageResource(moreImage);
                 this.moreImage = moreImage;
             }
-        } else if (this.moreImage != R.drawable.download_none_light) {
+        } else if (this.moreImage != R.drawable.download_none) {
             moreButton.setImageResource(DrawableTint.getDrawableRes(context, R.attr.download_none));
-            this.moreImage = R.drawable.download_none_light;
+            this.moreImage = R.drawable.download_none;
         }
 
         if (downloadFile.isDownloading() && !downloadFile.isDownloadCancelled() && partialFileExists) {
diff --git a/app/src/main/res/drawable-hdpi/action_toggle_list_dark.png b/app/src/main/res/drawable-hdpi/action_toggle_list_dark.png
deleted file mode 100644
index a312638..0000000
Binary files a/app/src/main/res/drawable-hdpi/action_toggle_list_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/action_toggle_list_light.png b/app/src/main/res/drawable-hdpi/action_toggle_list_light.png
deleted file mode 100644
index df74111..0000000
Binary files a/app/src/main/res/drawable-hdpi/action_toggle_list_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/download_cached.png b/app/src/main/res/drawable-hdpi/download_cached.png
deleted file mode 100644
index 8b6680b..0000000
Binary files a/app/src/main/res/drawable-hdpi/download_cached.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/download_none_dark.png b/app/src/main/res/drawable-hdpi/download_none_dark.png
deleted file mode 100644
index c3953cc..0000000
Binary files a/app/src/main/res/drawable-hdpi/download_none_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/download_none_light.png b/app/src/main/res/drawable-hdpi/download_none_light.png
deleted file mode 100644
index 3cd9f7a..0000000
Binary files a/app/src/main/res/drawable-hdpi/download_none_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/download_pinned.png b/app/src/main/res/drawable-hdpi/download_pinned.png
deleted file mode 100644
index 2b93e32..0000000
Binary files a/app/src/main/res/drawable-hdpi/download_pinned.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/downloading_dark.png b/app/src/main/res/drawable-hdpi/downloading_dark.png
deleted file mode 100644
index e8e2351..0000000
Binary files a/app/src/main/res/drawable-hdpi/downloading_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/downloading_light.png b/app/src/main/res/drawable-hdpi/downloading_light.png
deleted file mode 100644
index 13290f0..0000000
Binary files a/app/src/main/res/drawable-hdpi/downloading_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_add_dark.png b/app/src/main/res/drawable-hdpi/ic_action_add_dark.png
deleted file mode 100644
index 3933f35..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_add_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_add_light.png b/app/src/main/res/drawable-hdpi/ic_action_add_light.png
deleted file mode 100644
index bf583d0..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_add_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_artist.png b/app/src/main/res/drawable-hdpi/ic_action_artist.png
deleted file mode 100644
index 3a7001a..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_artist.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_song.png b/app/src/main/res/drawable-hdpi/ic_action_song.png
deleted file mode 100644
index 448611c..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_song.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_add_person_dark.png b/app/src/main/res/drawable-hdpi/ic_menu_add_person_dark.png
deleted file mode 100644
index eecb370..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_add_person_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_add_person_light.png b/app/src/main/res/drawable-hdpi/ic_menu_add_person_light.png
deleted file mode 100644
index cb6f71f..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_add_person_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_download_dark.png b/app/src/main/res/drawable-hdpi/ic_menu_download_dark.png
deleted file mode 100644
index b374370..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_download_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_download_light.png b/app/src/main/res/drawable-hdpi/ic_menu_download_light.png
deleted file mode 100644
index 4fd0717..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_download_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_library_dark.png b/app/src/main/res/drawable-hdpi/ic_menu_library_dark.png
deleted file mode 100644
index 006b521..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_library_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_library_light.png b/app/src/main/res/drawable-hdpi/ic_menu_library_light.png
deleted file mode 100644
index 2fc874e..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_library_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_password_dark.png b/app/src/main/res/drawable-hdpi/ic_menu_password_dark.png
deleted file mode 100644
index 986b0d5..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_password_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_password_light.png b/app/src/main/res/drawable-hdpi/ic_menu_password_light.png
deleted file mode 100644
index c7c6603..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_password_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_playlist_dark.png b/app/src/main/res/drawable-hdpi/ic_menu_playlist_dark.png
deleted file mode 100644
index 192c718..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_playlist_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_playlist_light.png b/app/src/main/res/drawable-hdpi/ic_menu_playlist_light.png
deleted file mode 100644
index 91860c7..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_playlist_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_refresh_dark.png b/app/src/main/res/drawable-hdpi/ic_menu_refresh_dark.png
deleted file mode 100644
index b76ee54..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_refresh_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_refresh_light.png b/app/src/main/res/drawable-hdpi/ic_menu_refresh_light.png
deleted file mode 100644
index d94921c..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_refresh_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_remove_dark.png b/app/src/main/res/drawable-hdpi/ic_menu_remove_dark.png
deleted file mode 100644
index a4db8b2..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_remove_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_remove_light.png b/app/src/main/res/drawable-hdpi/ic_menu_remove_light.png
deleted file mode 100644
index 7758d21..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_remove_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_save_dark.png b/app/src/main/res/drawable-hdpi/ic_menu_save_dark.png
deleted file mode 100644
index e22906d..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_save_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_save_light.png b/app/src/main/res/drawable-hdpi/ic_menu_save_light.png
deleted file mode 100644
index 5efe601..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_save_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_search_dark.png b/app/src/main/res/drawable-hdpi/ic_menu_search_dark.png
deleted file mode 100644
index 0e82171..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_search_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_search_light.png b/app/src/main/res/drawable-hdpi/ic_menu_search_light.png
deleted file mode 100644
index a345ccf..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_search_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_settings_dark.png b/app/src/main/res/drawable-hdpi/ic_menu_settings_dark.png
deleted file mode 100644
index 1d4e52d..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_settings_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_settings_light.png b/app/src/main/res/drawable-hdpi/ic_menu_settings_light.png
deleted file mode 100644
index 589c06e..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_settings_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_shuffle_dark.png b/app/src/main/res/drawable-hdpi/ic_menu_shuffle_dark.png
deleted file mode 100644
index 4195867..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_shuffle_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_shuffle_light.png b/app/src/main/res/drawable-hdpi/ic_menu_shuffle_light.png
deleted file mode 100644
index 39f5478..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_shuffle_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/main_offline_dark.png b/app/src/main/res/drawable-hdpi/main_offline_dark.png
deleted file mode 100644
index 8eddd08..0000000
Binary files a/app/src/main/res/drawable-hdpi/main_offline_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/main_offline_light.png b/app/src/main/res/drawable-hdpi/main_offline_light.png
deleted file mode 100644
index 160dcfc..0000000
Binary files a/app/src/main/res/drawable-hdpi/main_offline_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/main_select_server_dark.png b/app/src/main/res/drawable-hdpi/main_select_server_dark.png
deleted file mode 100644
index fc2345a..0000000
Binary files a/app/src/main/res/drawable-hdpi/main_select_server_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/main_select_server_light.png b/app/src/main/res/drawable-hdpi/main_select_server_light.png
deleted file mode 100644
index 3a256ff..0000000
Binary files a/app/src/main/res/drawable-hdpi/main_select_server_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/main_select_tabs_dark.png b/app/src/main/res/drawable-hdpi/main_select_tabs_dark.png
deleted file mode 100644
index 2775c14..0000000
Binary files a/app/src/main/res/drawable-hdpi/main_select_tabs_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/main_select_tabs_light.png b/app/src/main/res/drawable-hdpi/main_select_tabs_light.png
deleted file mode 100644
index 2b5198e..0000000
Binary files a/app/src/main/res/drawable-hdpi/main_select_tabs_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_backward_dark.png b/app/src/main/res/drawable-hdpi/media_backward_dark.png
deleted file mode 100644
index 91b8171..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_backward_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_backward_light.png b/app/src/main/res/drawable-hdpi/media_backward_light.png
deleted file mode 100644
index 92e8000..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_backward_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_fastforward_dark.png b/app/src/main/res/drawable-hdpi/media_fastforward_dark.png
deleted file mode 100644
index bf23a56..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_fastforward_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_fastforward_light.png b/app/src/main/res/drawable-hdpi/media_fastforward_light.png
deleted file mode 100644
index 2935e61..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_fastforward_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_forward_dark.png b/app/src/main/res/drawable-hdpi/media_forward_dark.png
deleted file mode 100644
index d488bd9..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_forward_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_forward_light.png b/app/src/main/res/drawable-hdpi/media_forward_light.png
deleted file mode 100644
index fb819e1..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_forward_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_pause_dark.png b/app/src/main/res/drawable-hdpi/media_pause_dark.png
deleted file mode 100644
index 139d448..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_pause_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_pause_light.png b/app/src/main/res/drawable-hdpi/media_pause_light.png
deleted file mode 100644
index b96ea88..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_pause_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_repeat_all_dark.png b/app/src/main/res/drawable-hdpi/media_repeat_all_dark.png
deleted file mode 100644
index a26a729..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_repeat_all_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_repeat_all_light.png b/app/src/main/res/drawable-hdpi/media_repeat_all_light.png
deleted file mode 100644
index feeb662..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_repeat_all_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_repeat_off_dark.png b/app/src/main/res/drawable-hdpi/media_repeat_off_dark.png
deleted file mode 100644
index 172575f..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_repeat_off_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_repeat_off_light.png b/app/src/main/res/drawable-hdpi/media_repeat_off_light.png
deleted file mode 100644
index 6a7f51a..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_repeat_off_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_repeat_single_dark.png b/app/src/main/res/drawable-hdpi/media_repeat_single_dark.png
deleted file mode 100644
index 568cf18..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_repeat_single_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_repeat_single_light.png b/app/src/main/res/drawable-hdpi/media_repeat_single_light.png
deleted file mode 100644
index d3b75bc..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_repeat_single_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_rewind_dark.png b/app/src/main/res/drawable-hdpi/media_rewind_dark.png
deleted file mode 100644
index 127b658..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_rewind_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_rewind_light.png b/app/src/main/res/drawable-hdpi/media_rewind_light.png
deleted file mode 100644
index 7a6d6ae..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_rewind_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_start_dark.png b/app/src/main/res/drawable-hdpi/media_start_dark.png
deleted file mode 100644
index 4039ee5..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_start_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_start_light.png b/app/src/main/res/drawable-hdpi/media_start_light.png
deleted file mode 100644
index 068c4ba..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_start_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_stop_dark.png b/app/src/main/res/drawable-hdpi/media_stop_dark.png
deleted file mode 100644
index 1f4f773..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_stop_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/media_stop_light.png b/app/src/main/res/drawable-hdpi/media_stop_light.png
deleted file mode 100644
index e0b2358..0000000
Binary files a/app/src/main/res/drawable-hdpi/media_stop_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/notification_close_dark.png b/app/src/main/res/drawable-hdpi/notification_close_dark.png
deleted file mode 100644
index 561f300..0000000
Binary files a/app/src/main/res/drawable-hdpi/notification_close_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/notification_close_light.png b/app/src/main/res/drawable-hdpi/notification_close_light.png
deleted file mode 100644
index 7bd2d51..0000000
Binary files a/app/src/main/res/drawable-hdpi/notification_close_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/playing_dark.png b/app/src/main/res/drawable-hdpi/playing_dark.png
deleted file mode 100644
index bf0b086..0000000
Binary files a/app/src/main/res/drawable-hdpi/playing_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/playing_light.png b/app/src/main/res/drawable-hdpi/playing_light.png
deleted file mode 100644
index 48203a1..0000000
Binary files a/app/src/main/res/drawable-hdpi/playing_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/stat_notify_playing.png b/app/src/main/res/drawable-hdpi/stat_notify_playing.png
deleted file mode 100644
index aa58825..0000000
Binary files a/app/src/main/res/drawable-hdpi/stat_notify_playing.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/action_toggle_list_dark.png b/app/src/main/res/drawable-mdpi/action_toggle_list_dark.png
deleted file mode 100644
index f4640d3..0000000
Binary files a/app/src/main/res/drawable-mdpi/action_toggle_list_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/action_toggle_list_light.png b/app/src/main/res/drawable-mdpi/action_toggle_list_light.png
deleted file mode 100644
index a6a255e..0000000
Binary files a/app/src/main/res/drawable-mdpi/action_toggle_list_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/download_cached.png b/app/src/main/res/drawable-mdpi/download_cached.png
deleted file mode 100644
index 71277b0..0000000
Binary files a/app/src/main/res/drawable-mdpi/download_cached.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/download_none_dark.png b/app/src/main/res/drawable-mdpi/download_none_dark.png
deleted file mode 100644
index f55a163..0000000
Binary files a/app/src/main/res/drawable-mdpi/download_none_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/download_none_light.png b/app/src/main/res/drawable-mdpi/download_none_light.png
deleted file mode 100644
index dd29866..0000000
Binary files a/app/src/main/res/drawable-mdpi/download_none_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/download_pinned.png b/app/src/main/res/drawable-mdpi/download_pinned.png
deleted file mode 100644
index 4dd6583..0000000
Binary files a/app/src/main/res/drawable-mdpi/download_pinned.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/downloading_dark.png b/app/src/main/res/drawable-mdpi/downloading_dark.png
deleted file mode 100644
index d2616a4..0000000
Binary files a/app/src/main/res/drawable-mdpi/downloading_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/downloading_light.png b/app/src/main/res/drawable-mdpi/downloading_light.png
deleted file mode 100644
index 9fcbe50..0000000
Binary files a/app/src/main/res/drawable-mdpi/downloading_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_add_dark.png b/app/src/main/res/drawable-mdpi/ic_action_add_dark.png
deleted file mode 100644
index 078d385..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_add_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_add_light.png b/app/src/main/res/drawable-mdpi/ic_action_add_light.png
deleted file mode 100644
index 56eb651..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_add_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_artist.png b/app/src/main/res/drawable-mdpi/ic_action_artist.png
deleted file mode 100644
index 7f1ac6c..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_artist.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_song.png b/app/src/main/res/drawable-mdpi/ic_action_song.png
deleted file mode 100644
index b707921..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_song.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_volume_dark.png b/app/src/main/res/drawable-mdpi/ic_action_volume_dark.png
deleted file mode 100644
index 7a68e9f..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_volume_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_volume_light.png b/app/src/main/res/drawable-mdpi/ic_action_volume_light.png
deleted file mode 100644
index 4e5dc12..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_volume_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_add_person_dark.png b/app/src/main/res/drawable-mdpi/ic_menu_add_person_dark.png
deleted file mode 100644
index 23cb6ac..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_add_person_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_add_person_light.png b/app/src/main/res/drawable-mdpi/ic_menu_add_person_light.png
deleted file mode 100644
index e1c1200..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_add_person_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_download_dark.png b/app/src/main/res/drawable-mdpi/ic_menu_download_dark.png
deleted file mode 100644
index 361f8a7..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_download_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_download_light.png b/app/src/main/res/drawable-mdpi/ic_menu_download_light.png
deleted file mode 100644
index 3818538..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_download_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_library_dark.png b/app/src/main/res/drawable-mdpi/ic_menu_library_dark.png
deleted file mode 100644
index b4a56f3..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_library_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_library_light.png b/app/src/main/res/drawable-mdpi/ic_menu_library_light.png
deleted file mode 100644
index 89b0927..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_library_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_password_dark.png b/app/src/main/res/drawable-mdpi/ic_menu_password_dark.png
deleted file mode 100644
index 177b9e3..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_password_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_password_light.png b/app/src/main/res/drawable-mdpi/ic_menu_password_light.png
deleted file mode 100644
index 2d57bb0..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_password_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_playlist_dark.png b/app/src/main/res/drawable-mdpi/ic_menu_playlist_dark.png
deleted file mode 100644
index d37d26f..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_playlist_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_playlist_light.png b/app/src/main/res/drawable-mdpi/ic_menu_playlist_light.png
deleted file mode 100644
index ea5c055..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_playlist_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_refresh_dark.png b/app/src/main/res/drawable-mdpi/ic_menu_refresh_dark.png
deleted file mode 100644
index b9bcca6..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_refresh_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_refresh_light.png b/app/src/main/res/drawable-mdpi/ic_menu_refresh_light.png
deleted file mode 100644
index 102e0f1..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_refresh_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_remove_dark.png b/app/src/main/res/drawable-mdpi/ic_menu_remove_dark.png
deleted file mode 100644
index 4ef960d..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_remove_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_remove_light.png b/app/src/main/res/drawable-mdpi/ic_menu_remove_light.png
deleted file mode 100644
index cb97678..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_remove_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_save_dark.png b/app/src/main/res/drawable-mdpi/ic_menu_save_dark.png
deleted file mode 100644
index ad14439..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_save_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_save_light.png b/app/src/main/res/drawable-mdpi/ic_menu_save_light.png
deleted file mode 100644
index 3614cd0..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_save_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_search_dark.png b/app/src/main/res/drawable-mdpi/ic_menu_search_dark.png
deleted file mode 100644
index 7919a79..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_search_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_search_light.png b/app/src/main/res/drawable-mdpi/ic_menu_search_light.png
deleted file mode 100644
index 9eda3c2..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_search_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_settings_dark.png b/app/src/main/res/drawable-mdpi/ic_menu_settings_dark.png
deleted file mode 100644
index 1f4c88a..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_settings_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_settings_light.png b/app/src/main/res/drawable-mdpi/ic_menu_settings_light.png
deleted file mode 100644
index a99f86d..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_settings_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_shuffle_dark.png b/app/src/main/res/drawable-mdpi/ic_menu_shuffle_dark.png
deleted file mode 100644
index de814cd..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_shuffle_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_shuffle_light.png b/app/src/main/res/drawable-mdpi/ic_menu_shuffle_light.png
deleted file mode 100644
index e833c0c..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_shuffle_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/main_offline_dark.png b/app/src/main/res/drawable-mdpi/main_offline_dark.png
deleted file mode 100644
index b0a909a..0000000
Binary files a/app/src/main/res/drawable-mdpi/main_offline_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/main_offline_light.png b/app/src/main/res/drawable-mdpi/main_offline_light.png
deleted file mode 100644
index a9890dd..0000000
Binary files a/app/src/main/res/drawable-mdpi/main_offline_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/main_select_server_dark.png b/app/src/main/res/drawable-mdpi/main_select_server_dark.png
deleted file mode 100644
index 8f8de3a..0000000
Binary files a/app/src/main/res/drawable-mdpi/main_select_server_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/main_select_server_light.png b/app/src/main/res/drawable-mdpi/main_select_server_light.png
deleted file mode 100644
index 28e00fc..0000000
Binary files a/app/src/main/res/drawable-mdpi/main_select_server_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/main_select_tabs_dark.png b/app/src/main/res/drawable-mdpi/main_select_tabs_dark.png
deleted file mode 100644
index 682f201..0000000
Binary files a/app/src/main/res/drawable-mdpi/main_select_tabs_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/main_select_tabs_light.png b/app/src/main/res/drawable-mdpi/main_select_tabs_light.png
deleted file mode 100644
index 05ed913..0000000
Binary files a/app/src/main/res/drawable-mdpi/main_select_tabs_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_backward_dark.png b/app/src/main/res/drawable-mdpi/media_backward_dark.png
deleted file mode 100644
index be797b5..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_backward_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_backward_light.png b/app/src/main/res/drawable-mdpi/media_backward_light.png
deleted file mode 100644
index ea543c1..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_backward_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_fastforward_dark.png b/app/src/main/res/drawable-mdpi/media_fastforward_dark.png
deleted file mode 100644
index 16455b1..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_fastforward_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_fastforward_light.png b/app/src/main/res/drawable-mdpi/media_fastforward_light.png
deleted file mode 100644
index b1e0571..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_fastforward_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_forward_dark.png b/app/src/main/res/drawable-mdpi/media_forward_dark.png
deleted file mode 100644
index 1a72ac9..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_forward_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_forward_light.png b/app/src/main/res/drawable-mdpi/media_forward_light.png
deleted file mode 100644
index e9dd01c..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_forward_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_pause_dark.png b/app/src/main/res/drawable-mdpi/media_pause_dark.png
deleted file mode 100644
index 7244185..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_pause_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_pause_light.png b/app/src/main/res/drawable-mdpi/media_pause_light.png
deleted file mode 100644
index 049fef3..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_pause_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_repeat_all_dark.png b/app/src/main/res/drawable-mdpi/media_repeat_all_dark.png
deleted file mode 100644
index 321eb3c..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_repeat_all_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_repeat_all_light.png b/app/src/main/res/drawable-mdpi/media_repeat_all_light.png
deleted file mode 100644
index 18627bb..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_repeat_all_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_repeat_off_dark.png b/app/src/main/res/drawable-mdpi/media_repeat_off_dark.png
deleted file mode 100644
index 33bdeb9..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_repeat_off_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_repeat_off_light.png b/app/src/main/res/drawable-mdpi/media_repeat_off_light.png
deleted file mode 100644
index f534899..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_repeat_off_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_repeat_single_dark.png b/app/src/main/res/drawable-mdpi/media_repeat_single_dark.png
deleted file mode 100644
index ce18dda..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_repeat_single_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_repeat_single_light.png b/app/src/main/res/drawable-mdpi/media_repeat_single_light.png
deleted file mode 100644
index 0e2d292..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_repeat_single_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_rewind_dark.png b/app/src/main/res/drawable-mdpi/media_rewind_dark.png
deleted file mode 100644
index e8aa8ae..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_rewind_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_rewind_light.png b/app/src/main/res/drawable-mdpi/media_rewind_light.png
deleted file mode 100644
index 7d60b0b..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_rewind_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_start_dark.png b/app/src/main/res/drawable-mdpi/media_start_dark.png
deleted file mode 100644
index 84e4175..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_start_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_start_light.png b/app/src/main/res/drawable-mdpi/media_start_light.png
deleted file mode 100644
index 5338069..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_start_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_stop_dark.png b/app/src/main/res/drawable-mdpi/media_stop_dark.png
deleted file mode 100644
index 736267a..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_stop_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/media_stop_light.png b/app/src/main/res/drawable-mdpi/media_stop_light.png
deleted file mode 100644
index ace9793..0000000
Binary files a/app/src/main/res/drawable-mdpi/media_stop_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/notification_close_dark.png b/app/src/main/res/drawable-mdpi/notification_close_dark.png
deleted file mode 100644
index 55e2bf2..0000000
Binary files a/app/src/main/res/drawable-mdpi/notification_close_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/notification_close_light.png b/app/src/main/res/drawable-mdpi/notification_close_light.png
deleted file mode 100644
index 780add4..0000000
Binary files a/app/src/main/res/drawable-mdpi/notification_close_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/playing_dark.png b/app/src/main/res/drawable-mdpi/playing_dark.png
deleted file mode 100644
index b5b90e0..0000000
Binary files a/app/src/main/res/drawable-mdpi/playing_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/playing_light.png b/app/src/main/res/drawable-mdpi/playing_light.png
deleted file mode 100644
index 55a0070..0000000
Binary files a/app/src/main/res/drawable-mdpi/playing_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/stat_notify_playing.png b/app/src/main/res/drawable-mdpi/stat_notify_playing.png
deleted file mode 100644
index fc0e806..0000000
Binary files a/app/src/main/res/drawable-mdpi/stat_notify_playing.png and /dev/null differ
diff --git a/app/src/main/res/drawable-v21/notification_backward.xml b/app/src/main/res/drawable-v21/notification_backward.xml
deleted file mode 100644
index 7b00628..0000000
--- a/app/src/main/res/drawable-v21/notification_backward.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/media_backward_light" />
diff --git a/app/src/main/res/drawable-v21/notification_close.xml b/app/src/main/res/drawable-v21/notification_close.xml
index 6f643f5..2d33ceb 100644
--- a/app/src/main/res/drawable-v21/notification_close.xml
+++ b/app/src/main/res/drawable-v21/notification_close.xml
@@ -1,3 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/notification_close_light" />
+<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="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-v21/notification_divider.xml b/app/src/main/res/drawable-v21/notification_divider.xml
new file mode 100644
index 0000000..7678614
--- /dev/null
+++ b/app/src/main/res/drawable-v21/notification_divider.xml
@@ -0,0 +1,5 @@
+<?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_forward.xml b/app/src/main/res/drawable-v21/notification_forward.xml
deleted file mode 100644
index 45cd535..0000000
--- a/app/src/main/res/drawable-v21/notification_forward.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/media_forward_light" />
diff --git a/app/src/main/res/drawable-v21/notification_media_backward.xml b/app/src/main/res/drawable-v21/notification_media_backward.xml
new file mode 100644
index 0000000..c3c7759
--- /dev/null
+++ b/app/src/main/res/drawable-v21/notification_media_backward.xml
@@ -0,0 +1,5 @@
+<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="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable-v21/notification_media_fastforward.xml b/app/src/main/res/drawable-v21/notification_media_fastforward.xml
new file mode 100644
index 0000000..8acaada
--- /dev/null
+++ b/app/src/main/res/drawable-v21/notification_media_fastforward.xml
@@ -0,0 +1,5 @@
+<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_forward.xml b/app/src/main/res/drawable-v21/notification_media_forward.xml
new file mode 100644
index 0000000..7b1be29
--- /dev/null
+++ b/app/src/main/res/drawable-v21/notification_media_forward.xml
@@ -0,0 +1,5 @@
+<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="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-v21/notification_media_pause.xml b/app/src/main/res/drawable-v21/notification_media_pause.xml
new file mode 100644
index 0000000..57c0890
--- /dev/null
+++ b/app/src/main/res/drawable-v21/notification_media_pause.xml
@@ -0,0 +1,5 @@
+<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="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</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
new file mode 100644
index 0000000..5f91b27
--- /dev/null
+++ b/app/src/main/res/drawable-v21/notification_media_rewind.xml
@@ -0,0 +1,5 @@
+<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-v21/notification_media_start.xml b/app/src/main/res/drawable-v21/notification_media_start.xml
new file mode 100644
index 0000000..a41d74b
--- /dev/null
+++ b/app/src/main/res/drawable-v21/notification_media_start.xml
@@ -0,0 +1,5 @@
+<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="M8,5v14l11,-7z"/>
+</vector>
diff --git a/app/src/main/res/drawable-v21/notification_pause.xml b/app/src/main/res/drawable-v21/notification_pause.xml
deleted file mode 100644
index 7ff55b2..0000000
--- a/app/src/main/res/drawable-v21/notification_pause.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/media_pause_light" />
diff --git a/app/src/main/res/drawable-v21/notification_start.xml b/app/src/main/res/drawable-v21/notification_start.xml
deleted file mode 100644
index fdcbb67..0000000
--- a/app/src/main/res/drawable-v21/notification_start.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/media_start_light" />
diff --git a/app/src/main/res/drawable-xhdpi/action_toggle_list_dark.png b/app/src/main/res/drawable-xhdpi/action_toggle_list_dark.png
deleted file mode 100644
index 3b98cba..0000000
Binary files a/app/src/main/res/drawable-xhdpi/action_toggle_list_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/action_toggle_list_light.png b/app/src/main/res/drawable-xhdpi/action_toggle_list_light.png
deleted file mode 100644
index 13dd7b2..0000000
Binary files a/app/src/main/res/drawable-xhdpi/action_toggle_list_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/download_cached.png b/app/src/main/res/drawable-xhdpi/download_cached.png
deleted file mode 100644
index 58620b7..0000000
Binary files a/app/src/main/res/drawable-xhdpi/download_cached.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/download_none_dark.png b/app/src/main/res/drawable-xhdpi/download_none_dark.png
deleted file mode 100644
index 826361e..0000000
Binary files a/app/src/main/res/drawable-xhdpi/download_none_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/download_none_light.png b/app/src/main/res/drawable-xhdpi/download_none_light.png
deleted file mode 100644
index 58ff3dc..0000000
Binary files a/app/src/main/res/drawable-xhdpi/download_none_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/download_pinned.png b/app/src/main/res/drawable-xhdpi/download_pinned.png
deleted file mode 100644
index 171c209..0000000
Binary files a/app/src/main/res/drawable-xhdpi/download_pinned.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/downloading_dark.png b/app/src/main/res/drawable-xhdpi/downloading_dark.png
deleted file mode 100644
index fe7eee7..0000000
Binary files a/app/src/main/res/drawable-xhdpi/downloading_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/downloading_light.png b/app/src/main/res/drawable-xhdpi/downloading_light.png
deleted file mode 100644
index 4f7b655..0000000
Binary files a/app/src/main/res/drawable-xhdpi/downloading_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_add_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_add_dark.png
deleted file mode 100644
index 0ba1405..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_add_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_add_light.png b/app/src/main/res/drawable-xhdpi/ic_action_add_light.png
deleted file mode 100644
index 0ccc11a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_add_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_artist.png b/app/src/main/res/drawable-xhdpi/ic_action_artist.png
deleted file mode 100644
index 0a1bc51..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_artist.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_song.png b/app/src/main/res/drawable-xhdpi/ic_action_song.png
deleted file mode 100644
index c1e3174..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_song.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_volume_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_volume_dark.png
deleted file mode 100644
index 31ad283..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_volume_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_volume_light.png b/app/src/main/res/drawable-xhdpi/ic_action_volume_light.png
deleted file mode 100644
index dc2af73..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_volume_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_add_person_dark.png b/app/src/main/res/drawable-xhdpi/ic_menu_add_person_dark.png
deleted file mode 100644
index 36a1d13..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_add_person_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_add_person_light.png b/app/src/main/res/drawable-xhdpi/ic_menu_add_person_light.png
deleted file mode 100644
index eac24f7..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_add_person_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_download_dark.png b/app/src/main/res/drawable-xhdpi/ic_menu_download_dark.png
deleted file mode 100644
index e08f624..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_download_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_download_light.png b/app/src/main/res/drawable-xhdpi/ic_menu_download_light.png
deleted file mode 100644
index 4e17b60..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_download_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_library_dark.png b/app/src/main/res/drawable-xhdpi/ic_menu_library_dark.png
deleted file mode 100644
index 2b2e796..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_library_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_library_light.png b/app/src/main/res/drawable-xhdpi/ic_menu_library_light.png
deleted file mode 100644
index fc83844..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_library_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_password_dark.png b/app/src/main/res/drawable-xhdpi/ic_menu_password_dark.png
deleted file mode 100644
index da58df5..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_password_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_password_light.png b/app/src/main/res/drawable-xhdpi/ic_menu_password_light.png
deleted file mode 100644
index 71834fa..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_password_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_playlist_dark.png b/app/src/main/res/drawable-xhdpi/ic_menu_playlist_dark.png
deleted file mode 100644
index 5601f8b..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_playlist_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_playlist_light.png b/app/src/main/res/drawable-xhdpi/ic_menu_playlist_light.png
deleted file mode 100644
index 80661d5..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_playlist_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_refresh_dark.png b/app/src/main/res/drawable-xhdpi/ic_menu_refresh_dark.png
deleted file mode 100644
index fe8bad5..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_refresh_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_refresh_light.png b/app/src/main/res/drawable-xhdpi/ic_menu_refresh_light.png
deleted file mode 100644
index 8defd5d..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_refresh_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_remove_dark.png b/app/src/main/res/drawable-xhdpi/ic_menu_remove_dark.png
deleted file mode 100644
index cfcfef9..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_remove_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_remove_light.png b/app/src/main/res/drawable-xhdpi/ic_menu_remove_light.png
deleted file mode 100644
index de35e04..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_remove_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_save_dark.png b/app/src/main/res/drawable-xhdpi/ic_menu_save_dark.png
deleted file mode 100644
index 19486f3..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_save_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_save_light.png b/app/src/main/res/drawable-xhdpi/ic_menu_save_light.png
deleted file mode 100644
index abc05ef..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_save_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_search_dark.png b/app/src/main/res/drawable-xhdpi/ic_menu_search_dark.png
deleted file mode 100644
index 14e8033..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_search_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_search_light.png b/app/src/main/res/drawable-xhdpi/ic_menu_search_light.png
deleted file mode 100644
index fa8017a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_search_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_settings_dark.png b/app/src/main/res/drawable-xhdpi/ic_menu_settings_dark.png
deleted file mode 100644
index abef850..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_settings_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_settings_light.png b/app/src/main/res/drawable-xhdpi/ic_menu_settings_light.png
deleted file mode 100644
index 0cfd427..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_settings_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_shuffle_dark.png b/app/src/main/res/drawable-xhdpi/ic_menu_shuffle_dark.png
deleted file mode 100644
index 96bc78b..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_shuffle_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_shuffle_light.png b/app/src/main/res/drawable-xhdpi/ic_menu_shuffle_light.png
deleted file mode 100644
index f93ed76..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_shuffle_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/main_offline_dark.png b/app/src/main/res/drawable-xhdpi/main_offline_dark.png
deleted file mode 100644
index 03708c8..0000000
Binary files a/app/src/main/res/drawable-xhdpi/main_offline_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/main_offline_light.png b/app/src/main/res/drawable-xhdpi/main_offline_light.png
deleted file mode 100644
index 21b6a14..0000000
Binary files a/app/src/main/res/drawable-xhdpi/main_offline_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/main_select_server_dark.png b/app/src/main/res/drawable-xhdpi/main_select_server_dark.png
deleted file mode 100644
index bb9a236..0000000
Binary files a/app/src/main/res/drawable-xhdpi/main_select_server_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/main_select_server_light.png b/app/src/main/res/drawable-xhdpi/main_select_server_light.png
deleted file mode 100644
index a6b1135..0000000
Binary files a/app/src/main/res/drawable-xhdpi/main_select_server_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/main_select_tabs_dark.png b/app/src/main/res/drawable-xhdpi/main_select_tabs_dark.png
deleted file mode 100644
index d4dbb69..0000000
Binary files a/app/src/main/res/drawable-xhdpi/main_select_tabs_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/main_select_tabs_light.png b/app/src/main/res/drawable-xhdpi/main_select_tabs_light.png
deleted file mode 100644
index ff3e8c8..0000000
Binary files a/app/src/main/res/drawable-xhdpi/main_select_tabs_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_backward_dark.png b/app/src/main/res/drawable-xhdpi/media_backward_dark.png
deleted file mode 100644
index 11e1e4f..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_backward_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_backward_light.png b/app/src/main/res/drawable-xhdpi/media_backward_light.png
deleted file mode 100644
index 441def2..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_backward_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_fastforward_dark.png b/app/src/main/res/drawable-xhdpi/media_fastforward_dark.png
deleted file mode 100644
index de5a50f..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_fastforward_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_fastforward_light.png b/app/src/main/res/drawable-xhdpi/media_fastforward_light.png
deleted file mode 100644
index 1b47bd0..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_fastforward_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_forward_dark.png b/app/src/main/res/drawable-xhdpi/media_forward_dark.png
deleted file mode 100644
index e520980..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_forward_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_forward_light.png b/app/src/main/res/drawable-xhdpi/media_forward_light.png
deleted file mode 100644
index f9b522e..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_forward_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_pause_dark.png b/app/src/main/res/drawable-xhdpi/media_pause_dark.png
deleted file mode 100644
index f1f9796..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_pause_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_pause_light.png b/app/src/main/res/drawable-xhdpi/media_pause_light.png
deleted file mode 100644
index 19f6b05..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_pause_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_repeat_all_dark.png b/app/src/main/res/drawable-xhdpi/media_repeat_all_dark.png
deleted file mode 100644
index 0c8ff22..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_repeat_all_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_repeat_all_light.png b/app/src/main/res/drawable-xhdpi/media_repeat_all_light.png
deleted file mode 100644
index d7b780a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_repeat_all_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_repeat_off_dark.png b/app/src/main/res/drawable-xhdpi/media_repeat_off_dark.png
deleted file mode 100644
index 6922a06..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_repeat_off_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_repeat_off_light.png b/app/src/main/res/drawable-xhdpi/media_repeat_off_light.png
deleted file mode 100644
index bf8f385..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_repeat_off_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_repeat_single_dark.png b/app/src/main/res/drawable-xhdpi/media_repeat_single_dark.png
deleted file mode 100644
index f3fac9a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_repeat_single_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_repeat_single_light.png b/app/src/main/res/drawable-xhdpi/media_repeat_single_light.png
deleted file mode 100644
index bacc1e3..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_repeat_single_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_rewind_dark.png b/app/src/main/res/drawable-xhdpi/media_rewind_dark.png
deleted file mode 100644
index 7505c15..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_rewind_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_rewind_light.png b/app/src/main/res/drawable-xhdpi/media_rewind_light.png
deleted file mode 100644
index 10bd470..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_rewind_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_start_dark.png b/app/src/main/res/drawable-xhdpi/media_start_dark.png
deleted file mode 100644
index 0ee9c0d..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_start_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_start_light.png b/app/src/main/res/drawable-xhdpi/media_start_light.png
deleted file mode 100644
index cd26708..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_start_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_stop_dark.png b/app/src/main/res/drawable-xhdpi/media_stop_dark.png
deleted file mode 100644
index 4f191b8..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_stop_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/media_stop_light.png b/app/src/main/res/drawable-xhdpi/media_stop_light.png
deleted file mode 100644
index 38d8cff..0000000
Binary files a/app/src/main/res/drawable-xhdpi/media_stop_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/notification_close_dark.png b/app/src/main/res/drawable-xhdpi/notification_close_dark.png
deleted file mode 100644
index 7da5f03..0000000
Binary files a/app/src/main/res/drawable-xhdpi/notification_close_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/notification_close_light.png b/app/src/main/res/drawable-xhdpi/notification_close_light.png
deleted file mode 100644
index 7ccd3d2..0000000
Binary files a/app/src/main/res/drawable-xhdpi/notification_close_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/playing_dark.png b/app/src/main/res/drawable-xhdpi/playing_dark.png
deleted file mode 100644
index 280a708..0000000
Binary files a/app/src/main/res/drawable-xhdpi/playing_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/playing_light.png b/app/src/main/res/drawable-xhdpi/playing_light.png
deleted file mode 100644
index 5760838..0000000
Binary files a/app/src/main/res/drawable-xhdpi/playing_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/stat_notify_playing.png b/app/src/main/res/drawable-xhdpi/stat_notify_playing.png
deleted file mode 100644
index a926014..0000000
Binary files a/app/src/main/res/drawable-xhdpi/stat_notify_playing.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/action_toggle_list_dark.png b/app/src/main/res/drawable-xxhdpi/action_toggle_list_dark.png
deleted file mode 100644
index 69f0d3f..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/action_toggle_list_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/action_toggle_list_light.png b/app/src/main/res/drawable-xxhdpi/action_toggle_list_light.png
deleted file mode 100644
index de26b6d..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/action_toggle_list_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/download_cached.png b/app/src/main/res/drawable-xxhdpi/download_cached.png
deleted file mode 100644
index aed0d67..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/download_cached.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/download_none_dark.png b/app/src/main/res/drawable-xxhdpi/download_none_dark.png
deleted file mode 100644
index 3dd3411..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/download_none_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/download_none_light.png b/app/src/main/res/drawable-xxhdpi/download_none_light.png
deleted file mode 100644
index a675574..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/download_none_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/download_pinned.png b/app/src/main/res/drawable-xxhdpi/download_pinned.png
deleted file mode 100644
index 07a2bf4..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/download_pinned.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/downloading_dark.png b/app/src/main/res/drawable-xxhdpi/downloading_dark.png
deleted file mode 100644
index 3c7e7b6..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/downloading_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/downloading_light.png b/app/src/main/res/drawable-xxhdpi/downloading_light.png
deleted file mode 100644
index d417b4a..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/downloading_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_add_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_add_dark.png
deleted file mode 100644
index b5a0c30..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_add_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_add_light.png b/app/src/main/res/drawable-xxhdpi/ic_action_add_light.png
deleted file mode 100644
index d74ec1b..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_add_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_artist.png b/app/src/main/res/drawable-xxhdpi/ic_action_artist.png
deleted file mode 100644
index c1fd3b0..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_artist.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_song.png b/app/src/main/res/drawable-xxhdpi/ic_action_song.png
deleted file mode 100644
index 0d6c268..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_song.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_volume_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_volume_dark.png
deleted file mode 100644
index 9fad1f6..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_volume_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_volume_light.png b/app/src/main/res/drawable-xxhdpi/ic_action_volume_light.png
deleted file mode 100644
index ad6903d..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_volume_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_add_person_dark.png b/app/src/main/res/drawable-xxhdpi/ic_menu_add_person_dark.png
deleted file mode 100644
index c563ff5..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_add_person_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_add_person_light.png b/app/src/main/res/drawable-xxhdpi/ic_menu_add_person_light.png
deleted file mode 100644
index 54e49df..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_add_person_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_download_dark.png b/app/src/main/res/drawable-xxhdpi/ic_menu_download_dark.png
deleted file mode 100644
index 6fe35de..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_download_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_download_light.png b/app/src/main/res/drawable-xxhdpi/ic_menu_download_light.png
deleted file mode 100644
index d1462ad..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_download_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_library_dark.png b/app/src/main/res/drawable-xxhdpi/ic_menu_library_dark.png
deleted file mode 100644
index 951b9c4..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_library_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_library_light.png b/app/src/main/res/drawable-xxhdpi/ic_menu_library_light.png
deleted file mode 100644
index 6ecd8e6..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_library_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_password_dark.png b/app/src/main/res/drawable-xxhdpi/ic_menu_password_dark.png
deleted file mode 100644
index 7436e5a..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_password_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_password_light.png b/app/src/main/res/drawable-xxhdpi/ic_menu_password_light.png
deleted file mode 100644
index c209086..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_password_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_playlist_dark.png b/app/src/main/res/drawable-xxhdpi/ic_menu_playlist_dark.png
deleted file mode 100644
index 4ee84ad..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_playlist_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_playlist_light.png b/app/src/main/res/drawable-xxhdpi/ic_menu_playlist_light.png
deleted file mode 100644
index b7ac964..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_playlist_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_refresh_dark.png b/app/src/main/res/drawable-xxhdpi/ic_menu_refresh_dark.png
deleted file mode 100644
index cdc926c..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_refresh_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_refresh_light.png b/app/src/main/res/drawable-xxhdpi/ic_menu_refresh_light.png
deleted file mode 100644
index 0c730c8..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_refresh_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_remove_dark.png b/app/src/main/res/drawable-xxhdpi/ic_menu_remove_dark.png
deleted file mode 100644
index d8e060d..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_remove_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_remove_light.png b/app/src/main/res/drawable-xxhdpi/ic_menu_remove_light.png
deleted file mode 100644
index e78aa48..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_remove_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_save_dark.png b/app/src/main/res/drawable-xxhdpi/ic_menu_save_dark.png
deleted file mode 100644
index bf48792..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_save_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_save_light.png b/app/src/main/res/drawable-xxhdpi/ic_menu_save_light.png
deleted file mode 100644
index fe8bfde..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_save_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_search_dark.png b/app/src/main/res/drawable-xxhdpi/ic_menu_search_dark.png
deleted file mode 100644
index 6b30493..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_search_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_search_light.png b/app/src/main/res/drawable-xxhdpi/ic_menu_search_light.png
deleted file mode 100644
index 93684fc..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_search_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_settings_dark.png b/app/src/main/res/drawable-xxhdpi/ic_menu_settings_dark.png
deleted file mode 100644
index 2e7e993..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_settings_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_settings_light.png b/app/src/main/res/drawable-xxhdpi/ic_menu_settings_light.png
deleted file mode 100644
index a709218..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_settings_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_shuffle_dark.png b/app/src/main/res/drawable-xxhdpi/ic_menu_shuffle_dark.png
deleted file mode 100644
index 933b3a3..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_shuffle_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_shuffle_light.png b/app/src/main/res/drawable-xxhdpi/ic_menu_shuffle_light.png
deleted file mode 100644
index 3b67542..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_shuffle_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/main_offline_dark.png b/app/src/main/res/drawable-xxhdpi/main_offline_dark.png
deleted file mode 100644
index 557028c..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/main_offline_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/main_offline_light.png b/app/src/main/res/drawable-xxhdpi/main_offline_light.png
deleted file mode 100644
index 130e3da..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/main_offline_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/main_select_server_dark.png b/app/src/main/res/drawable-xxhdpi/main_select_server_dark.png
deleted file mode 100644
index e9d64d6..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/main_select_server_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/main_select_server_light.png b/app/src/main/res/drawable-xxhdpi/main_select_server_light.png
deleted file mode 100644
index e6ec9a9..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/main_select_server_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/main_select_tabs_dark.png b/app/src/main/res/drawable-xxhdpi/main_select_tabs_dark.png
deleted file mode 100644
index 4895780..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/main_select_tabs_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/main_select_tabs_light.png b/app/src/main/res/drawable-xxhdpi/main_select_tabs_light.png
deleted file mode 100644
index 3f31efa..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/main_select_tabs_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_backward_dark.png b/app/src/main/res/drawable-xxhdpi/media_backward_dark.png
deleted file mode 100644
index 0ea774f..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_backward_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_backward_light.png b/app/src/main/res/drawable-xxhdpi/media_backward_light.png
deleted file mode 100644
index 303616f..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_backward_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_fastforward_dark.png b/app/src/main/res/drawable-xxhdpi/media_fastforward_dark.png
deleted file mode 100644
index 64be1c4..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_fastforward_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_fastforward_light.png b/app/src/main/res/drawable-xxhdpi/media_fastforward_light.png
deleted file mode 100644
index f0e0132..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_fastforward_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_forward_dark.png b/app/src/main/res/drawable-xxhdpi/media_forward_dark.png
deleted file mode 100644
index 28d3723..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_forward_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_forward_light.png b/app/src/main/res/drawable-xxhdpi/media_forward_light.png
deleted file mode 100644
index c76e116..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_forward_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_pause_dark.png b/app/src/main/res/drawable-xxhdpi/media_pause_dark.png
deleted file mode 100644
index 2dd83db..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_pause_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_pause_light.png b/app/src/main/res/drawable-xxhdpi/media_pause_light.png
deleted file mode 100644
index a31cace..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_pause_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_repeat_all_dark.png b/app/src/main/res/drawable-xxhdpi/media_repeat_all_dark.png
deleted file mode 100644
index 70866c8..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_repeat_all_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_repeat_all_light.png b/app/src/main/res/drawable-xxhdpi/media_repeat_all_light.png
deleted file mode 100644
index e9786d8..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_repeat_all_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_repeat_off_dark.png b/app/src/main/res/drawable-xxhdpi/media_repeat_off_dark.png
deleted file mode 100644
index a8a2043..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_repeat_off_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_repeat_off_light.png b/app/src/main/res/drawable-xxhdpi/media_repeat_off_light.png
deleted file mode 100644
index 0a96bd4..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_repeat_off_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_repeat_single_dark.png b/app/src/main/res/drawable-xxhdpi/media_repeat_single_dark.png
deleted file mode 100644
index a4532de..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_repeat_single_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_repeat_single_light.png b/app/src/main/res/drawable-xxhdpi/media_repeat_single_light.png
deleted file mode 100644
index c02ab24..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_repeat_single_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_rewind_dark.png b/app/src/main/res/drawable-xxhdpi/media_rewind_dark.png
deleted file mode 100644
index 6fcaa15..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_rewind_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_rewind_light.png b/app/src/main/res/drawable-xxhdpi/media_rewind_light.png
deleted file mode 100644
index ffcf2af..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_rewind_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_start_dark.png b/app/src/main/res/drawable-xxhdpi/media_start_dark.png
deleted file mode 100644
index 86d60a1..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_start_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_start_light.png b/app/src/main/res/drawable-xxhdpi/media_start_light.png
deleted file mode 100644
index fe8e549..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_start_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_stop_dark.png b/app/src/main/res/drawable-xxhdpi/media_stop_dark.png
deleted file mode 100644
index afd3263..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_stop_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/media_stop_light.png b/app/src/main/res/drawable-xxhdpi/media_stop_light.png
deleted file mode 100644
index 4e6b0bd..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/media_stop_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/notification_close_dark.png b/app/src/main/res/drawable-xxhdpi/notification_close_dark.png
deleted file mode 100644
index 479a90d..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/notification_close_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/notification_close_light.png b/app/src/main/res/drawable-xxhdpi/notification_close_light.png
deleted file mode 100644
index 9cb6f70..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/notification_close_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/playing_dark.png b/app/src/main/res/drawable-xxhdpi/playing_dark.png
deleted file mode 100644
index 5af5088..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/playing_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/playing_light.png b/app/src/main/res/drawable-xxhdpi/playing_light.png
deleted file mode 100644
index 6b5e382..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/playing_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/stat_notify_playing.png b/app/src/main/res/drawable-xxhdpi/stat_notify_playing.png
deleted file mode 100644
index b6bd07e..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/stat_notify_playing.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/action_toggle_list_dark.png b/app/src/main/res/drawable-xxxhdpi/action_toggle_list_dark.png
deleted file mode 100644
index 674c41b..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/action_toggle_list_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/action_toggle_list_light.png b/app/src/main/res/drawable-xxxhdpi/action_toggle_list_light.png
deleted file mode 100644
index 566bea8..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/action_toggle_list_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/download_none_dark.png b/app/src/main/res/drawable-xxxhdpi/download_none_dark.png
deleted file mode 100644
index 188af24..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/download_none_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/download_none_light.png b/app/src/main/res/drawable-xxxhdpi/download_none_light.png
deleted file mode 100644
index aae6689..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/download_none_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/downloading_dark.png b/app/src/main/res/drawable-xxxhdpi/downloading_dark.png
deleted file mode 100644
index 96bea87..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/downloading_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/downloading_light.png b/app/src/main/res/drawable-xxxhdpi/downloading_light.png
deleted file mode 100644
index 22e1047..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/downloading_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_add_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_action_add_dark.png
deleted file mode 100644
index 12f250a..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_add_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_add_light.png b/app/src/main/res/drawable-xxxhdpi/ic_action_add_light.png
deleted file mode 100644
index fe85b5a..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_add_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_artist.png b/app/src/main/res/drawable-xxxhdpi/ic_action_artist.png
deleted file mode 100644
index 3127416..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_artist.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_song.png b/app/src/main/res/drawable-xxxhdpi/ic_action_song.png
deleted file mode 100644
index 5d836e2..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_song.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_add_person_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_add_person_dark.png
deleted file mode 100644
index 0d5d0ba..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_add_person_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_add_person_light.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_add_person_light.png
deleted file mode 100644
index 2678249..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_add_person_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_download_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_download_dark.png
deleted file mode 100644
index 47aa8ad..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_download_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_download_light.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_download_light.png
deleted file mode 100644
index 4454eda..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_download_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_library_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_library_dark.png
deleted file mode 100644
index 8c3d713..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_library_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_library_light.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_library_light.png
deleted file mode 100644
index 5b35e18..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_library_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_password_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_password_dark.png
deleted file mode 100644
index 1972507..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_password_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_password_light.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_password_light.png
deleted file mode 100644
index 43402e8..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_password_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_playlist_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_playlist_dark.png
deleted file mode 100644
index 6b9aed2..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_playlist_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_playlist_light.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_playlist_light.png
deleted file mode 100644
index 19b4d48..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_playlist_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_refresh_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_refresh_dark.png
deleted file mode 100644
index 4254414..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_refresh_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_refresh_light.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_refresh_light.png
deleted file mode 100644
index 039e2cc..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_refresh_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_remove_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_remove_dark.png
deleted file mode 100644
index 5c36b88..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_remove_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_remove_light.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_remove_light.png
deleted file mode 100644
index c3cd678..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_remove_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_save_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_save_dark.png
deleted file mode 100644
index 8038e36..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_save_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_save_light.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_save_light.png
deleted file mode 100644
index a9e9a23..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_save_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_search_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_search_dark.png
deleted file mode 100644
index 70196b4..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_search_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_search_light.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_search_light.png
deleted file mode 100644
index e9c75b8..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_search_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_settings_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_settings_dark.png
deleted file mode 100644
index 62ff8ff..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_settings_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_settings_light.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_settings_light.png
deleted file mode 100644
index f5287f0..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_settings_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_shuffle_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_shuffle_dark.png
deleted file mode 100644
index 6d98f5b..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_shuffle_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_shuffle_light.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_shuffle_light.png
deleted file mode 100644
index 5feeb31..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_menu_shuffle_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/main_offline_dark.png b/app/src/main/res/drawable-xxxhdpi/main_offline_dark.png
deleted file mode 100644
index 3a4a38d..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/main_offline_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/main_offline_light.png b/app/src/main/res/drawable-xxxhdpi/main_offline_light.png
deleted file mode 100644
index 83d2a5c..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/main_offline_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/main_select_server_dark.png b/app/src/main/res/drawable-xxxhdpi/main_select_server_dark.png
deleted file mode 100644
index 649e4c0..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/main_select_server_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/main_select_server_light.png b/app/src/main/res/drawable-xxxhdpi/main_select_server_light.png
deleted file mode 100644
index 328bb64..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/main_select_server_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/main_select_tabs_dark.png b/app/src/main/res/drawable-xxxhdpi/main_select_tabs_dark.png
deleted file mode 100644
index 093f950..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/main_select_tabs_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/main_select_tabs_light.png b/app/src/main/res/drawable-xxxhdpi/main_select_tabs_light.png
deleted file mode 100644
index 49af1f8..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/main_select_tabs_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_backward_dark.png b/app/src/main/res/drawable-xxxhdpi/media_backward_dark.png
deleted file mode 100644
index 9ce790c..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_backward_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_backward_light.png b/app/src/main/res/drawable-xxxhdpi/media_backward_light.png
deleted file mode 100644
index b000b34..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_backward_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_fastforward_dark.png b/app/src/main/res/drawable-xxxhdpi/media_fastforward_dark.png
deleted file mode 100644
index f51569f..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_fastforward_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_fastforward_light.png b/app/src/main/res/drawable-xxxhdpi/media_fastforward_light.png
deleted file mode 100644
index 0b0ec88..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_fastforward_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_forward_dark.png b/app/src/main/res/drawable-xxxhdpi/media_forward_dark.png
deleted file mode 100644
index 10496b1..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_forward_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_forward_light.png b/app/src/main/res/drawable-xxxhdpi/media_forward_light.png
deleted file mode 100644
index e70dec6..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_forward_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_pause_dark.png b/app/src/main/res/drawable-xxxhdpi/media_pause_dark.png
deleted file mode 100644
index 74f5378..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_pause_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_pause_light.png b/app/src/main/res/drawable-xxxhdpi/media_pause_light.png
deleted file mode 100644
index ec0ce23..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_pause_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_repeat_all_dark.png b/app/src/main/res/drawable-xxxhdpi/media_repeat_all_dark.png
deleted file mode 100644
index 0bb7d11..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_repeat_all_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_repeat_all_light.png b/app/src/main/res/drawable-xxxhdpi/media_repeat_all_light.png
deleted file mode 100644
index 92dea83..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_repeat_all_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_repeat_off_dark.png b/app/src/main/res/drawable-xxxhdpi/media_repeat_off_dark.png
deleted file mode 100644
index c852f0f..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_repeat_off_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_repeat_off_light.png b/app/src/main/res/drawable-xxxhdpi/media_repeat_off_light.png
deleted file mode 100644
index 1fac4a3..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_repeat_off_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_repeat_single_dark.png b/app/src/main/res/drawable-xxxhdpi/media_repeat_single_dark.png
deleted file mode 100644
index 01ad0d9..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_repeat_single_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_repeat_single_light.png b/app/src/main/res/drawable-xxxhdpi/media_repeat_single_light.png
deleted file mode 100644
index 0acc6c5..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_repeat_single_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_rewind_dark.png b/app/src/main/res/drawable-xxxhdpi/media_rewind_dark.png
deleted file mode 100644
index e9f8df4..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_rewind_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_rewind_light.png b/app/src/main/res/drawable-xxxhdpi/media_rewind_light.png
deleted file mode 100644
index 339acda..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_rewind_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_start_dark.png b/app/src/main/res/drawable-xxxhdpi/media_start_dark.png
deleted file mode 100644
index ac20fff..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_start_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_start_light.png b/app/src/main/res/drawable-xxxhdpi/media_start_light.png
deleted file mode 100644
index bddff57..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_start_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_stop_dark.png b/app/src/main/res/drawable-xxxhdpi/media_stop_dark.png
deleted file mode 100644
index 4aa45ec..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_stop_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/media_stop_light.png b/app/src/main/res/drawable-xxxhdpi/media_stop_light.png
deleted file mode 100644
index fbb16bf..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/media_stop_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/notification_close_dark.png b/app/src/main/res/drawable-xxxhdpi/notification_close_dark.png
deleted file mode 100644
index 42388bf..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/notification_close_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/notification_close_light.png b/app/src/main/res/drawable-xxxhdpi/notification_close_light.png
deleted file mode 100644
index e40b9d8..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/notification_close_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/playing_dark.png b/app/src/main/res/drawable-xxxhdpi/playing_dark.png
deleted file mode 100644
index d2fae59..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/playing_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/playing_light.png b/app/src/main/res/drawable-xxxhdpi/playing_light.png
deleted file mode 100644
index a12d143..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/playing_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable/action_toggle_list.xml b/app/src/main/res/drawable/action_toggle_list.xml
new file mode 100644
index 0000000..f4b0ba9
--- /dev/null
+++ b/app/src/main/res/drawable/action_toggle_list.xml
@@ -0,0 +1,5 @@
+<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,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/actionbar_download.xml b/app/src/main/res/drawable/actionbar_download.xml
new file mode 100644
index 0000000..8e2d62e
--- /dev/null
+++ b/app/src/main/res/drawable/actionbar_download.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..9d66f8e
--- /dev/null
+++ b/app/src/main/res/drawable/actionbar_media_backward.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..65138dd
--- /dev/null
+++ b/app/src/main/res/drawable/actionbar_media_fastforward.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..cedb671
--- /dev/null
+++ b/app/src/main/res/drawable/actionbar_media_forward.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..572af19
--- /dev/null
+++ b/app/src/main/res/drawable/actionbar_media_pause.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..32bf021
--- /dev/null
+++ b/app/src/main/res/drawable/actionbar_media_rewind.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..c394f20
--- /dev/null
+++ b/app/src/main/res/drawable/actionbar_media_start.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..3ba1b59
--- /dev/null
+++ b/app/src/main/res/drawable/actionbar_media_stop.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..3c7b88a
--- /dev/null
+++ b/app/src/main/res/drawable/actionbar_radio.xml
@@ -0,0 +1,5 @@
+<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_refresh.xml b/app/src/main/res/drawable/actionbar_refresh.xml
new file mode 100644
index 0000000..70191e0
--- /dev/null
+++ b/app/src/main/res/drawable/actionbar_refresh.xml
@@ -0,0 +1,5 @@
+<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="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/actionbar_save.xml b/app/src/main/res/drawable/actionbar_save.xml
new file mode 100644
index 0000000..ec3c79c
--- /dev/null
+++ b/app/src/main/res/drawable/actionbar_save.xml
@@ -0,0 +1,5 @@
+<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="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/actionbar_search.xml b/app/src/main/res/drawable/actionbar_search.xml
new file mode 100644
index 0000000..96737c1
--- /dev/null
+++ b/app/src/main/res/drawable/actionbar_search.xml
@@ -0,0 +1,5 @@
+<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="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/actionbar_shuffle.xml b/app/src/main/res/drawable/actionbar_shuffle.xml
new file mode 100644
index 0000000..19aab05
--- /dev/null
+++ b/app/src/main/res/drawable/actionbar_shuffle.xml
@@ -0,0 +1,5 @@
+<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.xml b/app/src/main/res/drawable/card_rounded_corners.xml
new file mode 100644
index 0000000..7292444
--- /dev/null
+++ b/app/src/main/res/drawable/card_rounded_corners.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<solid android:color="?attr/card_background"/>
+	<corners android:radius="@dimen/Card.Radius"/>
+	<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
diff --git a/app/src/main/res/drawable/download_cached.xml b/app/src/main/res/drawable/download_cached.xml
new file mode 100644
index 0000000..8b5714a
--- /dev/null
+++ b/app/src/main/res/drawable/download_cached.xml
@@ -0,0 +1,5 @@
+<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,2C6.5,2 2,6.5 2,12s4.5,10 10,10 10,-4.5 10,-10S17.5,2 12,2zM17,18L7,18v-2h10v2zM10.3,14L7,10.7l1.4,-1.4 1.9,1.9 5.3,-5.3L17,7.3 10.3,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/download_none.xml b/app/src/main/res/drawable/download_none.xml
new file mode 100644
index 0000000..01a604c
--- /dev/null
+++ b/app/src/main/res/drawable/download_none.xml
@@ -0,0 +1,5 @@
+<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,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/download_pinned.xml b/app/src/main/res/drawable/download_pinned.xml
new file mode 100644
index 0000000..70eba9d
--- /dev/null
+++ b/app/src/main/res/drawable/download_pinned.xml
@@ -0,0 +1,5 @@
+<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/lightPrimary" android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10 10,-4.5 10,-10S17.5,2 12,2zM17,18L7,18v-2h10v2zM10.3,14L7,10.7l1.4,-1.4 1.9,1.9 5.3,-5.3L17,7.3 10.3,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/downloading.xml b/app/src/main/res/drawable/downloading.xml
new file mode 100644
index 0000000..02a3379
--- /dev/null
+++ b/app/src/main/res/drawable/downloading.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.8" 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="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_add.xml b/app/src/main/res/drawable/ic_action_add.xml
new file mode 100644
index 0000000..bed4701
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_add.xml
@@ -0,0 +1,5 @@
+<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="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_artist.xml b/app/src/main/res/drawable/ic_action_artist.xml
new file mode 100644
index 0000000..8e84aac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_artist.xml
@@ -0,0 +1,5 @@
+<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,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_bookmark.xml b/app/src/main/res/drawable/ic_action_bookmark.xml
new file mode 100644
index 0000000..61f9134
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_bookmark.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..3196707
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_playback_speed.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..904fa36
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_rating_bad.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..72a99e6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_rating_bad_selected.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..2ced033
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_rating_good.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..d9acf75
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_rating_good_selected.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..69f0a3a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_song.xml
@@ -0,0 +1,5 @@
+<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_action_volume.xml b/app/src/main/res/drawable/ic_action_volume.xml
new file mode 100644
index 0000000..88b6652
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_volume.xml
@@ -0,0 +1,5 @@
+<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,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/ic_menu_add_person.xml b/app/src/main/res/drawable/ic_menu_add_person.xml
new file mode 100644
index 0000000..15299be
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_add_person.xml
@@ -0,0 +1,5 @@
+<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,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,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_menu_admin.xml b/app/src/main/res/drawable/ic_menu_admin.xml
new file mode 100644
index 0000000..dfd6eea
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_admin.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..f2b3c90
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_bookmark.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..feb16ed
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_bookmark_selected.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..80291f8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_chat.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..71f6548
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_chat_send.xml
@@ -0,0 +1,5 @@
+<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_download.xml b/app/src/main/res/drawable/ic_menu_download.xml
new file mode 100644
index 0000000..9ddebc2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_download.xml
@@ -0,0 +1,5 @@
+<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="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_library.xml b/app/src/main/res/drawable/ic_menu_library.xml
new file mode 100644
index 0000000..c80b731
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_library.xml
@@ -0,0 +1,5 @@
+<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="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_menu_playlist.xml b/app/src/main/res/drawable/ic_menu_playlist.xml
new file mode 100644
index 0000000..43f3f02
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_playlist.xml
@@ -0,0 +1,5 @@
+<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,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_podcast.xml b/app/src/main/res/drawable/ic_menu_podcast.xml
new file mode 100644
index 0000000..3fecd4a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_podcast.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..c68033b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_radio.xml
@@ -0,0 +1,5 @@
+<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_remove.xml b/app/src/main/res/drawable/ic_menu_remove.xml
new file mode 100644
index 0000000..4bc10d0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_remove.xml
@@ -0,0 +1,5 @@
+<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="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_menu_settings.xml b/app/src/main/res/drawable/ic_menu_settings.xml
new file mode 100644
index 0000000..03e87da
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_settings.xml
@@ -0,0 +1,5 @@
+<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="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_menu_share.xml b/app/src/main/res/drawable/ic_menu_share.xml
new file mode 100644
index 0000000..c9ab44e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_share.xml
@@ -0,0 +1,5 @@
+<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_menu_shuffle.xml b/app/src/main/res/drawable/ic_menu_shuffle.xml
new file mode 100644
index 0000000..8c5e0fa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_shuffle.xml
@@ -0,0 +1,5 @@
+<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="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_social_person.xml b/app/src/main/res/drawable/ic_social_person.xml
new file mode 100644
index 0000000..82858bc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_social_person.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..e9cc1e0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_toggle_played.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..85c045c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_toggle_star.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..3fc251d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_toggle_star_outline.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..ddd3427
--- /dev/null
+++ b/app/src/main/res/drawable/ic_toggle_star_outline_dark.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..d81d1e4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_toggle_star_outline_light.xml
@@ -0,0 +1,5 @@
+<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/main_offline.xml b/app/src/main/res/drawable/main_offline.xml
new file mode 100644
index 0000000..8372d10
--- /dev/null
+++ b/app/src/main/res/drawable/main_offline.xml
@@ -0,0 +1,5 @@
+<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="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96z"/>
+</vector>
diff --git a/app/src/main/res/drawable/main_select_server.xml b/app/src/main/res/drawable/main_select_server.xml
new file mode 100644
index 0000000..5b3d7af
--- /dev/null
+++ b/app/src/main/res/drawable/main_select_server.xml
@@ -0,0 +1,5 @@
+<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.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/main_select_tabs.xml b/app/src/main/res/drawable/main_select_tabs.xml
new file mode 100644
index 0000000..48b9000
--- /dev/null
+++ b/app/src/main/res/drawable/main_select_tabs.xml
@@ -0,0 +1,5 @@
+<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,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/media_backward.xml b/app/src/main/res/drawable/media_backward.xml
new file mode 100644
index 0000000..6b177ba
--- /dev/null
+++ b/app/src/main/res/drawable/media_backward.xml
@@ -0,0 +1,5 @@
+<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="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/media_fastforward.xml b/app/src/main/res/drawable/media_fastforward.xml
new file mode 100644
index 0000000..33c7c8e
--- /dev/null
+++ b/app/src/main/res/drawable/media_fastforward.xml
@@ -0,0 +1,5 @@
+<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="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/media_forward.xml b/app/src/main/res/drawable/media_forward.xml
new file mode 100644
index 0000000..5396047
--- /dev/null
+++ b/app/src/main/res/drawable/media_forward.xml
@@ -0,0 +1,5 @@
+<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="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/media_pause.xml b/app/src/main/res/drawable/media_pause.xml
new file mode 100644
index 0000000..4fcf6f9
--- /dev/null
+++ b/app/src/main/res/drawable/media_pause.xml
@@ -0,0 +1,5 @@
+<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="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/media_repeat_all.xml b/app/src/main/res/drawable/media_repeat_all.xml
new file mode 100644
index 0000000..ca64ce7
--- /dev/null
+++ b/app/src/main/res/drawable/media_repeat_all.xml
@@ -0,0 +1,5 @@
+<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,5V1L7,6l5,5V7c3.31,0 6,2.69 6,6s-2.69,6 -6,6 -6,-2.69 -6,-6H4c0,4.42 3.58,8 8,8s8,-3.58 8,-8 -3.58,-8 -8,-8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/media_repeat_off.xml b/app/src/main/res/drawable/media_repeat_off.xml
new file mode 100644
index 0000000..00c7f94
--- /dev/null
+++ b/app/src/main/res/drawable/media_repeat_off.xml
@@ -0,0 +1,5 @@
+<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="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/media_repeat_single.xml b/app/src/main/res/drawable/media_repeat_single.xml
new file mode 100644
index 0000000..21c70f4
--- /dev/null
+++ b/app/src/main/res/drawable/media_repeat_single.xml
@@ -0,0 +1,5 @@
+<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="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/media_rewind.xml b/app/src/main/res/drawable/media_rewind.xml
new file mode 100644
index 0000000..1866ff1
--- /dev/null
+++ b/app/src/main/res/drawable/media_rewind.xml
@@ -0,0 +1,5 @@
+<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="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/media_start.xml b/app/src/main/res/drawable/media_start.xml
new file mode 100644
index 0000000..ddf62b0
--- /dev/null
+++ b/app/src/main/res/drawable/media_start.xml
@@ -0,0 +1,5 @@
+<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="M8,5v14l11,-7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/media_stop.xml b/app/src/main/res/drawable/media_stop.xml
new file mode 100644
index 0000000..97483d7
--- /dev/null
+++ b/app/src/main/res/drawable/media_stop.xml
@@ -0,0 +1,5 @@
+<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="M6,6h12v12H6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/notification_backward.xml b/app/src/main/res/drawable/notification_backward.xml
deleted file mode 100644
index 8374c8a..0000000
--- a/app/src/main/res/drawable/notification_backward.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/media_backward_dark" />
diff --git a/app/src/main/res/drawable/notification_close.xml b/app/src/main/res/drawable/notification_close.xml
index b4c5f4c..65b33d4 100644
--- a/app/src/main/res/drawable/notification_close.xml
+++ b/app/src/main/res/drawable/notification_close.xml
@@ -1,3 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/notification_close_dark" />
+<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="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/notification_forward.xml b/app/src/main/res/drawable/notification_forward.xml
deleted file mode 100644
index 9d11adb..0000000
--- a/app/src/main/res/drawable/notification_forward.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/media_forward_dark" />
diff --git a/app/src/main/res/drawable/notification_media_backward.xml b/app/src/main/res/drawable/notification_media_backward.xml
new file mode 100644
index 0000000..b1c49fd
--- /dev/null
+++ b/app/src/main/res/drawable/notification_media_backward.xml
@@ -0,0 +1,5 @@
+<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="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/notification_media_fastforward.xml b/app/src/main/res/drawable/notification_media_fastforward.xml
new file mode 100644
index 0000000..da07bd3
--- /dev/null
+++ b/app/src/main/res/drawable/notification_media_fastforward.xml
@@ -0,0 +1,5 @@
+<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/drawable/notification_media_forward.xml b/app/src/main/res/drawable/notification_media_forward.xml
new file mode 100644
index 0000000..8b4c77b
--- /dev/null
+++ b/app/src/main/res/drawable/notification_media_forward.xml
@@ -0,0 +1,5 @@
+<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="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/notification_media_pause.xml b/app/src/main/res/drawable/notification_media_pause.xml
new file mode 100644
index 0000000..27091be
--- /dev/null
+++ b/app/src/main/res/drawable/notification_media_pause.xml
@@ -0,0 +1,5 @@
+<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="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/notification_media_rewind.xml b/app/src/main/res/drawable/notification_media_rewind.xml
new file mode 100644
index 0000000..da56adf
--- /dev/null
+++ b/app/src/main/res/drawable/notification_media_rewind.xml
@@ -0,0 +1,5 @@
+<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,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/notification_media_start.xml b/app/src/main/res/drawable/notification_media_start.xml
new file mode 100644
index 0000000..b7f4083
--- /dev/null
+++ b/app/src/main/res/drawable/notification_media_start.xml
@@ -0,0 +1,5 @@
+<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="M8,5v14l11,-7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/notification_pause.xml b/app/src/main/res/drawable/notification_pause.xml
deleted file mode 100644
index 482685a..0000000
--- a/app/src/main/res/drawable/notification_pause.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/media_pause_dark" />
diff --git a/app/src/main/res/drawable/notification_start.xml b/app/src/main/res/drawable/notification_start.xml
deleted file mode 100644
index 854f7ee..0000000
--- a/app/src/main/res/drawable/notification_start.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/media_start_dark" />
diff --git a/app/src/main/res/drawable/playing.xml b/app/src/main/res/drawable/playing.xml
new file mode 100644
index 0000000..104f5ac
--- /dev/null
+++ b/app/src/main/res/drawable/playing.xml
@@ -0,0 +1,5 @@
+<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="?attr/element_color" android:pathData="M8,5v14l11,-7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/stat_notify_playing.xml b/app/src/main/res/drawable/stat_notify_playing.xml
new file mode 100644
index 0000000..e135a55
--- /dev/null
+++ b/app/src/main/res/drawable/stat_notify_playing.xml
@@ -0,0 +1,5 @@
+<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
new file mode 100644
index 0000000..c8e706e
--- /dev/null
+++ b/app/src/main/res/drawable/stat_notify_sync.xml
@@ -0,0 +1,5 @@
+<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_backward.xml b/app/src/main/res/drawable/widget_media_backward.xml
new file mode 100644
index 0000000..b1c49fd
--- /dev/null
+++ b/app/src/main/res/drawable/widget_media_backward.xml
@@ -0,0 +1,5 @@
+<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="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/widget_media_fastforward.xml b/app/src/main/res/drawable/widget_media_fastforward.xml
new file mode 100644
index 0000000..da07bd3
--- /dev/null
+++ b/app/src/main/res/drawable/widget_media_fastforward.xml
@@ -0,0 +1,5 @@
+<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/drawable/widget_media_forward.xml b/app/src/main/res/drawable/widget_media_forward.xml
new file mode 100644
index 0000000..8b4c77b
--- /dev/null
+++ b/app/src/main/res/drawable/widget_media_forward.xml
@@ -0,0 +1,5 @@
+<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="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/widget_media_pause.xml b/app/src/main/res/drawable/widget_media_pause.xml
new file mode 100644
index 0000000..27091be
--- /dev/null
+++ b/app/src/main/res/drawable/widget_media_pause.xml
@@ -0,0 +1,5 @@
+<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="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/widget_media_start.xml b/app/src/main/res/drawable/widget_media_start.xml
new file mode 100644
index 0000000..b7f4083
--- /dev/null
+++ b/app/src/main/res/drawable/widget_media_start.xml
@@ -0,0 +1,5 @@
+<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="M8,5v14l11,-7z"/>
+</vector>
diff --git a/app/src/main/res/layout/appwidget4x1.xml b/app/src/main/res/layout/appwidget4x1.xml
index 408099a..1a64bbd 100644
--- a/app/src/main/res/layout/appwidget4x1.xml
+++ b/app/src/main/res/layout/appwidget4x1.xml
@@ -88,7 +88,7 @@
                 android:layout_width="0dip"
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
-                app:srcCompat="@drawable/media_backward_dark" />
+                app:srcCompat="@drawable/widget_media_backward" />
 
             <ImageButton
                 android:id="@+id/control_play"
@@ -96,7 +96,7 @@
                 android:layout_width="0dip"
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
-                app:srcCompat="@drawable/media_start_dark" />
+                app:srcCompat="@drawable/widget_media_start" />
 
             <ImageButton
                 android:id="@+id/control_next"
@@ -104,7 +104,7 @@
                 android:layout_width="0dip"
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
-                app:srcCompat="@drawable/media_forward_dark" />
+                app:srcCompat="@drawable/widget_media_forward" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/appwidget4x2.xml b/app/src/main/res/layout/appwidget4x2.xml
index 6fb9b4c..47008fe 100644
--- a/app/src/main/res/layout/appwidget4x2.xml
+++ b/app/src/main/res/layout/appwidget4x2.xml
@@ -114,7 +114,7 @@
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                app:srcCompat="@drawable/media_backward_dark" />
+                app:srcCompat="@drawable/widget_media_backward" />
 
             <ImageButton
                 android:id="@+id/control_play"
@@ -122,7 +122,7 @@
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                app:srcCompat="@drawable/media_start_dark" />
+                app:srcCompat="@drawable/widget_media_start" />
 
             <ImageButton
                 android:id="@+id/control_next"
@@ -130,7 +130,7 @@
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                app:srcCompat="@drawable/media_forward_dark" />
+                app:srcCompat="@drawable/widget_media_forward" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/appwidget4x3.xml b/app/src/main/res/layout/appwidget4x3.xml
index ea63146..ae2c5c2 100644
--- a/app/src/main/res/layout/appwidget4x3.xml
+++ b/app/src/main/res/layout/appwidget4x3.xml
@@ -96,7 +96,7 @@
                 android:layout_width="0dip"
                 android:layout_height="56dip"
                 android:layout_weight="1"
-                app:srcCompat="@drawable/media_backward_dark" />
+                app:srcCompat="@drawable/widget_media_backward" />
 
             <ImageButton
                 android:id="@+id/control_play"
@@ -104,7 +104,7 @@
                 android:layout_width="0dip"
                 android:layout_height="56dip"
                 android:layout_weight="1"
-                app:srcCompat="@drawable/media_start_dark" />
+                app:srcCompat="@drawable/widget_media_start" />
 
             <ImageButton
                 android:id="@+id/control_next"
@@ -112,7 +112,7 @@
                 android:layout_width="0dip"
                 android:layout_height="56dip"
                 android:layout_weight="1"
-                app:srcCompat="@drawable/media_forward_dark" />
+                app:srcCompat="@drawable/widget_media_forward" />
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/appwidget4x4.xml b/app/src/main/res/layout/appwidget4x4.xml
index f20a1e5..e615f0e 100644
--- a/app/src/main/res/layout/appwidget4x4.xml
+++ b/app/src/main/res/layout/appwidget4x4.xml
@@ -98,7 +98,7 @@
                 android:layout_width="0dip"
                 android:layout_height="56dip"
                 android:layout_weight="1"
-                app:srcCompat="@drawable/media_backward_dark" />
+                app:srcCompat="@drawable/widget_media_backward" />
 
             <ImageButton
                 android:id="@+id/control_play"
@@ -106,7 +106,7 @@
                 android:layout_width="0dip"
                 android:layout_height="56dip"
                 android:layout_weight="1"
-                app:srcCompat="@drawable/media_start_dark" />
+                app:srcCompat="@drawable/widget_media_start" />
 
             <ImageButton
                 android:id="@+id/control_next"
@@ -114,7 +114,7 @@
                 android:layout_width="0dip"
                 android:layout_height="56dip"
                 android:layout_weight="1"
-                app:srcCompat="@drawable/media_forward_dark" />
+                app:srcCompat="@drawable/widget_media_forward" />
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index 5fed9e8..1ad0a01 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -47,6 +47,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:paddingRight="20dp"
-            app:srcCompat="@drawable/main_select_server_dark" />
+            app:srcCompat="@drawable/main_select_server" />
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/notification.xml b/app/src/main/res/layout/notification.xml
index 55ed452..1433b21 100644
--- a/app/src/main/res/layout/notification.xml
+++ b/app/src/main/res/layout/notification.xml
@@ -50,17 +50,17 @@
     <ImageButton
         android:id="@+id/control_previous"
         style="@style/NotificationButton"
-        app:srcCompat="@drawable/notification_backward" />
+        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_pause" />
+        app:srcCompat="@drawable/notification_media_pause" />
 
     <ImageButton
         android:id="@+id/control_next"
         style="@style/NotificationButton"
-        app:srcCompat="@drawable/notification_forward" />
+        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
index 8e6031a..0350ee2 100644
--- a/app/src/main/res/layout/notification_expanded.xml
+++ b/app/src/main/res/layout/notification_expanded.xml
@@ -80,17 +80,17 @@
             <ImageButton
                 android:id="@+id/control_previous"
                 style="@style/NotificationButton.Expanded"
-                app:srcCompat="@drawable/notification_backward" />
+                app:srcCompat="@drawable/notification_media_backward" />
 
             <ImageButton
                 android:id="@+id/control_pause"
                 style="@style/NotificationButton.Expanded"
-                app:srcCompat="@drawable/notification_pause" />
+                app:srcCompat="@drawable/notification_media_pause" />
 
             <ImageButton
                 android:id="@+id/control_next"
                 style="@style/NotificationButton.Expanded"
-                app:srcCompat="@drawable/notification_forward" />
+                app:srcCompat="@drawable/notification_media_forward" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 62928c0..f0888a2 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <attr name="element_color" format="reference"/>
+    <attr name="card_background" format="reference"/>
+    <attr name="actionbar_element_color" format="reference"/>
     <attr name="offline_icon" format="reference" />
     <attr name="media_button_backward" format="reference" />
     <attr name="media_button_forward" format="reference" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 508e651..876f541 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,6 +6,8 @@
     <color name="lightPrimary">#2196F3</color>
     <color name="lightPrimaryDark">#1E88E5</color>
     <color name="lightAccent">#448AFF</color>
+    <color name="lightElement">#A0000000</color>
 
     <color name="black">#000000</color>
+    <color name="darkElement">#CCFFFFFF</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 60cdbd3..5913902 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -6,45 +6,46 @@
     </style>
 
     <style name="Theme.Audinaut.Light.Base" parent="@style/Theme.AppCompat.Light.DarkActionBar">
-        <item name="offline_icon">@drawable/main_offline_light</item>
-        <item name="media_button_backward">@drawable/media_backward_light</item>
-        <item name="media_button_forward">@drawable/media_forward_light</item>
-        <item name="media_button_rewind">@drawable/media_rewind_light</item>
-        <item name="media_button_fastforward">@drawable/media_fastforward_light</item>
-        <item name="media_button_pause">@drawable/media_pause_light</item>
-        <item name="media_button_repeat_off">@drawable/media_repeat_off_light</item>
-        <item name="media_button_repeat_single">@drawable/media_repeat_single_light</item>
-        <item name="media_button_repeat_all">@drawable/media_repeat_all_light</item>
-        <item name="media_button_start">@drawable/media_start_light</item>
-        <item name="media_button_stop">@drawable/media_stop_light</item>
-        <item name="actionbar_backward">@drawable/media_backward_dark</item>
-        <item name="actionbar_forward">@drawable/media_forward_dark</item>
-        <item name="actionbar_pause">@drawable/media_pause_dark</item>
-        <item name="actionbar_start">@drawable/media_start_dark</item>
-        <item name="actionbar_stop">@drawable/media_stop_dark</item>
-        <item name="actionbar_rewind">@drawable/media_rewind_dark</item>
-        <item name="actionbar_fastforward">@drawable/media_fastforward_dark</item>
-        <item name="add">@drawable/ic_action_add_dark</item>
-        <item name="download_none">@drawable/download_none_light</item>
-        <item name="shuffle">@drawable/ic_menu_shuffle_dark</item>
-        <item name="shuffle_button">@drawable/ic_menu_shuffle_light</item>
-        <item name="refresh">@drawable/ic_menu_refresh_dark</item>
-        <item name="search">@drawable/ic_menu_search_dark</item>
-        <item name="remove">@drawable/ic_menu_remove_dark</item>
-        <item name="save">@drawable/ic_menu_save_dark</item>
-        <item name="volume">@drawable/ic_action_volume_light</item>
-        <item name="toggle_list">@drawable/action_toggle_list_light</item>
-        <item name="select_server">@drawable/main_select_server_light</item>
-        <item name="select_tabs">@drawable/main_select_tabs_light</item>
-        <item name="playing">@drawable/playing_light</item>
-        <item name="downloading">@drawable/downloading_light</item>
-        <item name="add_person">@drawable/ic_menu_add_person_dark</item>
-        <item name="password">@drawable/ic_menu_password_dark</item>
-        <item name="download">@drawable/ic_menu_download_dark</item>
-        <item name="drawerLibrary">@drawable/ic_menu_library_light</item>
-        <item name="drawerPlaylists">@drawable/ic_menu_playlist_light</item>
-        <item name="drawerDownloading">@drawable/ic_menu_download_light</item>
-        <item name="drawerSettings">@drawable/ic_menu_settings_light</item>
+        <item name="element_color">@color/lightElement</item>
+        <item name="actionbar_element_color">@color/darkElement</item>
+        <item name="offline_icon">@drawable/main_offline</item>
+        <item name="media_button_backward">@drawable/media_backward</item>
+        <item name="media_button_forward">@drawable/media_forward</item>
+        <item name="media_button_rewind">@drawable/media_rewind</item>
+        <item name="media_button_fastforward">@drawable/media_fastforward</item>
+        <item name="media_button_pause">@drawable/media_pause</item>
+        <item name="media_button_repeat_off">@drawable/media_repeat_off</item>
+        <item name="media_button_repeat_single">@drawable/media_repeat_single</item>
+        <item name="media_button_repeat_all">@drawable/media_repeat_all</item>
+        <item name="media_button_start">@drawable/media_start</item>
+        <item name="media_button_stop">@drawable/media_stop</item>
+        <item name="actionbar_backward">@drawable/media_backward</item>
+        <item name="actionbar_forward">@drawable/media_forward</item>
+        <item name="actionbar_pause">@drawable/media_pause</item>
+        <item name="actionbar_start">@drawable/media_start</item>
+        <item name="actionbar_stop">@drawable/media_stop</item>
+        <item name="actionbar_rewind">@drawable/media_rewind</item>
+        <item name="actionbar_fastforward">@drawable/media_fastforward</item>
+        <item name="add">@drawable/ic_action_add</item>
+        <item name="download_none">@drawable/download_none</item>
+        <item name="shuffle">@drawable/ic_menu_shuffle</item>
+        <item name="shuffle_button">@drawable/ic_menu_shuffle</item>
+        <item name="refresh">@drawable/actionbar_refresh</item>
+        <item name="search">@drawable/actionbar_search</item>
+        <item name="remove">@drawable/ic_menu_remove</item>
+        <item name="save">@drawable/actionbar_save</item>
+        <item name="volume">@drawable/ic_action_volume</item>
+        <item name="toggle_list">@drawable/action_toggle_list</item>
+        <item name="select_server">@drawable/main_select_server</item>
+        <item name="select_tabs">@drawable/main_select_tabs</item>
+        <item name="playing">@drawable/playing</item>
+        <item name="downloading">@drawable/downloading</item>
+        <item name="add_person">@drawable/ic_menu_add_person</item>
+        <item name="download">@drawable/ic_menu_download</item>
+        <item name="drawerLibrary">@drawable/ic_menu_library</item>
+        <item name="drawerPlaylists">@drawable/ic_menu_playlist</item>
+        <item name="drawerDownloading">@drawable/ic_menu_download</item>
+        <item name="drawerSettings">@drawable/ic_menu_settings</item>
         <item name="drawerArrowStyle">@style/Audinaut.DrawerArrow</item>
         <item name="colorPrimary">@color/lightPrimary</item>
         <item name="colorPrimaryDark">@color/lightPrimaryDark</item>
@@ -67,50 +68,52 @@
         </item>
         <item name="windowActionModeOverlay">true</item>
         <item name="actionModeBackground">?attr/colorPrimary</item>
-        <item name="cardBackgroundDrawable">@drawable/card_rounded_corners_light</item>
+        <item name="card_background">@android:color/white</item>
+        <item name="cardBackgroundDrawable">@drawable/card_rounded_corners</item>
         <item name="drawerHeaderBackground">@color/lightPrimary</item>
     </style>
 
     <style name="Theme.Audinaut.Dark.Base" parent="@style/Theme.AppCompat">
-        <item name="offline_icon">@drawable/main_offline_dark</item>
-        <item name="media_button_backward">@drawable/media_backward_dark</item>
-        <item name="media_button_forward">@drawable/media_forward_dark</item>
-        <item name="media_button_rewind">@drawable/media_rewind_dark</item>
-        <item name="media_button_fastforward">@drawable/media_fastforward_dark</item>
-        <item name="media_button_pause">@drawable/media_pause_dark</item>
-        <item name="media_button_repeat_off">@drawable/media_repeat_off_dark</item>
-        <item name="media_button_repeat_single">@drawable/media_repeat_single_dark</item>
-        <item name="media_button_repeat_all">@drawable/media_repeat_all_dark</item>
-        <item name="media_button_start">@drawable/media_start_dark</item>
-        <item name="media_button_stop">@drawable/media_stop_dark</item>
-        <item name="actionbar_backward">@drawable/media_backward_dark</item>
-        <item name="actionbar_forward">@drawable/media_forward_dark</item>
-        <item name="actionbar_pause">@drawable/media_pause_dark</item>
-        <item name="actionbar_start">@drawable/media_start_dark</item>
-        <item name="actionbar_stop">@drawable/media_stop_dark</item>
-        <item name="actionbar_rewind">@drawable/media_rewind_dark</item>
-        <item name="actionbar_fastforward">@drawable/media_fastforward_dark</item>
-        <item name="add">@drawable/ic_action_add_dark</item>
-        <item name="download_none">@drawable/download_none_dark</item>
-        <item name="shuffle">@drawable/ic_menu_shuffle_dark</item>
-        <item name="shuffle_button">@drawable/ic_menu_shuffle_dark</item>
-        <item name="refresh">@drawable/ic_menu_refresh_dark</item>
-        <item name="search">@drawable/ic_menu_search_dark</item>
-        <item name="remove">@drawable/ic_menu_remove_dark</item>
-        <item name="save">@drawable/ic_menu_save_dark</item>
-        <item name="volume">@drawable/ic_action_volume_dark</item>
-        <item name="toggle_list">@drawable/action_toggle_list_dark</item>
-        <item name="select_server">@drawable/main_select_server_dark</item>
-        <item name="select_tabs">@drawable/main_select_tabs_dark</item>
-        <item name="playing">@drawable/playing_dark</item>
-        <item name="downloading">@drawable/downloading_dark</item>
-        <item name="add_person">@drawable/ic_menu_add_person_dark</item>
-        <item name="password">@drawable/ic_menu_password_dark</item>
-        <item name="download">@drawable/ic_menu_download_dark</item>
-        <item name="drawerLibrary">@drawable/ic_menu_library_dark</item>
-        <item name="drawerPlaylists">@drawable/ic_menu_playlist_dark</item>
-        <item name="drawerDownloading">@drawable/ic_menu_download_dark</item>
-        <item name="drawerSettings">@drawable/ic_menu_settings_dark</item>
+        <item name="element_color">@color/darkElement</item>
+        <item name="actionbar_element_color">@color/darkElement</item>
+        <item name="offline_icon">@drawable/main_offline</item>
+        <item name="media_button_backward">@drawable/media_backward</item>
+        <item name="media_button_forward">@drawable/media_forward</item>
+        <item name="media_button_rewind">@drawable/media_rewind</item>
+        <item name="media_button_fastforward">@drawable/media_fastforward</item>
+        <item name="media_button_pause">@drawable/media_pause</item>
+        <item name="media_button_repeat_off">@drawable/media_repeat_off</item>
+        <item name="media_button_repeat_single">@drawable/media_repeat_single</item>
+        <item name="media_button_repeat_all">@drawable/media_repeat_all</item>
+        <item name="media_button_start">@drawable/media_start</item>
+        <item name="media_button_stop">@drawable/media_stop</item>
+        <item name="actionbar_backward">@drawable/media_backward</item>
+        <item name="actionbar_forward">@drawable/media_forward</item>
+        <item name="actionbar_pause">@drawable/media_pause</item>
+        <item name="actionbar_start">@drawable/media_start</item>
+        <item name="actionbar_stop">@drawable/media_stop</item>
+        <item name="actionbar_rewind">@drawable/media_rewind</item>
+        <item name="actionbar_fastforward">@drawable/media_fastforward</item>
+        <item name="add">@drawable/ic_action_add</item>
+        <item name="download_none">@drawable/download_none</item>
+        <item name="shuffle">@drawable/ic_menu_shuffle</item>
+        <item name="shuffle_button">@drawable/ic_menu_shuffle</item>
+        <item name="refresh">@drawable/actionbar_refresh</item>
+        <item name="search">@drawable/actionbar_search</item>
+        <item name="remove">@drawable/ic_menu_remove</item>
+        <item name="save">@drawable/actionbar_save</item>
+        <item name="volume">@drawable/ic_action_volume</item>
+        <item name="toggle_list">@drawable/action_toggle_list</item>
+        <item name="select_server">@drawable/main_select_server</item>
+        <item name="select_tabs">@drawable/main_select_tabs</item>
+        <item name="playing">@drawable/playing</item>
+        <item name="downloading">@drawable/downloading</item>
+        <item name="add_person">@drawable/ic_menu_add_person</item>
+        <item name="download">@drawable/ic_menu_download</item>
+        <item name="drawerLibrary">@drawable/ic_menu_library</item>
+        <item name="drawerPlaylists">@drawable/ic_menu_playlist</item>
+        <item name="drawerDownloading">@drawable/ic_menu_download</item>
+        <item name="drawerSettings">@drawable/ic_menu_settings</item>
         <item name="drawerArrowStyle">@style/Audinaut.DrawerArrow</item>
         <item name="colorPrimary">@color/lightPrimary</item>
         <item name="colorPrimaryDark">@color/lightPrimaryDark</item>
@@ -128,7 +131,8 @@
         </item>
         <item name="windowActionModeOverlay">true</item>
         <item name="actionModeBackground">?attr/colorPrimary</item>
-        <item name="cardBackgroundDrawable">@drawable/card_rounded_corners_dark</item>
+        <item name="card_background">@android:color/black</item>
+        <item name="cardBackgroundDrawable">@drawable/card_rounded_corners</item>
         <item name="drawerHeaderBackground">@color/lightPrimaryDark</item>
     </style>
 
@@ -137,7 +141,6 @@
     <style name="Theme.Audinaut.Dark" parent="Theme.Audinaut.Dark.Base" />
 
     <style name="Theme.Audinaut.Black.Base" parent="Theme.Audinaut.Dark.Base">
-        <item name="cardBackgroundDrawable">@drawable/card_rounded_corners_black</item>
         <item name="android:windowBackground">@android:color/black</item>
     </style>
 
@@ -159,6 +162,7 @@
     </style>
 
     <style name="Theme.Audinaut.Light.No_Color.Base" parent="Theme.Audinaut.Light.No_Actionbar">
+        <item name="actionbar_element_color">@color/lightElement</item>
         <item name="actionbarThemeStyle">@style/ThemeOverlay.AppCompat.ActionBar</item>
         <item name="actionbarBackgroundColor">@android:color/transparent</item>
         <item name="actionbarTitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Title
@@ -173,22 +177,21 @@
         <item name="drawerSubtitleStyle">
             @style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse
         </item>
-        <item name="actionbar_backward">@drawable/media_backward_light</item>
-        <item name="actionbar_forward">@drawable/media_forward_light</item>
-        <item name="actionbar_pause">@drawable/media_pause_light</item>
-        <item name="actionbar_start">@drawable/media_start_light</item>
-        <item name="actionbar_stop">@drawable/media_stop_light</item>
-        <item name="actionbar_rewind">@drawable/media_rewind_light</item>
-        <item name="actionbar_fastforward">@drawable/media_fastforward_light</item>
-        <item name="add">@drawable/ic_action_add_light</item>
-        <item name="shuffle">@drawable/ic_menu_shuffle_light</item>
-        <item name="refresh">@drawable/ic_menu_refresh_light</item>
-        <item name="search">@drawable/ic_menu_search_light</item>
-        <item name="remove">@drawable/ic_menu_remove_light</item>
-        <item name="save">@drawable/ic_menu_save_light</item>
-        <item name="add_person">@drawable/ic_menu_add_person_light</item>
-        <item name="password">@drawable/ic_menu_password_light</item>
-        <item name="download">@drawable/ic_menu_download_light</item>
+        <item name="actionbar_backward">@drawable/media_backward</item>
+        <item name="actionbar_forward">@drawable/media_forward</item>
+        <item name="actionbar_pause">@drawable/media_pause</item>
+        <item name="actionbar_start">@drawable/media_start</item>
+        <item name="actionbar_stop">@drawable/media_stop</item>
+        <item name="actionbar_rewind">@drawable/media_rewind</item>
+        <item name="actionbar_fastforward">@drawable/media_fastforward</item>
+        <item name="add">@drawable/ic_action_add</item>
+        <item name="shuffle">@drawable/ic_menu_shuffle</item>
+        <item name="refresh">@drawable/actionbar_refresh</item>
+        <item name="search">@drawable/actionbar_search</item>
+        <item name="remove">@drawable/ic_menu_remove</item>
+        <item name="save">@drawable/actionbar_save</item>
+        <item name="add_person">@drawable/ic_menu_add_person</item>
+        <item name="download">@drawable/ic_menu_download</item>
         <item name="actionModeBackground">@color/background_material_light</item>
         <item name="actionModeStyle">@style/LightActionMode</item>
         <item name="actionModeCloseButtonStyle">@style/DarkCloseButton</item>