diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java
index b0690df9..848decf3 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java
@@ -18,7 +18,6 @@ import com.kabouzeid.gramophone.misc.CustomFragmentStatePagerAdapter;
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/HorizontalAlbumAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/HorizontalAlbumAdapter.java
index 4bc42cf2..4336fea7 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/HorizontalAlbumAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/HorizontalAlbumAdapter.java
@@ -18,7 +18,6 @@ import com.kabouzeid.gramophone.interfaces.CabHolder;
 import com.kabouzeid.gramophone.model.Album;
 import com.kabouzeid.gramophone.util.MusicUtil;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
index 79782d32..1b1435ac 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
@@ -31,7 +31,6 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
diff --git a/app/src/main/java/com/kabouzeid/gramophone/glide/ArtistGlideRequest.java b/app/src/main/java/com/kabouzeid/gramophone/glide/ArtistGlideRequest.java
index 098d481c..d8a86b53 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/glide/ArtistGlideRequest.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/glide/ArtistGlideRequest.java
@@ -26,7 +26,6 @@ import com.kabouzeid.gramophone.model.Album;
 import com.kabouzeid.gramophone.model.Artist;
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.util.ArtistSignatureUtil;
-import com.kabouzeid.gramophone.util.CustomArtistImageUtil;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
@@ -35,12 +34,11 @@ public class ArtistGlideRequest {
 
     private static final DiskCacheStrategy DEFAULT_DISK_CACHE_STRATEGY = DiskCacheStrategy.ALL;
     private static final int DEFAULT_ERROR_IMAGE = R.drawable.default_artist_image;
-    public static final int DEFAULT_ANIMATION = android.R.anim.fade_in;
+    private static final int DEFAULT_ANIMATION = android.R.anim.fade_in;
 
     public static class Builder {
         final RequestManager requestManager;
         final Artist artist;
-        boolean noCustomImage;
 
         public static Builder from(@NonNull RequestManager requestManager, Artist artist) {
             return new Builder(requestManager, artist);
@@ -59,14 +57,9 @@ public class ArtistGlideRequest {
             return new BitmapBuilder(this);
         }
 
-        public Builder noCustomImage(boolean noCustomImage) {
-            this.noCustomImage = noCustomImage;
-            return this;
-        }
-
         public DrawableRequestBuilder<GlideDrawable> build() {
             //noinspection unchecked
-            return createBaseRequest(requestManager, artist, noCustomImage)
+            return createBaseRequest(requestManager, artist)
                     .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
                     .error(DEFAULT_ERROR_IMAGE)
                     .animate(DEFAULT_ANIMATION)
@@ -85,7 +78,7 @@ public class ArtistGlideRequest {
 
         public BitmapRequestBuilder<?, Bitmap> build() {
             //noinspection unchecked
-            return createBaseRequest(builder.requestManager, builder.artist, builder.noCustomImage)
+            return createBaseRequest(builder.requestManager, builder.artist)
                     .asBitmap()
                     .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
                     .error(DEFAULT_ERROR_IMAGE)
@@ -107,7 +100,7 @@ public class ArtistGlideRequest {
 
         public BitmapRequestBuilder<?, BitmapPaletteWrapper> build() {
             //noinspection unchecked
-            return createBaseRequest(builder.requestManager, builder.artist, builder.noCustomImage)
+            return createBaseRequest(builder.requestManager, builder.artist)
                     .asBitmap()
                     .transcode(new BitmapPaletteTranscoder(context), BitmapPaletteWrapper.class)
                     .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
@@ -119,18 +112,13 @@ public class ArtistGlideRequest {
         }
     }
 
-    public static DrawableTypeRequest createBaseRequest(RequestManager requestManager, Artist artist, boolean noCustomImage) {
-        boolean hasCustomImage = CustomArtistImageUtil.getInstance(App.getInstance()).hasCustomArtistImage(artist);
-        if (noCustomImage || !hasCustomImage) {
-            final List<AlbumCover> songs = new ArrayList<>();
-            for (final Album album : artist.albums) {
-                final Song song = album.safeGetFirstSong();
-                songs.add(new AlbumCover(album.getYear(), song.data));
-            }
-            return requestManager.load(new ArtistImage(artist.getName(), songs));
-        } else {
-            return requestManager.load(CustomArtistImageUtil.getFile(artist));
+    public static DrawableTypeRequest createBaseRequest(RequestManager requestManager, Artist artist) {
+        final List<AlbumCover> songs = new ArrayList<>();
+        for (final Album album : artist.albums) {
+            final Song song = album.safeGetFirstSong();
+            songs.add(new AlbumCover(album.getYear(), song.data));
         }
+        return requestManager.load(new ArtistImage(artist.getName(), songs));
     }
 
     private static Key createSignature(Artist artist) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
index f26a0f7a..45014f01 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
@@ -542,7 +542,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
     }
 
     public void initNotification() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && !PreferenceUtil.getInstance(this).classicNotification()) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && !PreferenceUtil.getInstance(this).getClassicNotification()) {
             playingNotification = new PlayingNotificationImpl24();
         } else {
             playingNotification = new PlayingNotificationImpl();
diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java b/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java
index b12de561..2d9233db 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java
@@ -112,7 +112,7 @@ public class PlayingNotificationImpl extends PlayingNotification {
                                     notificationLayoutBig.setImageViewResource(R.id.image, R.drawable.default_album_art);
                                 }
 
-                                if (!PreferenceUtil.getInstance(service).coloredNotification()) {
+                                if (!PreferenceUtil.getInstance(service).getColoredNotification()) {
                                     bgColor = Color.WHITE;
                                 }
                                 setBackgroundColor(bgColor);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl24.java b/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl24.java
index dfeba7f6..fc9fce7d 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl24.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl24.java
@@ -21,7 +21,6 @@ import com.kabouzeid.gramophone.glide.palette.BitmapPaletteWrapper;
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.service.MusicService;
 import com.kabouzeid.gramophone.ui.activities.MainActivity;
-import com.kabouzeid.gramophone.util.MusicUtil;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
 
 import static com.kabouzeid.gramophone.service.MusicService.ACTION_REWIND;
@@ -95,7 +94,7 @@ public class PlayingNotificationImpl24 extends PlayingNotification {
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                             builder.setStyle(new MediaStyle().setMediaSession(service.getMediaSession().getSessionToken()).setShowActionsInCompactView(0, 1, 2))
                                     .setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
-                            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O && PreferenceUtil.getInstance(service).coloredNotification())
+                            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O && PreferenceUtil.getInstance(service).getColoredNotification())
                                 builder.setColor(color);
                         }
 
diff --git a/app/src/main/java/com/kabouzeid/gramophone/shortcuts/AppShortcutIconGenerator.java b/app/src/main/java/com/kabouzeid/gramophone/shortcuts/AppShortcutIconGenerator.java
index 297806bb..bca090d6 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/shortcuts/AppShortcutIconGenerator.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/shortcuts/AppShortcutIconGenerator.java
@@ -22,7 +22,7 @@ import com.kabouzeid.gramophone.util.PreferenceUtil;
 public final class AppShortcutIconGenerator {
 
     public static Icon generateThemedIcon(Context context, int iconId) {
-        if (PreferenceUtil.getInstance(context).coloredAppShortcuts()) {
+        if (PreferenceUtil.getInstance(context).getColoredAppShortcuts()) {
             return generateUserThemedIcon(context, iconId).toIcon();
         } else {
             return generateDefaultThemedIcon(context, iconId).toIcon();
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 622860fd..c4cf376d 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
@@ -10,7 +10,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
+
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
 import androidx.loader.app.LoaderManager;
@@ -45,16 +45,13 @@ import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
 import com.kabouzeid.gramophone.model.Artist;
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity;
-import com.kabouzeid.gramophone.util.CustomArtistImageUtil;
 import com.kabouzeid.gramophone.util.MusicUtil;
-import com.kabouzeid.gramophone.util.NavigationUtil;
 import com.kabouzeid.gramophone.util.PhonographColorUtil;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
 
 public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implements PaletteColorHolder, CabHolder, LoaderManager.LoaderCallbacks<Artist> {
 
     private static final int LOADER_ID = LoaderIds.ARTIST_DETAIL_ACTIVITY;
-    private static final int REQUEST_CODE_SELECT_IMAGE = 1000;
 
     public static final String EXTRA_ARTIST_ID = "extra_artist_id";
 
@@ -201,17 +198,8 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        switch (requestCode) {
-            case REQUEST_CODE_SELECT_IMAGE:
-                if (resultCode == RESULT_OK) {
-                    CustomArtistImageUtil.getInstance(this).setCustomArtistImage(artist, data.getData());
-                }
-                break;
-            default:
-                if (resultCode == RESULT_OK) {
-                    reload();
-                }
-                break;
+        if (resultCode == RESULT_OK) {
+            reload();
         }
     }
 
@@ -277,15 +265,6 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
             case android.R.id.home:
                 super.onBackPressed();
                 return true;
-            case R.id.action_set_artist_image:
-                Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-                intent.setType("image/*");
-                startActivityForResult(Intent.createChooser(intent, getString(R.string.pick_from_local_storage)), REQUEST_CODE_SELECT_IMAGE);
-                return true;
-            case R.id.action_reset_artist_image:
-                Toast.makeText(ArtistDetailActivity.this, getResources().getString(R.string.updating), Toast.LENGTH_SHORT).show();
-                CustomArtistImageUtil.getInstance(ArtistDetailActivity.this).resetCustomArtistImage(artist);
-                return true;
             case R.id.action_colored_footers:
                 item.setChecked(!item.isChecked());
                 setUsePalette(item.isChecked());
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java
index ffacd755..da97dd13 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java
@@ -32,8 +32,6 @@ import com.kabouzeid.gramophone.preferences.NowPlayingScreenPreferenceDialog;
 import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
 
-import java.util.Arrays;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
@@ -232,7 +230,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
                 classicNotification.setVisible(false);
             } else {
-                classicNotification.setChecked(PreferenceUtil.getInstance(getActivity()).classicNotification());
+                classicNotification.setChecked(PreferenceUtil.getInstance(getActivity()).getClassicNotification());
                 classicNotification.setOnPreferenceChangeListener((preference, newValue) -> {
                     // Save preference
                     PreferenceUtil.getInstance(getActivity()).setClassicNotification((Boolean) newValue);
@@ -242,9 +240,9 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
 
             final TwoStatePreference coloredNotification = (TwoStatePreference) findPreference("colored_notification");
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                coloredNotification.setEnabled(PreferenceUtil.getInstance(getActivity()).classicNotification());
+                coloredNotification.setEnabled(PreferenceUtil.getInstance(getActivity()).getClassicNotification());
             } else {
-                coloredNotification.setChecked(PreferenceUtil.getInstance(getActivity()).coloredNotification());
+                coloredNotification.setChecked(PreferenceUtil.getInstance(getActivity()).getColoredNotification());
                 coloredNotification.setOnPreferenceChangeListener((preference, newValue) -> {
                     // Save preference
                     PreferenceUtil.getInstance(getActivity()).setColoredNotification((Boolean) newValue);
@@ -256,7 +254,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
                 colorAppShortcuts.setVisible(false);
             } else {
-                colorAppShortcuts.setChecked(PreferenceUtil.getInstance(getActivity()).coloredAppShortcuts());
+                colorAppShortcuts.setChecked(PreferenceUtil.getInstance(getActivity()).getColoredAppShortcuts());
                 colorAppShortcuts.setOnPreferenceChangeListener((preference, newValue) -> {
                     // Save preference
                     PreferenceUtil.getInstance(getActivity()).setColoredAppShortcuts((Boolean) newValue);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/CustomArtistImageUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/CustomArtistImageUtil.java
deleted file mode 100644
index 6e640ff7..00000000
--- a/app/src/main/java/com/kabouzeid/gramophone/util/CustomArtistImageUtil.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.kabouzeid.gramophone.util;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.AsyncTask;
-import androidx.annotation.NonNull;
-import android.widget.Toast;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.request.animation.GlideAnimation;
-import com.bumptech.glide.request.target.SimpleTarget;
-import com.kabouzeid.gramophone.App;
-import com.kabouzeid.gramophone.model.Artist;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Locale;
-
-/**
- * @author Karim Abou Zeid (kabouzeid)
- */
-
-public class CustomArtistImageUtil {
-    private static final String CUSTOM_ARTIST_IMAGE_PREFS = "custom_artist_image";
-    private static final String FOLDER_NAME = "/custom_artist_images/";
-
-    private static CustomArtistImageUtil sInstance;
-
-    private final SharedPreferences mPreferences;
-
-    private CustomArtistImageUtil(@NonNull final Context context) {
-        mPreferences = context.getApplicationContext().getSharedPreferences(CUSTOM_ARTIST_IMAGE_PREFS, Context.MODE_PRIVATE);
-    }
-
-    public static CustomArtistImageUtil getInstance(@NonNull final Context context) {
-        if (sInstance == null) {
-            sInstance = new CustomArtistImageUtil(context.getApplicationContext());
-        }
-        return sInstance;
-    }
-
-    public void setCustomArtistImage(final Artist artist, Uri uri) {
-        Glide.with(App.getInstance())
-                .load(uri)
-                .asBitmap()
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
-                .skipMemoryCache(true)
-                .into(new SimpleTarget<Bitmap>() {
-                    @Override
-                    public void onLoadFailed(Exception e, Drawable errorDrawable) {
-                        super.onLoadFailed(e, errorDrawable);
-                        e.printStackTrace();
-                        Toast.makeText(App.getInstance(), e.toString(), Toast.LENGTH_LONG).show();
-                    }
-
-                    @Override
-                    public void onResourceReady(final Bitmap resource, GlideAnimation<? super Bitmap> glideAnimation) {
-                        new AsyncTask<Void, Void, Void>() {
-                            @SuppressLint("ApplySharedPref")
-                            @Override
-                            protected Void doInBackground(Void... params) {
-                                File dir = new File(App.getInstance().getFilesDir(), FOLDER_NAME);
-                                if (!dir.exists()) {
-                                    if (!dir.mkdirs()) { // create the folder
-                                        return null;
-                                    }
-                                }
-                                File file = new File(dir, getFileName(artist));
-
-                                boolean succesful = false;
-                                try {
-                                    OutputStream os = new BufferedOutputStream(new FileOutputStream(file));
-                                    succesful = ImageUtil.resizeBitmap(resource, 2048).compress(Bitmap.CompressFormat.JPEG, 100, os);
-                                    os.close();
-                                } catch (IOException e) {
-                                    Toast.makeText(App.getInstance(), e.toString(), Toast.LENGTH_LONG).show();
-                                }
-
-                                if (succesful) {
-                                    mPreferences.edit().putBoolean(getFileName(artist), true).commit();
-                                    ArtistSignatureUtil.getInstance(App.getInstance()).updateArtistSignature(artist.getName());
-                                    App.getInstance().getContentResolver().notifyChange(Uri.parse("content://media"), null); // trigger media store changed to force artist image reload
-                                }
-                                return null;
-                            }
-                        }.execute();
-                    }
-                });
-    }
-
-    public void resetCustomArtistImage(final Artist artist) {
-        new AsyncTask<Void, Void, Void>() {
-            @SuppressLint("ApplySharedPref")
-            @Override
-            protected Void doInBackground(Void... params) {
-                mPreferences.edit().putBoolean(getFileName(artist), false).commit();
-                ArtistSignatureUtil.getInstance(App.getInstance()).updateArtistSignature(artist.getName());
-                App.getInstance().getContentResolver().notifyChange(Uri.parse("content://media"), null); // trigger media store changed to force artist image reload
-
-                File file = getFile(artist);
-                if (!file.exists()) {
-                    return null;
-                } else {
-                    file.delete();
-                }
-                return null;
-            }
-        }.execute();
-    }
-
-    // shared prefs saves us many IO operations
-    public boolean hasCustomArtistImage(Artist artist) {
-        return mPreferences.getBoolean(getFileName(artist), false);
-    }
-
-    private static String getFileName(Artist artist) {
-        String artistName = artist.getName();
-        if (artistName == null)
-            artistName = "";
-        // replace everything that is not a letter or a number with _
-        artistName = artistName.replaceAll("[^a-zA-Z0-9]", "_");
-        return String.format(Locale.US, "#%d#%s.jpeg", artist.getId(), artistName);
-    }
-
-    public static File getFile(Artist artist) {
-        File dir = new File(App.getInstance().getFilesDir(), FOLDER_NAME);
-        return new File(dir, getFileName(artist));
-    }
-}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
index 6c8a34ea..01c44523 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
@@ -6,7 +6,6 @@ import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.preference.PreferenceManager;
-import androidx.annotation.NonNull;
 import androidx.annotation.StyleRes;
 
 import com.google.gson.Gson;
@@ -18,7 +17,6 @@ import com.kabouzeid.gramophone.helper.SortOrder;
 import com.kabouzeid.gramophone.model.CategoryInfo;
 import com.kabouzeid.gramophone.ui.fragments.player.NowPlayingScreen;
 
-import java.io.File;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
@@ -76,8 +74,6 @@ public final class PreferenceUtil {
 
     public static final String SYNCHRONIZED_LYRICS_SHOW = "synchronized_lyrics_show";
 
-    public static final String INITIALIZED_BLACKLIST = "initialized_blacklist";
-
     public static final String LIBRARY_CATEGORIES = "library_categories";
 
     private static final String REMEMBER_SHUFFLE = "remember_shuffle";
@@ -86,11 +82,11 @@ public final class PreferenceUtil {
 
     private final SharedPreferences mPreferences;
 
-    private PreferenceUtil(@NonNull final Context context) {
+    private PreferenceUtil(final Context context) {
         mPreferences = PreferenceManager.getDefaultSharedPreferences(context);
     }
 
-    public static PreferenceUtil getInstance(@NonNull final Context context) {
+    public static PreferenceUtil getInstance(final Context context) {
         if (sInstance == null) {
             sInstance = new PreferenceUtil(context.getApplicationContext());
         }
@@ -133,13 +129,13 @@ public final class PreferenceUtil {
     @StyleRes
     public static int getThemeResFromPrefValue(String themePrefValue) {
         switch (themePrefValue) {
-            case "dark":
-                return R.style.Theme_Phonograph;
+            case "light":
+                return R.style.Theme_Phonograph_Light;
             case "black":
                 return R.style.Theme_Phonograph_Black;
-            case "light":
+            case "dark":
             default:
-                return R.style.Theme_Phonograph_Light;
+                return R.style.Theme_Phonograph;
         }
     }
 
@@ -172,36 +168,36 @@ public final class PreferenceUtil {
         editor.commit();
     }
 
-    public final boolean coloredNotification() {
+    public final boolean getColoredNotification() {
         return mPreferences.getBoolean(COLORED_NOTIFICATION, true);
     }
 
-    public final boolean classicNotification() {
-        return mPreferences.getBoolean(CLASSIC_NOTIFICATION, true);
-    }
-
     public void setColoredNotification(final boolean value) {
         final SharedPreferences.Editor editor = mPreferences.edit();
         editor.putBoolean(COLORED_NOTIFICATION, value);
         editor.apply();
     }
 
+    public final boolean getClassicNotification() {
+        return mPreferences.getBoolean(CLASSIC_NOTIFICATION, true);
+    }
+
     public void setClassicNotification(final boolean value) {
         final SharedPreferences.Editor editor = mPreferences.edit();
         editor.putBoolean(CLASSIC_NOTIFICATION, value);
         editor.apply();
     }
 
+    public final boolean getColoredAppShortcuts() {
+        return mPreferences.getBoolean(COLORED_APP_SHORTCUTS, true);
+    }
+
     public void setColoredAppShortcuts(final boolean value) {
         final SharedPreferences.Editor editor = mPreferences.edit();
         editor.putBoolean(COLORED_APP_SHORTCUTS, value);
         editor.apply();
     }
 
-    public final boolean coloredAppShortcuts() {
-        return mPreferences.getBoolean(COLORED_APP_SHORTCUTS, true);
-    }
-
     public final boolean gaplessPlayback() {
         return mPreferences.getBoolean(GAPLESS_PLAYBACK, true);
     }
@@ -444,16 +440,6 @@ public final class PreferenceUtil {
         return mPreferences.getBoolean(SYNCHRONIZED_LYRICS_SHOW, true);
     }
 
-    public void setInitializedBlacklist() {
-        final SharedPreferences.Editor editor = mPreferences.edit();
-        editor.putBoolean(INITIALIZED_BLACKLIST, true);
-        editor.apply();
-    }
-
-    public final boolean initializedBlacklist() {
-        return mPreferences.getBoolean(INITIALIZED_BLACKLIST, false);
-    }
-
     public void setLibraryCategoryInfos(List<CategoryInfo> categories) {
         Gson gson = new Gson();
         Type collectionType = new TypeToken<List<CategoryInfo>>() {
diff --git a/app/src/main/res/menu/menu_artist_detail.xml b/app/src/main/res/menu/menu_artist_detail.xml
index 89a93dbc..f164a8fc 100644
--- a/app/src/main/res/menu/menu_artist_detail.xml
+++ b/app/src/main/res/menu/menu_artist_detail.xml
@@ -24,16 +24,6 @@
         android:title="@string/action_add_to_playlist"
         app:showAsAction="never" />
 
-    <item
-        android:id="@+id/action_set_artist_image"
-        android:title="@string/set_artist_image"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/action_reset_artist_image"
-        android:title="@string/reset_artist_image"
-        app:showAsAction="never" />
-
     <item
         android:id="@+id/action_colored_footers"
         android:checkable="true"
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 1ad80fb1..3b0500b0 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">الذهاب إلى الألبوم</string>
     <string name="label_playing_queue">قائمة التشغيل</string>
     <string name="no_results">لا توجد نتائج</string>
-    <string name="updating">جار التحديث...</string>
     <string name="added_title_to_playing_queue">"تمت إضافة عنوان واحد إلى قائمة التشغيل."</string>
     <string name="added_x_titles_to_playing_queue">تمت إضافة %1$d عناوين إلى قائمة التشغيل.</string>
     <string name="action_remove_from_playlist">إزالة من قائمة التشغيل</string>
@@ -157,7 +156,6 @@
     <string name="last_added">المضافة مؤخراً</string>
     <string name="history">السجل</string>
     <string name="my_top_tracks">أفضل الأغاني</string>
-    <string name="pick_from_local_storage">اختيار من التخزين الداخلي</string>
     <string name="action_sleep_timer">مؤقت النوم</string>
     <string name="action_set">ضبط</string>
     <string name="cancel_current_timer">إلغاء المؤقت الحالي</string>
@@ -243,8 +241,6 @@
     <string name="eugene_cheung_summary">من أجل مساهماته في الكود المصدري.</string>
     <string name="adrian_summary">من أجل إنشاءه تصميم صفحة الألبومات.</string>
     <string name="add_action">إضافة</string>
-    <string name="reset_artist_image">إعادة تعيين صورة الفنان</string>
-    <string name="set_artist_image">تعيين صورة الفنان</string>
     <string name="library_categories">أقسام المكتبة</string>
     <string name="pref_summary_library_categories">تخصيص رؤية وترتيب أقسام المكتبة.</string>
     <string name="you_have_to_select_at_least_one_category">عليك أن تختار قسماً واحداً على الأقل.</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 0a24d4f8..debcfa56 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -50,7 +50,6 @@
     <string name="action_go_to_album">Отиди в албум</string>
     <string name="label_playing_queue">Възпроизвеждащи се файлове</string>
     <string name="no_results">Няма резултати</string>
-    <string name="updating">Обновява се...</string>
     <string name="added_title_to_playing_queue">"1 заглавие бе добавено към възпроизвеждащите се песни"</string>
     <string name="added_x_titles_to_playing_queue">%1$d заглавия бяха добавени към възпроизвеждащите се песни</string>
     <string name="action_remove_from_playlist">Премахни от плейлист</string>
@@ -135,7 +134,6 @@
     <string name="last_added">Последно добавени</string>
     <string name="history">История</string>
     <string name="my_top_tracks">Моите топ песни</string>
-    <string name="pick_from_local_storage">Избери от телефон</string>
     <string name="action_sleep_timer">Таймер за заспиване</string>
     <string name="action_set">Задай</string>
     <string name="cancel_current_timer">Премахни текущия таймер</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 89229c12..48ceeb94 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Přejít do alba</string>
     <string name="label_playing_queue">Fronta</string>
     <string name="no_results">Žádné výsledky</string>
-    <string name="updating">Aktualizace...</string>
     <string name="added_title_to_playing_queue">"Přidána 1 skladba do fronty."</string>
     <string name="added_x_titles_to_playing_queue">Přidáno %1$d skladeb do fronty.</string>
     <string name="action_remove_from_playlist">Odstranit z playlistu</string>
@@ -157,7 +156,6 @@
     <string name="last_added">Naposledy přidáno</string>
     <string name="history">Historie</string>
     <string name="my_top_tracks">"Moje nejposlouchanější skladby "</string>
-    <string name="pick_from_local_storage">Vybrat z místního úložiště</string>
     <string name="action_sleep_timer">Určit ukončení přehrávání</string>
     <string name="action_set">Nastavit</string>
     <string name="cancel_current_timer">Zrušit ukončení přehrávání</string>
@@ -243,8 +241,6 @@
     <string name="eugene_cheung_summary">Pro příspěvky ke zdrojovému kódu.</string>
     <string name="adrian_summary">Pro vytvoření návrhu stránky alba.</string>
     <string name="add_action">Přidat</string>
-    <string name="reset_artist_image">Obnovit obrázek interpreta</string>
-    <string name="set_artist_image">Nastavit obrázek interpreta</string>
     <string name="library_categories">Kategorie knihovny</string>
     <string name="pref_summary_library_categories">Nastavit viditelnost a pořadí kategorií knihoven.</string>
     <string name="you_have_to_select_at_least_one_category">Musíte zvolit alespoň jednu kategorii.</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b10ce4c9..2ddb2a81 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Gehe zum Album</string>
     <string name="label_playing_queue">Warteschlange</string>
     <string name="no_results">Keine Ergebnisse</string>
-    <string name="updating">Aktualisiere…</string>
     <string name="added_title_to_playing_queue">"1 Titel wurde der Warteschlange hinzugefügt."</string>
     <string name="added_x_titles_to_playing_queue">%1$d Titel wurden der Warteschlange hinzugefügt.</string>
     <string name="action_remove_from_playlist">Aus Wiedergabeliste entfernen</string>
@@ -161,7 +160,6 @@
     <string name="last_added">Zuletzt hinzugefügt</string>
     <string name="history">Verlauf</string>
     <string name="my_top_tracks">Meine Lieblingstitel</string>
-    <string name="pick_from_local_storage">Aus lokalem Speicher wählen</string>
     <string name="action_sleep_timer">Einschlaf Timer</string>
     <string name="action_set">Setze</string>
     <string name="cancel_current_timer">Aktuellen Timer abbrechen</string>
@@ -247,8 +245,6 @@
     <string name="eugene_cheung_summary">Für seinen Beitrag zum Quellcode.</string>
     <string name="adrian_summary">Für die Erstellung des Designs der Album-Seite.</string>
     <string name="add_action">Hinzufügen</string>
-    <string name="reset_artist_image">Künstler-Bild zurücksetzen</string>
-    <string name="set_artist_image">Künstler-Bild festlegen</string>
     <string name="library_categories">Bibliothekskategorien</string>
     <string name="pref_summary_library_categories">Anzeige und Anordnung der einzelnen Kategorien festlegen.</string>
     <string name="you_have_to_select_at_least_one_category">Mindestens eine Kategorie muss ausgewählt sein.</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index a3d30626..5e18caed 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Πήγαινε στο άλμπουμ</string>
     <string name="label_playing_queue">Ουρά αναπαραγωγής</string>
     <string name="no_results">Κανένα αποτέλεσμα</string>
-    <string name="updating">Γίνεται ανανέωση...</string>
     <string name="added_title_to_playing_queue">"Προστέθηκε ένας τίτλος στην ουρά αναπαραγωγής"</string>
     <string name="added_x_titles_to_playing_queue">"Προστέθηκαν %1$d τίτλοι στην ουρά αναπαραγωγής "</string>
     <string name="action_remove_from_playlist">Αφαίρεση από την λίστα</string>
@@ -150,7 +149,6 @@
     <string name="last_added">Προστέθηκαν τελευταία</string>
     <string name="history">Ιστορικό</string>
     <string name="my_top_tracks">Τα κορυφαία κομμάτια μου</string>
-    <string name="pick_from_local_storage">Επιλέξτε από την μνήμη της συσκευής</string>
     <string name="action_sleep_timer">Χρονοδιακόπτης ύπνου</string>
     <string name="action_set">Ορίστε</string>
     <string name="cancel_current_timer">Ακύρωση τρέχοντος χρονοδιακόπτη</string>
diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml
index 65791e98..19601457 100644
--- a/app/src/main/res/values-en-rCA/strings.xml
+++ b/app/src/main/res/values-en-rCA/strings.xml
@@ -50,7 +50,6 @@
     <string name="action_go_to_album">Go to album</string>
     <string name="label_playing_queue">Playing queue</string>
     <string name="no_results">No results</string>
-    <string name="updating">Updating…</string>
     <string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
     <string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
     <string name="action_remove_from_playlist">Remove from playlist</string>
@@ -150,7 +149,6 @@
     <string name="last_added">Last added</string>
     <string name="history">History</string>
     <string name="my_top_tracks">My top tracks</string>
-    <string name="pick_from_local_storage">Pick from local storage</string>
     <string name="action_sleep_timer">Sleep timer</string>
     <string name="action_set">Set</string>
     <string name="cancel_current_timer">Cancel current timer</string>
@@ -233,6 +231,4 @@
     <string name="no_purchase_found">No purchase found.</string>
     <string name="eugene_cheung_summary">For his contributions to the source code.</string>
     <string name="add_action">Add</string>
-    <string name="reset_artist_image">Reset artist image</string>
-    <string name="set_artist_image">Set artist image</string>
 </resources>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 45ce7e8d..21192f55 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Go to album</string>
     <string name="label_playing_queue">Playing queue</string>
     <string name="no_results">No results</string>
-    <string name="updating">Updating...</string>
     <string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
     <string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
     <string name="action_remove_from_playlist">Remove from playlist</string>
@@ -156,7 +155,6 @@
     <string name="last_added">Last added</string>
     <string name="history">History</string>
     <string name="my_top_tracks">My top tracks</string>
-    <string name="pick_from_local_storage">Pick from local storage</string>
     <string name="action_sleep_timer">Sleep timer</string>
     <string name="action_set">Set</string>
     <string name="cancel_current_timer">Cancel current timer</string>
@@ -239,8 +237,6 @@
     <string name="no_purchase_found">No purchase found.</string>
     <string name="eugene_cheung_summary">For his contributions to the source code.</string>
     <string name="add_action">Add</string>
-    <string name="reset_artist_image">Reset artist image</string>
-    <string name="set_artist_image">Set artist image</string>
     <string name="library_categories">Library categories</string>
     <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index fafb51a6..1c1256b4 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Ir al álbum</string>
     <string name="label_playing_queue">Cola de reproducción</string>
     <string name="no_results">No hay resultados</string>
-    <string name="updating">Actualizando...</string>
     <string name="added_title_to_playing_queue">"1 canción añadida a la cola de reproducción."</string>
     <string name="added_x_titles_to_playing_queue">%1$d canciones añadidas a la cola de reproducción.</string>
     <string name="action_remove_from_playlist">Eliminar de la lista de reproducción</string>
@@ -161,7 +160,6 @@
     <string name="last_added">Último agregado</string>
     <string name="history">Historial de reproducción</string>
     <string name="my_top_tracks">Canciones más reproducidas</string>
-    <string name="pick_from_local_storage">Seleccionar de almacenamiento interno</string>
     <string name="action_sleep_timer">Temporizador de apagado</string>
     <string name="action_set">Fijar</string>
     <string name="cancel_current_timer">Cancelar temporizador actual</string>
@@ -247,8 +245,6 @@
     <string name="eugene_cheung_summary">Por sus contribuciones al código fuente</string>
     <string name="adrian_summary">Para crear el diseño de la página del álbum.</string>
     <string name="add_action">Añadir</string>
-    <string name="reset_artist_image">Resetear la imagen del artista</string>
-    <string name="set_artist_image">Establecer la imagen del artista</string>
     <string name="library_categories">Categorías de la biblioteca</string>
     <string name="pref_summary_library_categories">Configure la visibilidad y el orden de las categorías de la biblioteca.</string>
     <string name="you_have_to_select_at_least_one_category">Debes seleccionar al menos una categoría.</string>
diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
index 66a4f0e9..d1e18f25 100644
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Ir al álbum</string>
     <string name="label_playing_queue">Cola de reproducción</string>
     <string name="no_results">Sin resultados</string>
-    <string name="updating">Actualizando...</string>
     <string name="added_title_to_playing_queue">"1 canción añadida a la cola de reproducción."</string>
     <string name="added_x_titles_to_playing_queue">%1$d canciones añadidas a la cola de reproducción.</string>
     <string name="action_remove_from_playlist">Eliminar de la lista de reproducción</string>
@@ -157,7 +156,6 @@
     <string name="last_added">Agregadas recientemente</string>
     <string name="history">Historial</string>
     <string name="my_top_tracks">Más reproducidas</string>
-    <string name="pick_from_local_storage">Seleccionar del almacenamiento interno</string>
     <string name="action_sleep_timer">Temporizador de apagado</string>
     <string name="action_set">Fijar</string>
     <string name="cancel_current_timer">Cancelar temporizador actual</string>
@@ -242,8 +240,6 @@
     <string name="eugene_cheung_summary">Por sus contribuciones al código fuente.</string>
     <string name="adrian_summary">Por crear el diseño para la ventana del álbum.</string>
     <string name="add_action">Agregar</string>
-    <string name="reset_artist_image">Reiniciar imagen de Artista</string>
-    <string name="set_artist_image">Establecer imagen de Artista</string>
     <string name="library_categories">Categorías de la biblioteca</string>
     <string name="pref_summary_library_categories">Configurar la vista y orden de las categorías de la biblioteca.</string>
     <string name="you_have_to_select_at_least_one_category">Tienes que seleccionar al menos una categoría.</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index b64f4248..0f51fc90 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Näytä albumi</string>
     <string name="label_playing_queue">Toistojono</string>
     <string name="no_results">Ei hakutuloksia</string>
-    <string name="updating">Päivitetään...</string>
     <string name="added_title_to_playing_queue">"Kappale lisätty toistojonoon."</string>
     <string name="added_x_titles_to_playing_queue">%1$d kappaletta lisättiin toistojonoon</string>
     <string name="action_remove_from_playlist">Poista soittolistasta</string>
@@ -161,7 +160,6 @@
     <string name="last_added">Viimeksi lisätyt</string>
     <string name="history">Viimeksi toistettu</string>
     <string name="my_top_tracks">Eniten kuunnellut</string>
-    <string name="pick_from_local_storage">Valitse paikallisesta muistista</string>
     <string name="action_sleep_timer">Ajastin</string>
     <string name="action_set">Aseta</string>
     <string name="cancel_current_timer">Peru tämänhetkinen ajastin</string>
@@ -247,8 +245,6 @@
     <string name="eugene_cheung_summary">Työpanoksesta sovelluksen lähdekoodin parissa.</string>
     <string name="adrian_summary">Albumisivun ulkonäöstä.</string>
     <string name="add_action">Lisää</string>
-    <string name="reset_artist_image">Nollaa artistin kuva</string>
-    <string name="set_artist_image">Aseta artistin kuva</string>
     <string name="library_categories">Kirjaston välilehdet</string>
     <string name="pref_summary_library_categories">Määrittele kirjaston välilehtien näkyvyyttä ja järjestystä.</string>
     <string name="you_have_to_select_at_least_one_category">Sinun täytyy valita vähintään yksi kategoria.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 229c7979..b94e9bf3 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Voir l\'album</string>
     <string name="label_playing_queue">File de lecture</string>
     <string name="no_results">Aucun résultat</string>
-    <string name="updating">Actualisation…</string>
     <string name="added_title_to_playing_queue">"1 titre ajouté à la file de lecture."</string>
     <string name="added_x_titles_to_playing_queue">%1$d titres ajoutés à la file de lecture.</string>
     <string name="action_remove_from_playlist">Retirer de la liste de lecture</string>
@@ -157,7 +156,6 @@
     <string name="last_added">Derniers ajouts</string>
     <string name="history">Titres écoutés récemment</string>
     <string name="my_top_tracks">Mes meilleurs titres</string>
-    <string name="pick_from_local_storage">Sélectionner depuis le stockage</string>
     <string name="action_sleep_timer">Minuteur sommeil</string>
     <string name="action_set">Définir</string>
     <string name="cancel_current_timer">Annuler le minuteur actuel</string>
@@ -242,8 +240,6 @@
     <string name="eugene_cheung_summary">Pour ses contributions au code source</string>
     <string name="adrian_summary">Pour créer le design de la page d\'album.</string>
     <string name="add_action">Ajouter</string>
-    <string name="reset_artist_image">Réinitialiser l\'image de l\'artiste</string>
-    <string name="set_artist_image">Actualiser l\'image de l\'artiste</string>
     <string name="library_categories">Catégories de la bibliothèque</string>
     <string name="pref_summary_library_categories">Configurer la visibilité et l\'ordre des catégories.</string>
     <string name="you_have_to_select_at_least_one_category">Vous devez sélectionner au moins une catégorie.</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index db1e5b68..ff1b35a6 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">מעבר לאלבום</string>
     <string name="label_playing_queue">מנגן תור השמעה</string>
     <string name="no_results">אין תוצאות</string>
-    <string name="updating">מעדכן...</string>
     <string name="added_title_to_playing_queue">"נוסף שיר אחד לתור "</string>
     <string name="added_x_titles_to_playing_queue">נוספו %1$d שירים לתור</string>
     <string name="action_remove_from_playlist">הסר מרשימת ההשמעה</string>
@@ -157,7 +156,6 @@
     <string name="last_added">נוספו לאחרונה</string>
     <string name="history">היסטוריה</string>
     <string name="my_top_tracks">השירים המובילים שלי</string>
-    <string name="pick_from_local_storage">בחר מאחסון מקומי</string>
     <string name="action_sleep_timer">טיימר לשינה</string>
     <string name="action_set">קבע</string>
     <string name="cancel_current_timer">בטל טיימר נוכחי</string>
@@ -243,8 +241,6 @@
     <string name="eugene_cheung_summary">על התרומה שלו לקוד המקור.</string>
     <string name="adrian_summary">על יצירת העיצוב של מסך האלבום.</string>
     <string name="add_action">הוסף</string>
-    <string name="reset_artist_image">אפס תמונת אמן</string>
-    <string name="set_artist_image">הגדר תמונת אמן</string>
     <string name="library_categories">קטגוריות הספרייה</string>
     <string name="pref_summary_library_categories">הגדר את הנראות והסדר של הקטגוריות בספרייה.</string>
     <string name="you_have_to_select_at_least_one_category">עליך לבחור לפחות קטגוריה אחת.</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 36081969..9f40ebce 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Idi na album</string>
     <string name="label_playing_queue">Red čekanja</string>
     <string name="no_results">Nema rezultata</string>
-    <string name="updating">Ažuriranje...</string>
     <string name="added_title_to_playing_queue">"1 pjesma je dodana u red čekanja."</string>
     <string name="added_x_titles_to_playing_queue">Dodano je %1$d pjesama u red čekanja.</string>
     <string name="action_remove_from_playlist">Ukloni s popisa naslova</string>
@@ -157,7 +156,6 @@
     <string name="last_added">Posljednje dodano</string>
     <string name="history">Povijest</string>
     <string name="my_top_tracks">Najslušanije</string>
-    <string name="pick_from_local_storage">Odaberi s pohrane uređaja</string>
     <string name="action_sleep_timer">Tajmer za spavanje</string>
     <string name="action_set">Postavi</string>
     <string name="cancel_current_timer">Otkaži trenutni tajmer</string>
@@ -243,8 +241,6 @@
     <string name="eugene_cheung_summary">Za njegov doprinos izvornom kodu.</string>
     <string name="adrian_summary">Za stvaranje dizajna stranice albuma.</string>
     <string name="add_action">Dodaj</string>
-    <string name="reset_artist_image">Resetiraj slike izvođača</string>
-    <string name="set_artist_image">Postavi sliku izvođača</string>
     <string name="library_categories">Kategorije biblioteke</string>
     <string name="pref_summary_library_categories">Prilagodite vidljivost i poredak kategorija biblioteke</string>
     <string name="you_have_to_select_at_least_one_category">Morate odabrati barem jednu kategoriju</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index e1b4844c..22cbbb1a 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Ugrás az albumhoz</string>
     <string name="label_playing_queue">Lejátszási sor</string>
     <string name="no_results">Nincs találat</string>
-    <string name="updating">Frissítés...</string>
     <string name="added_title_to_playing_queue">"1 dal hozzáadva a lejátszási sorhoz."</string>
     <string name="added_x_titles_to_playing_queue">%1$d dal hozzáadva a lejátszási sorhoz.</string>
     <string name="action_remove_from_playlist">Eltávolítás a lejátszási listából</string>
@@ -157,7 +156,6 @@
     <string name="last_added">Legfrissebb dalok</string>
     <string name="history">Előzmények</string>
     <string name="my_top_tracks">Toplista</string>
-    <string name="pick_from_local_storage">Kiválasztás az eszközről</string>
     <string name="action_sleep_timer">Elalvás időzítő</string>
     <string name="action_set">Beállítás</string>
     <string name="cancel_current_timer">Az aktuális időzítő törlése</string>
@@ -243,8 +241,6 @@
     <string name="eugene_cheung_summary">A forráskódhoz való hozzájárulásáért.</string>
     <string name="adrian_summary">Az album oldalának kialakításához.</string>
     <string name="add_action">Hozzáadás</string>
-    <string name="reset_artist_image">Előadó képének visszaállítása</string>
-    <string name="set_artist_image">Előadó képének beállítása</string>
     <string name="library_categories">Könyvtár kategóriák</string>
     <string name="pref_summary_library_categories">Könyvtár kategóriák láthatóságának és sorrendjének beállítása.</string>
     <string name="you_have_to_select_at_least_one_category">Legalább egy kategóriát ki kell választania.</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 967afba1..b5ba2898 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Pergi ke album</string>
     <string name="label_playing_queue">Antrean putar</string>
     <string name="no_results">Tidak ditemukan</string>
-    <string name="updating">Memperbaharui</string>
     <string name="added_title_to_playing_queue">"1 lagu ditambahkan ke antrean putar"</string>
     <string name="added_x_titles_to_playing_queue">Telah menambah %1$d lagu ke antrean putar</string>
     <string name="action_remove_from_playlist">Hapus dari daftar putar</string>
@@ -161,7 +160,6 @@
     <string name="last_added">Terakhir ditambahkan</string>
     <string name="history">Diputar baru-baru ini</string>
     <string name="my_top_tracks">Sering Diputar</string>
-    <string name="pick_from_local_storage">Ambil dari penyimpanan lokal</string>
     <string name="action_sleep_timer">Pewaktu tidur</string>
     <string name="action_set">Atur</string>
     <string name="cancel_current_timer">Batalkan pewaktu yang sekarang</string>
@@ -247,8 +245,6 @@
     <string name="eugene_cheung_summary">Untuk kontribusinya terhadap kode sumber.</string>
     <string name="adrian_summary">Untuk membuat halaman desain album.</string>
     <string name="add_action">Tambah</string>
-    <string name="reset_artist_image">Atur ulang gambar artist</string>
-    <string name="set_artist_image">Pasang gambar artis</string>
     <string name="library_categories">Kategori perpustakaan</string>
     <string name="pref_summary_library_categories">Konfigurasi visibilitas dan urutan kategori perpustakaan.</string>
     <string name="you_have_to_select_at_least_one_category">Anda harus memilih setidaknya satu kategori</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 967afba1..b5ba2898 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Pergi ke album</string>
     <string name="label_playing_queue">Antrean putar</string>
     <string name="no_results">Tidak ditemukan</string>
-    <string name="updating">Memperbaharui</string>
     <string name="added_title_to_playing_queue">"1 lagu ditambahkan ke antrean putar"</string>
     <string name="added_x_titles_to_playing_queue">Telah menambah %1$d lagu ke antrean putar</string>
     <string name="action_remove_from_playlist">Hapus dari daftar putar</string>
@@ -161,7 +160,6 @@
     <string name="last_added">Terakhir ditambahkan</string>
     <string name="history">Diputar baru-baru ini</string>
     <string name="my_top_tracks">Sering Diputar</string>
-    <string name="pick_from_local_storage">Ambil dari penyimpanan lokal</string>
     <string name="action_sleep_timer">Pewaktu tidur</string>
     <string name="action_set">Atur</string>
     <string name="cancel_current_timer">Batalkan pewaktu yang sekarang</string>
@@ -247,8 +245,6 @@
     <string name="eugene_cheung_summary">Untuk kontribusinya terhadap kode sumber.</string>
     <string name="adrian_summary">Untuk membuat halaman desain album.</string>
     <string name="add_action">Tambah</string>
-    <string name="reset_artist_image">Atur ulang gambar artist</string>
-    <string name="set_artist_image">Pasang gambar artis</string>
     <string name="library_categories">Kategori perpustakaan</string>
     <string name="pref_summary_library_categories">Konfigurasi visibilitas dan urutan kategori perpustakaan.</string>
     <string name="you_have_to_select_at_least_one_category">Anda harus memilih setidaknya satu kategori</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 475a119d..39b990df 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Vai all\'album</string>
     <string name="label_playing_queue">Coda di riproduzione</string>
     <string name="no_results">Nessun risultato</string>
-    <string name="updating">Aggiornamento...</string>
     <string name="added_title_to_playing_queue">"Un brano aggiunto alla coda di riproduzione."</string>
     <string name="added_x_titles_to_playing_queue">%1$d titoli aggiunti alla coda.</string>
     <string name="action_remove_from_playlist">Rimuovi dalla playlist</string>
@@ -161,7 +160,6 @@
     <string name="last_added">Aggiunti di recente</string>
     <string name="history">Ascoltati di recente</string>
     <string name="my_top_tracks">Brani preferiti</string>
-    <string name="pick_from_local_storage">Scegli dai tuoi file.</string>
     <string name="action_sleep_timer">Timer di spegnimento</string>
     <string name="action_set">Imposta</string>
     <string name="cancel_current_timer">Annulla questo timer</string>
@@ -248,8 +246,6 @@
     <string name="eugene_cheung_summary">Per il suo contributo al codice sorgente.</string>
     <string name="adrian_summary">Per creare la pagina dell\'album.</string>
     <string name="add_action">Aggiungi</string>
-    <string name="reset_artist_image">Reimposta immagine artista</string>
-    <string name="set_artist_image">Imposta immagine artista</string>
     <string name="library_categories">Categorie libreria</string>
     <string name="pref_summary_library_categories">Configura visibilità e ordine delle categorie della libreria.</string>
     <string name="you_have_to_select_at_least_one_category">Devi scegliere almeno una categoria.</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index db1e5b68..ff1b35a6 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">מעבר לאלבום</string>
     <string name="label_playing_queue">מנגן תור השמעה</string>
     <string name="no_results">אין תוצאות</string>
-    <string name="updating">מעדכן...</string>
     <string name="added_title_to_playing_queue">"נוסף שיר אחד לתור "</string>
     <string name="added_x_titles_to_playing_queue">נוספו %1$d שירים לתור</string>
     <string name="action_remove_from_playlist">הסר מרשימת ההשמעה</string>
@@ -157,7 +156,6 @@
     <string name="last_added">נוספו לאחרונה</string>
     <string name="history">היסטוריה</string>
     <string name="my_top_tracks">השירים המובילים שלי</string>
-    <string name="pick_from_local_storage">בחר מאחסון מקומי</string>
     <string name="action_sleep_timer">טיימר לשינה</string>
     <string name="action_set">קבע</string>
     <string name="cancel_current_timer">בטל טיימר נוכחי</string>
@@ -243,8 +241,6 @@
     <string name="eugene_cheung_summary">על התרומה שלו לקוד המקור.</string>
     <string name="adrian_summary">על יצירת העיצוב של מסך האלבום.</string>
     <string name="add_action">הוסף</string>
-    <string name="reset_artist_image">אפס תמונת אמן</string>
-    <string name="set_artist_image">הגדר תמונת אמן</string>
     <string name="library_categories">קטגוריות הספרייה</string>
     <string name="pref_summary_library_categories">הגדר את הנראות והסדר של הקטגוריות בספרייה.</string>
     <string name="you_have_to_select_at_least_one_category">עליך לבחור לפחות קטגוריה אחת.</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 83190f8d..a81982de 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">アルバムを表示</string>
     <string name="label_playing_queue">再生キュー</string>
     <string name="no_results">該当なし</string>
-    <string name="updating">更新中...</string>
     <string name="added_title_to_playing_queue">"曲を再生キューに追加しました"</string>
     <string name="added_x_titles_to_playing_queue">%1$d曲を再生キューに追加しました</string>
     <string name="action_remove_from_playlist">プレイリストから除去</string>
@@ -157,7 +156,6 @@
     <string name="last_added">最近追加された曲</string>
     <string name="history">履歴</string>
     <string name="my_top_tracks">よく聞く曲</string>
-    <string name="pick_from_local_storage">ローカルストレージから選択</string>
     <string name="action_sleep_timer">スリープタイマー</string>
     <string name="action_set">セット</string>
     <string name="cancel_current_timer">スリープタイマーを解除</string>
@@ -243,8 +241,6 @@
     <string name="eugene_cheung_summary">ソースコードへの貢献。</string>
     <string name="adrian_summary">Por criar o design da página de álbuns.</string>
     <string name="add_action">追加</string>
-    <string name="reset_artist_image">アーティスト画像をリセット</string>
-    <string name="set_artist_image">アーティスト画像をセット</string>
     <string name="library_categories">ライブラリのカテゴリ</string>
     <string name="pref_summary_library_categories">ライブラリに表示するカテゴリとその順番を設定します。</string>
     <string name="you_have_to_select_at_least_one_category">最低でも1つのカテゴリを選択を選択してください</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 69b31e05..77849563 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">앨범으로 가기</string>
     <string name="label_playing_queue">재생 대기열</string>
     <string name="no_results">결과 없음</string>
-    <string name="updating">업데이트 중...</string>
     <string name="added_title_to_playing_queue">"재생 대기열에 1개의 노래를 추가했습니다."</string>
     <string name="added_x_titles_to_playing_queue">재생 대기열에 %1$d개의 노래를 추가했습니다.</string>
     <string name="action_remove_from_playlist">재생 목록에서 제거</string>
@@ -159,7 +158,6 @@
     <string name="last_added">최근 추가됨</string>
     <string name="history">재생 기록</string>
     <string name="my_top_tracks">많이 재생한 트랙</string>
-    <string name="pick_from_local_storage">내부 저장소에서 선택</string>
     <string name="action_sleep_timer">수면 타이머</string>
     <string name="action_set">설정</string>
     <string name="cancel_current_timer">현재 타이머 취소</string>
@@ -245,8 +243,6 @@
     <string name="eugene_cheung_summary">소스 코드에 대한 기여</string>
     <string name="adrian_summary">앨범 페이지 디자인 제작</string>
     <string name="add_action">추가</string>
-    <string name="reset_artist_image">아티스트 이미지 초기화</string>
-    <string name="set_artist_image">아티스트 이미지 설정</string>
     <string name="library_categories">라이브러리 카테고리</string>
     <string name="pref_summary_library_categories">라이브러리 카테고리의 표시 여부 및 배열 순서를 조정합니다.</string>
     <string name="you_have_to_select_at_least_one_category">적어도 하나의 카테고리는 선택해야 합니다.</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 39e5a313..0aaf8014 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Ga naar album</string>
     <string name="label_playing_queue">Afspeelwachtrij</string>
     <string name="no_results">Geen resultaten</string>
-    <string name="updating">Bijwerken…</string>
     <string name="added_title_to_playing_queue">"1 titel toegevoegd aan de afspeelwachtrij."</string>
     <string name="added_x_titles_to_playing_queue">%1$d titels toegevoegd aan de afspeelwachtrij.</string>
     <string name="action_remove_from_playlist">Verwijderen uit afspeellijst</string>
@@ -157,7 +156,6 @@
     <string name="last_added">Laatst toegevoegd</string>
     <string name="history">Geschiedenis</string>
     <string name="my_top_tracks">Mijn top nummers</string>
-    <string name="pick_from_local_storage">Kies uit lokale opslag</string>
     <string name="action_sleep_timer">Slaaptimer</string>
     <string name="action_set">Zet</string>
     <string name="cancel_current_timer">Annuleer huidige timer</string>
@@ -243,8 +241,6 @@
     <string name="eugene_cheung_summary">Voor zijn bijdragen aan de broncode.</string>
     <string name="adrian_summary">Om het albumpagina-uiterlijk te maken.</string>
     <string name="add_action">Toevoegen</string>
-    <string name="reset_artist_image">Artiest afbeelding resetten</string>
-    <string name="set_artist_image">Artiest afbeelding instellen</string>
     <string name="library_categories">Bibliotheek categorieën</string>
     <string name="pref_summary_library_categories">Configureer de zichtbaarheid en volgorde van categorieën</string>
     <string name="you_have_to_select_at_least_one_category">Je moet tenminste één categorie selecteren.</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index ef8c82d8..84126405 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -32,7 +32,6 @@
     <string name="action_go_to_album">Gå til album</string>
     <string name="label_playing_queue">Songkø</string>
     <string name="no_results">Ingen resultat</string>
-    <string name="updating">Oppdaterer...</string>
     <string name="added_title_to_playing_queue">"La 1 tittel til songkøen."</string>
     <string name="added_x_titles_to_playing_queue">La %1$d titlar til songkøen.</string>
     <string name="created_playlist_x">Oppretta speleliste %1$s</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ab6e4378..6cd7a16a 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Przejdź do albumu</string>
     <string name="label_playing_queue">Kolejka odtwarzania</string>
     <string name="no_results">Brak wyników</string>
-    <string name="updating">Aktualizowanie...</string>
     <string name="added_title_to_playing_queue">"Dodano 1 tytuł do kolejki odtwarzania"</string>
     <string name="added_x_titles_to_playing_queue">Dodano %1$d tytuły do kolejki odtwarzania</string>
     <string name="action_remove_from_playlist">Usuń z listy odtwarzania</string>
@@ -157,7 +156,6 @@
     <string name="last_added">Ostatnio dodane</string>
     <string name="history">Historia odtwarzania</string>
     <string name="my_top_tracks">Moja Top Lista</string>
-    <string name="pick_from_local_storage">Wybierz z pamięci lokalnej</string>
     <string name="action_sleep_timer">Wyłącznik czasowy</string>
     <string name="action_set">Ustaw</string>
     <string name="cancel_current_timer">Anuluj wyłącznik</string>
@@ -243,8 +241,6 @@
     <string name="eugene_cheung_summary">Za jego wkład w kod źródłowy.</string>
     <string name="adrian_summary">Za stworzenie design\'u strony albumu</string>
     <string name="add_action">Dodaj</string>
-    <string name="reset_artist_image">Wyczyść obraz artysty</string>
-    <string name="set_artist_image">Zaktualizuj zdjęcie wykonawcy</string>
     <string name="library_categories">Kategorie biblioteki</string>
     <string name="pref_summary_library_categories">Ustawia widoczność i kolejność kategorii biblioteki</string>
     <string name="you_have_to_select_at_least_one_category">Musisz wybrać co najmniej jedną kategorię</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index c3eb3b08..88b39118 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Ir para o álbum</string>
     <string name="label_playing_queue">Fila de reprodução</string>
     <string name="no_results">Sem resultados</string>
-    <string name="updating">Atualizando...</string>
     <string name="added_title_to_playing_queue">"Adicionado 1 título à lista de reprodução"</string>
     <string name="added_x_titles_to_playing_queue">Adicionados {% 1 $ d} títulos á fila de reprodução</string>
     <string name="action_remove_from_playlist">Remover da playlist</string>
@@ -161,7 +160,6 @@
     <string name="last_added">Última Adição</string>
     <string name="history">Reproduzidas recentemente</string>
     <string name="my_top_tracks">Minhas melhores faixas</string>
-    <string name="pick_from_local_storage">Escolher do armazenamento local</string>
     <string name="action_sleep_timer">Temporizador</string>
     <string name="action_set">Definir</string>
     <string name="cancel_current_timer">Cancelar temporizador atual</string>
@@ -247,8 +245,6 @@
     <string name="eugene_cheung_summary">Pela sua contribuição com o código-fonte.</string>
     <string name="adrian_summary">Por criar o design da página de álbuns.</string>
     <string name="add_action">Adicionar</string>
-    <string name="reset_artist_image">Redefinir a imagem do artista</string>
-    <string name="set_artist_image">Definir imagem do artista</string>
     <string name="library_categories">Categorias da biblioteca</string>
     <string name="pref_summary_library_categories">Configurar a visibilidade e a ordem das categorias da biblioteca.</string>
     <string name="you_have_to_select_at_least_one_category">Você deve selecionar ao menos uma categoria.</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 5deb90fd..0c667d08 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -46,7 +46,6 @@
     <string name="action_go_to_album">Ir para o álbum</string>
     <string name="label_playing_queue">Fila de reprodução</string>
     <string name="no_results">Sem resultados</string>
-    <string name="updating">A atualizar...</string>
     <string name="added_title_to_playing_queue">"Adicionada uma música à fila de reprodução."</string>
     <string name="added_x_titles_to_playing_queue">Adicionadas %1$d títulos à fila de reprodução.</string>
     <string name="action_remove_from_playlist">Remover da lista de reprodução</string>
@@ -128,7 +127,6 @@
     <string name="last_added">Últimas adições</string>
     <string name="history">Histórico</string>
     <string name="my_top_tracks">As minhas faixas favoritas</string>
-    <string name="pick_from_local_storage">Escolher do armazenamento local</string>
     <string name="action_sleep_timer">Temporizador para dormir</string>
     <string name="action_set">Definir</string>
     <string name="cancel_current_timer">Cancelar temporizador atual</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index f8e609af..3ebfb097 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Accesaţi albumul</string>
     <string name="label_playing_queue">Lista de redare</string>
     <string name="no_results">Niciun rezultat</string>
-    <string name="updating">Actualizare...</string>
     <string name="added_title_to_playing_queue">"Melodie adăugată în lista de redare."</string>
     <string name="added_x_titles_to_playing_queue">%1$d melodii adăugate în lista de redare.</string>
     <string name="action_remove_from_playlist">Ștergeți din lista de redare.</string>
@@ -157,7 +156,6 @@
     <string name="last_added">Ultimele adăugate</string>
     <string name="history">Istoric</string>
     <string name="my_top_tracks">Melodiile mele favorite</string>
-    <string name="pick_from_local_storage">Alegeți din stocarea locală</string>
     <string name="action_sleep_timer">Cronometru pentru somn</string>
     <string name="action_set">Setează</string>
     <string name="cancel_current_timer">Anulează timer curent.</string>
@@ -243,8 +241,6 @@
     <string name="eugene_cheung_summary">Pentru contribuțiile sale la codul sursă.</string>
     <string name="adrian_summary">Pentru crearea designului paginii albume</string>
     <string name="add_action">Adăugare</string>
-    <string name="reset_artist_image">Resetați imaginea artistului</string>
-    <string name="set_artist_image">Setați imaginea artistului</string>
     <string name="library_categories">Categorii</string>
     <string name="pref_summary_library_categories">Configurați vizibilitatea și ordinea categoriilor din bibliotecă.</string>
     <string name="you_have_to_select_at_least_one_category">Trebuie să selectați cel puțin o categorie.</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6fcc8217..c1d3c747 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Перейти к альбому</string>
     <string name="label_playing_queue">Очередь воспроизведения</string>
     <string name="no_results">Нет результатов</string>
-    <string name="updating">Обновление...</string>
     <string name="added_title_to_playing_queue">"Композиция добавлена в очередь воспроизведения."</string>
     <string name="added_x_titles_to_playing_queue">%1$d композиций добавлено в очередь воспроизведения</string>
     <string name="action_remove_from_playlist">Удалить из плейлиста</string>
@@ -161,7 +160,6 @@
     <string name="last_added">Последние добавленные</string>
     <string name="history">Недавно воспроизведённые</string>
     <string name="my_top_tracks">Мои популярные треки</string>
-    <string name="pick_from_local_storage">Выбрать из локального хранилища</string>
     <string name="action_sleep_timer">Таймер сна</string>
     <string name="action_set">Установить</string>
     <string name="cancel_current_timer">Отменить текущий таймер</string>
@@ -247,8 +245,6 @@
     <string name="eugene_cheung_summary">За его вклад в исходный код.</string>
     <string name="adrian_summary">За создание дизайна показа альбомов.</string>
     <string name="add_action">Добавить</string>
-    <string name="reset_artist_image">Сбросить картинку исполнителя</string>
-    <string name="set_artist_image">Установить картинку исполнителя</string>
     <string name="library_categories">Категории библиотеки</string>
     <string name="pref_summary_library_categories">Настройте видимость и порядок категорий библиотеки.</string>
     <string name="you_have_to_select_at_least_one_category">Вы должны выбрать хотя бы одну категорию.</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index a5cb414c..58b982cf 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -46,7 +46,6 @@
     <string name="action_go_to_album">Gå till album</string>
     <string name="label_playing_queue">Spelarkö</string>
     <string name="no_results">Inga resultat</string>
-    <string name="updating">Uppdaterar ...</string>
     <string name="added_title_to_playing_queue">"Lagt till 1 titel till spellistan."</string>
     <string name="created_playlist_x">Spellista %1$s skapad</string>
     <string name="delete_playlist_x"><![CDATA[
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 781a0b82..49037d5a 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Albüme git</string>
     <string name="label_playing_queue">Çalma sırası</string>
     <string name="no_results">Sonuç bulunamadı</string>
-    <string name="updating">Güncelleniyor...</string>
     <string name="added_title_to_playing_queue">"Çalma sırasına 1 başlık eklendi."</string>
     <string name="added_x_titles_to_playing_queue">Çalma sırasına %1$d başlık eklendi.</string>
     <string name="action_remove_from_playlist">Çalma listesinden kaldır</string>
@@ -157,7 +156,6 @@
     <string name="last_added">Son eklenen</string>
     <string name="history">Geçmiş</string>
     <string name="my_top_tracks">En iyi parçalarım</string>
-    <string name="pick_from_local_storage">Dahili hafızadan al</string>
     <string name="action_sleep_timer">Uyku zamanlayıcı</string>
     <string name="action_set">Ayarla</string>
     <string name="cancel_current_timer">Şu anki zamanlayıcıyı iptal et</string>
@@ -243,8 +241,6 @@
     <string name="eugene_cheung_summary">Kaynak koda yaptığı katkılardan dolayı.</string>
     <string name="adrian_summary">Albüm sayfası tasarımı oluşturmak için.</string>
     <string name="add_action">Ekle</string>
-    <string name="reset_artist_image">Sanatçı resmini sıfırla</string>
-    <string name="set_artist_image">Sanatçı resmi ayarla</string>
     <string name="library_categories">Kitaplık kategorileri</string>
     <string name="pref_summary_library_categories">Kitaplık kategorilerinin görünürlüğünü ve sırasını yapılandırma.</string>
     <string name="you_have_to_select_at_least_one_category">En az bir kategori seçmeniz gerekiyor.</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index e2d76756..9fc4d743 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">Перейти до альбому</string>
     <string name="label_playing_queue">Черга відтворення</string>
     <string name="no_results">Немає результатів</string>
-    <string name="updating">Оновлення...</string>
     <string name="added_title_to_playing_queue">"Додано 1 композицію до черги відтворення."</string>
     <string name="added_x_titles_to_playing_queue">Додано %1$d композицій до черги відтворення</string>
     <string name="action_remove_from_playlist">Видалити зі списку відтворення</string>
@@ -156,7 +155,6 @@
     <string name="last_added">Останні додані</string>
     <string name="history">Історія</string>
     <string name="my_top_tracks">Мої популярні треки</string>
-    <string name="pick_from_local_storage">Вибрати з локального сховища</string>
     <string name="action_sleep_timer">Таймер сну</string>
     <string name="action_set">Встановити</string>
     <string name="cancel_current_timer">Скасувати встановленний таймер</string>
@@ -219,8 +217,6 @@
     <string name="bug_report_failed">Не вдалося надіслати звіт</string>
     <string name="bug_report_failed_wrong_credentials">Неправильне ім’я користувача або пароль</string>
     <string name="bug_report_failed_invalid_token">Недійсний токен доступу. Зв’яжіться з розробником додатка.</string>
-    <string name="reset_artist_image">Скинути зображення виконавця</string>
-    <string name="set_artist_image">Встановити зображення виконавця</string>
     <string name="library_categories">Категорії бібліотеки</string>
     <string name="pref_summary_library_categories">Налаштувати видимість та порядок категорій бібліотеки.</string>
     <string name="you_have_to_select_at_least_one_category">Виберіть принаймні одну категорію.</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 3f0d8331..c96bb7df 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -50,7 +50,6 @@
     <string name="action_go_to_album">Đi đến album</string>
     <string name="label_playing_queue">Hàng đợi phát</string>
     <string name="no_results">Không có kết quả</string>
-    <string name="updating">Đang cập nhật...</string>
     <string name="added_title_to_playing_queue">"Đã thêm 1 bài vào hàng đợi phát."</string>
     <string name="added_x_titles_to_playing_queue">Đã thêm %1$d bài vào hàng đợi phát.</string>
     <string name="action_remove_from_playlist">Xóa khỏi danh sách nhạc</string>
@@ -149,7 +148,6 @@
     <string name="last_added">Được thêm sau cùng</string>
     <string name="history">Lịch sử</string>
     <string name="my_top_tracks">Bài hát hàng đầu</string>
-    <string name="pick_from_local_storage">Chọn từ bộ nhớ máy</string>
     <string name="action_sleep_timer">Hẹn giờ ngủ</string>
     <string name="action_set">Đặt</string>
     <string name="cancel_current_timer">Hủy hẹn giờ hiện tại</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index c2b0dbc0..dca968db 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_go_to_album">查看专辑</string>
     <string name="label_playing_queue">播放队列</string>
     <string name="no_results">没有找到结果</string>
-    <string name="updating">正在更新…</string>
     <string name="added_title_to_playing_queue">"此歌曲已加入播放队列。"</string>
     <string name="added_x_titles_to_playing_queue">%1$d 首歌曲已加入播放队列。</string>
     <string name="action_remove_from_playlist">从播放列表中移除</string>
@@ -159,7 +158,6 @@
     <string name="last_added">最近添加</string>
     <string name="history">播放历史</string>
     <string name="my_top_tracks">最喜爱的歌曲</string>
-    <string name="pick_from_local_storage">从本地储存中选取</string>
     <string name="action_sleep_timer">睡眠定时器</string>
     <string name="action_set">设置</string>
     <string name="cancel_current_timer">取消当前定时器</string>
@@ -245,8 +243,6 @@
     <string name="eugene_cheung_summary">因他对源代码的贡献。</string>
     <string name="adrian_summary">以新增专辑封面设计。</string>
     <string name="add_action">添加</string>
-    <string name="reset_artist_image">重置艺术家图片</string>
-    <string name="set_artist_image">设置艺术家图片</string>
     <string name="library_categories">媒体库类别</string>
     <string name="pref_summary_library_categories">配置媒体库类别可见性和顺序。</string>
     <string name="you_have_to_select_at_least_one_category">您必需选择至少一个类别。</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 5a91d11d..834c1a08 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -52,7 +52,6 @@
     <string name="action_go_to_album">打開專輯</string>
     <string name="label_playing_queue">待播佇列</string>
     <string name="no_results">沒有搜尋結果</string>
-    <string name="updating">更新中…</string>
     <string name="added_title_to_playing_queue">"已將 1 首歌加到播放佇列"</string>
     <string name="added_x_titles_to_playing_queue">已將 %1$d 首歌加到播放佇列。</string>
     <string name="action_remove_from_playlist">從播放清單中移除</string>
@@ -162,7 +161,6 @@
     <string name="last_added">最後新增</string>
     <string name="history">最近播放</string>
     <string name="my_top_tracks">我的最佳單曲</string>
-    <string name="pick_from_local_storage">從手機裡選擇（SD卡或記憶體）</string>
     <string name="action_sleep_timer">睡眠定時器</string>
     <string name="action_set">設定</string>
     <string name="cancel_current_timer">取消目前的計時器</string>
@@ -248,8 +246,6 @@
     <string name="eugene_cheung_summary">原始碼貢獻者</string>
     <string name="adrian_summary">創建專輯頁面</string>
     <string name="add_action">新增</string>
-    <string name="reset_artist_image">重設歌手圖片</string>
-    <string name="set_artist_image">設定歌手圖片</string>
     <string name="library_categories">音樂庫類別</string>
     <string name="pref_summary_library_categories">調整音樂庫類別的顯示與排序</string>
     <string name="you_have_to_select_at_least_one_category">你至少要選擇 1 個類別</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 38c4d9f6..370a8bd8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -52,7 +52,6 @@
     <string name="action_go_to_album">Go to album</string>
     <string name="label_playing_queue">Playing queue</string>
     <string name="no_results">No results</string>
-    <string name="updating">Updating…</string>
     <string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
     <string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
     <string name="action_remove_from_playlist">Remove from playlist</string>
@@ -163,7 +162,6 @@
     <string name="last_added">Last added</string>
     <string name="history">Recently played</string>
     <string name="my_top_tracks">My top tracks</string>
-    <string name="pick_from_local_storage">Pick from local storage</string>
     <string name="action_sleep_timer">Sleep timer</string>
     <string name="action_set">Set</string>
     <string name="cancel_current_timer">Cancel current timer</string>
@@ -259,8 +257,6 @@
     <string name="eugene_cheung_summary">For his contributions to the source code.</string>
     <string name="adrian_summary">For creating the album page design.</string>
     <string name="add_action">Add</string>
-    <string name="reset_artist_image">Reset artist image</string>
-    <string name="set_artist_image">Set artist image</string>
     <string name="library_categories">Library categories</string>
     <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
diff --git a/app/src/main/res/xml/pref_colors.xml b/app/src/main/res/xml/pref_colors.xml
index e8b660fb..1560c020 100644
--- a/app/src/main/res/xml/pref_colors.xml
+++ b/app/src/main/res/xml/pref_colors.xml
@@ -5,7 +5,7 @@
 
         <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEListPreference
             app:iconSpaceReserved="false"
-            android:defaultValue="light"
+            android:defaultValue="dark"
             android:entries="@array/pref_general_theme_list_titles"
             android:entryValues="@array/pref_general_theme_list_values"
             android:key="general_theme"