diff --git a/view/js/fancybox/fancybox.config.js b/view/js/fancybox/fancybox.config.js
index 233b423f9..94a67eb7f 100644
--- a/view/js/fancybox/fancybox.config.js
+++ b/view/js/fancybox/fancybox.config.js
@@ -1,13 +1,10 @@
 $(document).ready(function() {
     $.fancybox.defaults.loop = "true";
-    // this disables the colorbox hook found in frio/js/modal.js:34
-    $("body").off("click", ".wall-item-body a img");
-
-    // Adds ALT/TITLE text to fancybox
-    $('a[data-fancybox').fancybox({
-        afterLoad : function(instance, current) {
-            current.$image.attr('alt', current.opts.$orig.find('img').attr('alt') );
-            current.$image.attr('title', current.opts.$orig.find('img').attr('title') );
-        }
-    });
-});
\ No newline at end of file
+	$.fancybox.defaults.afterLoad = function(instance, current) {
+		current.$image.attr('alt', current.opts.$orig.find('img').attr('alt') );
+		current.$image.attr('title', current.opts.$orig.find('img').attr('title') );
+	};
+    $.fancybox.defaults.caption = function (instance, slide, caption) {
+		return slide.$thumb.attr('alt');
+	};
+});
diff --git a/view/templates/content/image/single.tpl b/view/templates/content/image/single.tpl
index b3dfb7413..ea19c48a5 100644
--- a/view/templates/content/image/single.tpl
+++ b/view/templates/content/image/single.tpl
@@ -1,5 +1,10 @@
 {{if $image->preview}}
 <a data-fancybox="{{$image->uriId}}" href="{{$image->url}}"><img src="{{$image->preview}}" alt="{{$image->description}}" title="{{$image->description}}" loading="lazy"></a>
 {{else}}
-<img src="{{$image->url}}" alt="{{$image->description}}" title="{{$image->description}}" loading="lazy">
+<figure>
+	<img src="{{$image->url}}" alt="{{$image->description}}" title="{{$image->description}}" loading="lazy">
+	{{if $image->description}}
+	<figcaption>{{$image->description}}</figcaption>
+    {{/if}}
+</figure>
 {{/if}}
diff --git a/view/templates/content/image/single_with_height_allocation.tpl b/view/templates/content/image/single_with_height_allocation.tpl
index 1d70194be..60b4669e3 100644
--- a/view/templates/content/image/single_with_height_allocation.tpl
+++ b/view/templates/content/image/single_with_height_allocation.tpl
@@ -12,6 +12,9 @@
 		</a>
     {{else}}
 		<img src="{{$image->url}}" alt="{{$image->description}}" title="{{$image->description}}" loading="lazy">
+        {{if $image->description}}
+		    <figcaption>{{$image->description}}</figcaption>
+        {{/if}}
     {{/if}}
 </figure>