diff --git a/themes/default/category.tpl b/themes/default/category.tpl
index b5dd56881..87b9eca7d 100644
--- a/themes/default/category.tpl
+++ b/themes/default/category.tpl
@@ -73,7 +73,7 @@
 				<li class="clearfix">
 					<a href="{$link->getCategoryLink($subcategory.id_category, $subcategory.link_rewrite)|escape:'htmlall':'UTF-8'}" title="{$subcategory.name|escape:'htmlall':'UTF-8'}" class="img">
 						{if $subcategory.id_image}
-							<img src="{$link->getCatImageLink($subcategory.link_rewrite, $subcategory.id_image, 'medium_default')}" alt="" width="{$medium_defaultSize.width}" height="{$medium_defaultSize.height}" />
+							<img src="{$link->getCatImageLink($subcategory.link_rewrite, $subcategory.id_image, 'medium_default')}" alt="" width="{$mediumSize.width}" height="{$mediumSize.height}" />
 						{else}
 							<img src="{$img_cat_dir}default-medium_default.jpg" alt="" width="{$mediumSize.width}" height="{$mediumSize.height}" />
 						{/if}
diff --git a/themes/default/product.tpl b/themes/default/product.tpl
index 1984e8b02..8ed5cdab4 100644
--- a/themes/default/product.tpl
+++ b/themes/default/product.tpl
@@ -181,7 +181,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
 			</span>
 		{else}
 			<span id="view_full_size">
-				<img src="{$img_prod_dir}{$lang_iso}-default-large_default.jpg" id="bigpic" alt="" title="{$product->name|escape:'htmlall':'UTF-8'}" width="{$largeSize.width}" height="{$largeSize.height}" />
+				<img src="{$link->getImageLink($product->link_rewrite, $imageIds, 'large_default')}" id="bigpic" alt="" title="{$product->name|escape:'htmlall':'UTF-8'}" width="{$largeSize.width}" height="{$largeSize.height}" />
 				<span class="span_link">{l s='View full size'}</span>
 			</span>
 		{/if}