diff --git a/kml.module b/kml.module
index 13a0191..b982f00 100644
--- a/kml.module
+++ b/kml.module
@@ -27,6 +27,11 @@ function kml_theme() {
       'template' => 'kml-placemark',
       'path' => $path . "/views",
     ),
+    'kml_feed_icon' => array(
+      'arguments' => array(),
+      'file' => 'kml_views.theme.inc',
+      'path' => $path . "/views",
+    ),
     'kml_style' => array(
       'arguments' => array('points' => array()),
       'file' => 'kml_style.theme.inc',
diff --git a/views/kml_views.theme.inc b/views/kml_views.theme.inc
index 59b9e01..8b7b1cf 100644
--- a/views/kml_views.theme.inc
+++ b/views/kml_views.theme.inc
@@ -44,11 +44,9 @@ function template_preprocess_kml_placemark(&$vars) {
 }
 
 /**
- * Theme function for kml feed icon.
+ * Theme function for feed icon.
  */
-function theme_kml_feed_icon($url, $title, $icon) {
-  if ($image = theme('image', $icon, t('Download KML Feed'), $title)) {
-    return '<a href="'. check_url($url) 
-      .'" class="feed-icon">'. $image .'</a>';
-  }
-}
+function theme_kml_feed_icon() {
+  $icon = drupal_get_path('module', 'kml').'/images/kml.png';
+  return theme('image', $icon, t('KML icon'), t('Download KML Feed'));
+}
\ No newline at end of file
diff --git a/views/views_plugin_style_kml.inc b/views/views_plugin_style_kml.inc
index 1042819..ccee36d 100644
--- a/views/views_plugin_style_kml.inc
+++ b/views/views_plugin_style_kml.inc
@@ -8,19 +8,16 @@ class views_plugin_style_kml extends views_plugin_style {
 
   /**
    * Initialize plugin.
-   *
-   * Set feed image for shared rendering later.
    */
   function init(&$view, &$display, $options = NULL) {
     parent::init($view, $display, $options = NULL);
-    $this->feed_image = drupal_get_path('module', 'kml') . '/images/kml.png';
   }
 
   /**
    * Attach this view to another display as a feed.
    *
    * Provide basic functionality for all export style views like attaching a
-   * feed image link.
+   * feed icon link.
    */
   function attach_to($display_id, $path, $title) {
     $url_options = array('html' => TRUE);
@@ -31,8 +28,8 @@ class views_plugin_style_kml extends views_plugin_style {
       $url_options['query'] = $query;
     }
 
-    $image = theme('image', $this->feed_image);
-    $this->view->feed_icon .= l($image, $this->view->get_url(NULL, $path), $url_options);
+    $image = theme('kml_feed_icon');
+    $this->view->feed_icon .= l($image, $path, $url_options);
   }
 
   function option_definition() {