diff --git a/e107_core/shortcodes/single/imagepreview.php b/e107_core/shortcodes/single/imagepreview.php
index 8c95c8d92..5a5bc4c72 100644
--- a/e107_core/shortcodes/single/imagepreview.php
+++ b/e107_core/shortcodes/single/imagepreview.php
@@ -1,37 +1,37 @@
-<?php 
+<?php
 // $Id$
 
 function imagepreview_shortcode($parm)
 {
-	list($name, $width, $height) = explode("|",$parm, 3);
-	
+	list($name, $width, $height, $nothumb) = explode("|",$parm, 4);
+
 	$name = rawurldecode(varset($name));//avoid warnings
 	if(varset($width))
 	{
-		$width = " width: {$width};";
+		$width = intval($width);
 	}
-	else $width = '';
+	else $width = 0;
 	if(varset($height))
 	{
-		$height = " height: {$height};";
+		$height = intval($height);
 	}
-	else $height = '';
-		
+	else $height = 0;
+
 	// array support
 	if(strpos($name, '[')) //can't be first string
 	{
-		$matches = array(); 
+		$matches = array();
 		$search = $name;
-		
+
 		$tmp = explode('[', $name, 2);
 		$name = $tmp[0]; unset($tmp);
-		
+
 		$path = '';
 
 		if(isset($_POST[$name]) && is_array($_POST[$name]) && preg_match_all('#\[([\w]*)\]#', $search, $matches, PREG_PATTERN_ORDER))
 		{
 			$posted = $_POST[$name];
-			foreach ($matches[1] as $varname) 
+			foreach ($matches[1] as $varname)
 			{
 				if(!isset($posted[$varname]))
 				{
@@ -40,16 +40,21 @@ function imagepreview_shortcode($parm)
 				$posted = $posted[$varname];
 			}
 		}
-		if($posted && is_string($posted)) 
+		if($posted && is_string($posted))
 			$path = e107::getParser()->replaceConstants($posted, 'full');
 	}
 	else  $path = (varset($_POST[$name])/* && deftrue('e_AJAX_REQUEST')*/) ? e107::getParser()->replaceConstants($_POST[$name], 'full') : '';
 	$hide = '';
-	
-	if(!$path) 
+
+	if(!$path)
 	{
-		$path = e_IMAGE_ABS."generic/blank.gif";
+		$path = '#';
+		$thpath = e_IMAGE_ABS."generic/blank.gif";
 		$hide = ' style="display: none;"';
 	}
-	return "<a href='{$path}' rel='external' class='e-image-preview'{$hide}><img src='{$path}' alt=\"\" class='image-selector' style='{$width}{$height}' /></a>";
+	else
+	{
+		$thpath = !varset($nothumb) ? e107::getParser()->thumbUrl($path, 'w='.$width.'h='.$height, true) : $path;
+	}
+	return "<a href='{$path}' rel='external' class='e-image-preview'{$hide}><img src='{$thpath}' alt=\"\" class='image-selector' /></a>";
 }
\ No newline at end of file
diff --git a/e107_core/shortcodes/single/imageselector.sc b/e107_core/shortcodes/single/imageselector.sc
index e9ad91e20..15a97de28 100644
--- a/e107_core/shortcodes/single/imageselector.sc
+++ b/e107_core/shortcodes/single/imageselector.sc
@@ -1,7 +1,9 @@
 
 // $Id$
 //FIXME - full rewrite, backward compatible
-global $sql,$parm,$tp;
+
+$sql = e107::getDb();
+$tp = e107::getParser();
 
 if(strstr($parm,"="))
 {  // query style parms.
@@ -120,15 +122,16 @@ if(varset($click_target))
 {
    $pre		= varset($click_prefix);
    $post 	= varset($click_postfix);
-   $text .= "<a href='#'{$hide} onclick='addtext(\"{$pre}\"+document.getElementById(\"{$name_id}\").value+\"{$post}\", true);document.getElementById(\"{$name_id}\").selectedIndex = -1;return false;'>";
+   $text .= "<a href='#'{$hide} title='Select' onclick='addtext(\"{$pre}\"+document.getElementById(\"{$name_id}\").value+\"{$post}\", true);document.getElementById(\"{$name_id}\").selectedIndex = -1;return false;'>";
 }
 else
 {
-	$text .= "<a href='{$pvw_default}'{$hide} rel='external' class='e-image-preview'>";
+	$text .= "<a href='{$pvw_default}'{$hide} rel='external' title='Preview {$pvw_default}' class='e-image-preview'>";
 }
-if(vartrue($height)) $height = "height:{$height};";
-if(vartrue($width)) $width = "width:{$width}; ";
-$text .= "<img src='{$pvw_default}' alt='' style='{$width}{$height}' /></a>";
+if(vartrue($height)) $height = intval($height);
+if(vartrue($width)) $width = intval($width);
+$thpath = isset($parms['nothumb']) ? $pvw_default : $tp->thumbUrl($pvw_default, 'w='.$width.'h='.$height, true);
+$text .= "<img src='{$thpath}' alt='$pvw_default' class='image-selector' /></a>";
 
 $text .= "</div>\n";
 
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 443a96eb1..f551a91e8 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -177,7 +177,7 @@ class e_form
 		$parms .= "&multiple=FALSE";
 		$parms .= "&label=-- ".$label." --";
 		$parms .= "&subdirs=".varset($sc_parameters['subdirs'], 1);
-		$parms .= '&width='.vartrue($sc_parameters['width'], 150).'px';
+		$parms .= '&width='.vartrue($sc_parameters['width'], 150);
 		if(vartrue($sc_parameters['height'])) $parms .= '&height='.$sc_parameters['height'].'px';
 		//$parms .= "&tabindex=".$this->getNext();
 		//$parms .= "&click_target=data";