diff --git a/source/author.html.haml b/source/author.html.haml
index 97b5340..6ad2aa0 100644
--- a/source/author.html.haml
+++ b/source/author.html.haml
@@ -2,7 +2,7 @@
 pageable: true
 per_page: 6
 cover: cover.jpg
-cover_license: "[CC Zero 1.0](https://unsplash.com/license) by [José Martín](https://unsplash.com/photos/45sjAjSjArQ)"
+cover_license: '[Cover Image](https://unsplash.com/photos/2ShvY8Lf6l0) by [Lukasz Szmigiel](https://unsplash.com/szmigieldesign), [CC Zero 1.0](https://unsplash.com/license)'
 ---
 
 %header.main-header.author-head{cover}
diff --git a/source/impressum.md.erb b/source/impressum.md.erb
index c97fdde..2d797ad 100644
--- a/source/impressum.md.erb
+++ b/source/impressum.md.erb
@@ -3,7 +3,7 @@ title: Impressum
 lang: :de
 layout: page
 cover: impressum/cover.jpg
-cover_license: "[CC Zero 1.0](https://unsplash.com/license) by [Sergei Zolkin](https://unsplash.com/photos/E0Spm6XXn2Y)"
+cover_license: '[Cover Image](https://unsplash.com/photos/E0Spm6XXn2Y) by [Sergei Zolkin](https://unsplash.com/szolkin), [CC Zero 1.0](https://unsplash.com/license)'
 ---
 
 Holger Just<br>
diff --git a/source/index.html.haml b/source/index.html.haml
index ad233de..00b6fdb 100644
--- a/source/index.html.haml
+++ b/source/index.html.haml
@@ -1,7 +1,7 @@
 ---
 pageable: true
 cover: cover.jpg
-cover_license: "[CC Zero 1.0](https://unsplash.com/license) by [José Martín](https://unsplash.com/photos/45sjAjSjArQ)"
+cover_license: '[Cover Image](https://unsplash.com/photos/2ShvY8Lf6l0) by [Lukasz Szmigiel](https://unsplash.com/szmigieldesign), [CC Zero 1.0](https://unsplash.com/license)'
 ---
 
 %header.main-header{cover}
diff --git a/source/layouts/layout.haml b/source/layouts/layout.haml
index d005183..f82a142 100644
--- a/source/layouts/layout.haml
+++ b/source/layouts/layout.haml
@@ -51,7 +51,6 @@
         %section.license
           = partial("licenses/#{current_page.data.license || blog_settings.default_license}")
           - if current_page.data.cover_license.present?
-            | Cover image
-            = markdown(current_page.data.cover_license, true)
+            = '| ' + markdown(current_page.data.cover_license)
 
     = javascript_include_tag :application
diff --git a/source/tag.html.haml b/source/tag.html.haml
index 227c08b..bafcbaf 100644
--- a/source/tag.html.haml
+++ b/source/tag.html.haml
@@ -1,8 +1,7 @@
 ---
 pageable: true
-per_page: 6
 cover: cover.jpg
-cover_license: "[CC Zero 1.0](https://unsplash.com/license) by [José Martín](https://unsplash.com/photos/45sjAjSjArQ)"
+cover_license: '[Cover Image](https://unsplash.com/photos/2ShvY8Lf6l0) by [Lukasz Szmigiel](https://unsplash.com/szmigieldesign), [CC Zero 1.0](https://unsplash.com/license)'
 ---
 
 %header.main-header.tag-head{cover}