diff --git a/_includes/media-in-list.html b/_includes/media-in-list.html
index 8e768dc138b2edbf282f771e3fa74428f816c727..ed80a2bd87b3028821dead3ed9332c0f07ad8c42 100644
--- a/_includes/media-in-list.html
+++ b/_includes/media-in-list.html
@@ -1,12 +1,7 @@
 <li class="item  item--post">
 	<article class="article  article--post">
-		{% if video.image -%}
-        	{% if video.image  contains '://' -%}
-        		<img src="{{video.image}}" alt="" width=50% height=50% style="float: left; margin: 0 15px 0 0;"/>
-        	{% else -%}
-        		<img src="{{site.baseurl}}/images/thumbnails/{{video.image}}" alt="" width=50% height=50% style="float: right; margin: 0 0 0 15px;"/>
-            {% endif -%}
-		{% endif -%}  	
+		{%- assign realslug = video.url | split:'/' | last -%}
+        <img src="https://video.chaotikum.net/thumbnails/{{realslug}}_play.png" alt="" width=50% height=50% style="float: right; margin: 0 0 0 15px;"/>
 		<h2><a href="{{ site.baseurl }}{{ video.url }}">{{ title | markdownify | remove: '<p>' | remove: '</p>'  | strip_newlines }}</a></h2>
 		<div class="teaser">
 			{{ video.excerpt | strip_html | markdownify | truncatewords: 60 }}
diff --git a/_includes/site-header.html b/_includes/site-header.html
index 9d5132253d077e80d2615dc3a899f41349902c45..5d4f0f0e06d60c49ea13dafce12698e2b35685fb 100644
--- a/_includes/site-header.html
+++ b/_includes/site-header.html
@@ -20,14 +20,16 @@
     <!-- no feature -->
   {% else %}
     {% include site-feature.html %}
+    <div class="statusmobile" style="width: 80%; margin:0 auto; margin-top: -45px; background-color: #FAFAFA;">
+  {% include space-status-mobile.html %}
+</div>
   {% endif %}
 
   {% if page.layout == "video" -%}
-    {% capture feature_image %}https://video.chaotikum.net/thumbnails/{{page.name}}.png{% endcapture -%}
+    {%- assign realslug = page.url | split:'/' | last -%}
+    {% capture feature_image %}https://video.chaotikum.net/thumbnails/{{realslug}}_play.png{% endcapture -%}
   {% endif -%}
 
-<div class="statusmobile" style="width: 80%; margin:0 auto; margin-top: -45px; background-color: #FAFAFA;">
-  {% include space-status-mobile.html %}
-</div>
+
   
 </header>