diff --git a/data/TWiki/ImagePlugin.txt b/data/TWiki/ImagePlugin.txt
index 4c6e6ea..7596a95 100644
--- a/data/TWiki/ImagePlugin.txt
+++ b/data/TWiki/ImagePlugin.txt
@@ -138,19 +138,7 @@ order is left-to-right-inside-out.
    
 
 ---++ Plugin Installation Instructions
-
-   * Download the ZIP file
-   * Unzip ==%TOPIC%.zip== in your twiki installation directory. Content:
-     | *File:* | *Description:* |
-%$MANIFEST%
-   * Optionally, run ==%TOPIC%_installer== to automatically check and install
-     other extensions that this module depends on. You can also do this step
-     manually.
-   * Alternatively, manually make sure the dependencies listed in the table below are resolved.
-     %$DEPENDENCIES%
-   * run the [[%SCRIPTURL{"configure"}%][configure]] script to enable the plugin
-   * Test if the installation was successful:
-      * For complete example see Sandbox.ImagePluginTest
+%$INSTALL_INSTRUCTIONS%
 
 ---++ Plugin Info
 <!--
@@ -160,7 +148,7 @@ order is left-to-right-inside-out.
 |  Plugin Author: | Craig Meyer |
 |  Copyright: | &copy; 2006, Craig Meyer, %BR% &copy; 2006-2009 Michael Daum http://michaeldaumconsulting.com |
 |  License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
-|  Plugin Version: | 1.21 |
+|  Plugin Version: | 1.22 |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
 |  07 Jan 2008: | certified for foswiki/compat |
 |  03 Jul 2008: | fixed parsing the type parameter; \
diff --git a/lib/TWiki/Plugins/ImagePlugin.pm b/lib/TWiki/Plugins/ImagePlugin.pm
index c2d2289..0d6496c 100644
--- a/lib/TWiki/Plugins/ImagePlugin.pm
+++ b/lib/TWiki/Plugins/ImagePlugin.pm
@@ -28,7 +28,7 @@ use strict;
 use vars qw( $VERSION $RELEASE $doneHeader $imageCore $imgStyle $baseWeb $baseTopic);
 
 $VERSION = '$Rev$';
-$RELEASE = '1.21'; # please increase on every upload to twiki.org
+$RELEASE = '1.22'; # please increase on every upload to twiki.org
 
 ###############################################################################
 sub initPlugin {
@@ -45,7 +45,7 @@ sub initPlugin {
   $doneHeader = 0;
   $imgStyle = 
     '<link rel="stylesheet" '.
-    'href="%PUBURL%/%SYSTEMWEB%/ImagePlugin/style.css" '.
+    'href="%PUBURL%/%TWIKIWEB%/ImagePlugin/style.css" '.
     'type="text/css" media="all" />';
 
 
diff --git a/lib/TWiki/Plugins/ImagePlugin/Core.pm b/lib/TWiki/Plugins/ImagePlugin/Core.pm
index 5c55f05..1b285d3 100644
--- a/lib/TWiki/Plugins/ImagePlugin/Core.pm
+++ b/lib/TWiki/Plugins/ImagePlugin/Core.pm
@@ -104,7 +104,7 @@ sub new {
 
   $this->{magnifyIcon} = 
     TWiki::Func::getPluginPreferencesValue('IMAGEPLUGIN_MAGNIFY_ICON') ||
-    '%PUBURLPATH%/%SYSTEMWEB%/ImagePlugin/magnify-clip.png';
+    '%PUBURLPATH%/%TWIKIWEB%/ImagePlugin/magnify-clip.png';
   $this->{magnifyWidth} = 15; # TODO: make this configurable/autodetected/irgnored
   $this->{magnifyHeight} = 11; # TODO: make this configurable/autodetected/irgnored