Index: libnautilus-private/nautilus-icon-container.c
===================================================================
--- libnautilus-private/nautilus-icon-container.c	(revisione 12793)
+++ libnautilus-private/nautilus-icon-container.c	(copia locale)
@@ -7250,13 +7250,18 @@
 				  LABEL_INFO_COLOR, 
 				  eel_gdk_color_is_dark (&widget->style->base[GTK_STATE_NORMAL]) ? light_info_value : dark_info_value);
 	} else {
-		if (container->details->use_drop_shadows || eel_background_is_dark (background)) {
-			setup_gc_with_fg (container, LABEL_COLOR, 0xEFEFEF);
+		if (eel_background_is_dark (background)
+		    && !eel_gdk_color_is_dark (&widget->style->base[GTK_STATE_NORMAL])) {	  
+			setup_gc_with_fg (container, LABEL_COLOR, 
+					  eel_gdk_color_to_rgb (&widget->style->text[GTK_STATE_ACTIVE]));
+
 			setup_gc_with_fg (container, 
 					  LABEL_INFO_COLOR, 
 					  light_info_value);
 		} else { /* converse */
-			setup_gc_with_fg (container, LABEL_COLOR, 0x000000);
+			container->details->use_drop_shadows = FALSE;
+			setup_gc_with_fg (container, LABEL_COLOR, 
+					  eel_gdk_color_to_rgb (&widget->style->text[GTK_STATE_NORMAL]));
 			setup_gc_with_fg (container, 
 					  LABEL_INFO_COLOR, 
 					  dark_info_value);
