diff --git a/engine/lib/filestore.php b/engine/lib/filestore.php
index 61d57137287..5e8a5274e96 100644
--- a/engine/lib/filestore.php
+++ b/engine/lib/filestore.php
@@ -758,12 +758,13 @@ function get_uploaded_file($input_name) {
  * @param int $maxwidth The maximum width of the resized image
  * @param int $maxheight The maximum height of the resized image
  * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
+ * @param true|false $upscale Resize images smaller than $maxwidth x $maxheight?
  * @return false|mixed The contents of the resized image, or false on failure
  */
-function get_resized_image_from_uploaded_file($input_name, $maxwidth, $maxheight, $square = false) {
+function get_resized_image_from_uploaded_file($input_name, $maxwidth, $maxheight, $square = false, $upscale = false) {
 	// If our file exists ...
 	if (isset($_FILES[$input_name]) && $_FILES[$input_name]['error'] == 0) {
-		return get_resized_image_from_existing_file($_FILES[$input_name]['tmp_name'], $maxwidth, $maxheight, $square);
+		return get_resized_image_from_existing_file($_FILES[$input_name]['tmp_name'], $maxwidth, $maxheight, $square, 0, 0, 0, 0, $upscale);
 	}
 	return false;
 }
@@ -937,7 +938,7 @@ function get_image_resize_parameters($width, $height, $options) {
 	} else {
 		// non-square new image
 		$new_width = $maxwidth;
-		$new_height = $maxwidth;
+		$new_height = $maxheight;
 
 		// maintain aspect ratio of original image/crop
 		if (($selection_height / (float)$new_height) > ($selection_width / (float)$new_width)) {
@@ -956,21 +957,17 @@ function get_image_resize_parameters($width, $height, $options) {
 		}
 	}
 
-	// check for upscaling
-	if (!$upscale && ($height < $new_height || $width < $new_width)) {
-		// determine if we can scale it down at all
-		// (ie, if only one dimension is too small)
-		// if not, just use original size.
-		if ($height < $new_height && $width < $new_width) {
-			$ratio = 1;
-		} elseif ($height < $new_height) {
-			$ratio = $new_width / $width;
-		} elseif ($width < $new_width) {
-			$ratio = $new_height / $height;
+	if (!$upscale && ($selection_height < $new_height || $selection_width < $new_width)) {
+		// we cannot upscale and selected area is too small so we decrease size of returned image
+		if ($square) {
+			$new_height = $selection_height;
+			$new_width = $selection_width;
+		} else {
+			if ($selection_height < $new_height && $selection_width < $new_width) {
+				$new_height = $selection_height;
+				$new_width = $selection_width;
+			}
 		}
-		
-		$selection_height = $height;
-		$selection_width = $width;
 	}
 
 	$params = array(
diff --git a/mod/profile/actions/iconupload.php b/mod/profile/actions/iconupload.php
index 50ce2114110..f0a91efdbef 100644
--- a/mod/profile/actions/iconupload.php
+++ b/mod/profile/actions/iconupload.php
@@ -24,10 +24,10 @@
 			) {
 				
 				
-				$topbar = get_resized_image_from_uploaded_file('profileicon',16,16, true);
-				$tiny = get_resized_image_from_uploaded_file('profileicon',25,25, true);
-				$small = get_resized_image_from_uploaded_file('profileicon',40,40, true);
-				$medium = get_resized_image_from_uploaded_file('profileicon',100,100, true);
+				$topbar = get_resized_image_from_uploaded_file('profileicon',16,16, true, true);
+				$tiny = get_resized_image_from_uploaded_file('profileicon',25,25, true, true);
+				$small = get_resized_image_from_uploaded_file('profileicon',40,40, true, true);
+				$medium = get_resized_image_from_uploaded_file('profileicon',100,100, true, true);
 				$large = get_resized_image_from_uploaded_file('profileicon',200,200);
 				$master = get_resized_image_from_uploaded_file('profileicon',550,550);