diff --git a/v4/layouts/_default/_markup/render-image.html b/v4/layouts/_default/_markup/render-image.html
index 1ffc1db64..cd980b5f5 100644
--- a/v4/layouts/_default/_markup/render-image.html
+++ b/v4/layouts/_default/_markup/render-image.html
@@ -1,12 +1,42 @@
+{{- $u := urls.Parse .Destination -}}
+{{- $src := $u.String -}}
+{{- if not $u.IsAbs -}}
+  {{- $path := strings.TrimPrefix "./" $u.Path }}
+  {{- with or (.PageInner.Resources.Get $path) (resources.Get $path) -}}
+    {{- $src = .RelPermalink -}}
+    {{- with $u.RawQuery -}}
+      {{- $src = printf "%s?%s" $src . -}}
+    {{- end -}}
+    {{- with $u.Fragment -}}
+      {{- $src = printf "%s#%s" $src . -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+{{- $attributes := merge .Attributes (dict "alt" .Text "src" $src "title" (.Title | transform.HTMLEscape)) -}}
+
+{{- /* Define the href for the anchor tag, it could be same as the image src or another variable */ -}}
+{{- $href := $src | default $src -}}
+
 {{ if .Title }}
 <figure>
-    <a href="{{ .Destination | safeURL }}" data-dimbox data-dimbox-caption="{{ .Text }}">
-        <img src="{{ .Destination | safeURL }}" alt="{{ .Text }}" />
+    <a href="{{ $href | safeURL }}" data-dimbox data-dimbox-caption="{{ .Text }}">
+      <img
+      {{- range $k, $v := $attributes -}}
+        {{- if $v -}}
+          {{- printf " %s=%q" $k $v | safeHTMLAttr -}}
+        {{- end -}}
+      {{- end -}} />
     </a>
     <figcaption>{{ .Title }}</figcaption>
 </figure>
 {{ else }}
-<a href="{{ .Destination | safeURL }}" data-dimbox data-dimbox-caption="{{ .Text }}">
-    <img src="{{ .Destination | safeURL }}" alt="{{ .Text }}" />
+<a href="{{ $href | safeURL }}" data-dimbox data-dimbox-caption="{{ .Text }}">
+  <img
+    {{- range $k, $v := $attributes -}}
+      {{- if $v -}}
+        {{- printf " %s=%q" $k $v | safeHTMLAttr -}}
+      {{- end -}}
+    {{- end -}} />
 </a>
 {{ end }}
+{{- /**/ -}}