diff --git a/ws/Docbook/Extensions/Xsl/docbook2html.xsl b/ws/Docbook/Extensions/Xsl/docbook2html.xsl
index 0338766b0346a1db45b840ab3ba4dcb6c1813c9f..0ee7bb70cd73fc9cb4d0bd1a057140bfbe54b624 100644
--- a/ws/Docbook/Extensions/Xsl/docbook2html.xsl
+++ b/ws/Docbook/Extensions/Xsl/docbook2html.xsl
@@ -24,11 +24,6 @@
             <para>
                 <uri>
                     <xsl:attribute name="xlink:href">
-                        <xsl:call-template name="hdm.get.leftmost.of.separator">
-                            <xsl:with-param name="path" select="ancestor::*/@xml:base"/>
-                            <xsl:with-param name="separator" select="'/'"/>
-                        </xsl:call-template>                  
-                        <xsl:text>/</xsl:text>
                         <xsl:call-template name="hdm.get.leftmost.of.separator">
                             <xsl:with-param name="path" 
                                 select="parent::db:figure/db:mediaobject/db:imageobject/db:imagedata/@fileref"/>
@@ -43,22 +38,8 @@
         
         <xsl:if test="ends-with(parent::db:figure/db:mediaobject/db:imageobject/db:imagedata/@fileref, '.svg')">
             <para>
-                <uri target="_blank">
-                    <xsl:attribute name="xlink:href">
-                        <xsl:call-template name="hdm.get.leftmost.of.separator">
-                            <xsl:with-param name="path" select="ancestor::*/@xml:base"/>
-                            <xsl:with-param name="separator" select="'/'"/>
-                        </xsl:call-template>                  
-                        <xsl:text>/</xsl:text>
-                        <xsl:call-template name="hdm.get.leftmost.of.separator">
-                            <xsl:with-param name="path" 
-                                select="parent::db:figure/db:mediaobject/db:imageobject/db:imagedata/@fileref"/>
-                            <xsl:with-param name="separator" select="'.'"/>
-                        </xsl:call-template>                  
-                        <xsl:text>.svg</xsl:text>
-                    </xsl:attribute>
-                    <xsl:text>Separate SVG image link</xsl:text>
-                </uri>
+                <uri xlink:href="{parent::db:figure/db:mediaobject/db:imageobject/db:imagedata/@fileref}"
+                    >Separate SVG image link</uri>
             </para>
         </xsl:if>