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 9b8bf534..ede8c5de 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
@@ -123,15 +123,10 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
                                 return bitmap;
                             }
                         })
-                        .displayer(new FadeInBitmapDisplayer(FADE_IN_TIME) {
+                        .displayer(new FadeInBitmapDisplayer(FADE_IN_TIME, true, true, false) {
                             @Override
                             public void display(Bitmap bitmap, ImageAware imageAware, LoadedFrom loadedFrom) {
-                                boolean loadedFromMemoryCache = loadedFrom == LoadedFrom.MEMORY_CACHE;
-                                if (loadedFromMemoryCache) {
-                                    imageAware.setImageBitmap(bitmap);
-                                } else {
-                                    super.display(bitmap, imageAware, loadedFrom);
-                                }
+                                super.display(bitmap, imageAware, loadedFrom);
                                 if (usePalette)
                                     setColors(holder.paletteColor, holder);
                             }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java b/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java
index f38f744c..79dc9f3e 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java
@@ -8,6 +8,7 @@ import com.squareup.okhttp.Cache;
 import com.squareup.okhttp.OkHttpClient;
 
 import java.io.File;
+import java.util.concurrent.TimeUnit;
 
 import retrofit.RequestInterceptor;
 import retrofit.RestAdapter;
@@ -29,6 +30,9 @@ public class LastFMRestClient {
             okHttpClient.setCache(new Cache(cacheDir, 1024 * 1024 * 10));
         }
 
+        okHttpClient.setConnectTimeout(15, TimeUnit.SECONDS);
+        okHttpClient.setReadTimeout(20, TimeUnit.SECONDS);
+
         RestAdapter restAdapter = new RestAdapter.Builder()
                 .setEndpoint(BASE_URL)
                 .setClient(new OkClient(okHttpClient))