diff --git a/ext/image/main.php b/ext/image/main.php
index 03df47e4..f4066cd6 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -39,6 +39,12 @@ class ImageIO extends Extension {
 		}
 		
 		if(is_a($event, 'SetupBuildingEvent')) {
+			$sb = new SetupBlock("Image Options");
+			$sb->position = 30;
+			$sb->add_text_option("image_ilink", "Image link ");
+			$sb->add_text_option("image_tlink", "<br>Thumbnail link ");
+			$event->panel->add_block($sb);
+
 			$thumbers = array();
 			$thumbers['Built-in GD'] = "gd";
 			$thumbers['ImageMagick'] = "convert";
diff --git a/ext/view/main.php b/ext/view/main.php
index f15f1ebf..ad5bc9ff 100644
--- a/ext/view/main.php
+++ b/ext/view/main.php
@@ -23,15 +23,6 @@ class ViewImage extends Extension {
 		if(is_a($event, 'DisplayingImageEvent')) {
 			$this->theme->display_page($event->page, $event->get_image());
 		}
-
-		if(is_a($event, 'SetupBuildingEvent')) {
-			$sb = new SetupBlock("View Options");
-			$sb->position = 30;
-			$sb->add_text_option("image_ilink", "Long link ");
-			$sb->add_text_option("image_slink", "<br>Short link ");
-			$sb->add_text_option("image_tlink", "<br>Thumbnail link ");
-			$event->panel->add_block($sb);
-		}
 	}
 }
 add_event_listener(new ViewImage());
diff --git a/ext/view/theme.php b/ext/view/theme.php
index 82cc5d3e..1bf7b19b 100644
--- a/ext/view/theme.php
+++ b/ext/view/theme.php
@@ -75,10 +75,6 @@ class ViewTheme extends Themelet {
 		$i_owner_id = int_escape($owner->id);
 
 		$html = "";
-		if(strlen($image->get_short_link()) > 0) {
-			$slink = $image->get_short_link();
-			$html .= "<p>Link: <input size='50' type='text' value='$slink'>";
-		}
 		$html .= "<p>Uploaded by <a href='".make_link("user/$h_owner")."'>$h_owner</a>";
 		if($user->is_admin()) {
 			$html .= " ($h_ip)";