--- trunk/lib/Frey/Web.pm	2008/12/11 21:36:04	816
+++ trunk/lib/Frey/Web.pm	2008/12/12 18:01:02	819
@@ -478,18 +478,20 @@
 	}
 
 	my $path = icon_exists( $class );
-
-	while ( $class =~ s{::[^:]+$}{} && ! $path ) {
-		$path = icon_exists( $class ) unless $class eq 'Frey'; # don't default on Frey icon
+	if ( ! $path ) {
+		my $super_class = $class;
+		while ( $super_class =~ s{::[^:]+$}{} && ! $path ) {
+			$path = icon_exists( $super_class ) unless $super_class eq 'Frey'; # don't default on Frey icon
+		}
 	}
 
-	if ( -e $path ) {
-		warn "# $class from $self icon_path $path" if $self->debug;
-		return $path;
-	} else {
-		$self->TODO( "add $path icon for $class $variant" );
+	if ( ! $path ) {
+		$self->TODO( "add icon for $class" . ( $variant ? " variant $variant" : '' ) );
 		return undef;
 	}
+
+	warn "# $class from $self icon_path $path" if $self->debug;
+	return $path;
 }
 
 sub add_icon {