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 c5f40637..59beaeaa 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java
@@ -133,7 +133,7 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
                     .loadFromMediaStore(MusicUtil.getAlbumArtUri(song.albumId))
                     .asBitmap()
                     .transcode(new BitmapPaletteTranscoder(getActivity()), BitmapPaletteWrapper.class)
-                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .diskCacheStrategy(DiskCacheStrategy.NONE)
                     .error(R.drawable.default_album_art)
                     .signature(new MediaStoreSignature("", song.dateModified, 0))
                     .into(new PhonographColoredTarget(albumCover) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java
index b2f8fb0a..9081b0e3 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java
@@ -99,7 +99,7 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
                 holder.text.setText(album.getArtistName());
                 Glide.with(activity)
                         .loadFromMediaStore(MusicUtil.getAlbumArtUri(album.getId()))
-                        .diskCacheStrategy(DiskCacheStrategy.ALL)
+                        .diskCacheStrategy(DiskCacheStrategy.NONE)
                         .error(R.drawable.default_album_art)
                         .animate(android.R.anim.fade_in)
                         .signature(new MediaStoreSignature("", album.getDateModified(), 0))
@@ -111,7 +111,7 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
                 holder.text.setText(MusicUtil.getArtistInfoString(activity, artist));
                 Glide.with(activity)
                         .load(new ArtistImageRequest(artist.name, false))
-                        .diskCacheStrategy(DiskCacheStrategy.NONE)
+                        .diskCacheStrategy(DiskCacheStrategy.SOURCE)
                         .error(R.drawable.default_album_art)
                         .animate(android.R.anim.fade_in)
                         .signature(ArtistSignatureUtil.getInstance(activity).getArtistSignature(artist.name))
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
index c508677a..125e7fdb 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
@@ -124,7 +124,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
                 .loadFromMediaStore(MusicUtil.getAlbumArtUri(album.getId()))
                 .asBitmap()
                 .transcode(new BitmapPaletteTranscoder(activity), BitmapPaletteWrapper.class)
-                .diskCacheStrategy(DiskCacheStrategy.ALL)
+                .diskCacheStrategy(DiskCacheStrategy.NONE)
                 .error(R.drawable.default_album_art)
                 .animate(android.R.anim.fade_in)
                 .signature(new MediaStoreSignature("", album.getDateModified(), 0))
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
index 84896537..0c483fb1 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
@@ -12,6 +12,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.adapter.base.AbsMultiSelectAdapter;
@@ -123,9 +124,10 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
                 .load(new ArtistImageRequest(artist.name, false))
                 .asBitmap()
                 .transcode(new BitmapPaletteTranscoder(activity), BitmapPaletteWrapper.class)
-                .diskCacheStrategy(DiskCacheStrategy.ALL)
+                .diskCacheStrategy(DiskCacheStrategy.SOURCE)
                 .error(R.drawable.default_album_art)
                 .animate(android.R.anim.fade_in)
+                .priority(Priority.LOW)
                 .signature(ArtistSignatureUtil.getInstance(activity).getArtistSignature(artist.name))
                 .into(new PhonographColoredTarget(holder.image) {
                     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ArtistSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ArtistSongAdapter.java
index f1b79216..19d05be5 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ArtistSongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/ArtistSongAdapter.java
@@ -77,7 +77,7 @@ public class ArtistSongAdapter extends ArrayAdapter<Song> implements MaterialCab
 
         Glide.with(activity)
                 .loadFromMediaStore(MusicUtil.getAlbumArtUri(song.albumId))
-                .diskCacheStrategy(DiskCacheStrategy.ALL)
+                .diskCacheStrategy(DiskCacheStrategy.NONE)
                 .error(R.drawable.default_album_art)
                 .animate(android.R.anim.fade_in)
                 .signature(new MediaStoreSignature("", song.dateModified, 0))
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 501470f5..edfa1c9d 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
@@ -126,7 +126,7 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
                 .loadFromMediaStore(MusicUtil.getAlbumArtUri(song.albumId))
                 .asBitmap()
                 .transcode(new BitmapPaletteTranscoder(activity), BitmapPaletteWrapper.class)
-                .diskCacheStrategy(DiskCacheStrategy.ALL)
+                .diskCacheStrategy(DiskCacheStrategy.NONE)
                 .error(R.drawable.default_album_art)
                 .animate(android.R.anim.fade_in)
                 .signature(new MediaStoreSignature("", song.dateModified, 0))
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 bd669880..d6cb3c0e 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java
@@ -89,7 +89,7 @@ public class WidgetMedium extends AppWidgetProvider {
                 Glide.with(context)
                         .loadFromMediaStore(MusicUtil.getAlbumArtUri(song.albumId))
                         .asBitmap()
-                        .diskCacheStrategy(DiskCacheStrategy.ALL)
+                        .diskCacheStrategy(DiskCacheStrategy.NONE)
                         .signature(new MediaStoreSignature("", song.dateModified, 0))
                         .into(target);
             }
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 29ff2aa5..cda769d2 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java
@@ -199,7 +199,7 @@ public class PlayingNotificationHelper {
                         .loadFromMediaStore(MusicUtil.getAlbumArtUri(currentSong.albumId))
                         .asBitmap()
                         .transcode(new BitmapPaletteTranscoder(service), BitmapPaletteWrapper.class)
-                        .diskCacheStrategy(DiskCacheStrategy.ALL)
+                        .diskCacheStrategy(DiskCacheStrategy.NONE)
                         .signature(new MediaStoreSignature("", currentSong.dateModified, 0))
                         .into(target);
             }
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 57863e16..06125387 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
@@ -449,7 +449,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
             final BitmapRequestBuilder request = Glide.with(MusicService.this)
                     .loadFromMediaStore(MusicUtil.getAlbumArtUri(song.albumId))
                     .asBitmap()
-                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .diskCacheStrategy(DiskCacheStrategy.NONE)
                     .signature(new MediaStoreSignature("", song.dateModified, 0));
             if (blurAlbumArt) {
                 request.transform(new BlurTransformation.Builder(MusicService.this).build());
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 fca50937..0c1e3a02 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
@@ -158,7 +158,7 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
                 .loadFromMediaStore(MusicUtil.getAlbumArtUri(album.getId()))
                 .asBitmap()
                 .transcode(new BitmapPaletteTranscoder(this), BitmapPaletteWrapper.class)
-                .diskCacheStrategy(DiskCacheStrategy.ALL)
+                .diskCacheStrategy(DiskCacheStrategy.NONE)
                 .error(R.drawable.default_album_art)
                 .signature(new MediaStoreSignature("", album.getDateModified(), 0))
                 .into(new PhonographColoredTarget(albumArtImageView) {
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 cb04fd57..ff03efce 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
@@ -258,7 +258,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
                 .load(new ArtistImageRequest(artist.name, forceDownload))
                 .asBitmap()
                 .transcode(new BitmapPaletteTranscoder(this), BitmapPaletteWrapper.class)
-                .diskCacheStrategy(DiskCacheStrategy.ALL)
+                .diskCacheStrategy(DiskCacheStrategy.SOURCE)
                 .error(R.drawable.default_album_art)
                 .signature(ArtistSignatureUtil.getInstance(this).getArtistSignature(artist.name))
                 .into(new PhonographColoredTarget(artistImage) {
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 975537c6..873e77e5 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
@@ -277,7 +277,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
             ((TextView) navigationDrawerHeader.findViewById(R.id.text)).setText(song.artistName);
             Glide.with(this)
                     .loadFromMediaStore(MusicUtil.getAlbumArtUri(song.albumId))
-                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .diskCacheStrategy(DiskCacheStrategy.NONE)
                     .error(R.drawable.default_album_art)
                     .animate(android.R.anim.fade_in)
                     .signature(new MediaStoreSignature("", song.dateModified, 0))
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java
index 0bba5ee4..9a0ebd3d 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java
@@ -116,7 +116,7 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
                                 .load(url)
                                 .asBitmap()
                                 .transcode(new BitmapPaletteTranscoder(AlbumTagEditorActivity.this), BitmapPaletteWrapper.class)
-                                .diskCacheStrategy(DiskCacheStrategy.ALL)
+                                .diskCacheStrategy(DiskCacheStrategy.SOURCE)
                                 .error(R.drawable.default_album_art)
                                 .into(new SimpleTarget<BitmapPaletteWrapper>() {
                                     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java
index a7b19645..e122eb2d 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java
@@ -47,7 +47,6 @@ public class PlayerAlbumCoverFragment extends AbsMusicServiceFragment implements
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        viewPager.setOffscreenPageLimit(2);
         updatePlayingQueue();
         viewPager.addOnPageChangeListener(this);
         viewPager.setOnTouchListener(new View.OnTouchListener() {
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 5c03a25a..a3aac053 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
@@ -157,6 +157,11 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
         updateQueue();
     }
 
+    @Override
+    public void onMediaStoreChanged() {
+        updateQueue();
+    }
+
     private void updateQueue() {
         playingQueueAdapter.swapDataSet(MusicPlayerRemote.getPlayingQueue(), MusicPlayerRemote.getPosition());
         if (slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java
index 71ecf915..9d86b72b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java
@@ -14,6 +14,9 @@ import android.support.v7.graphics.Palette;
 
 import com.kabouzeid.gramophone.R;
 
+import java.util.Collections;
+import java.util.Comparator;
+
 /**
  * @author Karim Abou Zeid (kabouzeid)
  */
@@ -43,11 +46,29 @@ public class ColorUtil {
                 return palette.getLightVibrantSwatch().getRgb();
             } else if (palette.getLightMutedSwatch() != null) {
                 return palette.getLightMutedSwatch().getRgb();
+            } else if (palette.getSwatches() != null && !palette.getSwatches().isEmpty()) {
+                return Collections.max(palette.getSwatches(), SwatchComparator.getInstance()).getRgb();
             }
         }
         return fallback;
     }
 
+    private static class SwatchComparator implements Comparator<Palette.Swatch> {
+        private static SwatchComparator sInstance;
+
+        static SwatchComparator getInstance() {
+            if (sInstance == null) {
+                sInstance = new SwatchComparator();
+            }
+            return sInstance;
+        }
+
+        @Override
+        public int compare(Palette.Swatch lhs, Palette.Swatch rhs) {
+            return lhs.getPopulation() - rhs.getPopulation();
+        }
+    }
+
     @ColorInt
     public static int resolveColor(@NonNull Context context, @AttrRes int colorAttr) {
         TypedArray a = context.obtainStyledAttributes(new int[]{colorAttr});