diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm
index 49a71edb4..d16fc68a4 100644
--- a/lib/WebGUI/Asset/File/Image.pm
+++ b/lib/WebGUI/Asset/File/Image.pm
@@ -156,7 +156,7 @@ sub getEditForm {
 		my $storage = WebGUI::Storage->get($self->get("storageId"));
 		$tabform->getTab("properties")->readOnly(
 			-label=>"Thumbnail",
-			-value=>'<a href="'.$storage->getUrl($self->get("filename")).'"><img src="'.$storage->getUrl("thumb-".$self->get("filename")).'" alt="thumbnail" /></a>'
+			-value=>'<a href="'.$storage->getUrl($self->get("filename")).'"><img src="'.$storage->getUrl("thumb-".$self->get("filename")).'?noCache='.time().'" alt="thumbnail" /></a>'
 			);
 	}
 	return $tabform;
diff --git a/lib/WebGUI/Asset/FilePile.pm b/lib/WebGUI/Asset/FilePile.pm
index 72ae5b075..087ea7c9b 100644
--- a/lib/WebGUI/Asset/FilePile.pm
+++ b/lib/WebGUI/Asset/FilePile.pm
@@ -22,6 +22,7 @@ use WebGUI::Session;
 use WebGUI::SQL;
 use WebGUI::Storage;
 use WebGUI::Template;
+use WebGUI::Utility;
 
 our @ISA = qw(WebGUI::Asset);
 
@@ -180,7 +181,9 @@ sub editSave {
 		my $storage = WebGUI::Storage->create;
 		$storage->addFileFromFilesystem($tempStorage->getPath($filename));
 		my %data;
-		my $newAsset = $parent->addChild({className=>'WebGUI::Asset::File'});
+		my $class = 'WebGUI::Asset::File';
+		$class = "WebGUI::Asset::File::Image" if (isIn($storage->getFileExtension($filename),qw(jpg gif png)));
+		my $newAsset = $parent->addChild({className=>$class});
 		foreach my $definition (@{$self->definition}) {
 			foreach my $property (keys %{$definition->{properties}}) {
 				$data{$property} = WebGUI::FormProcessor::process(
@@ -196,6 +199,7 @@ sub editSave {
 		$data{url} = $parent->getUrl.'/'.$filename;
 		$newAsset->update(\%data);
 		$newAsset->setSize($storage->getFileSize($filename));
+		$newAsset->generateThumbnail if ($class eq "WebGUI::Asset::File::Image");
 	}
 	$tempStorage->delete;
 	return $parent->www_manageAssets if ($session{form}{afterEdit} eq "assetManager");