diff --git a/wp-admin/b2upload.php b/wp-admin/b2upload.php
index bd4a3555e..a413cc01f 100644
--- a/wp-admin/b2upload.php
+++ b/wp-admin/b2upload.php
@@ -207,7 +207,7 @@ if (!empty($HTTP_POST_VARS)) { //$img1_name != "") {
 
 
 if ( ereg('image/',$img1_type)) {
-	$piece_of_code = "<img src="$fileupload_url/$img1_name" border="0" alt="$imgdesc" />"; 
+	$piece_of_code = "<img src="$fileupload_url/$img1_name" alt="$imgdesc" />"; 
 } else {
 	$piece_of_code = "<a href="$fileupload_url/$img1_name" title="$imgdesc" />$imgdesc</a>"; 
 };
diff --git a/wp-layout.css b/wp-layout.css
index e41b5daf2..bf2ce114f 100644
--- a/wp-layout.css
+++ b/wp-layout.css
@@ -3,6 +3,10 @@
 	Please tweak this and make it your own. :)
 */
 
+a img {
+    border: none;
+}
+
 a {
 	color: #675;
 }