diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5361191..2570ddc 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -434,13 +434,16 @@ module ApplicationHelper
         else
           '/images/icons-app/person-'+ size.to_s() +'.png'
         end
-      if File.exists?(File.join(Rails.root, 'public', theme_path, icon))
-        theme_path + icon
-      else
-        icon
-      end
+      default_or_themed_icon(icon)
     end
+  end
 
+  def default_or_themed_icon(icon)
+    if File.exists?(File.join(Rails.root, 'public', theme_path, icon))
+      theme_path + icon
+    else
+      icon
+    end
   end
 
   def profile_sex_icon( profile )
diff --git a/app/views/search/_google_maps.rhtml b/app/views/search/_google_maps.rhtml
index 5b21fb6..0f8b825 100644
--- a/app/views/search/_google_maps.rhtml
+++ b/app/views/search/_google_maps.rhtml
@@ -48,7 +48,11 @@ if (GBrowserIsCompatible()) {
       baseIcon.shadowSize=new GSize(36,32);
       baseIcon.iconAnchor=new GPoint(16,32);
       baseIcon.infoWindowAnchor=new GPoint(16,0);
-  var icon = new GIcon(baseIcon, "/images/icons-map/enterprise.png", null, "/images/icons-map/enterprise_shadow.png");
+  <%
+    icon = default_or_themed_icon("/images/icons-map/enterprise.png")
+    icon_shadow = default_or_themed_icon("/images/icons-map/enterprise_shadow.png")
+  %>
+  var icon = new GIcon(baseIcon, "<%= icon %>", null, "<%= icon_shadow %>");
 
 <%
   missed = false
--
libgit2 0.21.2