diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index 7b3af3d16e20421ec17cbcb3b565faadaffa2c1d..6099b6c39b43dc8f9437e3cade1f8314a59cd363 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -12,6 +12,8 @@
                 @include handle-svg-fit
                 order: -1
                 margin-bottom: $spacing1
+                &:empty
+                    display: none
                 img
                     display: block
                     aspect-ratio: 16/9
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 36cc5617547e42ea8e1d2eaf1115b13dcc1cc05e..574bc71f183bc048218172743c2231668a05c99c 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    {{ partial "head/csp.html" }}
     {{ partial "head/css.html" }}
     {{ partial "head/seo.html" . }}
     {{ partial "head/favicons.html" . }}
diff --git a/layouts/partials/blocks/templates/partners.html b/layouts/partials/blocks/templates/partners.html
index 3815a63ca858085bae957d885adb335da8cb4d8f..9b721a2e3f441fb8c435df9b086bceadc520390e 100644
--- a/layouts/partials/blocks/templates/partners.html
+++ b/layouts/partials/blocks/templates/partners.html
@@ -14,6 +14,7 @@
 
 {{- with .block.data -}}
   {{- $layout := .layout -}}
+  {{- $with_link := .with_link -}}
 
   {{- if $layout -}}
     {{- $layout_class = printf "block-partners--%s" $layout -}}
@@ -38,6 +39,7 @@
         {{- partial (printf "blocks/templates/partners/%s.html" $layout) (dict 
             "partners" .partners
             "logo_index" $logo_index
+            "with_link" $with_link
           ) }}
       </div>
     </div>
@@ -51,7 +53,7 @@
   {{ if .title }}
     {{ $title = partial "PrepareHTML" .title -}}
     <h3>
-      {{- if .url }}
+      {{- if and .url .with_link }}
         <a href="{{ .url }}" {{ if .external }} target="_blank" rel="noopener" {{ end }} title="{{ safeHTML (i18n "commons.link.blank_aria" (dict "Title" $title)) }}">
       {{ end -}}
         {{- $title -}}
diff --git a/layouts/partials/blocks/templates/partners/grid.html b/layouts/partials/blocks/templates/partners/grid.html
index c767d1827eeaf31faa1d17ab921d8e50e9967787..f9cbcab260051f8b568a21a939fc5082a77b14eb 100644
--- a/layouts/partials/blocks/templates/partners/grid.html
+++ b/layouts/partials/blocks/templates/partners/grid.html
@@ -1,4 +1,5 @@
 {{ $logo_index := .logo_index }}
+{{ $with_link := .with_link }}
 
 <div class="grid organizations">
   {{- range .partners }}
@@ -8,6 +9,7 @@
             "title" .Title
             "url" .Permalink
             "logo" (index .Params $logo_index)
+            "with_link" $with_link
           )}}
       {{ end }}
     {{ else }}
@@ -16,6 +18,7 @@
           "url" .url
           "external" true
           "logo" .logo
+          "with_link" $with_link
         )}}
     {{ end }}
   {{ end -}}
diff --git a/layouts/partials/head/csp.html b/layouts/partials/head/csp.html
new file mode 100644
index 0000000000000000000000000000000000000000..82d5cb2279874ffd35e4c4c0a7f0649caa1de7d8
--- /dev/null
+++ b/layouts/partials/head/csp.html
@@ -0,0 +1,5 @@
+{{- with site.Data.website.external_domains -}}
+<meta
+  http-equiv="Content-Security-Policy"
+  content="default-src 'self' {{ delimit . " " }} {{ if not hugo.IsProduction }}'unsafe-inline'{{ end }}" />
+{{- end -}}
\ No newline at end of file