diff --git a/contrib/qr_code/theme.php b/contrib/qr_code/theme.php
index 92e2a01f..8f6103de 100644
--- a/contrib/qr_code/theme.php
+++ b/contrib/qr_code/theme.php
@@ -3,7 +3,7 @@ class QRImageTheme extends Themelet {
 	public function links_block($link) {
 		global $page;
 		$page->add_block( new Block(
-			"QR Code","<img src='http://chart.apis.google.com/chart?chs=150x150&cht=qr&chl=$link' />","left",50));
+			"QR Code","<img alt='QR Code' src='http://chart.apis.google.com/chart?chs=150x150&amp;cht=qr&amp;chl=$link' />","left",50));
 	}
 }
 ?>
diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index ea5815c9..a465eadf 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -563,6 +563,7 @@ class Image {
 		$tmpl = str_replace('$filesize', to_shorthand_int($this->filesize), $tmpl);
 		$tmpl = str_replace('$filename', $_escape($base_fname), $tmpl);
 		$tmpl = str_replace('$title', $_escape($config->get_string("title")), $tmpl);
+		$tmpl = str_replace(' ', '%20', $tmpl);
 
 		// nothing seems to use this, sending the event out to 50 exts is a lot of overhead
 		if(!SPEED_HAX) {
diff --git a/ext/handle_pixel/theme.php b/ext/handle_pixel/theme.php
index 84957ac3..565375cb 100644
--- a/ext/handle_pixel/theme.php
+++ b/ext/handle_pixel/theme.php
@@ -5,7 +5,7 @@ class PixelFileHandlerTheme extends Themelet {
 		global $config;
 
 		$u_ilink = $image->get_image_link();
-		$html = "<img id='main_image' src='$u_ilink'>";
+		$html = "<img alt='main image' id='main_image' src='$u_ilink'>";
 		if($config->get_bool("image_show_meta")) {
 			# FIXME: only read from jpegs?
 			$exif = @exif_read_data($image->get_image_filename(), 0, true);