diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/image-attachments.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/image-attachments.xsl
index 638b5161f..bdf2bc884 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/image-attachments.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/image-attachments.xsl
@@ -93,6 +93,9 @@
                 <xsl:with-param name="src" 
                                 tunnel="yes" 
                                 select="concat('/cms-service/stream/image/?image_id=', ./image/id)"/>
+                <xsl:with-param name="href" 
+                                tunnel="yes" 
+                                select="foundry:parse-link(concat('/cms-service/stream/image/?image_id=', ./image/id))"/>
                 <xsl:with-param name="img-width"
                                 tunnel="yes"
                                 select="./image/width"/>
@@ -110,6 +113,17 @@
                         </xsl:otherwise>
                     </xsl:choose>
                 </xsl:with-param>
+                <xsl:with-param name="title"
+                                tunnel="yes">
+                    <xsl:choose>
+                        <xsl:when test="string-length(./caption) &gt; 0">
+                            <xsl:value-of select="./caption"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="./image/displayName"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:with-param>
                 <xsl:with-param name="sort-key" tunnel="yes" select="./sortKey"/>
                 <xsl:with-param name="position" tunnel="yes" select="position()"/>
             </xsl:apply-templates>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
index 357aec41b..5108f8685 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
@@ -1317,6 +1317,7 @@
         <xsl:param name="img-height" tunnel="yes" as="xs:integer" select="(-1)"/>
         <!-- Content of the alt attribute if provided by surrounding tag -->
         <xsl:param name="alt" tunnel="yes" as="xs:string" select="''"/>
+        <xsl:param name="title" tunnel="yes" as="xs:string" select="''"/>
         
         <xsl:variable name="src-raw">
             <xsl:choose>
@@ -1433,6 +1434,11 @@
                     <xsl:value-of select="foundry:get-static-text('', ./@alt, false())"/>
                 </xsl:attribute>
             </xsl:if>
+            <xsl:if test="$title != ''">
+                <xsl:attribute name="title">
+                    <xsl:value-of select="$title"/>
+                </xsl:attribute>
+            </xsl:if>
             <xsl:if test="./@title">
                 <xsl:attribute name="title">
                     <xsl:value-of select="foundry:get-static-text('', ./@title, false())"/>