--- /usr/share/perl5/Slim/Music/Artwork.pm.orig	2009-01-20 12:13:59.000000000 +1100
+++ /usr/share/perl5/Slim/Music/Artwork.pm	2009-03-18 13:36:35.000000000 +1100
@@ -367,6 +367,8 @@
 			50 => '_o',
 			$coversize => '_o',
 			56 => '_o.jpg',
+			154 => '_o.jpg',
+			186 => '_o.jpg',
 		);
 	
 		for my $dim ( keys %dims ) {
--- /usr/share/perl5/Slim/Utils/Prefs.pm.orig	2009-01-20 12:13:59.000000000 +1100
+++ /usr/share/perl5/Slim/Utils/Prefs.pm	2009-03-18 13:50:55.000000000 +1100
@@ -198,6 +198,7 @@
 		'scannerPriority'       => 0,
 		'resampleArtwork'       => 1,
 		'precacheArtwork'       => 1,
+		'preferTrackArtwork'    => 1,
 		# Server Settings - Security
 		'filterHosts'           => 0,
 		'allowedHosts'          => sub { join(',', Slim::Utils::Network::hostAddr()) },
--- /usr/share/perl5/Slim/Control/Queries.pm.orig	2009-01-20 12:13:59.000000000 +1100
+++ /usr/share/perl5/Slim/Control/Queries.pm	2009-03-18 13:31:25.000000000 +1100
@@ -4057,7 +4057,7 @@
 						# special case: artwork, only if it exists
 						elsif ($key eq 'COVERART' && $artworkExists) {
 								# Bug 7443, check for a track cover before using the album cover
-								my $coverId = $track->coverArtExists ? $track->id : $val;
+								my $coverId = ($prefs->get('preferTrackArtwork') && $track->coverArtExists) ? $track->id : $val;
 							
 								$actions = {
 									'do' => {
@@ -4549,7 +4549,7 @@
 				my $albumObj = $item->album();
 				
 				# Bug 7443, check for a track cover before using the album cover
-				my $iconId = $item->coverArtExists ? $id : 0;
+				my $iconId = ($prefs->get('preferTrackArtwork') && $item->coverArtExists) ? $id : 0;
 				
 				if(defined($albumObj)) {
 					$album = $albumObj->title();
@@ -5084,7 +5084,7 @@
 	my $iconId;
 	
 	# Bug 7443, check for a track cover before using the album cover
-	if ( $track->coverArtExists() ) {
+	if ( $prefs->get('preferTrackArtwork') && $track->coverArtExists() ) {
 		$iconId = $track->id;
 	}