diff --git a/app/views/search/_google_maps.rhtml b/app/views/search/_google_maps.rhtml
index ace7851..aae0b53 100644
--- a/app/views/search/_google_maps.rhtml
+++ b/app/views/search/_google_maps.rhtml
@@ -3,28 +3,20 @@
   <div id="map"></div>
 </div>
 
-<%= content_tag('script', '', :src => GoogleMaps.api_url(environment.default_hostname), :type => 'text/javascript') %>
+<%= content_tag('script', '', :src => "http://maps.google.com/maps/api/js?sensor=true", :type => 'text/javascript') %>
 <%= javascript_include_tag('google_maps') %>
 
 <%
   icon = default_or_themed_icon("/images/icons-map/enterprise.png")
-  icon_shadow = default_or_themed_icon("/images/icons-map/enterprise_shadow.png")
 %>
 
 <script type='text/javascript'>
   mapLoad(<%= GoogleMaps.initial_zoom.to_json %>);
 
-  mapBaseIcon = new GIcon();
-  mapBaseIcon.iconSize=new GSize(32,32);
-  mapBaseIcon.shadowSize=new GSize(36,32);
-  mapBaseIcon.iconAnchor=new GPoint(16,32);
-  mapBaseIcon.infoWindowAnchor=new GPoint(16,0);
-  icon = new GIcon(mapBaseIcon, "<%= icon %>", null, "<%= icon_shadow %>");
-
   <% @results.each do |name,results| %>
     <% results.each do |item| %>
       <% if item.lat && item.lng %>
-        mapPutMarker(<%= item.lat.to_json %>, <%= item.lng.to_json %>, <%= item.name.to_json %>, icon,
+        mapPutMarker(<%= item.lat.to_json %>, <%= item.lng.to_json %>, <%= item.name.to_json %>, '<%= icon %>',
           '<%= url_for(:controller => :map_balloon, :action => name.to_s.singularize, :id => item.id) %>');
       <% end %>
     <% end %>
diff --git a/app/views/search/_product.rhtml b/app/views/search/_product.rhtml
index 2c18d3e..875c64b 100644
--- a/app/views/search/_product.rhtml
+++ b/app/views/search/_product.rhtml
@@ -3,7 +3,7 @@
 
 <li class="search-product-item">
   <div class="search-product-item-first-column">
-    <%= render :partial => 'image', :object => product %>
+    <%= render :partial => 'search/image', :object => product %>
 
     <% if product.available %>
       <% if product.price && product.price > 0 %>
--
libgit2 0.21.2