diff --git a/res/drawable/albumart_mp_unknown_list.png b/res/drawable/albumart_mp_unknown_list.png
new file mode 100644
index 00000000..dc21fb1f
Binary files /dev/null and b/res/drawable/albumart_mp_unknown_list.png differ
diff --git a/res/layout/library_withcontrols.xml b/res/layout/library_withcontrols.xml
index 54f868d5..9bd3688e 100644
--- a/res/layout/library_withcontrols.xml
+++ b/res/layout/library_withcontrols.xml
@@ -34,17 +34,13 @@ THE SOFTWARE.
 			android:layout_height="80dip">
 			<ImageView
 				android:id="@+id/cover"
-				android:adjustViewBounds="true"
-				android:padding="2dip"
 				android:scaleType="fitCenter"
 				android:maxWidth="80dip"
-				android:layout_width="wrap_content"
+				android:layout_width="80dip"
 				android:layout_height="fill_parent"
 				android:layout_gravity="center" />
 			<TextView
 				android:id="@+id/status_text"
-				android:paddingLeft="3dip"
-				android:paddingRight="3dip"
 				android:text="@string/none"
 				android:textSize="16sp"
 				android:singleLine="true"
diff --git a/src/org/kreed/vanilla/LibraryActivity.java b/src/org/kreed/vanilla/LibraryActivity.java
index f2651454..ca26151e 100644
--- a/src/org/kreed/vanilla/LibraryActivity.java
+++ b/src/org/kreed/vanilla/LibraryActivity.java
@@ -801,8 +801,12 @@ public class LibraryActivity extends PlaybackActivity implements AdapterView.OnI
 				cover = song.getCover(this);
 			}
 
-			mCover.setImageBitmap(cover);
-			mCover.setVisibility(cover == null ? View.GONE : View.VISIBLE);
+			if (Song.mDisableCoverArt)
+				mCover.setVisibility(View.GONE);
+			else if (cover == null)
+				mCover.setImageResource(R.drawable.albumart_mp_unknown_list);
+			else
+				mCover.setImageBitmap(cover);
 		}
 	}