diff --git a/assets/css/app.css b/assets/css/app.css
index a783b960..67f131b8 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -356,8 +356,9 @@ btn-xs
     box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
 }
 
+
 .thumbnail-sm {
-    height: 100px;
+    max-height: 100px;
 }
 
 img.img-attachement {
diff --git a/templates/AdminPages/_attachments.html.twig b/templates/AdminPages/_attachments.html.twig
index 7be983dd..d4e3c648 100644
--- a/templates/AdminPages/_attachments.html.twig
+++ b/templates/AdminPages/_attachments.html.twig
@@ -42,7 +42,7 @@
                         {% endif %}
                         {% if attach.picture %}
                             <a href="{{ attach | entityURL('file_view') }}" target="_blank" data-no-ajax>
-                                <img class="img-fluid img-thumbnail" src="{{ attach | entityURL('file_view') }}" alt="{% trans %}attachment.preview.alt{% endtrans %}" />
+                                <img class="img-fluid img-thumbnail thumbnail-sm" src="{{ attach | entityURL('file_view') }}" alt="{% trans %}attachment.preview.alt{% endtrans %}" />
                             </a>
                         {% else %}
                             <a href="{{ attach | entityURL('file_view') }}" target="_blank" data-no-ajax class="link-external">{% trans %}attachment.view{% endtrans %}</a>
diff --git a/templates/Parts/edit/_attachments.html.twig b/templates/Parts/edit/_attachments.html.twig
index 42f274c0..7496c25e 100644
--- a/templates/Parts/edit/_attachments.html.twig
+++ b/templates/Parts/edit/_attachments.html.twig
@@ -39,6 +39,14 @@
                         </span>
                         </h6>
                     {% endif %}
+
+                    {% if attach.picture %}
+                        <a href="{{ attach | entityURL('file_view') }}" target="_blank" data-no-ajax>
+                            <img class="img-fluid img-thumbnail thumbnail-sm" src="{{ attach | entityURL('file_view') }}" alt="{% trans %}attachment.preview.alt{% endtrans %}" />
+                        </a>
+                    {% else %}
+                        <a href="{{ attach | entityURL('file_view') }}" target="_blank" data-no-ajax class="link-external">{% trans %}attachment.view{% endtrans %}</a>
+                    {% endif %}
                 {% else %}
                     <br><br>
                     <h6>