diff --git a/layouts/diplomas/list.html b/layouts/diplomas/list.html
index 10585d3e3d481588aeb31099b44b52a51d6f2eff..90957484baf2e0366199c2885049094c29811e3e 100644
--- a/layouts/diplomas/list.html
+++ b/layouts/diplomas/list.html
@@ -3,14 +3,11 @@
 
   <div class="document-content">
     <div class="container">
-      {{ partial "diplomas/image.html" .Params.image }}
       {{ partial "diplomas/chapo.html" .Params.description_short }}
     </div>
     {{ partial "blocks/list.html" . }}
     <div class="container">
-      {{ .Scratch.Set "show_programs" true }}
       {{ partial "diplomas/diplomas.html" . }}
-      {{ .Scratch.Delete "show_programs" }}
     </div>
   </div>
 
diff --git a/layouts/partials/diplomas/diplomas.html b/layouts/partials/diplomas/diplomas.html
index f7a297eb7c72328a454b6415a8a9be500830a96e..cf025d6bb3903d4f4034c66f36b35ac67926ab8a 100644
--- a/layouts/partials/diplomas/diplomas.html
+++ b/layouts/partials/diplomas/diplomas.html
@@ -1,7 +1,3 @@
-{{ $show_programs := false }}
-{{- if .Scratch.Get "show_programs" }}
-  {{ $show_programs = true }}
-{{ end -}}
 <ul class="diplomas">
   {{ range .Paginator.Pages }}
     <li>
@@ -18,17 +14,17 @@
           Lorem, ipsum dolor sit amet consectetur adipisicing elit. Esse labore aliquid nobis quasi, molestiae voluptatum ullam et consequatur voluptas. Eligendi quaerat veniam, sequi repellat illo dignissimos quasi libero itaque dolorum?
           {{- partial "PrepareHTML" .Params.description_short -}}
         </div>
-        {{- if $show_programs }}
-          <ol class="programs">
-            {{- range .Pages -}}
-              <li>
-                <a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" .Title)) }}">
-                  {{- partial "PrepareHTML" .Title -}}
-                </a>
-              </li>
-            {{- end -}}
-          </ol>
-        {{ end -}}
+
+        <ol class="programs">
+          {{- range .Pages -}}
+            <li>
+              <a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" .Title)) }}">
+                {{- partial "PrepareHTML" .Title -}}
+              </a>
+            </li>
+          {{- end -}}
+        </ol>
+
       </div>
     </li>
   {{ end }}
diff --git a/layouts/partials/diplomas/hero-list.html b/layouts/partials/diplomas/hero-list.html
index d989fe21231ac352c6f61792a19853092bdff120..8e7e675c055dce99ef4dda14b248d20db258f721 100644
--- a/layouts/partials/diplomas/hero-list.html
+++ b/layouts/partials/diplomas/hero-list.html
@@ -2,5 +2,6 @@
 {{- partial "header/hero.html"
       (dict
         "title" $title
+        "image" .Params.image
         "context" .
       ) -}}
diff --git a/layouts/partials/diplomas/hero-single.html b/layouts/partials/diplomas/hero-single.html
index 0d4312a1536df56034877eb40ee5bc6bcdaf66e4..abe6f4f9c2ebc7bc15338bebca2343edcbaaf0a9 100644
--- a/layouts/partials/diplomas/hero-single.html
+++ b/layouts/partials/diplomas/hero-single.html
@@ -6,6 +6,22 @@
     {{- end -}}
     <div class="content">
       <h1>{{ partial "PrepareHTML" $title }}</h1>
+      {{- if .Params.image }}
+        <figure>
+          {{ partial "commons/image.html"
+            (dict
+              "image"    .image
+              "mobile"   "351"
+              "tablet"   "456"
+              "desktop"  "856"
+            ) }}
+          {{ if .image.credit }}
+            <figcaption>
+              {{- partial "PrepareHTML" .image.credit -}}
+            </figcaption>
+          {{ end }}
+        </figure>
+      {{ end -}}
     </div>
   </div>
   <div id="essential">