diff --git a/app/views/manage_products/_display_image.rhtml b/app/views/manage_products/_display_image.rhtml
index d273a22..a17e39a 100644
--- a/app/views/manage_products/_display_image.rhtml
+++ b/app/views/manage_products/_display_image.rhtml
@@ -1,5 +1,11 @@
 <div id='display-product-image'>
-  <%= image_tag (@product.reload.default_image('thumb')), :class => 'product-pic' %>
+  <%= image_tag (@product.reload.default_image('big')), :class => 'product-pic' %>
 </div>
 
+<% if @product.image %>
+  <%= link_to content_tag(:span, _('Zoom in')), @product.image.public_filename, 
+    :class => 'zoomify-image' %>
+<% end %>
+<%= add_zoom_to_images %>
+
 <%= edit_product_link_to_remote(@product, 'image', _('Change image')) %>
diff --git a/app/views/manage_products/show.rhtml b/app/views/manage_products/show.rhtml
index fa118b7..d9bcb47 100644
--- a/app/views/manage_products/show.rhtml
+++ b/app/views/manage_products/show.rhtml
@@ -9,7 +9,7 @@
   </div>
 
   <div id='product-details'>
-    <div id='product-image'>
+    <div id='product-image' class="zoomable-image">
       <%= render :partial => 'manage_products/display_image' %>
     </div>
     <div id='product-extra-content'>
diff --git a/app/views/search/_display_results.rhtml b/app/views/search/_display_results.rhtml
index 9489186..9615f64 100644
--- a/app/views/search/_display_results.rhtml
+++ b/app/views/search/_display_results.rhtml
@@ -38,5 +38,7 @@
   <% end %>
   
   <div style="clear:both"></div>
+
+  <%= add_zoom_to_images %>
 </div><!-- end id="search-results" -->
 
diff --git a/app/views/search/_image.rhtml b/app/views/search/_image.rhtml
index aa509b2..ed5d004 100644
--- a/app/views/search/_image.rhtml
+++ b/app/views/search/_image.rhtml
@@ -40,7 +40,7 @@
     <div class="zoomable-image">
       <%= link_to '', product_path(image), :class => "search-image-pic", 
           :style => 'background-image: url(%s)'% image.default_image(:thumb) %>
-      <%= link_to content_tag(:span, _('Zoom in')), image.default_image(:big).gsub('_big',''), 
+      <%= link_to content_tag(:span, _('Zoom in')), image.image.public_filename, 
           :class => 'zoomify-image' %>
     </div>
     <% else %>
@@ -50,4 +50,3 @@
     <div class="search-content-type-icon icon-content-<%=image.class.to_s.underscore.dasherize%>"></div>
   <% end %>
 </div>
-<%= add_zoom_to_images %>
diff --git a/app/views/search/_search_form.rhtml b/app/views/search/_search_form.rhtml
index 6143e41..ccb475e 100644
--- a/app/views/search/_search_form.rhtml
+++ b/app/views/search/_search_form.rhtml
@@ -30,14 +30,14 @@
         <%= _("Type more than 2 characters to start a search") %>
       </div>
     </div>
+
+  <% end %>
   
-    <% if @empty_query %>
-      <% hint = environment.search_hints[@asset] %>
-      <% if hint and !hint.blank? %>
-        <span class="search-hint"><%= hint %></span>
-      <% end %>
+  <% if @empty_query %>
+    <% hint = environment.search_hints[@asset] %>
+    <% if hint and !hint.blank? %>
+      <div class="search-hint"><%= hint %></div>
     <% end %>
-
   <% end %>
 
   <div style="clear: both"></div>
--
libgit2 0.21.2