diff --git a/lib/WebGUI/Attachment.pm b/lib/WebGUI/Attachment.pm
index 44931167f..f772d646a 100644
--- a/lib/WebGUI/Attachment.pm
+++ b/lib/WebGUI/Attachment.pm
@@ -208,7 +208,7 @@ sub getIcon {
 	$icon = $session{setting}{lib}."/fileIcons/";
 	if (isIn($extension, qw(doc dot wri))) {
                 $icon .= "doc.gif";
-        } elsif (isIn($extension, qw(txt log config conf))) {
+        } elsif (isIn($extension, qw(txt log config conf pm cnf readme))) {
                 $icon .= "txt.gif";
 	} elsif (isIn($extension, qw(xlt csv xls))) {
                 $icon .= "xls.gif";
@@ -218,9 +218,11 @@ sub getIcon {
                 $icon .= "html.gif";
         } elsif (isIn($extension, qw(exe com bat pif))) {
                 $icon .= "exe.gif";
+        } elsif (isIn($extension, qw(vsd vdx))) {
+                $icon .= "vsd.gif";
         } elsif (isIn($extension, qw(sit hqx))) {
                 $icon .= "sit.gif";
-        } elsif (isIn($extension, qw(dwg dwf))) {
+        } elsif (isIn($extension, qw(dwg dwf dxf))) {
                 $icon .= "dwg.gif";
         } elsif (isIn($extension, qw(indd p65))) {
                 $icon .= "indd.gif";
@@ -323,7 +325,7 @@ sub getThumbnail {
 
 sub getType {
 	my ($extension);
-	$extension = $_[0]->getFilename;
+	$extension = lc($_[0]->getFilename);
 	$extension =~ s/.*\.(.*?)$/$1/;
 	return $extension;
 }
diff --git a/www/extras/fileIcons/dwg.gif b/www/extras/fileIcons/dwg.gif
index a19caf28f..d2467da65 100644
Binary files a/www/extras/fileIcons/dwg.gif and b/www/extras/fileIcons/dwg.gif differ
diff --git a/www/extras/fileIcons/vsd.gif b/www/extras/fileIcons/vsd.gif
new file mode 100644
index 000000000..360232dfc
Binary files /dev/null and b/www/extras/fileIcons/vsd.gif differ