Made icons black instead of grey

Since switching to the official Toolbar theme, the back arrow and the overflow dots are black, too.
author: ByteHamster <info@bytehamster.com> 2020-03-16 20:49:40 +0100
committer: ByteHamster <info@bytehamster.com> 2020-03-16 22:34:06 +0100
commit: 9f32b6cebf503961077f1f3d26735ff17c7219e0 (patch)
tree: 6eec81946a639ee66d046fa63ad241c2e954cbcf
parent: 15b1afa38b3ca1614296acc55ecc0535ac39df28 (diff)
download: AntennaPod-9f32b6cebf503961077f1f3d26735ff17c7219e0.zip
393 files changed, 466 insertions, 219 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index a5ae5e58c..c0ba75ba6 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -6,17 +6,9 @@ import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.content.res.TypedArray;
-import android.graphics.Color;
 import android.graphics.PixelFormat;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.ActivityCompat;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.app.AlertDialog;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -27,11 +19,13 @@ import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 import android.widget.Toast;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.content.ContextCompat;
 import com.bumptech.glide.Glide;
-import com.joanzapata.iconify.IconDrawable;
-import com.joanzapata.iconify.fonts.FontAwesomeIcons;
-
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.event.PlaybackPositionEvent;
 import de.danoeh.antennapod.core.feed.FeedItem;
@@ -360,19 +354,6 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
 
         menu.findItem(R.id.set_sleeptimer_item).setVisible(!controller.sleepTimerActive());
         menu.findItem(R.id.disable_sleeptimer_item).setVisible(controller.sleepTimerActive());
-
-        if (this instanceof AudioplayerActivity) {
-            int[] attrs = {R.attr.action_bar_icon_color};
-            TypedArray ta = obtainStyledAttributes(UserPreferences.getTheme(), attrs);
-            int textColor = ta.getColor(0, Color.GRAY);
-            ta.recycle();
-            menu.findItem(R.id.audio_controls).setIcon(new IconDrawable(this,
-                    FontAwesomeIcons.fa_sliders).color(textColor).actionBarSize());
-        } else {
-            menu.findItem(R.id.audio_controls).setIcon(new IconDrawable(this,
-                    FontAwesomeIcons.fa_sliders).color(0xffffffff).actionBarSize());
-        }
-
         return true;
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 8fb7aa73f..a1a4e0374 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -382,6 +382,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
         if (PictureInPictureUtil.supportsPictureInPicture(this)) {
             menu.findItem(R.id.player_go_to_picture_in_picture).setVisible(true);
         }
+        menu.findItem(R.id.audio_controls).setIcon(R.drawable.ic_sliders_white);
         return true;
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
index 307dabf14..b34963574 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
@@ -50,7 +50,7 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter {
         final FeedItem item = getItem(position);
         holder.bind(item);
         holder.dragHandle.setVisibility(View.GONE);
-        holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(activity, R.attr.content_discard));
+        holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(activity, R.attr.ic_delete));
         holder.secondaryActionButton.setOnClickListener(v -> itemAccess.onFeedItemSecondaryAction(item));
         holder.hideSeparatorIfNecessary();
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java
index 7831c6450..4d1ae76a2 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java
@@ -24,7 +24,7 @@ public class DeleteActionButton extends ItemActionButton {
     @Override
     @AttrRes
     public int getDrawable() {
-        return R.attr.content_discard;
+        return R.attr.ic_delete;
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
index 16337b00d..0305a7d48 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
@@ -153,7 +153,7 @@ public class DownloadLogFragment extends ListFragment {
         super.onCreateOptionsMenu(menu, inflater);
         MenuItem clearHistory = menu.add(Menu.NONE, R.id.clear_history_item, Menu.CATEGORY_CONTAINER, R.string.clear_history_label);
         MenuItemCompat.setShowAsAction(clearHistory, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
-        TypedArray drawables = getActivity().obtainStyledAttributes(new int[]{R.attr.content_discard});
+        TypedArray drawables = getActivity().obtainStyledAttributes(new int[]{R.attr.ic_delete});
         clearHistory.setIcon(drawables.getDrawable(0));
         drawables.recycle();
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
index f57b83bb8..f9bc6642e 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
@@ -114,7 +114,7 @@ public class PlaybackHistoryFragment extends Fragment implements AdapterView.OnI
         super.onCreateOptionsMenu(menu, inflater);
         MenuItem clearHistory = menu.add(Menu.NONE, R.id.clear_history_item, Menu.CATEGORY_CONTAINER, R.string.clear_history_label);
         MenuItemCompat.setShowAsAction(clearHistory, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
-        TypedArray drawables = getActivity().obtainStyledAttributes(new int[]{R.attr.content_discard});
+        TypedArray drawables = getActivity().obtainStyledAttributes(new int[]{R.attr.ic_delete});
         clearHistory.setIcon(drawables.getDrawable(0));
         drawables.recycle();
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/view/CircularProgressBar.java b/app/src/main/java/de/danoeh/antennapod/view/CircularProgressBar.java
index 4b3c51cfc..c6b50e728 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/CircularProgressBar.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/CircularProgressBar.java
@@ -1,13 +1,14 @@
 package de.danoeh.antennapod.view;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.RectF;
 import android.util.AttributeSet;
 import android.view.View;
 import androidx.annotation.Nullable;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.util.ThemeUtils;
 
 public class CircularProgressBar extends View {
     private static final float EPSILON = 0.005f;
@@ -41,11 +42,9 @@ public class CircularProgressBar extends View {
         paintProgress.setStyle(Paint.Style.STROKE);
         paintProgress.setStrokeCap(Paint.Cap.ROUND);
 
-        int[] colorAttrs = new int[] { android.R.attr.textColorPrimary, android.R.attr.textColorSecondary };
-        TypedArray a = getContext().obtainStyledAttributes(colorAttrs);
-        paintProgress.setColor(a.getColor(0, 0xffffffff));
-        paintBackground.setColor(a.getColor(1, 0xffffffff));
-        a.recycle();
+        int color = ThemeUtils.getColorFromAttr(getContext(), R.attr.action_icon_color);
+        paintProgress.setColor(color);
+        paintBackground.setColor(color);
     }
 
     /**
@@ -68,7 +67,7 @@ public class CircularProgressBar extends View {
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
 
-        float padding = getHeight() * 0.06f;
+        float padding = getHeight() * 0.07f;
         paintBackground.setStrokeWidth(getHeight() * 0.02f);
         paintProgress.setStrokeWidth(padding);
         RectF bounds = new RectF(padding, padding, getWidth() - padding, getHeight() - padding);
diff --git a/app/src/main/res/layout/all_episodes_fragment.xml b/app/src/main/res/layout/all_episodes_fragment.xml
index 2ccfe2494..ca84439da 100644
--- a/app/src/main/res/layout/all_episodes_fragment.xml
+++ b/app/src/main/res/layout/all_episodes_fragment.xml
@@ -29,10 +29,10 @@
         android:paddingBottom="@dimen/list_vertical_padding"
         android:layout_above="@id/loadingMore"
         app:fastScrollEnabled="true"
-        app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
-        app:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
-        app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
-        app:fastScrollVerticalTrackDrawable="@drawable/line_drawable"
+        app:fastScrollHorizontalThumbDrawable="@drawable/scrollbar_thumb_drawable"
+        app:fastScrollHorizontalTrackDrawable="@drawable/scrollbar_line_drawable"
+        app:fastScrollVerticalThumbDrawable="@drawable/scrollbar_thumb_drawable"
+        app:fastScrollVerticalTrackDrawable="@drawable/scrollbar_line_drawable"
         tools:itemCount="13"
         tools:listitem="@layout/feeditemlist_item" />
 
diff --git a/app/src/main/res/layout/empty_view_layout.xml b/app/src/main/res/layout/empty_view_layout.xml
index 4ccbf45db..768f74c41 100644
--- a/app/src/main/res/layout/empty_view_layout.xml
+++ b/app/src/main/res/layout/empty_view_layout.xml
@@ -12,11 +12,10 @@
 
     <ImageView
             android:id="@+id/emptyViewIcon"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:paddingBottom="8dp"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
             android:visibility="gone"
-            tools:src="@drawable/ic_feed_grey600_24dp"
+            tools:src="@drawable/ic_feed_black"
             tools:visibility="visible"/>
 
     <TextView
@@ -25,8 +24,7 @@
             android:layout_height="wrap_content"
             tools:text="Title"
             android:textSize="16sp"
-            android:textStyle="bold"
-            android:paddingBottom="8dp"/>
+            android:textColor="?android:attr/textColorPrimary"/>
 
     <TextView
             android:id="@+id/emptyViewMessage"
diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml
index 50ef20a06..f00fb349b 100644
--- a/app/src/main/res/layout/feeditemlist_header.xml
+++ b/app/src/main/res/layout/feeditemlist_header.xml
@@ -2,6 +2,7 @@
 <LinearLayout
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
@@ -65,7 +66,7 @@
                         android:layout_height="40dp"
                         android:background="?attr/selectableItemBackground"
                         android:contentDescription="@string/show_info_label"
-                        android:src="@drawable/ic_info_white_24dp"
+                        app:srcCompat="@drawable/ic_info_white"
                         tools:background="@android:color/holo_green_dark"
                         android:layout_marginLeft="-8dp"
                         android:layout_marginStart="-8dp"
@@ -78,7 +79,7 @@
                         android:layout_height="40dp"
                         android:background="?attr/selectableItemBackground"
                         android:contentDescription="@string/show_feed_settings_label"
-                        android:src="@drawable/ic_settings_white_24dp"
+                        app:srcCompat="@drawable/ic_settings_white"
                         tools:background="@android:color/holo_green_dark"
                         android:scaleType="fitXY"
                         android:padding="8dp"/>
diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml
index 6e2f2c43c..1bc18dc0a 100644
--- a/app/src/main/res/layout/feeditemlist_item.xml
+++ b/app/src/main/res/layout/feeditemlist_item.xml
@@ -99,21 +99,21 @@
                     android:layout_width="14sp"
                     android:layout_height="14sp"
                     app:srcCompat="?attr/type_video"
-                    tools:srcCompat="@drawable/ic_videocam_grey600_24dp"
+                    tools:srcCompat="@drawable/ic_videocam_black_24dp"
                     android:id="@+id/ivIsVideo"/>
 
             <ImageView
                     android:layout_width="14sp"
                     android:layout_height="14sp"
                     app:srcCompat="?attr/ic_unfav"
-                    tools:srcCompat="@drawable/ic_star_grey600_24dp"
+                    tools:srcCompat="@drawable/ic_star_black"
                     android:id="@+id/isFavorite"/>
 
             <ImageView
                     android:layout_width="14sp"
                     android:layout_height="14sp"
                     app:srcCompat="?attr/stat_playlist"
-                    tools:srcCompat="@drawable/ic_list_grey600_24dp"
+                    tools:srcCompat="@drawable/ic_playlist_black"
                     android:id="@+id/ivInPlaylist"/>
 
             <TextView
diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml
index d16331a10..4cfd369a7 100644
--- a/app/src/main/res/layout/fragment_subscriptions.xml
+++ b/app/src/main/res/layout/fragment_subscriptions.xml
@@ -35,5 +35,5 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:contentDescription="@string/add_feed_label"
-            android:src="@drawable/ic_add_white_24dp"/>
+            app:srcCompat="@drawable/ic_add_white"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/mediaplayerinfo_activity.xml b/app/src/main/res/layout/mediaplayerinfo_activity.xml
index 212d8b9d8..667e0c72a 100644
--- a/app/src/main/res/layout/mediaplayerinfo_activity.xml
+++ b/app/src/main/res/layout/mediaplayerinfo_activity.xml
@@ -167,7 +167,7 @@
                     android:layout_centerVertical="true"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/set_playback_speed_label"
-                    tools:srcCompat="@drawable/ic_playback_speed_white_48dp"
+                    tools:srcCompat="@drawable/ic_playback_speed_white"
                     tools:visibility="gone"
                     tools:background="@android:color/holo_green_dark" />
 
diff --git a/app/src/main/res/layout/storage_error.xml b/app/src/main/res/layout/storage_error.xml
index 8ff28b3c1..7b0579927 100644
--- a/app/src/main/res/layout/storage_error.xml
+++ b/app/src/main/res/layout/storage_error.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -13,7 +14,7 @@
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_margin="8dp"
-        android:src="?attr/ic_sd_storage" />
+        app:srcCompat="?attr/storage" />
 
     <TextView
         android:id="@+id/textView1"
diff --git a/app/src/main/res/menu/directory_chooser.xml b/app/src/main/res/menu/directory_chooser.xml
index 3f860d636..e6150ac20 100644
--- a/app/src/main/res/menu/directory_chooser.xml
+++ b/app/src/main/res/menu/directory_chooser.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/new_folder_item"
         android:title="@string/create_folder_label"
-        android:icon="?attr/ic_create_new_folder"
-        custom:showAsAction="ifRoom|withText" />
+        app:icon="?attr/content_new"
+        app:showAsAction="ifRoom|withText" />
     <item
         android:id="@+id/set_to_default_folder_item"
         android:title="@string/set_to_default_folder"
-        custom:showAsAction="collapseActionView" />
+        app:showAsAction="collapseActionView" />
 
 </menu>
diff --git a/app/src/main/res/menu/downloads_completed.xml b/app/src/main/res/menu/downloads_completed.xml
index 9f297988d..8badc4927 100644
--- a/app/src/main/res/menu/downloads_completed.xml
+++ b/app/src/main/res/menu/downloads_completed.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/episode_actions"
         android:menuCategory="container"
         android:title="@string/multi_select"
         android:icon="?attr/checkbox_multiple"
-        android:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/episodes_apply_action_speeddial.xml b/app/src/main/res/menu/episodes_apply_action_speeddial.xml
index 39083e41b..370cedd90 100644
--- a/app/src/main/res/menu/episodes_apply_action_speeddial.xml
+++ b/app/src/main/res/menu/episodes_apply_action_speeddial.xml
@@ -6,7 +6,7 @@
          visually it will be shown at the bottom of the list of actions.
       -->
     <item android:id="@+id/delete_batch"
-        android:icon="?attr/content_discard"
+        android:icon="?attr/ic_delete"
         android:title="@string/delete_episode_label"
         />
     <item android:id="@+id/download_batch"
diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml
index 7f32ef744..939a51ab2 100644
--- a/app/src/main/res/menu/feedlist.xml
+++ b/app/src/main/res/menu/feedlist.xml
@@ -73,7 +73,7 @@
 
     <item
         android:id="@+id/remove_item"
-        android:icon="?attr/content_discard"
+        android:icon="?attr/ic_delete"
         android:menuCategory="container"
         android:title="@string/remove_feed_label"
         android:visible="true"
diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml
index 055951760..a61616ce9 100644
--- a/app/src/main/res/menu/mediaplayer.xml
+++ b/app/src/main/res/menu/mediaplayer.xml
@@ -30,6 +30,7 @@
 
     <item
         android:id="@+id/audio_controls"
+        android:icon="?attr/ic_sliders"
         android:title="@string/audio_controls"
         custom:showAsAction="always">
     </item>
@@ -59,9 +60,8 @@
 
     <item
         android:id="@+id/share_item"
-        android:icon="?attr/social_share"
         android:menuCategory="container"
-        custom:showAsAction="ifRoom"
+        custom:showAsAction="never"
         android:title="@string/share_label">
         <menu>
             <item
diff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml
index 08e7572af..d65280061 100644
--- a/app/src/main/res/xml/feed_settings.xml
+++ b/app/src/main/res/xml/feed_settings.xml
@@ -23,7 +23,7 @@
     <ListPreference
             android:entries="@array/spnAutoDeleteItems"
             android:entryValues="@array/spnAutoDeleteValues"
-            android:icon="?attr/content_discard"
+            android:icon="?attr/ic_delete"
             android:title="@string/auto_delete_label"
             android:summary="@string/feed_auto_download_global"
             android:key="autoDelete"/>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index ef7b9357f..8cd1b8be0 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -13,7 +13,7 @@
             android:key="prefScreenInterface"
             android:title="@string/user_interface_label"
             android:summary="@string/user_interface_sum"
-            android:icon="?attr/ic_cellphone_text" />
+            android:icon="?attr/ic_appearance" />
 
     <Preference
             android:key="prefScreenPlayback"
@@ -25,7 +25,7 @@
             android:key="prefScreenNetwork"
             android:title="@string/network_pref"
             android:summary="@string/network_pref_sum"
-            android:icon="?attr/ic_swap" />
+            android:icon="?attr/ic_network" />
 
     <Preference
             android:key="prefScreenIntegrations"
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
index 5cc2bbc64..6347f8284 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
@@ -400,8 +400,8 @@ public class PlaybackController {
 
         if (PlaybackService.getCurrentMediaType() == MediaType.AUDIO  ||  PlaybackService.isCasting()) {
             TypedArray res = activity.obtainStyledAttributes(new int[]{ R.attr.av_play, R.attr.av_pause});
-            playResource = res.getResourceId(0, R.drawable.ic_av_play_dark_48dp);
-            pauseResource = res.getResourceId(1, R.drawable.ic_av_pause_dark_48dp);
+            playResource = res.getResourceId(0, R.drawable.ic_av_play_black_48dp);
+            pauseResource = res.getResourceId(1, R.drawable.ic_av_pause_black_48dp);
             res.recycle();
         } else {
             playResource = R.drawable.ic_av_play_white_80dp;
diff --git a/core/src/main/res/drawable-hdpi/ic_add_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_add_grey600_24dp.png
deleted file mode 100644
index 69efaccd1..000000000
--- a/core/src/main/res/drawable-hdpi/ic_add_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_add_white_24dp.png
deleted file mode 100644
index 023e5d21a..000000000
--- a/core/src/main/res/drawable-hdpi/ic_add_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_audiotrack_light.png b/core/src/main/res/drawable-hdpi/ic_audiotrack_light.png
deleted file mode 100644
index 04e23e1f6..000000000
--- a/core/src/main/res/drawable-hdpi/ic_audiotrack_light.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_bug_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_bug_grey600_24dp.png
deleted file mode 100644
index daadfb35f..000000000
--- a/core/src/main/res/drawable-hdpi/ic_bug_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_bug_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_bug_white_24dp.png
deleted file mode 100644
index 549f67bf4..000000000
--- a/core/src/main/res/drawable-hdpi/ic_bug_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_cancel_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_cancel_grey600_24dp.png
deleted file mode 100644
index 6a2ca5023..000000000
--- a/core/src/main/res/drawable-hdpi/ic_cancel_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png
deleted file mode 100644
index 9698d4b7d..000000000
--- a/core/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_cellphone_text_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_cellphone_text_grey600_24dp.png
deleted file mode 100644
index 71ccc26ea..000000000
--- a/core/src/main/res/drawable-hdpi/ic_cellphone_text_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_cellphone_text_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_cellphone_text_white_24dp.png
deleted file mode 100644
index 70e52c60b..000000000
--- a/core/src/main/res/drawable-hdpi/ic_cellphone_text_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_checkbox_multiple_marked_outline_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_checkbox_multiple_marked_outline_grey600_24dp.png
deleted file mode 100644
index 212948b70..000000000
--- a/core/src/main/res/drawable-hdpi/ic_checkbox_multiple_marked_outline_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_checkbox_multiple_marked_outline_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_checkbox_multiple_marked_outline_white_24dp.png
deleted file mode 100644
index cce69655d..000000000
--- a/core/src/main/res/drawable-hdpi/ic_checkbox_multiple_marked_outline_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_create_new_folder_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_create_new_folder_grey600_24dp.png
deleted file mode 100644
index 75c703ae4..000000000
--- a/core/src/main/res/drawable-hdpi/ic_create_new_folder_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_create_new_folder_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_create_new_folder_white_24dp.png
deleted file mode 100644
index e6ae7f36b..000000000
--- a/core/src/main/res/drawable-hdpi/ic_create_new_folder_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index 501e60fa0..000000000
--- a/core/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 4d8ce49e3..000000000
--- a/core/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_done_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_done_grey600_24dp.png
deleted file mode 100644
index 72eea4a8d..000000000
--- a/core/src/main/res/drawable-hdpi/ic_done_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_done_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_done_white_24dp.png
deleted file mode 100644
index 9b4047a41..000000000
--- a/core/src/main/res/drawable-hdpi/ic_done_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_expand_more_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_expand_more_grey600_36dp.png
deleted file mode 100644
index 96ed70a40..000000000
--- a/core/src/main/res/drawable-hdpi/ic_expand_more_grey600_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_expand_more_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_expand_more_white_36dp.png
deleted file mode 100644
index f3c628e77..000000000
--- a/core/src/main/res/drawable-hdpi/ic_expand_more_white_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_feed_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_feed_grey600_24dp.png
deleted file mode 100755
index c09c73441..000000000
--- a/core/src/main/res/drawable-hdpi/ic_feed_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_feed_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_feed_white_24dp.png
deleted file mode 100755
index 43183d393..000000000
--- a/core/src/main/res/drawable-hdpi/ic_feed_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_file_download_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_file_download_grey600_24dp.png
deleted file mode 100644
index 62caf8392..000000000
--- a/core/src/main/res/drawable-hdpi/ic_file_download_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png
deleted file mode 100644
index 8300268dc..000000000
--- a/core/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_folder_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_folder_grey600_24dp.png
deleted file mode 100755
index e3dccd298..000000000
--- a/core/src/main/res/drawable-hdpi/ic_folder_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_folder_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_folder_white_24dp.png
deleted file mode 100755
index 9f5c75609..000000000
--- a/core/src/main/res/drawable-hdpi/ic_folder_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_history_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_history_grey600_24dp.png
deleted file mode 100644
index f02be50e2..000000000
--- a/core/src/main/res/drawable-hdpi/ic_history_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_history_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_history_white_24dp.png
deleted file mode 100644
index a0756f264..000000000
--- a/core/src/main/res/drawable-hdpi/ic_history_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_info_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_info_grey600_24dp.png
deleted file mode 100644
index 754299c4a..000000000
--- a/core/src/main/res/drawable-hdpi/ic_info_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_info_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_info_white_24dp.png
deleted file mode 100644
index 61ca3fee4..000000000
--- a/core/src/main/res/drawable-hdpi/ic_info_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_list_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_list_grey600_24dp.png
deleted file mode 100644
index 11c973d3d..000000000
--- a/core/src/main/res/drawable-hdpi/ic_list_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_list_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_list_white_24dp.png
deleted file mode 100644
index 4f1e57ec1..000000000
--- a/core/src/main/res/drawable-hdpi/ic_list_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_lock_closed_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_lock_closed_grey600_24dp.png
deleted file mode 100644
index 3e52fd88d..000000000
--- a/core/src/main/res/drawable-hdpi/ic_lock_closed_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_lock_closed_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_lock_closed_white_24dp.png
deleted file mode 100644
index 2260411cb..000000000
--- a/core/src/main/res/drawable-hdpi/ic_lock_closed_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_lock_open_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_lock_open_grey600_24dp.png
deleted file mode 100644
index a42417431..000000000
--- a/core/src/main/res/drawable-hdpi/ic_lock_open_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png
deleted file mode 100644
index 7bde52e12..000000000
--- a/core/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_poll_box_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_poll_box_grey600_24dp.png
deleted file mode 100644
index 2ee172a51..000000000
--- a/core/src/main/res/drawable-hdpi/ic_poll_box_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_poll_box_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_poll_box_white_24dp.png
deleted file mode 100644
index 3fe2256c7..000000000
--- a/core/src/main/res/drawable-hdpi/ic_poll_box_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index ec8ac3041..000000000
--- a/core/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
deleted file mode 100644
index db069b266..000000000
--- a/core/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_sd_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_sd_grey600_24dp.png
deleted file mode 100644
index 2c7c210d3..000000000
--- a/core/src/main/res/drawable-hdpi/ic_sd_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_sd_storage_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_sd_storage_grey600_36dp.png
deleted file mode 100644
index 26a39bec9..000000000
--- a/core/src/main/res/drawable-hdpi/ic_sd_storage_grey600_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_sd_storage_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_sd_storage_white_36dp.png
deleted file mode 100644
index 751e0e360..000000000
--- a/core/src/main/res/drawable-hdpi/ic_sd_storage_white_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_sd_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_sd_white_24dp.png
deleted file mode 100644
index 77fd16301..000000000
--- a/core/src/main/res/drawable-hdpi/ic_sd_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_search_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_search_grey600_24dp.png
deleted file mode 100644
index 022f081e0..000000000
--- a/core/src/main/res/drawable-hdpi/ic_search_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_search_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_search_white_24dp.png
deleted file mode 100644
index cc6d5da86..000000000
--- a/core/src/main/res/drawable-hdpi/ic_search_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index a7c216d3d..000000000
--- a/core/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
deleted file mode 100644
index 14c7da0c2..000000000
--- a/core/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_share_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_share_grey600_24dp.png
deleted file mode 100644
index 9457cac52..000000000
--- a/core/src/main/res/drawable-hdpi/ic_share_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_share_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_share_white_24dp.png
deleted file mode 100644
index 80c24d993..000000000
--- a/core/src/main/res/drawable-hdpi/ic_share_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_sleep_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_sleep_grey600_24dp.png
deleted file mode 100644
index f25063071..000000000
--- a/core/src/main/res/drawable-hdpi/ic_sleep_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_sleep_off_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_sleep_off_grey600_24dp.png
deleted file mode 100644
index 0db6381ea..000000000
--- a/core/src/main/res/drawable-hdpi/ic_sleep_off_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_sleep_off_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_sleep_off_white_24dp.png
deleted file mode 100644
index c614c2b3d..000000000
--- a/core/src/main/res/drawable-hdpi/ic_sleep_off_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_sleep_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_sleep_white_24dp.png
deleted file mode 100644
index 5d8072149..000000000
--- a/core/src/main/res/drawable-hdpi/ic_sleep_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_sort_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_sort_grey600_24dp.png
deleted file mode 100644
index 715dea65f..000000000
--- a/core/src/main/res/drawable-hdpi/ic_sort_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_sort_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_sort_white_24dp.png
deleted file mode 100644
index 9cdac3582..000000000
--- a/core/src/main/res/drawable-hdpi/ic_sort_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_star_border_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_star_border_grey600_24dp.png
deleted file mode 100644
index 6b5bc858a..000000000
--- a/core/src/main/res/drawable-hdpi/ic_star_border_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_star_border_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_star_border_white_24dp.png
deleted file mode 100644
index d59bc4792..000000000
--- a/core/src/main/res/drawable-hdpi/ic_star_border_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_star_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_star_grey600_24dp.png
deleted file mode 100644
index e4fe7f43a..000000000
--- a/core/src/main/res/drawable-hdpi/ic_star_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_star_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_star_white_24dp.png
deleted file mode 100644
index 394c5a60c..000000000
--- a/core/src/main/res/drawable-hdpi/ic_star_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_swap_vertical_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_swap_vertical_grey600_24dp.png
deleted file mode 100644
index cd3508d72..000000000
--- a/core/src/main/res/drawable-hdpi/ic_swap_vertical_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_swap_vertical_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_swap_vertical_white_24dp.png
deleted file mode 100644
index b26af6aac..000000000
--- a/core/src/main/res/drawable-hdpi/ic_swap_vertical_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_web_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_web_grey600_24dp.png
deleted file mode 100644
index 57c236892..000000000
--- a/core/src/main/res/drawable-hdpi/ic_web_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_web_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_web_white_24dp.png
deleted file mode 100644
index 410ef41e9..000000000
--- a/core/src/main/res/drawable-hdpi/ic_web_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_add_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_add_grey600_24dp.png
deleted file mode 100644
index 27e311f39..000000000
--- a/core/src/main/res/drawable-mdpi/ic_add_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_add_white_24dp.png
deleted file mode 100644
index 3856041d7..000000000
--- a/core/src/main/res/drawable-mdpi/ic_add_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_audiotrack_light.png b/core/src/main/res/drawable-mdpi/ic_audiotrack_light.png
deleted file mode 100644
index 8ce237e38..000000000
--- a/core/src/main/res/drawable-mdpi/ic_audiotrack_light.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_bug_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_bug_grey600_24dp.png
deleted file mode 100644
index 4b372a4e3..000000000
--- a/core/src/main/res/drawable-mdpi/ic_bug_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_bug_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_bug_white_24dp.png
deleted file mode 100644
index 9d7603552..000000000
--- a/core/src/main/res/drawable-mdpi/ic_bug_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_cancel_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_cancel_grey600_24dp.png
deleted file mode 100644
index e91e2cbf6..000000000
--- a/core/src/main/res/drawable-mdpi/ic_cancel_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png
deleted file mode 100644
index c433d9ba0..000000000
--- a/core/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_cellphone_text_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_cellphone_text_grey600_24dp.png
deleted file mode 100644
index c26da2ce2..000000000
--- a/core/src/main/res/drawable-mdpi/ic_cellphone_text_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_cellphone_text_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_cellphone_text_white_24dp.png
deleted file mode 100644
index 8569a642d..000000000
--- a/core/src/main/res/drawable-mdpi/ic_cellphone_text_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_checkbox_multiple_marked_outline_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_checkbox_multiple_marked_outline_grey600_24dp.png
deleted file mode 100644
index 498ddf8eb..000000000
--- a/core/src/main/res/drawable-mdpi/ic_checkbox_multiple_marked_outline_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_checkbox_multiple_marked_outline_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_checkbox_multiple_marked_outline_white_24dp.png
deleted file mode 100644
index 66a6d7681..000000000
--- a/core/src/main/res/drawable-mdpi/ic_checkbox_multiple_marked_outline_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_create_new_folder_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_create_new_folder_grey600_24dp.png
deleted file mode 100644
index 45c0c29bf..000000000
--- a/core/src/main/res/drawable-mdpi/ic_create_new_folder_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_create_new_folder_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_create_new_folder_white_24dp.png
deleted file mode 100644
index 02167a9f0..000000000
--- a/core/src/main/res/drawable-mdpi/ic_create_new_folder_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index 3bf363a2b..000000000
--- a/core/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 6b44a07da..000000000
--- a/core/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_done_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_done_grey600_24dp.png
deleted file mode 100644
index 73f72da71..000000000
--- a/core/src/main/res/drawable-mdpi/ic_done_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_done_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_done_white_24dp.png
deleted file mode 100644
index e094dee36..000000000
--- a/core/src/main/res/drawable-mdpi/ic_done_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_expand_more_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_expand_more_grey600_36dp.png
deleted file mode 100644
index 4d8cd8e99..000000000
--- a/core/src/main/res/drawable-mdpi/ic_expand_more_grey600_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_expand_more_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_expand_more_white_36dp.png
deleted file mode 100644
index 682bcf79f..000000000
--- a/core/src/main/res/drawable-mdpi/ic_expand_more_white_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_feed_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_feed_grey600_24dp.png
deleted file mode 100755
index 8037c315e..000000000
--- a/core/src/main/res/drawable-mdpi/ic_feed_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_feed_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_feed_white_24dp.png
deleted file mode 100755
index 026cac8f2..000000000
--- a/core/src/main/res/drawable-mdpi/ic_feed_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_file_download_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_file_download_grey600_24dp.png
deleted file mode 100644
index 74d554774..000000000
--- a/core/src/main/res/drawable-mdpi/ic_file_download_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png
deleted file mode 100644
index b09c53c86..000000000
--- a/core/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_folder_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_folder_grey600_24dp.png
deleted file mode 100755
index 1028bfaf3..000000000
--- a/core/src/main/res/drawable-mdpi/ic_folder_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_folder_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_folder_white_24dp.png
deleted file mode 100755
index 1c5797c9e..000000000
--- a/core/src/main/res/drawable-mdpi/ic_folder_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_history_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_history_grey600_24dp.png
deleted file mode 100644
index 397972f67..000000000
--- a/core/src/main/res/drawable-mdpi/ic_history_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_history_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_history_white_24dp.png
deleted file mode 100644
index bcc729de0..000000000
--- a/core/src/main/res/drawable-mdpi/ic_history_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_info_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_info_grey600_24dp.png
deleted file mode 100644
index b5c14a369..000000000
--- a/core/src/main/res/drawable-mdpi/ic_info_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_info_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_info_white_24dp.png
deleted file mode 100644
index 6dbeeb0b7..000000000
--- a/core/src/main/res/drawable-mdpi/ic_info_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_list_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_list_grey600_24dp.png
deleted file mode 100644
index ac5b3bed4..000000000
--- a/core/src/main/res/drawable-mdpi/ic_list_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_list_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_list_white_24dp.png
deleted file mode 100644
index 15d8fc2bb..000000000
--- a/core/src/main/res/drawable-mdpi/ic_list_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_lock_closed_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_lock_closed_grey600_24dp.png
deleted file mode 100644
index f9415627e..000000000
--- a/core/src/main/res/drawable-mdpi/ic_lock_closed_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_lock_closed_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_lock_closed_white_24dp.png
deleted file mode 100644
index 1203a4406..000000000
--- a/core/src/main/res/drawable-mdpi/ic_lock_closed_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_lock_open_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_lock_open_grey600_24dp.png
deleted file mode 100644
index 192e27ccd..000000000
--- a/core/src/main/res/drawable-mdpi/ic_lock_open_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png
deleted file mode 100644
index 232b4bfb4..000000000
--- a/core/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_poll_box_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_poll_box_grey600_24dp.png
deleted file mode 100644
index 6fefa8b8c..000000000
--- a/core/src/main/res/drawable-mdpi/ic_poll_box_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_poll_box_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_poll_box_white_24dp.png
deleted file mode 100644
index cf45cde6d..000000000
--- a/core/src/main/res/drawable-mdpi/ic_poll_box_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index 0e927f106..000000000
--- a/core/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
deleted file mode 100644
index 79b5ec871..000000000
--- a/core/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_sd_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_sd_grey600_24dp.png
deleted file mode 100644
index 81c5f77d9..000000000
--- a/core/src/main/res/drawable-mdpi/ic_sd_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_sd_storage_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_sd_storage_grey600_36dp.png
deleted file mode 100644
index 26977a920..000000000
--- a/core/src/main/res/drawable-mdpi/ic_sd_storage_grey600_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_sd_storage_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_sd_storage_white_36dp.png
deleted file mode 100644
index 4aeb2e668..000000000
--- a/core/src/main/res/drawable-mdpi/ic_sd_storage_white_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_sd_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_sd_white_24dp.png
deleted file mode 100644
index a012f237c..000000000
--- a/core/src/main/res/drawable-mdpi/ic_sd_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_search_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_search_grey600_24dp.png
deleted file mode 100644
index c386dbb38..000000000
--- a/core/src/main/res/drawable-mdpi/ic_search_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_search_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_search_white_24dp.png
deleted file mode 100644
index faefc59c8..000000000
--- a/core/src/main/res/drawable-mdpi/ic_search_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_share_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_share_grey600_24dp.png
deleted file mode 100644
index 42eb539de..000000000
--- a/core/src/main/res/drawable-mdpi/ic_share_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_share_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_share_white_24dp.png
deleted file mode 100644
index 9d2ef6655..000000000
--- a/core/src/main/res/drawable-mdpi/ic_share_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_sleep_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_sleep_grey600_24dp.png
deleted file mode 100644
index df84861b9..000000000
--- a/core/src/main/res/drawable-mdpi/ic_sleep_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_sleep_off_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_sleep_off_grey600_24dp.png
deleted file mode 100644
index 463b87d2f..000000000
--- a/core/src/main/res/drawable-mdpi/ic_sleep_off_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_sleep_off_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_sleep_off_white_24dp.png
deleted file mode 100644
index 942e7f380..000000000
--- a/core/src/main/res/drawable-mdpi/ic_sleep_off_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_sleep_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_sleep_white_24dp.png
deleted file mode 100644
index 9f37b124d..000000000
--- a/core/src/main/res/drawable-mdpi/ic_sleep_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_sort_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_sort_grey600_24dp.png
deleted file mode 100644
index dc393caf7..000000000
--- a/core/src/main/res/drawable-mdpi/ic_sort_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_sort_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_sort_white_24dp.png
deleted file mode 100644
index 3d84a4442..000000000
--- a/core/src/main/res/drawable-mdpi/ic_sort_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_star_border_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_star_border_grey600_24dp.png
deleted file mode 100644
index 8b5275b11..000000000
--- a/core/src/main/res/drawable-mdpi/ic_star_border_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_star_border_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_star_border_white_24dp.png
deleted file mode 100644
index edfd7d71d..000000000
--- a/core/src/main/res/drawable-mdpi/ic_star_border_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_star_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_star_grey600_24dp.png
deleted file mode 100644
index 246b43279..000000000
--- a/core/src/main/res/drawable-mdpi/ic_star_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_star_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_star_white_24dp.png
deleted file mode 100644
index c79334c61..000000000
--- a/core/src/main/res/drawable-mdpi/ic_star_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_swap_vertical_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_swap_vertical_grey600_24dp.png
deleted file mode 100644
index c2aeb3b5d..000000000
--- a/core/src/main/res/drawable-mdpi/ic_swap_vertical_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_swap_vertical_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_swap_vertical_white_24dp.png
deleted file mode 100644
index ea4faabdf..000000000
--- a/core/src/main/res/drawable-mdpi/ic_swap_vertical_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_web_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_web_grey600_24dp.png
deleted file mode 100644
index c620bc4dd..000000000
--- a/core/src/main/res/drawable-mdpi/ic_web_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_web_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_web_white_24dp.png
deleted file mode 100644
index f59e16fa9..000000000
--- a/core/src/main/res/drawable-mdpi/ic_web_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_add_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_add_grey600_24dp.png
deleted file mode 100644
index 19ed567e9..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_add_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
deleted file mode 100644
index 67bb598e5..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_audiotrack_light.png b/core/src/main/res/drawable-xhdpi/ic_audiotrack_light.png
deleted file mode 100644
index 247df6f39..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_audiotrack_light.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_bug_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_bug_grey600_24dp.png
deleted file mode 100644
index 49e5deaa9..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_bug_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_bug_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_bug_white_24dp.png
deleted file mode 100644
index 7416bde03..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_bug_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_cancel_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_cancel_grey600_24dp.png
deleted file mode 100644
index 2ad1ac3f5..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_cancel_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png
deleted file mode 100644
index e8836a1b0..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_cellphone_text_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_cellphone_text_grey600_24dp.png
deleted file mode 100644
index fc8219fa9..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_cellphone_text_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_cellphone_text_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_cellphone_text_white_24dp.png
deleted file mode 100644
index 9468fa9a9..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_cellphone_text_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_checkbox_multiple_marked_outline_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_checkbox_multiple_marked_outline_grey600_24dp.png
deleted file mode 100644
index df64c26fe..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_checkbox_multiple_marked_outline_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_checkbox_multiple_marked_outline_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_checkbox_multiple_marked_outline_white_24dp.png
deleted file mode 100644
index 9e49cbe0a..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_checkbox_multiple_marked_outline_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_create_new_folder_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_create_new_folder_grey600_24dp.png
deleted file mode 100644
index bb16eabce..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_create_new_folder_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_create_new_folder_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_create_new_folder_white_24dp.png
deleted file mode 100644
index ae5448d24..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_create_new_folder_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index 5ad22d0f1..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 63f990408..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_done_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_done_grey600_24dp.png
deleted file mode 100644
index 3f78a47a3..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_done_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_done_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_done_white_24dp.png
deleted file mode 100644
index 5567661ac..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_done_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_expand_more_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_expand_more_grey600_36dp.png
deleted file mode 100644
index 8e697365f..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_expand_more_grey600_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_expand_more_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_expand_more_white_36dp.png
deleted file mode 100644
index 16b7c081e..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_expand_more_white_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_feed_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_feed_grey600_24dp.png
deleted file mode 100755
index 84554ce5b..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_feed_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_feed_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_feed_white_24dp.png
deleted file mode 100755
index 339113c20..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_feed_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_file_download_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_file_download_grey600_24dp.png
deleted file mode 100644
index 0d42f1749..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_file_download_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png
deleted file mode 100644
index 219f47167..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_folder_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_folder_grey600_24dp.png
deleted file mode 100755
index 190df8236..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_folder_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png
deleted file mode 100755
index e5f54cef0..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_history_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_history_grey600_24dp.png
deleted file mode 100644
index c0ffea719..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_history_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_history_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_history_white_24dp.png
deleted file mode 100644
index 3aa40c305..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_history_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_info_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_info_grey600_24dp.png
deleted file mode 100644
index 57f3ec5e3..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_info_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_info_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_info_white_24dp.png
deleted file mode 100644
index e18df93a1..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_info_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_list_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_list_grey600_24dp.png
deleted file mode 100644
index 030263ce3..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_list_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_list_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_list_white_24dp.png
deleted file mode 100644
index 2b7253975..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_list_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_lock_closed_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_lock_closed_grey600_24dp.png
deleted file mode 100644
index c6f6fa06c..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_lock_closed_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_lock_closed_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_lock_closed_white_24dp.png
deleted file mode 100644
index 873687188..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_lock_closed_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_lock_open_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_lock_open_grey600_24dp.png
deleted file mode 100644
index d82d4bd8b..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_lock_open_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png
deleted file mode 100644
index a5ed62d8a..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_poll_box_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_poll_box_grey600_24dp.png
deleted file mode 100644
index e09b052b9..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_poll_box_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_poll_box_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_poll_box_white_24dp.png
deleted file mode 100644
index 9ed41f906..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_poll_box_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index b2f5463a8..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
deleted file mode 100644
index 3dffcc846..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_sd_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_sd_grey600_24dp.png
deleted file mode 100644
index c2bc3fa9f..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_sd_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_sd_storage_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_sd_storage_grey600_36dp.png
deleted file mode 100644
index 57162f5ca..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_sd_storage_grey600_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_sd_storage_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_sd_storage_white_36dp.png
deleted file mode 100644
index ced6247ca..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_sd_storage_white_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_sd_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_sd_white_24dp.png
deleted file mode 100644
index 76e620405..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_sd_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_search_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_search_grey600_24dp.png
deleted file mode 100644
index b0999b31d..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_search_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_search_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_search_white_24dp.png
deleted file mode 100644
index ee844ccdd..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_search_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 5a70fdb99..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
deleted file mode 100644
index d0cf80051..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_share_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_share_grey600_24dp.png
deleted file mode 100644
index e856dca31..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_share_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_share_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_share_white_24dp.png
deleted file mode 100644
index 82692971c..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_share_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_sleep_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_sleep_grey600_24dp.png
deleted file mode 100644
index 2d8cb9a75..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_sleep_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_sleep_off_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_sleep_off_grey600_24dp.png
deleted file mode 100644
index 6ba86245c..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_sleep_off_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_sleep_off_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_sleep_off_white_24dp.png
deleted file mode 100644
index b03fb39b4..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_sleep_off_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_sleep_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_sleep_white_24dp.png
deleted file mode 100644
index 4d03cc0dc..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_sleep_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_sort_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_sort_grey600_24dp.png
deleted file mode 100644
index 91447dc4c..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_sort_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_sort_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_sort_white_24dp.png
deleted file mode 100644
index 6d4af1bcb..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_sort_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_star_border_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_star_border_grey600_24dp.png
deleted file mode 100644
index 2bd46b7e7..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_star_border_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_star_border_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_star_border_white_24dp.png
deleted file mode 100644
index 4eaf8b891..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_star_border_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_star_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_star_grey600_24dp.png
deleted file mode 100644
index 30f1e6ae6..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_star_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_star_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_star_white_24dp.png
deleted file mode 100644
index 93d3b5d0c..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_star_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_swap_vertical_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_swap_vertical_grey600_24dp.png
deleted file mode 100644
index c6139c821..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_swap_vertical_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_swap_vertical_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_swap_vertical_white_24dp.png
deleted file mode 100644
index c4bee7069..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_swap_vertical_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_web_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_web_grey600_24dp.png
deleted file mode 100644
index 38150f680..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_web_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_web_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_web_white_24dp.png
deleted file mode 100644
index cce57ef59..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_web_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_add_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_add_grey600_24dp.png
deleted file mode 100644
index 396d18bca..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_add_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
deleted file mode 100644
index 0fdced8fc..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_audiotrack_light.png b/core/src/main/res/drawable-xxhdpi/ic_audiotrack_light.png
deleted file mode 100644
index 8c83b169d..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_audiotrack_light.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_bug_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_bug_grey600_24dp.png
deleted file mode 100644
index 7bbf31c6b..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_bug_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_bug_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_bug_white_24dp.png
deleted file mode 100644
index fe2c2bee3..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_bug_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_cancel_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_cancel_grey600_24dp.png
deleted file mode 100644
index 3d2aba75b..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_cancel_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png
deleted file mode 100644
index 5bb0c3cc4..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_cellphone_text_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_cellphone_text_grey600_24dp.png
deleted file mode 100644
index 82a453f05..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_cellphone_text_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_cellphone_text_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_cellphone_text_white_24dp.png
deleted file mode 100644
index d1f990a65..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_cellphone_text_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_checkbox_multiple_marked_outline_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_checkbox_multiple_marked_outline_grey600_24dp.png
deleted file mode 100644
index 951244d68..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_checkbox_multiple_marked_outline_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_checkbox_multiple_marked_outline_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_checkbox_multiple_marked_outline_white_24dp.png
deleted file mode 100644
index 3eaedd318..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_checkbox_multiple_marked_outline_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_grey600_24dp.png
deleted file mode 100644
index 23fa54d28..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_white_24dp.png
deleted file mode 100644
index d8391d37c..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index 1a3a6192b..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index e4a5d0261..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_done_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_done_grey600_24dp.png
deleted file mode 100644
index 7feeca3a1..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_done_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png
deleted file mode 100644
index edb552b49..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_expand_more_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_expand_more_grey600_36dp.png
deleted file mode 100644
index 07bb07a38..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_expand_more_grey600_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_expand_more_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_expand_more_white_36dp.png
deleted file mode 100644
index fe5c3d280..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_expand_more_white_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_feed_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_feed_grey600_24dp.png
deleted file mode 100755
index 62decef68..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_feed_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_feed_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_feed_white_24dp.png
deleted file mode 100755
index 7838ab87c..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_feed_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_file_download_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_file_download_grey600_24dp.png
deleted file mode 100644
index 82b0d1986..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_file_download_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
deleted file mode 100644
index 0b479dba2..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_folder_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_folder_grey600_24dp.png
deleted file mode 100755
index 6fbc40459..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_folder_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png
deleted file mode 100755
index 0d1ac4876..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_history_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_history_grey600_24dp.png
deleted file mode 100644
index f083e0f2c..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_history_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png
deleted file mode 100644
index 17d6d29b8..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_info_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_info_grey600_24dp.png
deleted file mode 100644
index 874226124..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_info_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_info_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_info_white_24dp.png
deleted file mode 100644
index 8a1b185ff..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_info_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_list_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_list_grey600_24dp.png
deleted file mode 100644
index c92e250b8..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_list_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png
deleted file mode 100644
index 4d2807e4e..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_lock_closed_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_lock_closed_grey600_24dp.png
deleted file mode 100644
index 386595f99..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_lock_closed_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_lock_closed_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_lock_closed_white_24dp.png
deleted file mode 100644
index 7bc7c690d..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_lock_closed_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_lock_open_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_lock_open_grey600_24dp.png
deleted file mode 100644
index a424f4c5d..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_lock_open_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png
deleted file mode 100644
index d37d40dcb..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_poll_box_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_poll_box_grey600_24dp.png
deleted file mode 100644
index 3d24d9670..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_poll_box_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_poll_box_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_poll_box_white_24dp.png
deleted file mode 100644
index 3d9f54b6c..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_poll_box_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index e5eef5d8a..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
deleted file mode 100644
index 13157817d..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sd_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_sd_grey600_24dp.png
deleted file mode 100644
index 7e8fa947e..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_sd_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sd_storage_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_sd_storage_grey600_36dp.png
deleted file mode 100644
index 597f417d5..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_sd_storage_grey600_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sd_storage_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_sd_storage_white_36dp.png
deleted file mode 100644
index 2ef908e26..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_sd_storage_white_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sd_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_sd_white_24dp.png
deleted file mode 100644
index 66c74428e..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_sd_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_search_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_search_grey600_24dp.png
deleted file mode 100644
index 2cac5b19c..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_search_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png
deleted file mode 100644
index 0ada3a39f..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index fe7d1a24d..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
deleted file mode 100644
index e5de22411..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_share_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_share_grey600_24dp.png
deleted file mode 100644
index 97a334744..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_share_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png
deleted file mode 100644
index 406bc9ab5..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sleep_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_sleep_grey600_24dp.png
deleted file mode 100644
index 8346240f1..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_sleep_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sleep_off_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_sleep_off_grey600_24dp.png
deleted file mode 100644
index 07748be06..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_sleep_off_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sleep_off_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_sleep_off_white_24dp.png
deleted file mode 100644
index 8e2e80e71..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_sleep_off_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sleep_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_sleep_white_24dp.png
deleted file mode 100644
index 33770dbb1..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_sleep_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sort_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_sort_grey600_24dp.png
deleted file mode 100644
index fa8c4c593..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_sort_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sort_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_sort_white_24dp.png
deleted file mode 100644
index b8ef1050e..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_sort_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_star_border_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_star_border_grey600_24dp.png
deleted file mode 100644
index 06f24ef24..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_star_border_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_star_border_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_star_border_white_24dp.png
deleted file mode 100644
index 70785a1e3..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_star_border_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_star_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_star_grey600_24dp.png
deleted file mode 100644
index 29fff7d5f..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_star_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_star_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_star_white_24dp.png
deleted file mode 100644
index d5d478096..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_star_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_swap_vertical_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_swap_vertical_grey600_24dp.png
deleted file mode 100644
index 2d71e15fc..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_swap_vertical_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_swap_vertical_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_swap_vertical_white_24dp.png
deleted file mode 100644
index 24df5b942..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_swap_vertical_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_web_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_web_grey600_24dp.png
deleted file mode 100644
index abb58b77b..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_web_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_web_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_web_white_24dp.png
deleted file mode 100644
index abf5662b3..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_web_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_bug_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_bug_grey600_24dp.png
deleted file mode 100644
index b612b2aa9..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_bug_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_bug_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_bug_white_24dp.png
deleted file mode 100644
index 32a3f5511..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_bug_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_cellphone_text_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_cellphone_text_grey600_24dp.png
deleted file mode 100644
index 829b15396..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_cellphone_text_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_cellphone_text_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_cellphone_text_white_24dp.png
deleted file mode 100644
index baa783a92..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_cellphone_text_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_checkbox_multiple_marked_outline_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_checkbox_multiple_marked_outline_grey600_24dp.png
deleted file mode 100644
index 6c4c2b94c..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_checkbox_multiple_marked_outline_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_checkbox_multiple_marked_outline_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_checkbox_multiple_marked_outline_white_24dp.png
deleted file mode 100644
index fd5114044..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_checkbox_multiple_marked_outline_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_grey600_24dp.png
deleted file mode 100644
index 448ca4898..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_white_24dp.png
deleted file mode 100644
index 56a47309c..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_folder_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_folder_grey600_24dp.png
deleted file mode 100755
index 0107ea21c..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_folder_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png
deleted file mode 100755
index 7a3c198ee..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_lock_closed_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_lock_closed_grey600_24dp.png
deleted file mode 100644
index 03ccfd0d6..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_lock_closed_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_lock_closed_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_lock_closed_white_24dp.png
deleted file mode 100644
index 2586be5ab..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_lock_closed_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_lock_open_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_lock_open_grey600_24dp.png
deleted file mode 100644
index e46b956e0..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_lock_open_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_lock_open_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_lock_open_white_24dp.png
deleted file mode 100644
index b2dd88c07..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_lock_open_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_poll_box_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_poll_box_grey600_24dp.png
deleted file mode 100644
index c97eba579..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_poll_box_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_poll_box_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_poll_box_white_24dp.png
deleted file mode 100644
index 54e169d54..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_poll_box_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sd_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sd_grey600_24dp.png
deleted file mode 100644
index 744b2c8f4..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_sd_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_grey600_36dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_grey600_36dp.png
deleted file mode 100644
index 25d26d523..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_grey600_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_white_36dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_white_36dp.png
deleted file mode 100644
index 505fb28dc..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_white_36dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sd_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sd_white_24dp.png
deleted file mode 100644
index 1bee910ed..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_sd_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sleep_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sleep_grey600_24dp.png
deleted file mode 100644
index e8348b7e4..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_sleep_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sleep_off_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sleep_off_grey600_24dp.png
deleted file mode 100644
index c06456421..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_sleep_off_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sleep_off_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sleep_off_white_24dp.png
deleted file mode 100644
index 5cf1d4f3b..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_sleep_off_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sleep_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sleep_white_24dp.png
deleted file mode 100644
index 3e9984bf0..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_sleep_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_star_border_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_star_border_grey600_24dp.png
deleted file mode 100644
index d79dfa577..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_star_border_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_star_border_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_star_border_white_24dp.png
deleted file mode 100644
index c2d2ee285..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_star_border_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_star_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_star_grey600_24dp.png
deleted file mode 100644
index 2866aff29..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_star_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_star_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_star_white_24dp.png
deleted file mode 100644
index a74fee378..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_star_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_swap_vertical_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_swap_vertical_grey600_24dp.png
deleted file mode 100644
index 631ef6d0a..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_swap_vertical_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_swap_vertical_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_swap_vertical_white_24dp.png
deleted file mode 100644
index 5bf24ac32..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_swap_vertical_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable/ic_add_black.xml b/core/src/main/res/drawable/ic_add_black.xml
new file mode 100644
index 000000000..624c18b7b
--- /dev/null
+++ b/core/src/main/res/drawable/ic_add_black.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="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_add_white.xml b/core/src/main/res/drawable/ic_add_white.xml
new file mode 100644
index 000000000..3052692a0
--- /dev/null
+++ b/core/src/main/res/drawable/ic_add_white.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="#FFFFFFFF" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_appearance_black.xml b/core/src/main/res/drawable/ic_appearance_black.xml
new file mode 100644
index 000000000..7c574b336
--- /dev/null
+++ b/core/src/main/res/drawable/ic_appearance_black.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="#FF000000" android:pathData="M17,19V5H7V19H17M17,1A2,2 0 0,1 19,3V21A2,2 0 0,1 17,23H7C5.89,23 5,22.1 5,21V3C5,1.89 5.89,1 7,1H17M9,7H15V9H9V7M9,11H13V13H9V11Z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_appearance_white.xml b/core/src/main/res/drawable/ic_appearance_white.xml
new file mode 100644
index 000000000..882f47937
--- /dev/null
+++ b/core/src/main/res/drawable/ic_appearance_white.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="#FFFFFFFF" android:pathData="M17,19V5H7V19H17M17,1A2,2 0 0,1 19,3V21A2,2 0 0,1 17,23H7C5.89,23 5,22.1 5,21V3C5,1.89 5.89,1 7,1H17M9,7H15V9H9V7M9,11H13V13H9V11Z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_av_fast_forward_dark_48dp.xml b/core/src/main/res/drawable/ic_av_fast_forward_black_48dp.xml
index cf0faa33e..f55701e95 100644
--- a/core/src/main/res/drawable/ic_av_fast_forward_dark_48dp.xml
+++ b/core/src/main/res/drawable/ic_av_fast_forward_black_48dp.xml
@@ -3,5 +3,5 @@
     android:height="48dp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
-    <path android:fillColor="#FF757575" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
+    <path android:fillColor="#FF000000" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_av_fast_rewind_dark_48dp.xml b/core/src/main/res/drawable/ic_av_fast_rewind_black_48dp.xml
index 47d1189cb..e97e29955 100644
--- a/core/src/main/res/drawable/ic_av_fast_rewind_dark_48dp.xml
+++ b/core/src/main/res/drawable/ic_av_fast_rewind_black_48dp.xml
@@ -3,5 +3,5 @@
     android:height="48dp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
-    <path android:fillColor="#FF757575" android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/>
+    <path android:fillColor="#FF000000" android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_av_pause_dark_48dp.xml b/core/src/main/res/drawable/ic_av_pause_black_48dp.xml
index 61fdd4b5b..c5bf76f38 100644
--- a/core/src/main/res/drawable/ic_av_pause_dark_48dp.xml
+++ b/core/src/main/res/drawable/ic_av_pause_black_48dp.xml
@@ -3,5 +3,5 @@
     android:height="48dp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
-    <path android:fillColor="#FF757575" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+    <path android:fillColor="#FF000000" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_av_play_dark_24dp.xml b/core/src/main/res/drawable/ic_av_play_black_24dp.xml
index 5bc12c0e1..a93221fb6 100644
--- a/core/src/main/res/drawable/ic_av_play_dark_24dp.xml
+++ b/core/src/main/res/drawable/ic_av_play_black_24dp.xml
@@ -3,5 +3,5 @@
     android:height="24dp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
-    <path android:fillColor="#FF757575" android:pathData="M8,5v14l11,-7z"/>
+    <path android:fillColor="#FF000000" android:pathData="M8,5v14l11,-7z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_av_play_dark_48dp.xml b/core/src/main/res/drawable/ic_av_play_black_48dp.xml
index dbe5e7104..2e0d011aa 100644
--- a/core/src/main/res/drawable/ic_av_play_dark_48dp.xml
+++ b/core/src/main/res/drawable/ic_av_play_black_48dp.xml
@@ -3,5 +3,5 @@
     android:height="48dp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
-    <path android:fillColor="#FF757575" android:pathData="M8,5v14l11,-7z"/>
+    <path android:fillColor="#FF000000" android:pathData="M8,5v14l11,-7z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_av_skip_dark_48dp.xml b/core/src/main/res/drawable/ic_av_skip_black_48dp.xml
index 2552f8d73..24a795dbc 100644
--- a/core/src/main/res/drawable/ic_av_skip_dark_48dp.xml
+++ b/core/src/main/res/drawable/ic_av_skip_black_48dp.xml
@@ -3,5 +3,5 @@
     android:height="48dp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
-    <path android:fillColor="#FF757575" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+    <path android:fillColor="#FF000000" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_bookmark_grey600_24dp.xml b/core/src/main/res/drawable/ic_bookmark_black_24dp.xml
index d665d42a5..6af633f12 100644
--- a/core/src/main/res/drawable/ic_bookmark_grey600_24dp.xml
+++ b/core/src/main/res/drawable/ic_bookmark_black_24dp.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="#b4b4b4"
+<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="#FFb4b4b4" 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"/>
+    <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/core/src/main/res/drawable/ic_bookmark_white_24dp.xml b/core/src/main/res/drawable/ic_bookmark_white_24dp.xml
index 02728b731..798df2d24 100644
--- a/core/src/main/res/drawable/ic_bookmark_white_24dp.xml
+++ b/core/src/main/res/drawable/ic_bookmark_white_24dp.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<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="#FFFFFFFF" 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"/>
diff --git a/core/src/main/res/drawable/ic_bug_black.xml b/core/src/main/res/drawable/ic_bug_black.xml
new file mode 100644
index 000000000..59d6fa653
--- /dev/null
+++ b/core/src/main/res/drawable/ic_bug_black.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="#FF000000" android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_bug_white.xml b/core/src/main/res/drawable/ic_bug_white.xml
new file mode 100644
index 000000000..c22514bfe
--- /dev/null
+++ b/core/src/main/res/drawable/ic_bug_white.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="#FFFFFFFF" android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_cancel_black.xml b/core/src/main/res/drawable/ic_cancel_black.xml
new file mode 100644
index 000000000..e254218af
--- /dev/null
+++ b/core/src/main/res/drawable/ic_cancel_black.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="#FF000000" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_cancel_white.xml b/core/src/main/res/drawable/ic_cancel_white.xml
new file mode 100644
index 000000000..a5480c71f
--- /dev/null
+++ b/core/src/main/res/drawable/ic_cancel_white.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="#FFFFFFFF" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_chat_black.xml b/core/src/main/res/drawable/ic_chat_black.xml
new file mode 100644
index 000000000..3f2692d39
--- /dev/null
+++ b/core/src/main/res/drawable/ic_chat_black.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="#FF000000" android:pathData="M15,4V11H5.17L4,12.17V4H15M16,2H3A1,1 0 0,0 2,3V17L6,13H16A1,1 0 0,0 17,12V3A1,1 0 0,0 16,2M21,6H19V15H6V17A1,1 0 0,0 7,18H18L22,22V7A1,1 0 0,0 21,6Z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_chat_grey600.xml b/core/src/main/res/drawable/ic_chat_grey600.xml
deleted file mode 100644
index ebae2dbed..000000000
--- a/core/src/main/res/drawable/ic_chat_grey600.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF757575" android:pathData="M21,6h-2v9L6,15v2c0,0.55 0.45,1 1,1h11l4,4L22,7c0,-0.55 -0.45,-1 -1,-1zM17,12L17,3c0,-0.55 -0.45,-1 -1,-1L3,2c-0.55,0 -1,0.45 -1,1v14l4,-4h10c0.55,0 1,-0.45 1,-1z"/>
-</vector>
diff --git a/core/src/main/res/drawable/ic_chat_white.xml b/core/src/main/res/drawable/ic_chat_white.xml
index 45691c525..222615bfe 100644
--- a/core/src/main/res/drawable/ic_chat_white.xml
+++ b/core/src/main/res/drawable/ic_chat_white.xml
@@ -1,5 +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="#FFFFFFFF" android:pathData="M21,6h-2v9L6,15v2c0,0.55 0.45,1 1,1h11l4,4L22,7c0,-0.55 -0.45,-1 -1,-1zM17,12L17,3c0,-0.55 -0.45,-1 -1,-1L3,2c-0.55,0 -1,0.45 -1,1v14l4,-4h10c0.55,0 1,-0.45 1,-1z"/>
+    <path android:fillColor="#FFFFFFFF" android:pathData="M15,4V11H5.17L4,12.17V4H15M16,2H3A1,1 0 0,0 2,3V17L6,13H16A1,1 0 0,0 17,12V3A1,1 0 0,0 16,2M21,6H19V15H6V17A1,1 0 0,0 7,18H18L22,22V7A1,1 0 0,0 21,6Z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_check_black.xml b/core/src/main/res/drawable/ic_check_black.xml
new file mode 100644
index 000000000..c4654dd52
--- /dev/null
+++ b/core/src/main/res/drawable/ic_check_black.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="#FF000000" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_check_multiple_black.xml b/core/src/main/res/drawable/ic_check_multiple_black.xml
new file mode 100644
index 000000000..a0a79299d
--- /dev/null
+++ b/core/src/main/res/drawable/ic_check_multiple_black.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="#FF000000" android:pathData="M20,16V10H22V16A2,2 0 0,1 20,18H8C6.89,18 6,17.1 6,16V4C6,2.89 6.89,2 8,2H16V4H8V16H20M10.91,7.08L14,10.17L20.59,3.58L22,5L14,13L9.5,8.5L10.91,7.08M16,20V22H4A2,2 0 0,1 2,20V7H4V20H16Z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_check_multiple_white.xml b/core/src/main/res/drawable/ic_check_multiple_white.xml
new file mode 100644
index 000000000..777f6eb59
--- /dev/null
+++ b/core/src/main/res/drawable/ic_check_multiple_white.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="#FFFFFFFF" android:pathData="M20,16V10H22V16A2,2 0 0,1 20,18H8C6.89,18 6,17.1 6,16V4C6,2.89 6.89,2 8,2H16V4H8V16H20M10.91,7.08L14,10.17L20.59,3.58L22,5L14,13L9.5,8.5L10.91,7.08M16,20V22H4A2,2 0 0,1 2,20V7H4V20H16Z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_check_white.xml b/core/src/main/res/drawable/ic_check_white.xml
new file mode 100644
index 000000000..80651f6ee
--- /dev/null
+++ b/core/src/main/res/drawable/ic_check_white.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="#FFFFFFFF" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_delete_black.xml b/core/src/main/res/drawable/ic_delete_black.xml
new file mode 100644
index 000000000..a4d94b247
--- /dev/null
+++ b/core/src/main/res/drawable/ic_delete_black.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="#FF000000" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_delete_white.xml b/core/src/main/res/drawable/ic_delete_white.xml
new file mode 100644
index 000000000..1f2b6e734
--- /dev/null
+++ b/core/src/main/res/drawable/ic_delete_white.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="#FFFFFFFF" 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/core/src/main/res/drawable/ic_download_black.xml b/core/src/main/res/drawable/ic_download_black.xml
new file mode 100644
index 000000000..0e0b47c88
--- /dev/null
+++ b/core/src/main/res/drawable/ic_download_black.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="#FF000000" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_download_white.xml b/core/src/main/res/drawable/ic_download_white.xml
new file mode 100644
index 000000000..8a9cfa3cd
--- /dev/null
+++ b/core/src/main/res/drawable/ic_download_white.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="#FFFFFFFF" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_feed_black.xml b/core/src/main/res/drawable/ic_feed_black.xml
new file mode 100644
index 000000000..54c9286de
--- /dev/null
+++ b/core/src/main/res/drawable/ic_feed_black.xml
@@ -0,0 +1,6 @@
+<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="#FF000000" android:pathData="M6.18,17.82m-2.18,0a2.18,2.18 0,1 1,4.36 0a2.18,2.18 0,1 1,-4.36 0"/>
+    <path android:fillColor="#FF000000" android:pathData="M4,4.44v2.83c7.03,0 12.73,5.7 12.73,12.73h2.83c0,-8.59 -6.97,-15.56 -15.56,-15.56zM4,10.1v2.83c3.9,0 7.07,3.17 7.07,7.07h2.83c0,-5.47 -4.43,-9.9 -9.9,-9.9z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_feed_white.xml b/core/src/main/res/drawable/ic_feed_white.xml
new file mode 100644
index 000000000..da0139ff5
--- /dev/null
+++ b/core/src/main/res/drawable/ic_feed_white.xml
@@ -0,0 +1,6 @@
+<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="#FFFFFFFF" android:pathData="M6.18,17.82m-2.18,0a2.18,2.18 0,1 1,4.36 0a2.18,2.18 0,1 1,-4.36 0"/>
+    <path android:fillColor="#FFFFFFFF" android:pathData="M4,4.44v2.83c7.03,0 12.73,5.7 12.73,12.73h2.83c0,-8.59 -6.97,-15.56 -15.56,-15.56zM4,10.1v2.83c3.9,0 7.07,3.17 7.07,7.07h2.83c0,-5.47 -4.43,-9.9 -9.9,-9.9z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_filter_grey600_24dp.xml b/core/src/main/res/drawable/ic_filter_black_24dp.xml
index dc164504c..54c5123d7 100644
--- a/core/src/main/res/drawable/ic_filter_grey600_24dp.xml
+++ b/core/src/main/res/drawable/ic_filter_black_24dp.xml
@@ -3,5 +3,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#FF757575" android:pathData="M15,19.88C15.04,20.18 14.94,20.5 14.71,20.71C14.32,21.1 13.69,21.1 13.3,20.71L9.29,16.7C9.06,16.47 8.96,16.16 9,15.87V10.75L4.21,4.62C3.87,4.19 3.95,3.56 4.38,3.22C4.57,3.08 4.78,3 5,3V3H19V3C19.22,3 19.43,3.08 19.62,3.22C20.05,3.56 20.13,4.19 19.79,4.62L15,10.75V19.88M7.04,5L11,10.06V15.58L13,17.58V10.05L16.96,5H7.04Z" />
+    <path android:fillColor="#FF000000" android:pathData="M15,19.88C15.04,20.18 14.94,20.5 14.71,20.71C14.32,21.1 13.69,21.1 13.3,20.71L9.29,16.7C9.06,16.47 8.96,16.16 9,15.87V10.75L4.21,4.62C3.87,4.19 3.95,3.56 4.38,3.22C4.57,3.08 4.78,3 5,3V3H19V3C19.22,3 19.43,3.08 19.62,3.22C20.05,3.56 20.13,4.19 19.79,4.62L15,10.75V19.88M7.04,5L11,10.06V15.58L13,17.58V10.05L16.96,5H7.04Z" />
 </vector>
diff --git a/core/src/main/res/drawable/ic_folder_black.xml b/core/src/main/res/drawable/ic_folder_black.xml
new file mode 100644
index 000000000..b1b259ba4
--- /dev/null
+++ b/core/src/main/res/drawable/ic_folder_black.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="#FF000000" android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_folder_white.xml b/core/src/main/res/drawable/ic_folder_white.xml
new file mode 100644
index 000000000..91506ec4d
--- /dev/null
+++ b/core/src/main/res/drawable/ic_folder_white.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="#FFFFFFFF" android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_history_black.xml b/core/src/main/res/drawable/ic_history_black.xml
new file mode 100644
index 000000000..d7130c9a8
--- /dev/null
+++ b/core/src/main/res/drawable/ic_history_black.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="#FF000000" android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_history_white.xml b/core/src/main/res/drawable/ic_history_white.xml
new file mode 100644
index 000000000..1ffb08b91
--- /dev/null
+++ b/core/src/main/res/drawable/ic_history_white.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="#FFFFFFFF" android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_info_black.xml b/core/src/main/res/drawable/ic_info_black.xml
new file mode 100644
index 000000000..f52a15fb6
--- /dev/null
+++ b/core/src/main/res/drawable/ic_info_black.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="#FF000000" android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_info_white.xml b/core/src/main/res/drawable/ic_info_white.xml
new file mode 100644
index 000000000..3abb510bb
--- /dev/null
+++ b/core/src/main/res/drawable/ic_info_white.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="#FFFFFFFF" android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_key_grey600.xml b/core/src/main/res/drawable/ic_key_black.xml
index 71cc98f2f..2c78e7c39 100644
--- a/core/src/main/res/drawable/ic_key_grey600.xml
+++ b/core/src/main/res/drawable/ic_key_black.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="24dp" android:viewportHeight="24.0"
         android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#FF757575"
+    <path android:fillColor="#FF000000"
           android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-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/core/src/main/res/drawable/ic_load_more_black.xml b/core/src/main/res/drawable/ic_load_more_black.xml
new file mode 100644
index 000000000..534478772
--- /dev/null
+++ b/core/src/main/res/drawable/ic_load_more_black.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="#FF000000" android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_load_more_white.xml b/core/src/main/res/drawable/ic_load_more_white.xml
new file mode 100644
index 000000000..c47933164
--- /dev/null
+++ b/core/src/main/res/drawable/ic_load_more_white.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="#FFFFFFFF" android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_lock_closed_black.xml b/core/src/main/res/drawable/ic_lock_closed_black.xml
new file mode 100644
index 000000000..63ea6d78d
--- /dev/null
+++ b/core/src/main/res/drawable/ic_lock_closed_black.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="#FF000000" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_lock_closed_white.xml b/core/src/main/res/drawable/ic_lock_closed_white.xml
new file mode 100644
index 000000000..8c923f1d1
--- /dev/null
+++ b/core/src/main/res/drawable/ic_lock_closed_white.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="#FFFFFFFF" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_lock_open_black.xml b/core/src/main/res/drawable/ic_lock_open_black.xml
new file mode 100644
index 000000000..e91724c22
--- /dev/null
+++ b/core/src/main/res/drawable/ic_lock_open_black.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="#FF000000" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_lock_open_white.xml b/core/src/main/res/drawable/ic_lock_open_white.xml
new file mode 100644
index 000000000..87d5cf09a
--- /dev/null
+++ b/core/src/main/res/drawable/ic_lock_open_white.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="#FFFFFFFF" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_network_black.xml b/core/src/main/res/drawable/ic_network_black.xml
new file mode 100644
index 000000000..d9be81776
--- /dev/null
+++ b/core/src/main/res/drawable/ic_network_black.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="#FF000000" android:pathData="M16,17.01V10h-2v7.01h-3L15,21l4,-3.99h-3zM9,3L5,6.99h3V14h2V6.99h3L9,3z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_network_white.xml b/core/src/main/res/drawable/ic_network_white.xml
new file mode 100644
index 000000000..cb90ee547
--- /dev/null
+++ b/core/src/main/res/drawable/ic_network_white.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="#FFFFFFFF" android:pathData="M16,17.01V10h-2v7.01h-3L15,21l4,-3.99h-3zM9,3L5,6.99h3V14h2V6.99h3L9,3z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_playback_speed_dark_24dp.xml b/core/src/main/res/drawable/ic_playback_speed_black.xml
index 456aeba71..81b1bdd5c 100644
--- a/core/src/main/res/drawable/ic_playback_speed_dark_24dp.xml
+++ b/core/src/main/res/drawable/ic_playback_speed_black.xml
@@ -4,5 +4,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#FF757575" android:pathData="M 12,15.976673 A 2.9838134,2.9838134 0 0 1 9.0161867,12.992861 c 0,-1.113957 0.6067085,-2.08867 1.4919063,-2.595918 L 20.165701,4.8072659 14.66554,14.335576 C 14.168238,15.310289 13.163688,15.976673 12,15.976673 M 12,3.0468162 c 1.800234,0 3.481116,0.4973021 4.943185,1.3128776 l -2.08867,1.2034715 C 13.989209,5.2249998 12.994606,5.036025 12,5.036025 a 7.9568354,7.9568354 0 0 0 -7.9568354,7.956836 c 0,2.198075 0.885198,4.187283 2.3273743,5.619514 h 0.00995 c 0.3878957,0.387896 0.3878957,1.014497 0,1.402393 -0.3878958,0.387895 -1.0244427,0.387895 -1.4123384,0.01 v 0 C 3.1679127,18.224479 2.0539558,15.737969 2.0539558,12.992861 A 9.9460442,9.9460442 0 0 1 12,3.0468162 m 9.946045,9.9460448 c 0,2.745108 -1.113958,5.231618 -2.914192,7.031853 v 0 c -0.387896,0.377949 -1.014497,0.377949 -1.402392,-0.01 -0.387896,-0.387897 -0.387896,-1.014497 0,-1.402392 v 0 c 1.442176,-1.442178 2.327374,-3.421439 2.327374,-5.619515 0,-0.994605 -0.188974,-1.989209 -0.537086,-2.884354 L 20.62322,8.0197843 c 0.825522,1.4919063 1.322825,3.1628417 1.322825,4.9730227 z" />
+    <path android:fillColor="#FF000000" android:pathData="M 12,15.976673 A 2.9838134,2.9838134 0 0 1 9.0161867,12.992861 c 0,-1.113957 0.6067085,-2.08867 1.4919063,-2.595918 L 20.165701,4.8072659 14.66554,14.335576 C 14.168238,15.310289 13.163688,15.976673 12,15.976673 M 12,3.0468162 c 1.800234,0 3.481116,0.4973021 4.943185,1.3128776 l -2.08867,1.2034715 C 13.989209,5.2249998 12.994606,5.036025 12,5.036025 a 7.9568354,7.9568354 0 0 0 -7.9568354,7.956836 c 0,2.198075 0.885198,4.187283 2.3273743,5.619514 h 0.00995 c 0.3878957,0.387896 0.3878957,1.014497 0,1.402393 -0.3878958,0.387895 -1.0244427,0.387895 -1.4123384,0.01 v 0 C 3.1679127,18.224479 2.0539558,15.737969 2.0539558,12.992861 A 9.9460442,9.9460442 0 0 1 12,3.0468162 m 9.946045,9.9460448 c 0,2.745108 -1.113958,5.231618 -2.914192,7.031853 v 0 c -0.387896,0.377949 -1.014497,0.377949 -1.402392,-0.01 -0.387896,-0.387897 -0.387896,-1.014497 0,-1.402392 v 0 c 1.442176,-1.442178 2.327374,-3.421439 2.327374,-5.619515 0,-0.994605 -0.188974,-1.989209 -0.537086,-2.884354 L 20.62322,8.0197843 c 0.825522,1.4919063 1.322825,3.1628417 1.322825,4.9730227 z" />
 </vector>
 \ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_playback_speed_dark_48dp.xml b/core/src/main/res/drawable/ic_playback_speed_dark_48dp.xml
deleted file mode 100644
index de7ca9d78..000000000
--- a/core/src/main/res/drawable/ic_playback_speed_dark_48dp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="48dp"
-    android:width="48dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#FF757575" android:pathData="M 12,14.888154 A 2.2284437,2.2284437 0 0 1 9.7715563,12.659711 c 0,-0.831952 0.4531167,-1.559911 1.1142217,-1.938746 L 18.098507,6.5463469 13.990743,13.66251 C 13.619336,14.390469 12.869093,14.888154 12,14.888154 m 0,-9.6565888 c 1.344494,0 2.599851,0.3714073 3.691789,0.9805151 L 14.131878,7.110886 C 13.485629,6.858329 12.742815,6.7171943 12,6.7171943 A 5.9425165,5.9425165 0 0 0 6.0574835,12.659711 c 0,1.64162 0.661105,3.127249 1.7381861,4.196902 h 0.00743 c 0.2896977,0.289697 0.2896977,0.757671 0,1.047369 -0.2896977,0.289697 -0.7650991,0.289697 -1.0547967,0.0075 v 0 C 5.4038067,16.566915 4.5718544,14.709879 4.5718544,12.659711 A 7.4281456,7.4281456 0 0 1 12,5.2315652 m 7.428145,7.4281458 c 0,2.050168 -0.831952,3.907204 -2.176446,5.251699 v 0 c -0.289698,0.282269 -0.757671,0.282269 -1.047369,-0.0075 -0.289697,-0.289698 -0.289697,-0.757671 0,-1.047368 v 0 c 1.077082,-1.077082 1.738186,-2.555282 1.738186,-4.196902 0,-0.742815 -0.141134,-1.48563 -0.401119,-2.154163 l 0.898805,-1.5599106 c 0.616537,1.1142216 0.987943,2.3621496 0.987943,3.7140736 z" />
-</vector>
-\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_playback_speed_white_24dp.xml b/core/src/main/res/drawable/ic_playback_speed_white.xml
index 183bb595a..183bb595a 100644
--- a/core/src/main/res/drawable/ic_playback_speed_white_24dp.xml
+++ b/core/src/main/res/drawable/ic_playback_speed_white.xml
diff --git a/core/src/main/res/drawable/ic_playback_speed_white_48dp.xml b/core/src/main/res/drawable/ic_playback_speed_white_48dp.xml
deleted file mode 100644
index cc6af0d55..000000000
--- a/core/src/main/res/drawable/ic_playback_speed_white_48dp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="48dp"
-    android:width="48dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#ffffffff" android:pathData="M 12,14.888154 A 2.2284437,2.2284437 0 0 1 9.7715563,12.659711 c 0,-0.831952 0.4531167,-1.559911 1.1142217,-1.938746 L 18.098507,6.5463469 13.990743,13.66251 C 13.619336,14.390469 12.869093,14.888154 12,14.888154 m 0,-9.6565888 c 1.344494,0 2.599851,0.3714073 3.691789,0.9805151 L 14.131878,7.110886 C 13.485629,6.858329 12.742815,6.7171943 12,6.7171943 A 5.9425165,5.9425165 0 0 0 6.0574835,12.659711 c 0,1.64162 0.661105,3.127249 1.7381861,4.196902 h 0.00743 c 0.2896977,0.289697 0.2896977,0.757671 0,1.047369 -0.2896977,0.289697 -0.7650991,0.289697 -1.0547967,0.0075 v 0 C 5.4038067,16.566915 4.5718544,14.709879 4.5718544,12.659711 A 7.4281456,7.4281456 0 0 1 12,5.2315652 m 7.428145,7.4281458 c 0,2.050168 -0.831952,3.907204 -2.176446,5.251699 v 0 c -0.289698,0.282269 -0.757671,0.282269 -1.047369,-0.0075 -0.289697,-0.289698 -0.289697,-0.757671 0,-1.047368 v 0 c 1.077082,-1.077082 1.738186,-2.555282 1.738186,-4.196902 0,-0.742815 -0.141134,-1.48563 -0.401119,-2.154163 l 0.898805,-1.5599106 c 0.616537,1.1142216 0.987943,2.3621496 0.987943,3.7140736 z" />
-</vector>
-\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_playlist_black.xml b/core/src/main/res/drawable/ic_playlist_black.xml
new file mode 100644
index 000000000..3cd963836
--- /dev/null
+++ b/core/src/main/res/drawable/ic_playlist_black.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="#FF000000" android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_playlist_white.xml b/core/src/main/res/drawable/ic_playlist_white.xml
new file mode 100644
index 000000000..2b97e9d2b
--- /dev/null
+++ b/core/src/main/res/drawable/ic_playlist_white.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="#FFFFFFFF" android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_questionmark_black.xml b/core/src/main/res/drawable/ic_questionmark_black.xml
new file mode 100644
index 000000000..8a187e813
--- /dev/null
+++ b/core/src/main/res/drawable/ic_questionmark_black.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="#FF000000" android:pathData="M11,18H13V16H11V18M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,6A4,4 0 0,0 8,10H10A2,2 0 0,1 12,8A2,2 0 0,1 14,10C14,12 11,11.75 11,15H13C13,12.75 16,12.5 16,10A4,4 0 0,0 12,6Z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_questionmark_grey600.xml b/core/src/main/res/drawable/ic_questionmark_grey600.xml
deleted file mode 100644
index 0907fcdec..000000000
--- a/core/src/main/res/drawable/ic_questionmark_grey600.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF757575" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
-</vector>
diff --git a/core/src/main/res/drawable/ic_questionmark_white.xml b/core/src/main/res/drawable/ic_questionmark_white.xml
index 69b42fef8..d7a5ba7bf 100644
--- a/core/src/main/res/drawable/ic_questionmark_white.xml
+++ b/core/src/main/res/drawable/ic_questionmark_white.xml
@@ -1,5 +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="#FFFFFFFF" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
+    <path android:fillColor="#FFFFFFFF" android:pathData="M11,18H13V16H11V18M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,6A4,4 0 0,0 8,10H10A2,2 0 0,1 12,8A2,2 0 0,1 14,10C14,12 11,11.75 11,15H13C13,12.75 16,12.5 16,10A4,4 0 0,0 12,6Z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_refresh_black.xml b/core/src/main/res/drawable/ic_refresh_black.xml
new file mode 100644
index 000000000..59d1caca4
--- /dev/null
+++ b/core/src/main/res/drawable/ic_refresh_black.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="#FF000000" 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/core/src/main/res/drawable/ic_refresh_white.xml b/core/src/main/res/drawable/ic_refresh_white.xml
new file mode 100644
index 000000000..c6e841f57
--- /dev/null
+++ b/core/src/main/res/drawable/ic_refresh_white.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="#FFFFFFFF" 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/core/src/main/res/drawable/ic_remove_grey600.xml b/core/src/main/res/drawable/ic_remove_black.xml
index 5a6b2af6b..c988cb5f3 100644
--- a/core/src/main/res/drawable/ic_remove_grey600.xml
+++ b/core/src/main/res/drawable/ic_remove_black.xml
@@ -1,5 +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="#FF757575" android:pathData="M19,13H5v-2h14v2z"/>
+    <path android:fillColor="#FF000000" android:pathData="M19,13H5v-2h14v2z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_search_black.xml b/core/src/main/res/drawable/ic_search_black.xml
new file mode 100644
index 000000000..272c0e746
--- /dev/null
+++ b/core/src/main/res/drawable/ic_search_black.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="#FF000000" 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/core/src/main/res/drawable/ic_search_white.xml b/core/src/main/res/drawable/ic_search_white.xml
new file mode 100644
index 000000000..7d86ce939
--- /dev/null
+++ b/core/src/main/res/drawable/ic_search_white.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="#FFFFFFFF" 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/core/src/main/res/drawable/ic_select_all_grey600.xml b/core/src/main/res/drawable/ic_select_all_black.xml
index 96e9a2de5..68702c1fe 100644
--- a/core/src/main/res/drawable/ic_select_all_grey600.xml
+++ b/core/src/main/res/drawable/ic_select_all_black.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF757575"
+        android:fillColor="#FF000000"
         android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_select_none_grey600.xml b/core/src/main/res/drawable/ic_select_none_black.xml
index 8057f73ca..6d4ff62fa 100644
--- a/core/src/main/res/drawable/ic_select_none_grey600.xml
+++ b/core/src/main/res/drawable/ic_select_none_black.xml
@@ -4,8 +4,8 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF757575"
+        android:fillColor="#FF000000"
         android:pathData="m3,5l2,0l0,-2c-1.1,0 -2,0.9 -2,2zm0,8l2,0l0,-2l-2,0l0,2zm4,8l2,0l0,-2l-2,0l0,2zm-4,-12l2,0l0,-2l-2,0l0,2zm10,-6l-2,0l0,2l2,0l0,-2zm6,0l0,2l2,0c0,-1.1 -0.9,-2 -2,-2zm-14,18l0,-2l-2,0c0,1.1 0.9,2 2,2zm-2,-4l2,0l0,-2l-2,0l0,2zm6,-14l-2,0l0,2l2,0l0,-2zm2,18l2,0l0,-2l-2,0l0,2zm8,-8l2,0l0,-2l-2,0l0,2zm0,8c1.1,0 2,-0.9 2,-2l-2,0l0,2zm0,-12l2,0l0,-2l-2,0l0,2zm0,8l2,0l0,-2l-2,0l0,2zm-4,4l2,0l0,-2l-2,0l0,2zm0,-16l2,0l0,-2l-2,0l0,2z"/>
-    <path android:fillColor="#FF757575"
+    <path android:fillColor="#FF000000"
         android:pathData="M17,8.41L15.59,7 12,10.59 8.41,7 7,8.41 10.59,12 7,15.59 8.41,17 12,13.41 15.59,17 17,15.59 13.41,12z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_settings_black.xml b/core/src/main/res/drawable/ic_settings_black.xml
new file mode 100644
index 000000000..8b2b9f733
--- /dev/null
+++ b/core/src/main/res/drawable/ic_settings_black.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="#FF000000" android:pathData="M12,8A4,4 0 0,1 16,12A4,4 0 0,1 12,16A4,4 0 0,1 8,12A4,4 0 0,1 12,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10M10,22C9.75,22 9.54,21.82 9.5,21.58L9.13,18.93C8.5,18.68 7.96,18.34 7.44,17.94L4.95,18.95C4.73,19.03 4.46,18.95 4.34,18.73L2.34,15.27C2.21,15.05 2.27,14.78 2.46,14.63L4.57,12.97L4.5,12L4.57,11L2.46,9.37C2.27,9.22 2.21,8.95 2.34,8.73L4.34,5.27C4.46,5.05 4.73,4.96 4.95,5.05L7.44,6.05C7.96,5.66 8.5,5.32 9.13,5.07L9.5,2.42C9.54,2.18 9.75,2 10,2H14C14.25,2 14.46,2.18 14.5,2.42L14.87,5.07C15.5,5.32 16.04,5.66 16.56,6.05L19.05,5.05C19.27,4.96 19.54,5.05 19.66,5.27L21.66,8.73C21.79,8.95 21.73,9.22 21.54,9.37L19.43,11L19.5,12L19.43,13L21.54,14.63C21.73,14.78 21.79,15.05 21.66,15.27L19.66,18.73C19.54,18.95 19.27,19.04 19.05,18.95L16.56,17.95C16.04,18.34 15.5,18.68 14.87,18.93L14.5,21.58C14.46,21.82 14.25,22 14,22H10M11.25,4L10.88,6.61C9.68,6.86 8.62,7.5 7.85,8.39L5.44,7.35L4.69,8.65L6.8,10.2C6.4,11.37 6.4,12.64 6.8,13.8L4.68,15.36L5.43,16.66L7.86,15.62C8.63,16.5 9.68,17.14 10.87,17.38L11.24,20H12.76L13.13,17.39C14.32,17.14 15.37,16.5 16.14,15.62L18.57,16.66L19.32,15.36L17.2,13.81C17.6,12.64 17.6,11.37 17.2,10.2L19.31,8.65L18.56,7.35L16.15,8.39C15.38,7.5 14.32,6.86 13.12,6.62L12.75,4H11.25Z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_settings_white.xml b/core/src/main/res/drawable/ic_settings_white.xml
new file mode 100644
index 000000000..63b5c79ef
--- /dev/null
+++ b/core/src/main/res/drawable/ic_settings_white.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="#FFFFFFFF" android:pathData="M12,8A4,4 0 0,1 16,12A4,4 0 0,1 12,16A4,4 0 0,1 8,12A4,4 0 0,1 12,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10M10,22C9.75,22 9.54,21.82 9.5,21.58L9.13,18.93C8.5,18.68 7.96,18.34 7.44,17.94L4.95,18.95C4.73,19.03 4.46,18.95 4.34,18.73L2.34,15.27C2.21,15.05 2.27,14.78 2.46,14.63L4.57,12.97L4.5,12L4.57,11L2.46,9.37C2.27,9.22 2.21,8.95 2.34,8.73L4.34,5.27C4.46,5.05 4.73,4.96 4.95,5.05L7.44,6.05C7.96,5.66 8.5,5.32 9.13,5.07L9.5,2.42C9.54,2.18 9.75,2 10,2H14C14.25,2 14.46,2.18 14.5,2.42L14.87,5.07C15.5,5.32 16.04,5.66 16.56,6.05L19.05,5.05C19.27,4.96 19.54,5.05 19.66,5.27L21.66,8.73C21.79,8.95 21.73,9.22 21.54,9.37L19.43,11L19.5,12L19.43,13L21.54,14.63C21.73,14.78 21.79,15.05 21.66,15.27L19.66,18.73C19.54,18.95 19.27,19.04 19.05,18.95L16.56,17.95C16.04,18.34 15.5,18.68 14.87,18.93L14.5,21.58C14.46,21.82 14.25,22 14,22H10M11.25,4L10.88,6.61C9.68,6.86 8.62,7.5 7.85,8.39L5.44,7.35L4.69,8.65L6.8,10.2C6.4,11.37 6.4,12.64 6.8,13.8L4.68,15.36L5.43,16.66L7.86,15.62C8.63,16.5 9.68,17.14 10.87,17.38L11.24,20H12.76L13.13,17.39C14.32,17.14 15.37,16.5 16.14,15.62L18.57,16.66L19.32,15.36L17.2,13.81C17.6,12.64 17.6,11.37 17.2,10.2L19.31,8.65L18.56,7.35L16.15,8.39C15.38,7.5 14.32,6.86 13.12,6.62L12.75,4H11.25Z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_sleep_black.xml b/core/src/main/res/drawable/ic_sleep_black.xml
new file mode 100644
index 000000000..f30d5209f
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sleep_black.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="#FF000000" android:pathData="M23,12H17V10L20.39,6H17V4H23V6L19.62,10H23V12M15,16H9V14L12.39,10H9V8H15V10L11.62,14H15V16M7,20H1V18L4.39,14H1V12H7V14L3.62,18H7V20Z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_sleep_off_black.xml b/core/src/main/res/drawable/ic_sleep_off_black.xml
new file mode 100644
index 000000000..a45f2b91d
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sleep_off_black.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="#FF000000" android:pathData="M2,5.27L3.28,4L20,20.72L18.73,22L12.73,16H9V14L9.79,13.06L2,5.27M23,12H17V10L20.39,6H17V4H23V6L19.62,10H23V12M9.82,8H15V10L13.54,11.72L9.82,8M7,20H1V18L4.39,14H1V12H7V14L3.62,18H7V20Z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_sleep_off_white.xml b/core/src/main/res/drawable/ic_sleep_off_white.xml
new file mode 100644
index 000000000..e06505a9f
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sleep_off_white.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="#FFFFFFFF" android:pathData="M2,5.27L3.28,4L20,20.72L18.73,22L12.73,16H9V14L9.79,13.06L2,5.27M23,12H17V10L20.39,6H17V4H23V6L19.62,10H23V12M9.82,8H15V10L13.54,11.72L9.82,8M7,20H1V18L4.39,14H1V12H7V14L3.62,18H7V20Z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_sleep_white.xml b/core/src/main/res/drawable/ic_sleep_white.xml
new file mode 100644
index 000000000..11678c89b
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sleep_white.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="#FFFFFFFF" android:pathData="M23,12H17V10L20.39,6H17V4H23V6L19.62,10H23V12M15,16H9V14L12.39,10H9V8H15V10L11.62,14H15V16M7,20H1V18L4.39,14H1V12H7V14L3.62,18H7V20Z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_sliders_black.xml b/core/src/main/res/drawable/ic_sliders_black.xml
new file mode 100644
index 000000000..fe3a3476f
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sliders_black.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="#FF000000" android:pathData="M3,17V19H9V17H3M3,5V7H13V5H3M13,21V19H21V17H13V15H11V21H13M7,9V11H3V13H7V15H9V9H7M21,13V11H11V13H21M15,9H17V7H21V5H17V3H15V9Z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_sliders_white.xml b/core/src/main/res/drawable/ic_sliders_white.xml
new file mode 100644
index 000000000..c74b7e494
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sliders_white.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="#FFFFFFFF" android:pathData="M3,17V19H9V17H3M3,5V7H13V5H3M13,21V19H21V17H13V15H11V21H13M7,9V11H3V13H7V15H9V9H7M21,13V11H11V13H21M15,9H17V7H21V5H17V3H15V9Z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_sort_black.xml b/core/src/main/res/drawable/ic_sort_black.xml
new file mode 100644
index 000000000..f3f46335d
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sort_black.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="#FF000000" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_sort_white.xml b/core/src/main/res/drawable/ic_sort_white.xml
new file mode 100644
index 000000000..9b76aab9f
--- /dev/null
+++ b/core/src/main/res/drawable/ic_sort_white.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="#FFFFFFFF" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_star_black.xml b/core/src/main/res/drawable/ic_star_black.xml
new file mode 100644
index 000000000..d0f1012ca
--- /dev/null
+++ b/core/src/main/res/drawable/ic_star_black.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="#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/core/src/main/res/drawable/ic_star_border_black.xml b/core/src/main/res/drawable/ic_star_border_black.xml
new file mode 100644
index 000000000..5e9f484c4
--- /dev/null
+++ b/core/src/main/res/drawable/ic_star_border_black.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="#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/core/src/main/res/drawable/ic_star_border_white.xml b/core/src/main/res/drawable/ic_star_border_white.xml
new file mode 100644
index 000000000..6df0e2919
--- /dev/null
+++ b/core/src/main/res/drawable/ic_star_border_white.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="#FFFFFFFF" 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/core/src/main/res/drawable/ic_star_white.xml b/core/src/main/res/drawable/ic_star_white.xml
new file mode 100644
index 000000000..c8a628241
--- /dev/null
+++ b/core/src/main/res/drawable/ic_star_white.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="#FFFFFFFF" 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/core/src/main/res/drawable/ic_statistics_black.xml b/core/src/main/res/drawable/ic_statistics_black.xml
new file mode 100644
index 000000000..f5e7f7153
--- /dev/null
+++ b/core/src/main/res/drawable/ic_statistics_black.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="#FF000000" android:pathData="M13,2.05V5.08C16.39,5.57 19,8.47 19,12C19,12.9 18.82,13.75 18.5,14.54L21.12,16.07C21.68,14.83 22,13.45 22,12C22,6.82 18.05,2.55 13,2.05M12,19A7,7 0 0,1 5,12C5,8.47 7.61,5.57 11,5.08V2.05C5.94,2.55 2,6.81 2,12A10,10 0 0,0 12,22C15.3,22 18.23,20.39 20.05,17.91L17.45,16.38C16.17,18 14.21,19 12,19Z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_statistics_white.xml b/core/src/main/res/drawable/ic_statistics_white.xml
new file mode 100644
index 000000000..7d180b568
--- /dev/null
+++ b/core/src/main/res/drawable/ic_statistics_white.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="#FFFFFFFF" android:pathData="M13,2.05V5.08C16.39,5.57 19,8.47 19,12C19,12.9 18.82,13.75 18.5,14.54L21.12,16.07C21.68,14.83 22,13.45 22,12C22,6.82 18.05,2.55 13,2.05M12,19A7,7 0 0,1 5,12C5,8.47 7.61,5.57 11,5.08V2.05C5.94,2.55 2,6.81 2,12A10,10 0 0,0 12,22C15.3,22 18.23,20.39 20.05,17.91L17.45,16.38C16.17,18 14.21,19 12,19Z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_storage_black.xml b/core/src/main/res/drawable/ic_storage_black.xml
new file mode 100644
index 000000000..89a6417f5
--- /dev/null
+++ b/core/src/main/res/drawable/ic_storage_black.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="#FF000000" android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM12,8h-2L10,4h2v4zM15,8h-2L13,4h2v4zM18,8h-2L16,4h2v4z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_storage_white.xml b/core/src/main/res/drawable/ic_storage_white.xml
new file mode 100644
index 000000000..db7e76bd5
--- /dev/null
+++ b/core/src/main/res/drawable/ic_storage_white.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="#FFFFFFFF" android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM12,8h-2L10,4h2v4zM15,8h-2L13,4h2v4zM18,8h-2L16,4h2v4z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_stream_grey600.xml b/core/src/main/res/drawable/ic_stream_black.xml
index da9636f8c..26b473a35 100644
--- a/core/src/main/res/drawable/ic_stream_grey600.xml
+++ b/core/src/main/res/drawable/ic_stream_black.xml
@@ -4,11 +4,11 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF757575"
+      android:fillColor="#FF000000"
       android:pathData="m20.5099,12.0219c0,-1.41 -1.143,-2.553 -2.553,-2.553h-1.2765v-0.4255c0,-2.5849 -2.0955,-4.6804 -4.6804,-4.6804 -2.1275,0 -3.9401,1.4382 -4.5017,3.4039H6.8941c-1.8799,0 -3.4039,1.524 -3.4039,3.4039 0,1.8799 1.524,3.4039 3.4039,3.4039h2.553v1.702H6.8941c-2.8199,0 -5.1059,-2.286 -5.1059,-5.1059 0,-2.6381 1.9913,-4.7996 4.5528,-5.0719C7.4047,4.0566 9.5407,2.661 12,2.661c3.0976,0 5.6761,2.2041 6.2633,5.14 2.2041,0.1532 3.9486,1.9743 3.9486,4.2209 0,1.4041 -0.6445,2.3463 -1.5471,3.1885 -0.4185,-0.2876 -0.8313,-0.5368 -1.3724,-0.8908 1.092,-0.8808 1.2175,-1.8722 1.2175,-2.2977z"
       android:strokeWidth="0.85098612"/>
   <path
-      android:fillColor="#FF757575"
+      android:fillColor="#FF000000"
       android:pathData="m12.2085,13.3476v9.4907l7.4569,-4.7453z"
       android:strokeWidth="0.67790419"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_videocam_grey600_24dp.xml b/core/src/main/res/drawable/ic_videocam_black_24dp.xml
index 40c893883..86283557e 100644
--- a/core/src/main/res/drawable/ic_videocam_grey600_24dp.xml
+++ b/core/src/main/res/drawable/ic_videocam_black_24dp.xml
@@ -3,6 +3,6 @@
         android:width="24dp"
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
-    <path android:fillColor="#FF757575"
+    <path android:fillColor="#FF000000"
           android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_volume_adaption_grey.xml b/core/src/main/res/drawable/ic_volume_adaption_black.xml
index fe39e1c70..5aac62e0a 100644
--- a/core/src/main/res/drawable/ic_volume_adaption_grey.xml
+++ b/core/src/main/res/drawable/ic_volume_adaption_black.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-            android:fillColor="#FF757575"
+            android:fillColor="#FF000000"
             android:pathData="M14,3.23V5.29C16.89,6.15 19,8.83 19,12C19,15.17 16.89,17.84 14,18.7V20.77C18,19.86 21,16.28 21,12C21,7.72 18,4.14 14,3.23M16.5,12C16.5,10.23 15.5,8.71 14,7.97V16C15.5,15.29 16.5,13.76 16.5,12M3,9V15H7L12,20V4L7,9H3Z" />
 </vector>
 \ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_web_black.xml b/core/src/main/res/drawable/ic_web_black.xml
new file mode 100644
index 000000000..0ad45e031
--- /dev/null
+++ b/core/src/main/res/drawable/ic_web_black.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="#FF000000" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_web_white.xml b/core/src/main/res/drawable/ic_web_white.xml
new file mode 100644
index 000000000..02dab111c
--- /dev/null
+++ b/core/src/main/res/drawable/ic_web_white.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="#FFFFFFFF" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
+</vector>
diff --git a/core/src/main/res/drawable/line.xml b/core/src/main/res/drawable/scrollbar_line.xml
index 1d5362840..1d5362840 100644
--- a/core/src/main/res/drawable/line.xml
+++ b/core/src/main/res/drawable/scrollbar_line.xml
diff --git a/core/src/main/res/drawable/line_drawable.xml b/core/src/main/res/drawable/scrollbar_line_drawable.xml
index 503179b12..1339fa4a4 100644
--- a/core/src/main/res/drawable/line_drawable.xml
+++ b/core/src/main/res/drawable/scrollbar_line_drawable.xml
@@ -2,8 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
             android:state_pressed="true"
-            android:drawable="@drawable/line"/>
+            android:drawable="@drawable/scrollbar_line"/>
 
     <item
-            android:drawable="@drawable/line"/>
+            android:drawable="@drawable/scrollbar_line"/>
 </selector>
diff --git a/core/src/main/res/drawable/thumb.xml b/core/src/main/res/drawable/scrollbar_thumb.xml
index 0416c8be9..0416c8be9 100644
--- a/core/src/main/res/drawable/thumb.xml
+++ b/core/src/main/res/drawable/scrollbar_thumb.xml
diff --git a/core/src/main/res/drawable/thumb_drawable.xml b/core/src/main/res/drawable/scrollbar_thumb_drawable.xml
index 37e7c4896..efed1748c 100644
--- a/core/src/main/res/drawable/thumb_drawable.xml
+++ b/core/src/main/res/drawable/scrollbar_thumb_drawable.xml
@@ -2,8 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
             android:state_pressed="true"
-            android:drawable="@drawable/thumb"/>
+            android:drawable="@drawable/scrollbar_thumb"/>
 
     <item
-            android:drawable="@drawable/thumb"/>
+            android:drawable="@drawable/scrollbar_thumb"/>
 </selector>
diff --git a/core/src/main/res/layout/more_content_list_footer.xml b/core/src/main/res/layout/more_content_list_footer.xml
index b9947dc33..bfe9e89b6 100644
--- a/core/src/main/res/layout/more_content_list_footer.xml
+++ b/core/src/main/res/layout/more_content_list_footer.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -12,7 +14,7 @@
         android:layout_gravity="center"
         android:layout_margin="16dp"
         android:contentDescription="@string/load_next_page_label"
-        android:src="?attr/navigation_expand" />
+        app:srcCompat="?attr/ic_load_more" />
 
     <ProgressBar
         android:id="@+id/progBar"
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 40c9514f3..3dcbae206 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <attr name="action_bar_icon_color" format="reference"/>
     <attr name="action_about" format="reference"/>
     <attr name="action_search" format="reference"/>
     <attr name="action_stream" format="reference"/>
@@ -10,9 +8,8 @@
     <attr name="av_pause" format="reference"/>
     <attr name="av_play" format="reference"/>
     <attr name="av_skip" format="reference"/>
-    <attr name="av_speed" format="reference"/>
     <attr name="av_rewind" format="reference"/>
-    <attr name="content_discard" format="reference"/>
+    <attr name="ic_delete" format="reference"/>
     <attr name="content_new" format="reference"/>
     <attr name="content_remove_from_queue" format="reference"/>
     <attr name="storage" format="reference"/>
@@ -21,15 +18,15 @@
     <attr name="location_web_site" format="reference"/>
     <attr name="navigation_accept" format="reference"/>
     <attr name="navigation_cancel" format="reference"/>
-    <attr name="navigation_expand" format="reference"/>
+    <attr name="ic_load_more" format="reference"/>
     <attr name="navigation_refresh" format="reference"/>
     <attr name="navigation_up" format="reference"/>
-    <attr name="social_share" format="reference"/>
     <attr name="stat_playlist" format="reference"/>
     <attr name="ic_folder" format="reference"/>
     <attr name="type_video" format="reference"/>
     <attr name="dragview_background" format="reference"/>
     <attr name="ic_history" format="reference"/>
+    <attr name="ic_sliders" format="reference"/>
     <attr name="ic_settings_playback" format="reference"/>
     <attr name="ic_settings" format="reference"/>
     <attr name="ic_lock_open" format="reference"/>
@@ -46,11 +43,9 @@
     <attr name="ic_sort" format="reference"/>
     <attr name="ic_key" format="reference"/>
     <attr name="ic_volume_adaption" format="reference"/>
-    <attr name="ic_sd_storage" format="reference"/>
-    <attr name="ic_create_new_folder" format="reference"/>
     <attr name="ic_cast_disconnect" format="reference"/>
-    <attr name="ic_swap" format="reference"/>
-    <attr name="ic_cellphone_text" format="reference"/>
+    <attr name="ic_network" format="reference"/>
+    <attr name="ic_appearance" format="reference"/>
     <attr name="ic_questionmark" format="reference" />
     <attr name="ic_chat" format="reference"/>
     <attr name="ic_bug" format="reference" />
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 377347ebd..b6bbedd00 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -12,66 +12,62 @@
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
         <item name="android:windowBackground">@color/primary_light</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Light</item>
-        <item name="action_bar_icon_color">@color/grey600</item>
-        <item name="storage">@drawable/ic_sd_grey600_24dp</item>
-        <item name="ic_swap">@drawable/ic_swap_vertical_grey600_24dp</item>
-        <item name="statistics">@drawable/ic_poll_box_grey600_24dp</item>
-        <item name="action_about">@drawable/ic_info_grey600_24dp</item>
-        <item name="checkbox_multiple">@drawable/ic_checkbox_multiple_marked_outline_grey600_24dp</item>
-        <item name="action_search">@drawable/ic_search_grey600_24dp</item>
-        <item name="action_stream">@drawable/ic_stream_grey600</item>
-        <item name="av_download">@drawable/ic_file_download_grey600_24dp</item>
-        <item name="av_pause">@drawable/ic_av_pause_dark_48dp</item>
-        <item name="av_play">@drawable/ic_av_play_dark_48dp</item>
-        <item name="av_rewind">@drawable/ic_av_fast_rewind_dark_48dp</item>
-        <item name="av_fast_forward">@drawable/ic_av_fast_forward_dark_48dp</item>
-        <item name="av_skip">@drawable/ic_av_skip_dark_48dp</item>
-        <item name="av_speed">@drawable/ic_playback_speed_dark_48dp</item>
-        <item name="ic_settings_speed">@drawable/ic_playback_speed_dark_24dp</item>
-        <item name="content_discard">@drawable/ic_delete_grey600_24dp</item>
-        <item name="content_new">@drawable/ic_add_grey600_24dp</item>
-        <item name="content_remove_from_queue">@drawable/ic_remove_grey600</item>
-        <item name="feed">@drawable/ic_feed_grey600_24dp</item>
-        <item name="location_web_site">@drawable/ic_web_grey600_24dp</item>
-        <item name="navigation_accept">@drawable/ic_done_grey600_24dp</item>
-        <item name="navigation_cancel">@drawable/ic_cancel_grey600_24dp</item>
-        <item name="navigation_expand">@drawable/ic_expand_more_grey600_36dp</item>
-        <item name="navigation_refresh">@drawable/ic_refresh_grey600_24dp</item>
+        <item name="storage">@drawable/ic_storage_black</item>
+        <item name="ic_network">@drawable/ic_network_black</item>
+        <item name="statistics">@drawable/ic_statistics_black</item>
+        <item name="action_about">@drawable/ic_info_black</item>
+        <item name="checkbox_multiple">@drawable/ic_check_multiple_black</item>
+        <item name="action_search">@drawable/ic_search_black</item>
+        <item name="action_stream">@drawable/ic_stream_black</item>
+        <item name="av_download">@drawable/ic_download_black</item>
+        <item name="av_pause">@drawable/ic_av_pause_black_48dp</item>
+        <item name="av_play">@drawable/ic_av_play_black_48dp</item>
+        <item name="av_rewind">@drawable/ic_av_fast_rewind_black_48dp</item>
+        <item name="av_fast_forward">@drawable/ic_av_fast_forward_black_48dp</item>
+        <item name="av_skip">@drawable/ic_av_skip_black_48dp</item>
+        <item name="ic_settings_speed">@drawable/ic_playback_speed_black</item>
+        <item name="ic_delete">@drawable/ic_delete_black</item>
+        <item name="content_new">@drawable/ic_add_black</item>
+        <item name="content_remove_from_queue">@drawable/ic_remove_black</item>
+        <item name="feed">@drawable/ic_feed_black</item>
+        <item name="location_web_site">@drawable/ic_web_black</item>
+        <item name="navigation_accept">@drawable/ic_check_black</item>
+        <item name="navigation_cancel">@drawable/ic_cancel_black</item>
+        <item name="ic_load_more">@drawable/ic_load_more_black</item>
+        <item name="navigation_refresh">@drawable/ic_refresh_black</item>
         <item name="navigation_up">@drawable/navigation_up</item>
-        <item name="social_share">@drawable/ic_share_grey600_24dp</item>
-        <item name="stat_playlist">@drawable/ic_list_grey600_24dp</item>
-        <item name="type_video">@drawable/ic_videocam_grey600_24dp</item>
+        <item name="stat_playlist">@drawable/ic_playlist_black</item>
+        <item name="type_video">@drawable/ic_videocam_black_24dp</item>
         <item name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
         <item name="drawer_activated_color">@color/highlight_light</item>
-        <item name="ic_history">@drawable/ic_history_grey600_24dp</item>
-        <item name="ic_folder">@drawable/ic_folder_grey600_24dp</item>
-        <item name="ic_settings_playback">@drawable/ic_av_play_dark_24dp</item>
-        <item name="ic_fav">@drawable/ic_star_border_grey600_24dp</item>
-        <item name="ic_unfav">@drawable/ic_star_grey600_24dp</item>
-        <item name="ic_settings">@drawable/ic_settings_grey600_24dp</item>
-        <item name="ic_lock_open">@drawable/ic_lock_open_grey600_24dp</item>
-        <item name="ic_lock_closed">@drawable/ic_lock_closed_grey600_24dp</item>
-        <item name="ic_filter">@drawable/ic_filter_grey600_24dp</item>
-        <item name="ic_sleep">@drawable/ic_sleep_grey600_24dp</item>
-        <item name="ic_sleep_off">@drawable/ic_sleep_off_grey600_24dp</item>
-        <item name="ic_select_all">@drawable/ic_select_all_grey600</item>
-        <item name="ic_select_none">@drawable/ic_select_none_grey600</item>
-        <item name="ic_sort">@drawable/ic_sort_grey600_24dp</item>
-        <item name="ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item>
-        <item name="ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item>
+        <item name="ic_history">@drawable/ic_history_black</item>
+        <item name="ic_folder">@drawable/ic_folder_black</item>
+        <item name="ic_settings_playback">@drawable/ic_av_play_black_24dp</item>
+        <item name="ic_fav">@drawable/ic_star_border_black</item>
+        <item name="ic_unfav">@drawable/ic_star_black</item>
+        <item name="ic_settings">@drawable/ic_settings_black</item>
+        <item name="ic_lock_open">@drawable/ic_lock_open_black</item>
+        <item name="ic_lock_closed">@drawable/ic_lock_closed_black</item>
+        <item name="ic_filter">@drawable/ic_filter_black_24dp</item>
+        <item name="ic_sleep">@drawable/ic_sleep_black</item>
+        <item name="ic_sleep_off">@drawable/ic_sleep_off_black</item>
+        <item name="ic_select_all">@drawable/ic_select_all_black</item>
+        <item name="ic_select_none">@drawable/ic_select_none_black</item>
+        <item name="ic_sort">@drawable/ic_sort_black</item>
+        <item name="ic_sliders">@drawable/ic_sliders_black</item>
         <item name="ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item>
-        <item name="ic_cellphone_text">@drawable/ic_cellphone_text_grey600_24dp</item>
-        <item name="ic_questionmark">@drawable/ic_questionmark_grey600</item>
-        <item name="ic_chat">@drawable/ic_chat_grey600</item>
-        <item name="ic_bug">@drawable/ic_bug_grey600_24dp</item>
-        <item name="ic_bookmark">@drawable/ic_bookmark_grey600_24dp</item>
+        <item name="ic_appearance">@drawable/ic_appearance_black</item>
+        <item name="ic_questionmark">@drawable/ic_questionmark_black</item>
+        <item name="ic_chat">@drawable/ic_chat_black</item>
+        <item name="ic_bug">@drawable/ic_bug_black</item>
+        <item name="ic_bookmark">@drawable/ic_bookmark_black_24dp</item>
         <item name="batch_edit_fab_icon">@drawable/ic_fab_edit_white</item>
-        <item name="ic_key">@drawable/ic_key_grey600</item>
-        <item name="ic_volume_adaption">@drawable/ic_volume_adaption_grey</item>
+        <item name="ic_key">@drawable/ic_key_black</item>
+        <item name="ic_volume_adaption">@drawable/ic_volume_adaption_black</item>
         <item name="master_switch_background">@color/master_switch_background_light</item>
         <item name="currently_playing_background">@color/highlight_light</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-        <item name="action_icon_color">#FF757575</item>
+        <item name="action_icon_color">@color/black</item>
     </style>
 
     <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
@@ -87,58 +83,54 @@
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
         <item name="progressBarTheme">@style/ProgressBarDark</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</item>
-        <item name="action_bar_icon_color">@color/white</item>
-        <item name="storage">@drawable/ic_sd_white_24dp</item>
-        <item name="ic_swap">@drawable/ic_swap_vertical_white_24dp</item>
-        <item name="statistics">@drawable/ic_poll_box_white_24dp</item>
-        <item name="action_about">@drawable/ic_info_white_24dp</item>
-        <item name="checkbox_multiple">@drawable/ic_checkbox_multiple_marked_outline_white_24dp</item>
-        <item name="action_search">@drawable/ic_search_white_24dp</item>
+        <item name="storage">@drawable/ic_storage_white</item>
+        <item name="ic_network">@drawable/ic_network_white</item>
+        <item name="statistics">@drawable/ic_statistics_white</item>
+        <item name="action_about">@drawable/ic_info_white</item>
+        <item name="checkbox_multiple">@drawable/ic_check_multiple_white</item>
+        <item name="action_search">@drawable/ic_search_white</item>
         <item name="action_stream">@drawable/ic_stream_white</item>
-        <item name="av_download">@drawable/ic_file_download_white_24dp</item>
+        <item name="av_download">@drawable/ic_download_white</item>
         <item name="av_rewind">@drawable/ic_av_fast_rewind_white_48dp</item>
         <item name="av_fast_forward">@drawable/ic_av_fast_forward_white_48dp</item>
         <item name="av_pause">@drawable/ic_av_pause_white_48dp</item>
         <item name="av_play">@drawable/ic_av_play_white_48dp</item>
         <item name="av_skip">@drawable/ic_av_skip_white_48dp</item>
-        <item name="av_speed">@drawable/ic_playback_speed_white_48dp</item>
-        <item name="ic_settings_speed">@drawable/ic_playback_speed_white_24dp</item>
-        <item name="content_discard">@drawable/ic_delete_white_24dp</item>
-        <item name="content_new">@drawable/ic_add_white_24dp</item>
+        <item name="ic_settings_speed">@drawable/ic_playback_speed_white</item>
+        <item name="ic_delete">@drawable/ic_delete_white</item>
+        <item name="content_new">@drawable/ic_add_white</item>
         <item name="content_remove_from_queue">@drawable/ic_remove_white</item>
-        <item name="feed">@drawable/ic_feed_white_24dp</item>
-        <item name="location_web_site">@drawable/ic_web_white_24dp</item>
-        <item name="navigation_accept">@drawable/ic_done_white_24dp</item>
-        <item name="navigation_cancel">@drawable/ic_cancel_white_24dp</item>
-        <item name="navigation_expand">@drawable/ic_expand_more_white_36dp</item>
-        <item name="navigation_refresh">@drawable/ic_refresh_white_24dp</item>
+        <item name="feed">@drawable/ic_feed_white</item>
+        <item name="location_web_site">@drawable/ic_web_white</item>
+        <item name="navigation_accept">@drawable/ic_check_white</item>
+        <item name="navigation_cancel">@drawable/ic_cancel_white</item>
+        <item name="ic_load_more">@drawable/ic_load_more_white</item>
+        <item name="navigation_refresh">@drawable/ic_refresh_white</item>
         <item name="navigation_up">@drawable/navigation_up_dark</item>
-        <item name="social_share">@drawable/ic_share_white_24dp</item>
-        <item name="stat_playlist">@drawable/ic_list_white_24dp</item>
+        <item name="stat_playlist">@drawable/ic_playlist_white</item>
         <item name="type_video">@drawable/ic_videocam_white_24dp</item>
         <item name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
         <item name="drawer_activated_color">@color/highlight_dark</item>
-        <item name="ic_history">@drawable/ic_history_white_24dp</item>
-        <item name="ic_folder">@drawable/ic_folder_white_24dp</item>
+        <item name="ic_history">@drawable/ic_history_white</item>
+        <item name="ic_folder">@drawable/ic_folder_white</item>
         <item name="ic_settings_playback">@drawable/ic_av_play_white_24dp</item>
-        <item name="ic_fav">@drawable/ic_star_border_white_24dp</item>
-        <item name="ic_unfav">@drawable/ic_star_white_24dp</item>
-        <item name="ic_settings">@drawable/ic_settings_white_24dp</item>
-        <item name="ic_lock_open">@drawable/ic_lock_open_white_24dp</item>
-        <item name="ic_lock_closed">@drawable/ic_lock_closed_white_24dp</item>
+        <item name="ic_fav">@drawable/ic_star_border_white</item>
+        <item name="ic_unfav">@drawable/ic_star_white</item>
+        <item name="ic_settings">@drawable/ic_settings_white</item>
+        <item name="ic_lock_open">@drawable/ic_lock_open_white</item>
+        <item name="ic_lock_closed">@drawable/ic_lock_closed_white</item>
         <item name="ic_filter">@drawable/ic_filter_white_24dp</item>
-        <item name="ic_sleep">@drawable/ic_sleep_white_24dp</item>
-        <item name="ic_sleep_off">@drawable/ic_sleep_off_white_24dp</item>
+        <item name="ic_sleep">@drawable/ic_sleep_white</item>
+        <item name="ic_sleep_off">@drawable/ic_sleep_off_white</item>
         <item name="ic_select_all">@drawable/ic_select_all_white</item>
         <item name="ic_select_none">@drawable/ic_select_none_white</item>
-        <item name="ic_sort">@drawable/ic_sort_white_24dp</item>
-        <item name="ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item>
-        <item name="ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item>
+        <item name="ic_sort">@drawable/ic_sort_white</item>
+        <item name="ic_sliders">@drawable/ic_sliders_white</item>
         <item name="ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
-        <item name="ic_cellphone_text">@drawable/ic_cellphone_text_white_24dp</item>
+        <item name="ic_appearance">@drawable/ic_appearance_white</item>
         <item name="ic_questionmark">@drawable/ic_questionmark_white</item>
         <item name="ic_chat">@drawable/ic_chat_white</item>
-        <item name="ic_bug">@drawable/ic_bug_white_24dp</item>
+        <item name="ic_bug">@drawable/ic_bug_white</item>
         <item name="ic_bookmark">@drawable/ic_bookmark_white_24dp</item>
         <item name="batch_edit_fab_icon">@drawable/ic_fab_edit_white</item>
         <item name="ic_key">@drawable/ic_key_white</item>
author	ByteHamster <info@bytehamster.com>	2020-03-16 20:49:40 +0100
committer	ByteHamster <info@bytehamster.com>	2020-03-16 22:34:06 +0100
commit	9f32b6cebf503961077f1f3d26735ff17c7219e0 (patch)
tree	6eec81946a639ee66d046fa63ad241c2e954cbcf
parent	15b1afa38b3ca1614296acc55ecc0535ac39df28 (diff)
download	AntennaPod-9f32b6cebf503961077f1f3d26735ff17c7219e0.zip