diff --git a/app/views/admin/communication/blocks/templates/chapter/_preview.html.erb b/app/views/admin/communication/blocks/templates/chapter/_preview.html.erb
index d0ccddf6fb680bba7b0830b4eaf268ba468e0fd3..a7476fa18f180dcb1166cab63d949cbf5d0edb63 100644
--- a/app/views/admin/communication/blocks/templates/chapter/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/chapter/_preview.html.erb
@@ -1,9 +1,14 @@
-<%= block_component_preview :image %>
-<div class="small">
-  <p class="mb-0">
-    <%= block_component_preview :alt %>
-  </p>
-  <%= block_component_preview :credit %>
+<div class="chapter">
+  <div>
+    <%= block_component_preview :text %>
+  </div>
+  <div class="notes">
+    <%= block_component_preview :notes %>
+  </div>
 </div>
-<%= block_component_preview :text %>
-<%= block_component_preview :notes %>
+<figure>
+    <%= block_component_preview :image %>
+    <figcaption>
+      <%= block_component_preview :credit %>
+    </figcaption>
+</figure>
diff --git a/app/views/admin/communication/blocks/templates/files/_preview.html.erb b/app/views/admin/communication/blocks/templates/files/_preview.html.erb
index f7e976917bebcd69d2ed4080e7948d589be3bdb7..d4335a6f54e742415bb3061c68575d21900b9f86 100644
--- a/app/views/admin/communication/blocks/templates/files/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/files/_preview.html.erb
@@ -1,12 +1,13 @@
-<%= block_component_preview :description %>
+<div class="description">
+  <%= block_component_preview :description %>
+</div>
 <ul>
   <% @block.template.elements.each do |element| %>
     <% next unless element.blob %>
     <li>
-      <a href="<%= element.blob.url %>" download>
-        <%= element.title %>
-        <small>(<%= element.blob.filename %>)</small>
+      <a href="<%= element.blob.url %>" download="{{ partial 'PrepareHTML' $file.name }}" target="_blank" title="{{ i18n 'commons.link.blank_aria' (dict 'Title' $title_with_size) }}">
+        <span><%= element.title %><br><span>(<%= element.blob.filename %>)</span></span>
       </a>
     </li>
   <% end %>
-</ul>
+</ul>
\ No newline at end of file