Index: trunk/i386/boot2/gui.c
===================================================================
--- trunk/i386/boot2/gui.c	(revision 301)
+++ trunk/i386/boot2/gui.c	(revision 302)
@@ -754,8 +754,12 @@
 		}
 	}
 	
-	// Use the next (device_*_o) image for the selected item.
-    if (isSelected) devicetype++;
+	// Draw the selection image and use the next (device_*_o) image for the selected item.
+    if (isSelected)
+	{
+		blend(images[iSelection].image, buffer, centeredAt(images[iSelection].image, p));
+		devicetype++;
+	}
 
 	// draw icon
 	blend( images[devicetype].image, buffer, centeredAt( images[devicetype].image, p ));
@@ -827,8 +831,6 @@
 			if(gui.menu.draw)
 				drawInfoMenuItems();
 			 
-			blend( images[iSelection].image, gui.devicelist.pixmap, centeredAt( images[iSelection].image, p ) );
-			
 #if DEBUG
             gui.debug.cursor = pos( 10, 100);
             dprintf( &gui.screen, "label     %s\n",   param->label );
Index: trunk/i386/boot2/options.c
===================================================================
--- trunk/i386/boot2/options.c	(revision 301)
+++ trunk/i386/boot2/options.c	(revision 302)
@@ -112,7 +112,7 @@
 	
 		char dummy[80];
 		getBootVolumeDescription( gBootVolume, dummy, 80, true );
-		drawDeviceIcon( gBootVolume, gui.screen.pixmap, p, false );
+		drawDeviceIcon( gBootVolume, gui.screen.pixmap, p, true );
 		drawStrCenteredAt( (char *) msg, &font_small, gui.screen.pixmap, gui.countdown.pos );
 		
 		// make this screen the new background