diff --git a/css/style.css b/css/style.css
index e5efa00..8d09e05 100644
--- a/css/style.css
+++ b/css/style.css
@@ -545,6 +545,7 @@ h1 {
 
 .thumb {
     max-width: 700px;
+    height: auto;
 }
 
 .format {
diff --git a/templates/inc/logo.tpl b/templates/inc/logo.tpl
index a600013..09e7fc3 100644
--- a/templates/inc/logo.tpl
+++ b/templates/inc/logo.tpl
@@ -1,8 +1,7 @@
 <h1 class="logobis">
     <a class="logocompatible" href="{base_url}">
         <span class="logocompatiblemask">
-            <img src="{base_url}/img/logocompatiblemask.png" width="447" height="107"
-                 alt="{$config->appName}"/>
+            {html_image file='img/logocompatiblemask.png' path_prefix={base_url}|cat:'/' alt=$config->appName}
         </span>
     </a>
 </h1>
diff --git a/templates/index.tpl b/templates/index.tpl
index fab4b08..a06bf59 100644
--- a/templates/index.tpl
+++ b/templates/index.tpl
@@ -1,7 +1,8 @@
 {extends file='page.tpl'}
 {block name='main'}
-    <div><img class="logo" src="{base_url}/img/logo.png"
-              alt="{$config->appName}" width="328" height="284"></div>
+    <div>
+        {html_image file='img/logo.png' path_prefix={base_url}|cat:'/' alt=$config->appName class="logo"}
+    </div>
     <form action="{path_for name="info"}">
         <label class="labelurl" for="url">
             {t}Copy here the URL of your video (YouTube, Dailymotion, etc.){/t}
diff --git a/templates/info.tpl b/templates/info.tpl
index fa881ac..51474eb 100644
--- a/templates/info.tpl
+++ b/templates/info.tpl
@@ -7,7 +7,7 @@
             {t params=['@title' => $title]}You are going to download @title.{/t}
         </p>
         {if isset($video->thumbnail)}
-            <img itemprop="thumbnailUrl" class="thumb" src="{$video->thumbnail}" alt=""/>
+            {html_image file=$video->thumbnail itemprop="thumbnailUrl" class="thumb"}
         {/if}
         {if isset($video->description)}
             <meta itemprop="description" content="{$video->description|escape}"/>