diff --git a/app/helpers/catalog_helper.rb b/app/helpers/catalog_helper.rb
index 84a7c4a..5f550e9 100644
--- a/app/helpers/catalog_helper.rb
+++ b/app/helpers/catalog_helper.rb
@@ -8,7 +8,7 @@ include ManageProductsHelper
     products.each { |product|
       extra_content = @plugins.map(:catalog_item_extras, product).collect { |content| instance_eval(&content) }
       data << content_tag('li',
-        link_to_product(product, :class => 'product-pic', :style => 'background-image:url(%s)' % ( product.image ? product.image.public_filename(:portrait) : '/images/icons-app/product-default-pic-portrait.png' )) +
+        link_to_product(product, :class => 'product-pic', :style => 'background-image:url(%s)' % product.default_image(:portrait) ) +
         content_tag('h3', link_to_product(product)) +
         content_tag('ul',
           (product.price ? content_tag('li', _('Price: %s') % ( "%.2f" % product.price), :class => 'product_price') : '') +
diff --git a/app/models/product.rb b/app/models/product.rb
index a67cc52..20e85e5 100644
--- a/app/models/product.rb
+++ b/app/models/product.rb
@@ -68,7 +68,7 @@ class Product < ActiveRecord::Base
   end
 
   def default_image(size='thumb')
-    '/images/icons-app/product-default-pic-%s.png' % size
+    image ? image.public_filename(size) : '/images/icons-app/product-default-pic-%s.png' % size
   end
 
   def category_full_name
diff --git a/app/models/products_block.rb b/app/models/products_block.rb
index 2b64092..fb804a9 100644
--- a/app/models/products_block.rb
+++ b/app/models/products_block.rb
@@ -20,7 +20,15 @@ class ProductsBlock < Block
     block_title(title) +
     content_tag(
       'ul',
-      products.map {|product| content_tag('li', link_to(product.name, product.url, :style => 'background-image:url(%s)' % ( product.image ? product.image.public_filename(:minor) : product.default_image('minor'))), :class => 'product' )}
+      products.map {|product|
+        content_tag('li',
+          link_to( product.name,
+                   product.url,
+                   :style => 'background-image:url(%s)' % product.default_image('minor')
+                 ),
+          :class => 'product'
+        )
+      }
     )
   end
 
diff --git a/app/views/manage_products/_display_image.rhtml b/app/views/manage_products/_display_image.rhtml
index 3ed4218..d273a22 100644
--- a/app/views/manage_products/_display_image.rhtml
+++ b/app/views/manage_products/_display_image.rhtml
@@ -1,5 +1,5 @@
 <div id='display-product-image'>
-  <%= image_tag (@product.reload.image ? @product.image.public_filename : @product.default_image('thumb')), :class => 'product-pic' %>
+  <%= image_tag (@product.reload.default_image('thumb')), :class => 'product-pic' %>
 </div>
 
 <%= edit_product_link_to_remote(@product, 'image', _('Change image')) %>
diff --git a/app/views/manage_products/_edit_image.rhtml b/app/views/manage_products/_edit_image.rhtml
index fa40388..3924386 100644
--- a/app/views/manage_products/_edit_image.rhtml
+++ b/app/views/manage_products/_edit_image.rhtml
@@ -1,5 +1,5 @@
 <div id='display-product-image'>
-  <%= image_tag (@product.reload.image ? @product.image.public_filename : @product.default_image('thumb')), :class => 'product-pic' %>
+  <%= image_tag (@product.reload.default_image('thumb')), :class => 'product-pic' %>
 </div>
 
 <% form_for(:product, :url => { :controller => 'manage_products', :action => 'edit', :id => @product, :field => 'image' }, :html => { :method => 'post', :id => 'uploadForm', :multipart => true}) do |f| %>
--
libgit2 0.21.2