diff --git a/HTML/Default/cmdwrappers_Default b/HTML/Default/cmdwrappers_Default
index 6676a44da40..991d1001065 100644
--- a/HTML/Default/cmdwrappers_Default
+++ b/HTML/Default/cmdwrappers_Default
@@ -55,6 +55,8 @@
 					<a href="[% item.weblink %]" target="_blank">
 				[% ELSIF item.type != 'text' %]
 					<a href="[% path %]?[% searchquery %]index=[% index _ (start + loop.index) %]&amp;player=[% player | uri %][% IF sess %]&amp;sess=[% sess; END %]" class="browseItemLink">
+				[% ELSIF item.type == "text" && item.image %]
+					<a href="[% item.image %]" target="_blank">
 				[% END %]
 				[% PROCESS $itemImg height="$item.size" %]</a>
 
diff --git a/HTML/Default/xmlbrowser.html b/HTML/Default/xmlbrowser.html
index 2d44d1ef536..68cc68ed6cf 100644
--- a/HTML/Default/xmlbrowser.html
+++ b/HTML/Default/xmlbrowser.html
@@ -409,11 +409,20 @@
 		[% END %]
 	[% ELSIF !item.type.match('^text') %]
 		<a href="[% path %]?[% multiquery %][% searchquery | replace("'", "%27") | uri %]index=[% (item.index || index _ (start + loop.index)) | replace("'", "%27") | uri %]&amp;player=[% player | uri %]&amp;sess=[% sess %]" class="browseItemLink">
+	[% ELSIF item.type == "text" && item.image %]
+		<a href="[% item.image %]" target="_blank">
 	[% END %]
 	
 	[% content %]
 	
 	[% IF item.weblink || item.link || !item.type.match('^text') %]
 		</a>
+	[% ELSIF item.type == "text" && item.image;
+		details = [];
+		IF item.owner; details.push(item.owner); END;
+		IF item.date; details.push(item.date); END;
+		IF details.size; "(" _ details.join(' - ') _ ")"; END;
+	 %]
+		</a>
 	[% END %]
 [% END %]