diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
index 55204058..1041b245 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
@@ -113,7 +113,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
         if (playlist instanceof AbsSmartPlaylist) {
             return ((AbsSmartPlaylist) playlist).iconRes;
         }
-        return playlist.id == favoritePlaylistId ? R.drawable.ic_favorite_black_24dp : R.drawable.ic_queue_music_black_24dp;
+        return playlist.id == favoritePlaylistId ? R.drawable.ic_favorite_white_24dp : R.drawable.ic_queue_music_white_24dp;
     }
 
     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ShuffleButtonSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ShuffleButtonSongAdapter.java
index f0b41b1b..bbdb1301 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ShuffleButtonSongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ShuffleButtonSongAdapter.java
@@ -87,7 +87,7 @@ public class ShuffleButtonSongAdapter extends SongAdapter {
                 final int padding = activity.getResources().getDimensionPixelSize(R.dimen.default_item_margin) / 2;
                 holder.image.setPadding(padding, padding, padding, padding);
                 holder.image.setColorFilter(accentColor);
-                holder.image.setImageResource(R.drawable.ic_shuffle_black_24dp);
+                holder.image.setImageResource(R.drawable.ic_shuffle_white_24dp);
             }
             if (holder.separator != null) {
                 holder.separator.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java b/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java
index 13728d5d..8a655819 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java
@@ -61,7 +61,7 @@ public class WidgetMedium extends AppWidgetProvider {
 
     public static void updateWidgetsPlayState(@NonNull final Context context, boolean isPlaying) {
         initLayoutIfNecessary(context);
-        int playPauseRes = isPlaying ? R.drawable.ic_pause_black_24dp : R.drawable.ic_play_arrow_black_24dp;
+        int playPauseRes = isPlaying ? R.drawable.ic_pause_white_24dp : R.drawable.ic_play_arrow_white_24dp;
         widgetLayout.setImageViewBitmap(R.id.button_toggle_play_pause, createBitmap(Util.getTintedDrawable(context, playPauseRes, MaterialValueHelper.getPrimaryTextColor(context, true)), 1.5f));
         updateWidgets(context);
     }
@@ -69,8 +69,8 @@ public class WidgetMedium extends AppWidgetProvider {
     private static void initLayoutIfNecessary(Context context) {
         if (widgetLayout == null)
             widgetLayout = new RemoteViews(context.getPackageName(), R.layout.widget_medium);
-        widgetLayout.setImageViewBitmap(R.id.button_next, createBitmap(Util.getTintedDrawable(context, R.drawable.ic_skip_next_black_24dp, MaterialValueHelper.getPrimaryTextColor(context, true)), 1.5f));
-        widgetLayout.setImageViewBitmap(R.id.button_prev, createBitmap(Util.getTintedDrawable(context, R.drawable.ic_skip_previous_black_24dp, MaterialValueHelper.getPrimaryTextColor(context, true)), 1.5f));
+        widgetLayout.setImageViewBitmap(R.id.button_next, createBitmap(Util.getTintedDrawable(context, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getPrimaryTextColor(context, true)), 1.5f));
+        widgetLayout.setImageViewBitmap(R.id.button_prev, createBitmap(Util.getTintedDrawable(context, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getPrimaryTextColor(context, true)), 1.5f));
     }
 
     private static void updateWidgets(@NonNull final Context context) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java
index e2d1dc56..ac39aaa4 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java
@@ -250,9 +250,9 @@ public class PlayingNotificationHelper {
             int primary = MaterialValueHelper.getPrimaryTextColor(service, dark);
             int secondary = MaterialValueHelper.getSecondaryTextColor(service, dark);
 
-            Bitmap prev = createBitmap(Util.getTintedDrawable(service, R.drawable.ic_skip_previous_black_24dp, primary), 1.5f);
-            Bitmap next = createBitmap(Util.getTintedDrawable(service, R.drawable.ic_skip_next_black_24dp, primary), 1.5f);
-            Bitmap close = createBitmap(Util.getTintedDrawable(service, R.drawable.ic_close_black_24dp, secondary), 1f);
+            Bitmap prev = createBitmap(Util.getTintedDrawable(service, R.drawable.ic_skip_previous_white_24dp, primary), 1.5f);
+            Bitmap next = createBitmap(Util.getTintedDrawable(service, R.drawable.ic_skip_next_white_24dp, primary), 1.5f);
+            Bitmap close = createBitmap(Util.getTintedDrawable(service, R.drawable.ic_close_white_24dp, secondary), 1f);
 
             notificationLayout.setTextColor(R.id.title, primary);
             notificationLayout.setTextColor(R.id.text, secondary);
@@ -269,7 +269,7 @@ public class PlayingNotificationHelper {
     }
 
     private void setPlayPauseDrawable() {
-        Bitmap playPause = createBitmap(Util.getTintedDrawable(service, isPlaying ? R.drawable.ic_pause_black_24dp : R.drawable.ic_play_arrow_black_24dp, MaterialValueHelper.getPrimaryTextColor(service, isDark)), 1.5f);
+        Bitmap playPause = createBitmap(Util.getTintedDrawable(service, isPlaying ? R.drawable.ic_pause_white_24dp : R.drawable.ic_play_arrow_white_24dp, MaterialValueHelper.getPrimaryTextColor(service, isDark)), 1.5f);
         if (notificationLayout != null) {
             notificationLayout.setImageViewBitmap(R.id.action_play_pause, playPause);
         }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/AbsSmartPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/AbsSmartPlaylist.java
index dab7b26f..8a89f8c3 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/AbsSmartPlaylist.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/AbsSmartPlaylist.java
@@ -25,7 +25,7 @@ public abstract class AbsSmartPlaylist extends Playlist {
 
     public AbsSmartPlaylist() {
         super();
-        this.iconRes = R.drawable.ic_queue_music_black_24dp;
+        this.iconRes = R.drawable.ic_queue_music_white_24dp;
     }
 
     public abstract ArrayList<Song> getSongs(Context context);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/HistoryPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/HistoryPlaylist.java
index 6466b96a..02cc93c3 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/HistoryPlaylist.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/HistoryPlaylist.java
@@ -17,7 +17,7 @@ import java.util.ArrayList;
 public class HistoryPlaylist extends AbsSmartPlaylist {
 
     public HistoryPlaylist(@NonNull Context context) {
-        super(context.getString(R.string.history), R.drawable.ic_access_time_black_24dp);
+        super(context.getString(R.string.history), R.drawable.ic_access_time_white_24dp);
     }
 
     @NonNull
diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java
index 0019207e..1c09f469 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java
@@ -17,7 +17,7 @@ import java.util.ArrayList;
 public class LastAddedPlaylist extends AbsSmartPlaylist {
 
     public LastAddedPlaylist(@NonNull Context context) {
-        super(context.getString(R.string.last_added), R.drawable.ic_library_add_black_24dp);
+        super(context.getString(R.string.last_added), R.drawable.ic_library_add_white_24dp);
     }
 
     @NonNull
diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/MyTopTracksPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/MyTopTracksPlaylist.java
index b674b2ae..444debf1 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/MyTopTracksPlaylist.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/MyTopTracksPlaylist.java
@@ -17,7 +17,7 @@ import java.util.ArrayList;
 public class MyTopTracksPlaylist extends AbsSmartPlaylist {
 
     public MyTopTracksPlaylist(@NonNull Context context) {
-        super(context.getString(R.string.my_top_tracks), R.drawable.ic_trending_up_black_24dp);
+        super(context.getString(R.string.my_top_tracks), R.drawable.ic_trending_up_white_24dp);
     }
 
     @NonNull
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java
index a2c6fc89..882106d8 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java
@@ -32,7 +32,7 @@ import de.psdev.licensesdialog.LicensesDialog;
 public class AboutActivity extends AbsBaseActivity implements View.OnClickListener {
 
     private static String GOOGLE_PLUS = "https://google.com/+KarimAbouZeid23697";
-    private static String TWITTER = "https://twitter.com/karim23697";
+    private static String TWITTER = "https://ic_twitter_white_24dp.com/karim23697";
     private static String GITHUB = "https://github.com/kabouzeid";
     private static String WEBSITE = "http://kabouzeid.com/";
 
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
index cd2d09c1..4894d265 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
@@ -296,7 +296,7 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
         if (cab != null && cab.isActive()) cab.finish();
         cab = new MaterialCab(this, R.id.cab_stub)
                 .setMenu(menuRes)
-                .setCloseDrawableRes(R.drawable.ic_close_black_24dp)
+                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
                 .setBackgroundColor(PhonographColorUtil.shiftBackgroundColorForLightText(getPaletteColor()))
                 .start(new MaterialCab.Callback() {
                     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
index ed9d5073..58ec3e2e 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
@@ -382,7 +382,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
         if (cab != null && cab.isActive()) cab.finish();
         cab = new MaterialCab(this, R.id.cab_stub)
                 .setMenu(menuRes)
-                .setCloseDrawableRes(R.drawable.ic_close_black_24dp)
+                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
                 .setBackgroundColor(PhonographColorUtil.shiftBackgroundColorForLightText(getPaletteColor()))
                 .start(new MaterialCab.Callback() {
                     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
index fadd01f9..9a821cbd 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
@@ -179,7 +179,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
         int primaryColor = ThemeStore.primaryColor(this);
         appbar.setBackgroundColor(primaryColor);
         toolbar.setBackgroundColor(primaryColor);
-        toolbar.setNavigationIcon(R.drawable.ic_menu_black_24dp);
+        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
         setTitle(getResources().getString(R.string.app_name));
         setSupportActionBar(toolbar);
     }
@@ -544,7 +544,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
         if (cab != null && cab.isActive()) cab.finish();
         cab = new MaterialCab(this, R.id.cab_stub)
                 .setMenu(menu)
-                .setCloseDrawableRes(R.drawable.ic_close_black_24dp)
+                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
                 .setBackgroundColor(PhonographColorUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor(this)))
                 .start(callback);
         return cab;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
index a527f26b..d0ca8ef7 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
@@ -193,7 +193,7 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme
         if (cab != null && cab.isActive()) cab.finish();
         cab = new MaterialCab(this, R.id.cab_stub)
                 .setMenu(menu)
-                .setCloseDrawableRes(R.drawable.ic_close_black_24dp)
+                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
                 .setBackgroundColor(PhonographColorUtil.shiftBackgroundColorForLightText(ThemeStore.primaryColor(this)))
                 .start(callback);
         return cab;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/intro/AppIntroActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/intro/AppIntroActivity.java
index b04603c5..07cf2d52 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/intro/AppIntroActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/intro/AppIntroActivity.java
@@ -43,7 +43,7 @@ public class AppIntroActivity extends com.heinrichreimersoftware.materialintro.a
             addSlide(new PhonographSimpleSlide.Builder()
                     .title(R.string.label_storage)
                     .description(R.string.storage_permission_explaination)
-                    .image(R.drawable.ic_folder_black_24dp)
+                    .image(R.drawable.ic_folder_white_24dp)
                     .background(R.color.md_indigo_500)
                     .backgroundDark(R.color.md_indigo_600)
                     .build());
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlaybackControlsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlaybackControlsFragment.java
index c49292c0..854f1550 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlaybackControlsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlaybackControlsFragment.java
@@ -262,15 +262,15 @@ public class PlaybackControlsFragment extends Fragment implements MusicServiceEv
     private void updateRepeatState() {
         switch (MusicPlayerRemote.getRepeatMode()) {
             case MusicService.REPEAT_MODE_NONE:
-                repeatButton.setImageResource(R.drawable.ic_repeat_black_24dp);
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp);
                 repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
                 break;
             case MusicService.REPEAT_MODE_ALL:
-                repeatButton.setImageResource(R.drawable.ic_repeat_black_24dp);
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp);
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
                 break;
             case MusicService.REPEAT_MODE_THIS:
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_black_24dp);
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp);
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
                 break;
         }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
index 2dd78b9e..0f12c4e2 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
@@ -195,7 +195,7 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
 
     private void setUpPlayerToolbar() {
         toolbar.inflateMenu(R.menu.menu_player);
-        toolbar.setNavigationIcon(R.drawable.ic_close_black_24dp);
+        toolbar.setNavigationIcon(R.drawable.ic_close_white_24dp);
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -229,7 +229,7 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
 
     private void updateIsFavorite() {
         boolean isFavorite = MusicUtil.isFavorite(getActivity(), MusicPlayerRemote.getCurrentSong());
-        int res = isFavorite ? R.drawable.ic_favorite_black_24dp : R.drawable.ic_favorite_border_black_24dp;
+        int res = isFavorite ? R.drawable.ic_favorite_white_24dp : R.drawable.ic_favorite_border_white_24dp;
 
         Drawable favoriteIcon = TintHelper.createTintedDrawable(ContextCompat.getDrawable(getActivity(), res), ToolbarContentTintHelper.toolbarContentColor(getActivity(), Color.TRANSPARENT));
         toolbar.getMenu().findItem(R.id.action_toggle_favorite)
@@ -387,7 +387,7 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
             currentSongViewHolder.shortSeparator.setVisibility(View.GONE);
             currentSongViewHolder.image.setScaleType(ImageView.ScaleType.CENTER);
             currentSongViewHolder.image.setColorFilter(ATHUtil.resolveColor(fragment.getActivity(), R.attr.iconColor, ThemeStore.textColorSecondary(fragment.getActivity())), PorterDuff.Mode.SRC_IN);
-            currentSongViewHolder.image.setImageResource(R.drawable.ic_volume_up_black_24dp);
+            currentSongViewHolder.image.setImageResource(R.drawable.ic_volume_up_white_24dp);
             currentSongViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
diff --git a/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_black_24dp.xml b/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_24dp.xml
similarity index 91%
rename from app/src/main/res/drawable-xxhdpi/ic_drag_vertical_black_24dp.xml
rename to app/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_24dp.xml
index 7779e9a9..be0c17aa 100644
--- a/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_black_24dp.xml
+++ b/app/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M9,3H11V5H9V3M13,3H15V5H13V3M9,7H11V9H9V7M13,7H15V9H13V7M9,11H11V13H9V11M13,11H15V13H13V11M9,15H11V17H9V15M13,15H15V17H13V15M9,19H11V21H9V19M13,19H15V21H13V19Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_access_time_black_24dp.xml b/app/src/main/res/drawable/ic_access_time_white_24dp.xml
similarity index 91%
rename from app/src/main/res/drawable/ic_access_time_black_24dp.xml
rename to app/src/main/res/drawable/ic_access_time_white_24dp.xml
index c0ecd8dc..cc55531c 100644
--- a/app/src/main/res/drawable/ic_access_time_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_access_time_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_assignment_turned_in_black_24dp.xml b/app/src/main/res/drawable/ic_assignment_turned_in_white_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_assignment_turned_in_black_24dp.xml
rename to app/src/main/res/drawable/ic_assignment_turned_in_white_24dp.xml
diff --git a/app/src/main/res/drawable/ic_bug_report_black_24dp.xml b/app/src/main/res/drawable/ic_bug_report_white_24dp.xml
similarity index 94%
rename from app/src/main/res/drawable/ic_bug_report_black_24dp.xml
rename to app/src/main/res/drawable/ic_bug_report_white_24dp.xml
index 206702ff..ae908f44 100644
--- a/app/src/main/res/drawable/ic_bug_report_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_bug_report_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        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/app/src/main/res/drawable/ic_card_giftcard_black_24dp.xml b/app/src/main/res/drawable/ic_card_giftcard_white_24dp.xml
similarity index 95%
rename from app/src/main/res/drawable/ic_card_giftcard_black_24dp.xml
rename to app/src/main/res/drawable/ic_card_giftcard_white_24dp.xml
index 65acd125..f7da14ba 100644
--- a/app/src/main/res/drawable/ic_card_giftcard_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_card_giftcard_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M20,6h-2.18c0.11,-0.31 0.18,-0.65 0.18,-1 0,-1.66 -1.34,-3 -3,-3 -1.05,0 -1.96,0.54 -2.5,1.35l-0.5,0.67 -0.5,-0.68C10.96,2.54 10.05,2 9,2 7.34,2 6,3.34 6,5c0,0.35 0.07,0.69 0.18,1L4,6c-1.11,0 -1.99,0.89 -1.99,2L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM15,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM9,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM20,19L4,19v-2h16v2zM20,14L4,14L4,8h5.08L7,10.83 8.62,12 11,8.76l1,-1.36 1,1.36L15.38,12 17,10.83 14.92,8L20,8v6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_close_black_24dp.xml b/app/src/main/res/drawable/ic_close_white_24dp.xml
similarity index 89%
rename from app/src/main/res/drawable/ic_close_black_24dp.xml
rename to app/src/main/res/drawable/ic_close_white_24dp.xml
index f50fd991..c63eeb59 100644
--- a/app/src/main/res/drawable/ic_close_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_close_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_delete_black_24dp.xml b/app/src/main/res/drawable/ic_delete_white_24dp.xml
similarity index 89%
rename from app/src/main/res/drawable/ic_delete_black_24dp.xml
rename to app/src/main/res/drawable/ic_delete_white_24dp.xml
index 962e0337..1014e3d9 100644
--- a/app/src/main/res/drawable/ic_delete_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_delete_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        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/app/src/main/res/drawable/ic_description_black_24dp.xml b/app/src/main/res/drawable/ic_description_white_24dp.xml
similarity index 91%
rename from app/src/main/res/drawable/ic_description_black_24dp.xml
rename to app/src/main/res/drawable/ic_description_white_24dp.xml
index a30bc6ca..6f55b8de 100644
--- a/app/src/main/res/drawable/ic_description_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_description_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_done_black_24dp.xml b/app/src/main/res/drawable/ic_done_white_24dp.xml
similarity index 88%
rename from app/src/main/res/drawable/ic_done_black_24dp.xml
rename to app/src/main/res/drawable/ic_done_white_24dp.xml
index bda675f1..c3fb8a47 100644
--- a/app/src/main/res/drawable/ic_done_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_done_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_expand_less_black_24dp.xml b/app/src/main/res/drawable/ic_expand_less_white_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_expand_less_black_24dp.xml
rename to app/src/main/res/drawable/ic_expand_less_white_24dp.xml
diff --git a/app/src/main/res/drawable/ic_favorite_border_black_24dp.xml b/app/src/main/res/drawable/ic_favorite_border_white_24dp.xml
similarity index 94%
rename from app/src/main/res/drawable/ic_favorite_border_black_24dp.xml
rename to app/src/main/res/drawable/ic_favorite_border_white_24dp.xml
index feccba74..fd124161 100644
--- a/app/src/main/res/drawable/ic_favorite_border_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_favorite_border_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_favorite_black_24dp.xml b/app/src/main/res/drawable/ic_favorite_white_24dp.xml
similarity index 91%
rename from app/src/main/res/drawable/ic_favorite_black_24dp.xml
rename to app/src/main/res/drawable/ic_favorite_white_24dp.xml
index 17cea927..48dfa57b 100644
--- a/app/src/main/res/drawable/ic_favorite_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_favorite_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_flag_black_24dp.xml b/app/src/main/res/drawable/ic_flag_white_24dp.xml
similarity index 87%
rename from app/src/main/res/drawable/ic_flag_black_24dp.xml
rename to app/src/main/res/drawable/ic_flag_white_24dp.xml
index 5f358e8d..0a6acfb6 100644
--- a/app/src/main/res/drawable/ic_flag_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_flag_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M14.4,6L14,4H5v17h2v-7h5.6l0.4,2h7V6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_folder_black_24dp.xml b/app/src/main/res/drawable/ic_folder_white_24dp.xml
similarity index 90%
rename from app/src/main/res/drawable/ic_folder_black_24dp.xml
rename to app/src/main/res/drawable/ic_folder_white_24dp.xml
index a0243c28..cbccbd4b 100644
--- a/app/src/main/res/drawable/ic_folder_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_folder_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_github_circle.xml b/app/src/main/res/drawable/ic_github_circle_white_24dp.xml
similarity index 96%
rename from app/src/main/res/drawable/ic_github_circle.xml
rename to app/src/main/res/drawable/ic_github_circle_white_24dp.xml
index bfd548da..e236be14 100644
--- a/app/src/main/res/drawable/ic_github_circle.xml
+++ b/app/src/main/res/drawable/ic_github_circle_white_24dp.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_google_circles_communities.xml b/app/src/main/res/drawable/ic_google_circles_communities_white_24dp.xml
similarity index 85%
rename from app/src/main/res/drawable/ic_google_circles_communities.xml
rename to app/src/main/res/drawable/ic_google_circles_communities_white_24dp.xml
index 26447870..77db0fcb 100644
--- a/app/src/main/res/drawable/ic_google_circles_communities.xml
+++ b/app/src/main/res/drawable/ic_google_circles_communities_white_24dp.xml
@@ -1,10 +1,10 @@
-<!-- drawable/ic_google_circles_communities.xmlxml -->
+<!-- drawable/ic_google_circles_communities_white_24dp.xmlxml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M15,12C13.89,12 13,12.89 13,14A2,2 0 0,0 15,16A2,2 0 0,0 17,14C17,12.89 16.1,12 15,12M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M14,9C14,7.89 13.1,7 12,7C10.89,7 10,7.89 10,9A2,2 0 0,0 12,11A2,2 0 0,0 14,9M9,12A2,2 0 0,0 7,14A2,2 0 0,0 9,16A2,2 0 0,0 11,14C11,12.89 10.1,12 9,12Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_google_plus.xml b/app/src/main/res/drawable/ic_google_plus_white_24dp.xml
similarity index 93%
rename from app/src/main/res/drawable/ic_google_plus.xml
rename to app/src/main/res/drawable/ic_google_plus_white_24dp.xml
index 0ba434db..2d3f0c6d 100644
--- a/app/src/main/res/drawable/ic_google_plus.xml
+++ b/app/src/main/res/drawable/ic_google_plus_white_24dp.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M23,11H21V9H19V11H17V13H19V15H21V13H23M8,11V13.4H12C11.8,14.4 10.8,16.4 8,16.4C5.6,16.4 3.7,14.4 3.7,12C3.7,9.6 5.6,7.6 8,7.6C9.4,7.6 10.3,8.2 10.8,8.7L12.7,6.9C11.5,5.7 9.9,5 8,5C4.1,5 1,8.1 1,12C1,15.9 4.1,19 8,19C12,19 14.7,16.2 14.7,12.2C14.7,11.7 14.7,11.4 14.6,11H8Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_help_black_24dp.xml b/app/src/main/res/drawable/ic_help_white_24dp.xml
similarity index 93%
rename from app/src/main/res/drawable/ic_help_black_24dp.xml
rename to app/src/main/res/drawable/ic_help_white_24dp.xml
index b1d7a2cf..04c1c00f 100644
--- a/app/src/main/res/drawable/ic_help_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_help_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        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" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_info_outline_black_24dp.xml b/app/src/main/res/drawable/ic_info_outline_white_24dp.xml
similarity index 91%
rename from app/src/main/res/drawable/ic_info_outline_black_24dp.xml
rename to app/src/main/res/drawable/ic_info_outline_white_24dp.xml
index 9c51a4ff..a6ad5d39 100644
--- a/app/src/main/res/drawable/ic_info_outline_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_info_outline_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        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/app/src/main/res/drawable/ic_library_add_black_24dp.xml b/app/src/main/res/drawable/ic_library_add_white_24dp.xml
similarity index 91%
rename from app/src/main/res/drawable/ic_library_add_black_24dp.xml
rename to app/src/main/res/drawable/ic_library_add_white_24dp.xml
index 6cef0c20..be44d76c 100644
--- a/app/src/main/res/drawable/ic_library_add_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_library_add_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6zM20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM19,11h-4v4h-2v-4L9,11L9,9h4L13,5h2v4h4v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_library_music_black_24dp.xml b/app/src/main/res/drawable/ic_library_music_white_24dp.xml
similarity index 92%
rename from app/src/main/res/drawable/ic_library_music_black_24dp.xml
rename to app/src/main/res/drawable/ic_library_music_white_24dp.xml
index 6046503f..e040bd52 100644
--- a/app/src/main/res/drawable/ic_library_music_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_library_music_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,7h-3v5.5c0,1.38 -1.12,2.5 -2.5,2.5S10,13.88 10,12.5s1.12,-2.5 2.5,-2.5c0.57,0 1.08,0.19 1.5,0.51L14,5h4v2zM4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_black_24dp.xml b/app/src/main/res/drawable/ic_menu_white_24dp.xml
similarity index 88%
rename from app/src/main/res/drawable/ic_menu_black_24dp.xml
rename to app/src/main/res/drawable/ic_menu_white_24dp.xml
index 8a6004bd..c47718d9 100644
--- a/app/src/main/res/drawable/ic_menu_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_menu_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_more_vert_black_24dp.xml b/app/src/main/res/drawable/ic_more_vert_white_24dp.xml
similarity index 91%
rename from app/src/main/res/drawable/ic_more_vert_black_24dp.xml
rename to app/src/main/res/drawable/ic_more_vert_white_24dp.xml
index 7b7f1955..61e8792a 100644
--- a/app/src/main/res/drawable/ic_more_vert_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_more_vert_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_open_in_browser_black_24dp.xml b/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml
similarity index 91%
rename from app/src/main/res/drawable/ic_open_in_browser_black_24dp.xml
rename to app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml
index 97d25109..7a90c802 100644
--- a/app/src/main/res/drawable/ic_open_in_browser_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M19,4L5,4c-1.11,0 -2,0.9 -2,2v12c0,1.1 0.89,2 2,2h4v-2L5,18L5,8h14v10h-4v2h4c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.89,-2 -2,-2zM12,10l-4,4h3v6h2v-6h3l-4,-4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_pause_black_24dp.xml b/app/src/main/res/drawable/ic_pause_white_24dp.xml
similarity index 87%
rename from app/src/main/res/drawable/ic_pause_black_24dp.xml
rename to app/src/main/res/drawable/ic_pause_white_24dp.xml
index 53b5e6a9..193030b1 100644
--- a/app/src/main/res/drawable/ic_pause_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_pause_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_person_black_24dp.xml b/app/src/main/res/drawable/ic_person_white_24dp.xml
similarity index 90%
rename from app/src/main/res/drawable/ic_person_black_24dp.xml
rename to app/src/main/res/drawable/ic_person_white_24dp.xml
index 55495d5a..4726b88c 100644
--- a/app/src/main/res/drawable/ic_person_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_person_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow_black_24dp.xml b/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
similarity index 86%
rename from app/src/main/res/drawable/ic_play_arrow_black_24dp.xml
rename to app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
index dbe3ec66..4250d72c 100644
--- a/app/src/main/res/drawable/ic_play_arrow_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M8,5v14l11,-7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml b/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml
similarity index 89%
rename from app/src/main/res/drawable/ic_playlist_add_black_24dp.xml
rename to app/src/main/res/drawable/ic_playlist_add_white_24dp.xml
index f30f2955..d2ce69e9 100644
--- a/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M14,10L2,10v2h12v-2zM14,6L2,6v2h12L14,6zM18,14v-4h-2v4h-4v2h4v4h2v-4h4v-2h-4zM2,16h8v-2L2,14v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_queue_music_black_24dp.xml b/app/src/main/res/drawable/ic_queue_music_white_24dp.xml
similarity index 91%
rename from app/src/main/res/drawable/ic_queue_music_black_24dp.xml
rename to app/src/main/res/drawable/ic_queue_music_white_24dp.xml
index f6a97cf3..39f63a2d 100644
--- a/app/src/main/res/drawable/ic_queue_music_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_queue_music_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M15,6L3,6v2h12L15,6zM15,10L3,10v2h12v-2zM3,16h8v-2L3,14v2zM17,6v8.18c-0.31,-0.11 -0.65,-0.18 -1,-0.18 -1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3L19,8h3L22,6h-5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_repeat_one_black_24dp.xml b/app/src/main/res/drawable/ic_repeat_one_white_24dp.xml
similarity index 90%
rename from app/src/main/res/drawable/ic_repeat_one_black_24dp.xml
rename to app/src/main/res/drawable/ic_repeat_one_white_24dp.xml
index 91ccc513..109f1744 100644
--- a/app/src/main/res/drawable/ic_repeat_one_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_repeat_one_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4zM13,15L13,9h-1l-2,1v1h1.5v4L13,15z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_repeat_black_24dp.xml b/app/src/main/res/drawable/ic_repeat_white_24dp.xml
similarity index 89%
rename from app/src/main/res/drawable/ic_repeat_black_24dp.xml
rename to app/src/main/res/drawable/ic_repeat_white_24dp.xml
index a10f3b45..cf0fb37c 100644
--- a/app/src/main/res/drawable/ic_repeat_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_repeat_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_restore_black_24dp.xml b/app/src/main/res/drawable/ic_restore_white_24dp.xml
similarity index 92%
rename from app/src/main/res/drawable/ic_restore_black_24dp.xml
rename to app/src/main/res/drawable/ic_restore_white_24dp.xml
index d9f75ea6..bb75fb8b 100644
--- a/app/src/main/res/drawable/ic_restore_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_restore_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        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/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_white_24dp.xml
similarity index 96%
rename from app/src/main/res/drawable/ic_settings_black_24dp.xml
rename to app/src/main/res/drawable/ic_settings_white_24dp.xml
index 7c0394bb..60555103 100644
--- a/app/src/main/res/drawable/ic_settings_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_settings_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_shuffle_black_24dp.xml b/app/src/main/res/drawable/ic_shuffle_white_24dp.xml
similarity index 91%
rename from app/src/main/res/drawable/ic_shuffle_black_24dp.xml
rename to app/src/main/res/drawable/ic_shuffle_white_24dp.xml
index 5b8ccd9b..e9860b73 100644
--- a/app/src/main/res/drawable/ic_shuffle_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_shuffle_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M10.59,9.17L5.41,4 4,5.41l5.17,5.17 1.42,-1.41zM14.5,4l2.04,2.04L4,18.59 5.41,20 17.96,7.46 20,9.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_skip_next_black_24dp.xml b/app/src/main/res/drawable/ic_skip_next_white_24dp.xml
similarity index 87%
rename from app/src/main/res/drawable/ic_skip_next_black_24dp.xml
rename to app/src/main/res/drawable/ic_skip_next_white_24dp.xml
index eae4da1b..b5e31f5d 100644
--- a/app/src/main/res/drawable/ic_skip_next_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_skip_next_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_skip_previous_black_24dp.xml b/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml
similarity index 87%
rename from app/src/main/res/drawable/ic_skip_previous_black_24dp.xml
rename to app/src/main/res/drawable/ic_skip_previous_white_24dp.xml
index abb9944f..dd6c1cb2 100644
--- a/app/src/main/res/drawable/ic_skip_previous_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_star_black_24dp.xml b/app/src/main/res/drawable/ic_star_white_24dp.xml
similarity index 89%
rename from app/src/main/res/drawable/ic_star_black_24dp.xml
rename to app/src/main/res/drawable/ic_star_white_24dp.xml
index a2ebf353..de6119f8 100644
--- a/app/src/main/res/drawable/ic_star_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_star_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        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/app/src/main/res/drawable/ic_trending_up_black_24dp.xml b/app/src/main/res/drawable/ic_trending_up_white_24dp.xml
similarity index 89%
rename from app/src/main/res/drawable/ic_trending_up_black_24dp.xml
rename to app/src/main/res/drawable/ic_trending_up_white_24dp.xml
index c00c42e4..6ac9a1c8 100644
--- a/app/src/main/res/drawable/ic_trending_up_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_trending_up_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M16,6l2.29,2.29 -4.88,4.88 -4,-4L2,16.59 3.41,18l6,-6 4,4 6.3,-6.29L22,12V6z" />
 </vector>
diff --git a/app/src/main/res/drawable/twitter.xml b/app/src/main/res/drawable/ic_twitter_white_24dp.xml
similarity index 90%
rename from app/src/main/res/drawable/twitter.xml
rename to app/src/main/res/drawable/ic_twitter_white_24dp.xml
index 0dd8628a..08b364bc 100644
--- a/app/src/main/res/drawable/twitter.xml
+++ b/app/src/main/res/drawable/ic_twitter_white_24dp.xml
@@ -1,10 +1,10 @@
-<!-- drawable/twitter.xml -->
+<!-- drawable/ic_twitter_white_24dpter_white_24dp.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M22.46,6C21.69,6.35 20.86,6.58 20,6.69C20.88,6.16 21.56,5.32 21.88,4.31C21.05,4.81 20.13,5.16 19.16,5.36C18.37,4.5 17.26,4 16,4C13.65,4 11.73,5.92 11.73,8.29C11.73,8.63 11.77,8.96 11.84,9.27C8.28,9.09 5.11,7.38 3,4.79C2.63,5.42 2.42,6.16 2.42,6.94C2.42,8.43 3.17,9.75 4.33,10.5C3.62,10.5 2.96,10.3 2.38,10C2.38,10 2.38,10 2.38,10.03C2.38,12.11 3.86,13.85 5.82,14.24C5.46,14.34 5.08,14.39 4.69,14.39C4.42,14.39 4.15,14.36 3.89,14.31C4.43,16 6,17.26 7.89,17.29C6.43,18.45 4.58,19.13 2.56,19.13C2.22,19.13 1.88,19.11 1.54,19.07C3.44,20.29 5.7,21 8.12,21C16,21 20.33,14.46 20.33,8.79C20.33,8.6 20.33,8.42 20.32,8.23C21.16,7.63 21.88,6.87 22.46,6Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_volume_up_black_24dp.xml b/app/src/main/res/drawable/ic_volume_up_white_24dp.xml
similarity index 92%
rename from app/src/main/res/drawable/ic_volume_up_black_24dp.xml
rename to app/src/main/res/drawable/ic_volume_up_white_24dp.xml
index 2ee5bce4..5d604f82 100644
--- a/app/src/main/res/drawable/ic_volume_up_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_volume_up_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z" />
 </vector>
diff --git a/app/src/main/res/drawable/slider_thumb.xml b/app/src/main/res/drawable/slider_thumb.xml
index 33c58225..fa815ee9 100644
--- a/app/src/main/res/drawable/slider_thumb.xml
+++ b/app/src/main/res/drawable/slider_thumb.xml
@@ -4,5 +4,5 @@
     <size
         android:width="4dp"
         android:height="24dp" />
-    <solid android:color="@android:color/black" />
+    <solid android:color="#FFFFFFFF" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml
index 4892cdd4..6d86a84e 100644
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -152,7 +152,7 @@
         style="@style/PlayPauseFab"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin_top_left_right"
-        app:srcCompat="@drawable/ic_done_black_24dp" />
+        app:srcCompat="@drawable/ic_done_white_24dp" />
 
 </FrameLayout>
 
diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml
index 25f3cfc7..687012ca 100644
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -176,7 +176,7 @@
         style="@style/PlayPauseFab"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin_top_left_right"
-        app:srcCompat="@drawable/ic_done_black_24dp" />
+        app:srcCompat="@drawable/ic_done_white_24dp" />
 
 </FrameLayout>
 
diff --git a/app/src/main/res/layout/card_about_app.xml b/app/src/main/res/layout/card_about_app.xml
index b2bdc364..9b6d0936 100644
--- a/app/src/main/res/layout/card_about_app.xml
+++ b/app/src/main/res/layout/card_about_app.xml
@@ -53,7 +53,7 @@
                 android:id="@+id/icon_info"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                app:srcCompat="@drawable/ic_info_outline_black_24dp"
+                app:srcCompat="@drawable/ic_info_outline_white_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
@@ -98,7 +98,7 @@
                 android:id="@+id/icon_changelog"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                app:srcCompat="@drawable/ic_restore_black_24dp"
+                app:srcCompat="@drawable/ic_restore_white_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
@@ -129,7 +129,7 @@
                 android:id="@+id/icon_intro"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                app:srcCompat="@drawable/ic_assignment_turned_in_black_24dp"
+                app:srcCompat="@drawable/ic_assignment_turned_in_white_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
@@ -160,7 +160,7 @@
                 android:id="@+id/icon_licenses"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                app:srcCompat="@drawable/ic_description_black_24dp"
+                app:srcCompat="@drawable/ic_description_white_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
diff --git a/app/src/main/res/layout/card_author.xml b/app/src/main/res/layout/card_author.xml
index 05805a2f..7ff89d60 100644
--- a/app/src/main/res/layout/card_author.xml
+++ b/app/src/main/res/layout/card_author.xml
@@ -41,7 +41,7 @@
                 android:id="@+id/icon_author"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                app:srcCompat="@drawable/ic_person_black_24dp"
+                app:srcCompat="@drawable/ic_person_white_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
@@ -84,7 +84,7 @@
                 android:id="@+id/icon_google_plus"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                app:srcCompat="@drawable/ic_google_plus"
+                app:srcCompat="@drawable/ic_google_plus_white_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
@@ -115,7 +115,7 @@
                 android:id="@+id/icon_twitter"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                app:srcCompat="@drawable/twitter"
+                app:srcCompat="@drawable/ic_twitter_white_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
@@ -146,7 +146,7 @@
                 android:id="@+id/icon_github"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                app:srcCompat="@drawable/ic_github_circle"
+                app:srcCompat="@drawable/ic_github_circle_white_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
@@ -177,7 +177,7 @@
                 android:id="@+id/icon_website"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                app:srcCompat="@drawable/ic_open_in_browser_black_24dp"
+                app:srcCompat="@drawable/ic_open_in_browser_white_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <TextView
diff --git a/app/src/main/res/layout/card_support_development.xml b/app/src/main/res/layout/card_support_development.xml
index 917ec41c..d00af3af 100644
--- a/app/src/main/res/layout/card_support_development.xml
+++ b/app/src/main/res/layout/card_support_development.xml
@@ -42,7 +42,7 @@
                 android:id="@+id/icon_bug_report"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                app:srcCompat="@drawable/ic_bug_report_black_24dp"
+                app:srcCompat="@drawable/ic_bug_report_white_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
@@ -85,7 +85,7 @@
                 android:id="@+id/icon_google_plus_community"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                app:srcCompat="@drawable/ic_google_circles_communities"
+                app:srcCompat="@drawable/ic_google_circles_communities_white_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
@@ -128,7 +128,7 @@
                 android:id="@+id/icon_flag"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                app:srcCompat="@drawable/ic_flag_black_24dp"
+                app:srcCompat="@drawable/ic_flag_white_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
@@ -171,7 +171,7 @@
                 android:id="@+id/icon_rate"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                app:srcCompat="@drawable/ic_star_black_24dp"
+                app:srcCompat="@drawable/ic_star_white_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
@@ -214,7 +214,7 @@
                 android:id="@+id/icon_donate"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                app:srcCompat="@drawable/ic_card_giftcard_black_24dp"
+                app:srcCompat="@drawable/ic_card_giftcard_white_24dp"
                 tools:ignore="ContentDescription,UnusedAttribute" />
 
             <LinearLayout
diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml
index 74cb5bf6..3b60b323 100644
--- a/app/src/main/res/layout/fragment_mini_player.xml
+++ b/app/src/main/res/layout/fragment_mini_player.xml
@@ -24,7 +24,7 @@
             android:layout_gravity="center_vertical"
             android:layout_margin="16dp"
             android:scaleType="centerCrop"
-            app:srcCompat="@drawable/ic_expand_less_black_24dp"
+            app:srcCompat="@drawable/ic_expand_less_white_24dp"
             tools:ignore="ContentDescription" />
 
         <TextView
diff --git a/app/src/main/res/layout/fragment_playback_controls.xml b/app/src/main/res/layout/fragment_playback_controls.xml
index 1df9a245..260e0689 100644
--- a/app/src/main/res/layout/fragment_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_playback_controls.xml
@@ -68,7 +68,7 @@
             android:background="?attr/roundSelector"
             android:padding="22dp"
             android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_skip_previous_black_24dp"
+            app:srcCompat="@drawable/ic_skip_previous_white_24dp"
             tools:ignore="MissingPrefix" />
 
         <ImageButton
@@ -83,7 +83,7 @@
             android:background="?attr/roundSelector"
             android:padding="22dp"
             android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_skip_next_black_24dp"
+            app:srcCompat="@drawable/ic_skip_next_white_24dp"
             tools:ignore="MissingPrefix" />
 
         <ImageButton
@@ -98,7 +98,7 @@
             android:background="?attr/roundSelector"
             android:padding="22dp"
             android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_repeat_black_24dp"
+            app:srcCompat="@drawable/ic_repeat_white_24dp"
             tools:ignore="MissingPrefix" />
 
         <ImageButton
@@ -113,7 +113,7 @@
             android:background="?attr/roundSelector"
             android:padding="22dp"
             android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_shuffle_black_24dp"
+            app:srcCompat="@drawable/ic_shuffle_white_24dp"
             tools:ignore="MissingPrefix" />
 
         <Space
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index 4cff827f..791d7587 100644
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -14,7 +14,7 @@
         android:layout_gravity="center_vertical|start"
         android:layout_marginLeft="-8dp"
         android:layout_marginStart="-8dp"
-        app:srcCompat="@drawable/ic_drag_vertical_black_24dp"
+        app:srcCompat="@drawable/ic_drag_vertical_white_24dp"
         android:tint="?attr/iconColor"
         android:visibility="gone"
         android:tintMode="src_in"
diff --git a/app/src/main/res/layout/item_list_single_row.xml b/app/src/main/res/layout/item_list_single_row.xml
index e028d11e..32f14228 100644
--- a/app/src/main/res/layout/item_list_single_row.xml
+++ b/app/src/main/res/layout/item_list_single_row.xml
@@ -14,7 +14,7 @@
         android:layout_gravity="center_vertical|start"
         android:layout_marginLeft="-8dp"
         android:layout_marginStart="-8dp"
-        app:srcCompat="@drawable/ic_drag_vertical_black_24dp"
+        app:srcCompat="@drawable/ic_drag_vertical_white_24dp"
         android:visibility="gone"
         tools:ignore="ContentDescription" />
 
diff --git a/app/src/main/res/menu/menu_album_detail.xml b/app/src/main/res/menu/menu_album_detail.xml
index 6d07fb9b..035ab981 100644
--- a/app/src/main/res/menu/menu_album_detail.xml
+++ b/app/src/main/res/menu/menu_album_detail.xml
@@ -4,7 +4,7 @@
     tools:context="com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity">
 
     <item
-        android:icon="@drawable/ic_shuffle_black_24dp"
+        android:icon="@drawable/ic_shuffle_white_24dp"
         android:id="@+id/action_shuffle_album"
         android:title="@string/action_shuffle_album"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/menu_artist_detail.xml b/app/src/main/res/menu/menu_artist_detail.xml
index 33832ec4..c4432093 100644
--- a/app/src/main/res/menu/menu_artist_detail.xml
+++ b/app/src/main/res/menu/menu_artist_detail.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_shuffle_artist"
-        android:icon="@drawable/ic_shuffle_black_24dp"
+        android:icon="@drawable/ic_shuffle_white_24dp"
         android:title="@string/action_shuffle_artist"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml b/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml
index 54a9fecd..9b1961e2 100644
--- a/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml
+++ b/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml
@@ -4,13 +4,13 @@
 
     <item
         android:id="@+id/action_add_to_playlist"
-        android:icon="@drawable/ic_playlist_add_black_24dp"
+        android:icon="@drawable/ic_playlist_add_white_24dp"
         android:title="@string/action_add_to_playlist"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_add_to_current_playing"
-        android:icon="@drawable/ic_library_add_black_24dp"
+        android:icon="@drawable/ic_library_add_white_24dp"
         android:title="@string/action_add_to_playing_queue"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_drawer.xml b/app/src/main/res/menu/menu_drawer.xml
index 01daf0cb..65f8f894 100644
--- a/app/src/main/res/menu/menu_drawer.xml
+++ b/app/src/main/res/menu/menu_drawer.xml
@@ -6,12 +6,12 @@
         android:checkableBehavior="single">
         <item
             android:id="@+id/nav_library"
-            android:icon="@drawable/ic_library_music_black_24dp"
+            android:icon="@drawable/ic_library_music_white_24dp"
             android:title="@string/library" />
         <item
             android:enabled="false"
             android:id="@+id/nav_folders"
-            android:icon="@drawable/ic_folder_black_24dp"
+            android:icon="@drawable/ic_folder_white_24dp"
             android:title="Folders (soon)" />
     </group>
 
@@ -20,15 +20,15 @@
         android:checkableBehavior="none">
         <item
             android:id="@+id/support_development"
-            android:icon="@drawable/ic_favorite_black_24dp"
+            android:icon="@drawable/ic_favorite_white_24dp"
             android:title="@string/support_development" />
         <item
             android:id="@+id/nav_settings"
-            android:icon="@drawable/ic_settings_black_24dp"
+            android:icon="@drawable/ic_settings_white_24dp"
             android:title="@string/action_settings" />
         <item
             android:id="@+id/nav_about"
-            android:icon="@drawable/ic_help_black_24dp"
+            android:icon="@drawable/ic_help_white_24dp"
             android:title="@string/action_about" />
     </group>
 
diff --git a/app/src/main/res/menu/menu_media_selection.xml b/app/src/main/res/menu/menu_media_selection.xml
index bf2c0c48..cd84b1f3 100644
--- a/app/src/main/res/menu/menu_media_selection.xml
+++ b/app/src/main/res/menu/menu_media_selection.xml
@@ -4,19 +4,19 @@
 
     <item
         android:id="@+id/action_add_to_playlist"
-        android:icon="@drawable/ic_playlist_add_black_24dp"
+        android:icon="@drawable/ic_playlist_add_white_24dp"
         android:title="@string/action_add_to_playlist"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_add_to_current_playing"
-        android:icon="@drawable/ic_library_add_black_24dp"
+        android:icon="@drawable/ic_library_add_white_24dp"
         android:title="@string/action_add_to_playing_queue"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_delete_from_disk"
-        android:icon="@drawable/ic_delete_black_24dp"
+        android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/action_delete_from_device"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_player.xml b/app/src/main/res/menu/menu_player.xml
index 596048b9..113fbb92 100644
--- a/app/src/main/res/menu/menu_player.xml
+++ b/app/src/main/res/menu/menu_player.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/action_toggle_favorite"
-        android:icon="@drawable/ic_favorite_border_black_24dp"
+        android:icon="@drawable/ic_favorite_border_white_24dp"
         android:title="@string/action_add_to_favorites"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_playlist_detail.xml b/app/src/main/res/menu/menu_playlist_detail.xml
index 2f7551c0..e74968f6 100644
--- a/app/src/main/res/menu/menu_playlist_detail.xml
+++ b/app/src/main/res/menu/menu_playlist_detail.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_shuffle_playlist"
-        android:icon="@drawable/ic_shuffle_black_24dp"
+        android:icon="@drawable/ic_shuffle_white_24dp"
         android:title="@string/action_shuffle_playlist"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_playlists_selection.xml b/app/src/main/res/menu/menu_playlists_selection.xml
index ed3f62a1..f486f55e 100644
--- a/app/src/main/res/menu/menu_playlists_selection.xml
+++ b/app/src/main/res/menu/menu_playlists_selection.xml
@@ -4,19 +4,19 @@
 
     <item
         android:id="@+id/action_add_to_playlist"
-        android:icon="@drawable/ic_playlist_add_black_24dp"
+        android:icon="@drawable/ic_playlist_add_white_24dp"
         android:title="@string/action_add_to_playlist"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_add_to_current_playing"
-        android:icon="@drawable/ic_library_add_black_24dp"
+        android:icon="@drawable/ic_library_add_white_24dp"
         android:title="@string/action_add_to_playing_queue"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_delete_playlist"
-        android:icon="@drawable/ic_delete_black_24dp"
+        android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/delete_playlists_title"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_playlists_songs_selection.xml b/app/src/main/res/menu/menu_playlists_songs_selection.xml
index 121c4c8f..884d43f9 100644
--- a/app/src/main/res/menu/menu_playlists_songs_selection.xml
+++ b/app/src/main/res/menu/menu_playlists_songs_selection.xml
@@ -4,19 +4,19 @@
 
     <item
         android:id="@+id/action_add_to_playlist"
-        android:icon="@drawable/ic_playlist_add_black_24dp"
+        android:icon="@drawable/ic_playlist_add_white_24dp"
         android:title="@string/action_add_to_playlist"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_add_to_current_playing"
-        android:icon="@drawable/ic_library_add_black_24dp"
+        android:icon="@drawable/ic_library_add_white_24dp"
         android:title="@string/action_add_to_playing_queue"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_remove_from_playlist"
-        android:icon="@drawable/ic_delete_black_24dp"
+        android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/action_remove_from_playlist"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2e1366a6..2332aec6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -11,7 +11,7 @@
     <style name="Theme.Phonograph.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title" />
 
     <style name="OverFlowButton">
-        <item name="srcCompat">@drawable/ic_more_vert_black_24dp</item>
+        <item name="srcCompat">@drawable/ic_more_vert_white_24dp</item>
         <item name="android:layout_margin">8dp</item>
         <item name="android:layout_width">48dp</item>
         <item name="android:layout_height">48dp</item>