--- trunk/lib/Frey/Class/Browser.pm	2009/06/29 16:46:03	1108
+++ trunk/lib/Frey/Class/Browser.pm	2009/06/29 16:54:02	1109
@@ -1,14 +1,14 @@
 package Frey::Class::Browser;
 use Moose;
 
+use lib 'lib';
+
 extends 'Frey::Class::Loader';
 with 'Frey::Web';
 with 'Frey::Session';
 with 'Frey::Web::CombineImages';
+with 'Frey::Class::Icon';
 
-use lib 'lib';
-
-use Frey::Run;
 use Data::Dump qw/dump/;
 
 has 'usage_sort' => (
@@ -35,16 +35,12 @@
 	$usage ||= $self->session_dump( $self->usage );
 	#warn "# usage ",dump( $usage );
 
-	if ( ! $self->can('icon_path') ) {
-		$self->TODO( "re-apply Frey::Web on $self" );
-		Frey::Web->meta->apply( $self );
-	}
-
 	my $runnable = $self->load('var/Frey/Class/Browser/runnable.yaml');
 
 	foreach my $class ( $self->classes ) {
 
 		my $icon = $self->icon_path( $class );
+
 		if ($icon) {
 			push @icons, $icon;
 			$icon = qq|<!-- icon:$icon -->|;
@@ -100,7 +96,7 @@
 		$icons_html->{ $path } || die "can't find $path in ",dump($icons_html);
 	};
 
-	$self->title('Frey');
+	$self->title('Frey') if $self->can('title'); # FIXME
 
 	$self->add_css(qq|
 		a.graph {