diff --git a/src/ch/blinkenlights/android/vanilla/CoverBitmap.java b/src/ch/blinkenlights/android/vanilla/CoverBitmap.java
index 64544ff2..4cc63065 100644
--- a/src/ch/blinkenlights/android/vanilla/CoverBitmap.java
+++ b/src/ch/blinkenlights/android/vanilla/CoverBitmap.java
@@ -181,7 +181,7 @@ public final class CoverBitmap {
 		int bitmapWidth = Math.max(coverWidth, boxWidth);
 		int bitmapHeight = Math.max(coverHeight, boxHeight);
 
-		Bitmap bitmap = Bitmap.createBitmap(bitmapWidth, bitmapHeight, Bitmap.Config.RGB_565);
+		Bitmap bitmap = Bitmap.createBitmap(bitmapWidth, bitmapHeight, Bitmap.Config.ARGB_8888);
 		Canvas canvas = new Canvas(bitmap);
 
 		if (cover != null) {
@@ -267,7 +267,7 @@ public final class CoverBitmap {
 		int bitmapWidth = horizontal ? coverWidth + boxWidth : Math.max(coverWidth, boxWidth);
 		int bitmapHeight = horizontal ? Math.max(coverHeight, boxHeight) : coverHeight + boxHeight;
 
-		Bitmap bitmap = Bitmap.createBitmap(bitmapWidth, bitmapHeight, Bitmap.Config.RGB_565);
+		Bitmap bitmap = Bitmap.createBitmap(bitmapWidth, bitmapHeight, Bitmap.Config.ARGB_8888);
 		Canvas canvas = new Canvas(bitmap);
 
 		if (cover != null) {
diff --git a/src/ch/blinkenlights/android/vanilla/CoverView.java b/src/ch/blinkenlights/android/vanilla/CoverView.java
index 3da98750..33bdb279 100644
--- a/src/ch/blinkenlights/android/vanilla/CoverView.java
+++ b/src/ch/blinkenlights/android/vanilla/CoverView.java
@@ -365,16 +365,14 @@ public final class CoverView extends View implements Handler.Callback {
 		Context context = getContext();
 		Bitmap cover = song == null ? null : song.getCover(context);
 
-		if (cover == null && style == CoverBitmap.STYLE_NO_INFO) {
-			Bitmap def = mDefaultCover;
-			if (def == null) {
-				mDefaultCover = def = CoverBitmap.generateDefaultCover(context, getWidth(), getHeight());
+		if (cover == null && style != CoverBitmap.STYLE_OVERLAPPING_BOX) {
+			if (mDefaultCover == null) {
+				mDefaultCover = CoverBitmap.generateDefaultCover(context, getWidth(), getHeight());
 			}
-			mBitmaps[i] = def;
-		} else {
-			mBitmaps[i] = CoverBitmap.createBitmap(context, style, cover, song, getWidth(), getHeight());
+			cover = mDefaultCover;
 		}
 
+		mBitmaps[i] = CoverBitmap.createBitmap(context, style, cover, song, getWidth(), getHeight());
 		postInvalidate();
 	}