--- a/src/pyams_content/component/gallery/zmi/templates/gallery-images.pt	Wed Feb 07 09:20:50 2018 +0100
+++ b/src/pyams_content/component/gallery/zmi/templates/gallery-images.pt	Wed Feb 07 09:22:03 2018 +0100
@@ -33,25 +33,44 @@
 				 tal:attributes="data-ams-element-name image.__name__">
 				<tal:var define="thumbnails extension:thumbnails(image.data);">
 					<tal:if condition="thumbnails">
-						<a class="fancyimg hint" data-toggle
-						   data-ams-hint-gravity="sw"
-						   title="Zoom image" i18n:attributes="title"
-						   tal:define="target thumbnails.get_thumbnail('800x600')"
-						   tal:attributes="class 'fancyimg hint {0}'.format('not-visible' if not image.visible else '');
-										   href extension:absolute_url(target);
-										   rel string:gallery_${context.__name__};">
-							<img class="thumbnail"
-								 data-ams-hint-gravity="s"
-								 tal:define="thumbnail thumbnails.get_thumbnail('128x128');
-											 image_size thumbnail.get_image_size();
-											 margin_left 64 - image_size[0] / 2;
-											 margin_top 64 - image_size[1] / 2;
-											 title i18n:image.title;"
-								 tal:attributes="src extension:absolute_url(thumbnail);
-												 id 'image_{0}_{1}'.format(context.__name__, image.__name__);
-												 original-title title or '--';
-												 style string:margin-left: ${margin_left}px;; margin-right: ${margin_left}px;; margin-top: ${margin_top}px;; margin-bottom: ${margin_top}px;;" />
-						</a>
+						<tal:if condition="image.data.content_type.startswith('image/')">
+							<a class="fancyimg hint" data-toggle
+							   data-ams-hint-gravity="sw"
+							   title="Zoom image" i18n:attributes="title"
+							   tal:define="target thumbnails.get_thumbnail('800x600')"
+							   tal:attributes="class 'fancyimg hint {0}'.format('not-visible' if not image.visible else '');
+											   href extension:absolute_url(target);
+											   rel string:gallery_${context.__name__};">
+								<img class="thumbnail"
+									 data-ams-hint-gravity="s"
+									 tal:define="thumbnail thumbnails.get_thumbnail('128x128');
+												 image_size thumbnail.get_image_size();
+												 margin_left 64 - image_size[0] / 2;
+												 margin_top 64 - image_size[1] / 2;
+												 title i18n:image.title;"
+									 tal:attributes="src extension:absolute_url(thumbnail);
+													 id 'image_{0}_{1}'.format(context.__name__, image.__name__);
+													 original-title title or '--';
+													 style string:margin-left: ${margin_left}px;; margin-right: ${margin_left}px;; margin-top: ${margin_top}px;; margin-bottom: ${margin_top}px;;" />
+							</a>
+						</tal:if>
+						<tal:if condition="not:image.data.content_type.startswith('image/')">
+							<a tal:define="thumbnail thumbnails.get_thumbnail('128x128');
+										   target view.get_thumbnail_target(image.data);
+										   image_size thumbnail.get_image_size();
+										   margin_left 64 - image_size[0] / 2;
+										   margin_top 64 - image_size[1] / 2;
+										   title i18n:image.title;"
+							   tal:omit-tag="not:target"
+							   tal:attributes="href target" data-toggle="modal">
+								<img class="thumbnail no-border"
+									 data-ams-hint-gravity="s"
+									 tal:attributes="src extension:absolute_url(thumbnail);
+													 id 'media_{0}_{1}'.format(context.__name__, image.__name__);
+													 original-title title or '--';
+													 style string:margin-left: ${margin_left}px;; margin-right: ${margin_left}px;; margin-top: ${margin_top}px;; margin-bottom: ${margin_top}px;;" />
+							</a>
+						</tal:if>
 					</tal:if>
 					<tal:if condition="not:thumbnails">
 						<img class="thumbnail hint" src="/--static--/pyams_skin/img/mimetypes/unknown.png"