diff --git a/prosopopee/templates/index.html b/prosopopee/templates/index.html
index 4869b10..b866c4b 100644
--- a/prosopopee/templates/index.html
+++ b/prosopopee/templates/index.html
@@ -31,7 +31,9 @@
               {% if gallery.date %}<div class="gallery-datetime">{{ gallery.date.strftime("%d %B %Y") }}</div>{% endif %}
             </div>
           </a>
-          <div class="gallery-cover" style="background-image: url('{{ helpers.generate_thumbnail(gallery.cover, "x900") }}');"></div>
+          {% set cover = Image(gallery.cover) %}
+          {{ cover.copy() }}
+          <div class="gallery-cover" style="background-image: url('{{ cover.generate_thumbnail("x900") }}');"></div>
         </div><!-- comment tricks against space between inline-block
         -->{% endfor %}
       </div>
diff --git a/prosopopee/templates/sections/bordered-picture.html b/prosopopee/templates/sections/bordered-picture.html
index 6c7ee0c..294c454 100644
--- a/prosopopee/templates/sections/bordered-picture.html
+++ b/prosopopee/templates/sections/bordered-picture.html
@@ -1,6 +1,7 @@
-{{ helpers.copy_image(section.image) }}
+{% set image = Image(section.image) %}
+{{ image.copy()}}
 <section class="bordered-picture baguette">
-    <a href="{{ helpers.get_image_name(section.image) }}">
-        <img src="{{ helpers.get_image_name(section.image) }}">
+    <a href="{{ image }}">
+        <img src="{{ image }}">
     </a>
 </section>
diff --git a/prosopopee/templates/sections/full-picture.html b/prosopopee/templates/sections/full-picture.html
index 79c3e9d..48eb774 100644
--- a/prosopopee/templates/sections/full-picture.html
+++ b/prosopopee/templates/sections/full-picture.html
@@ -1,5 +1,6 @@
-{{ helpers.copy_image(section.image) }}
-<section class="full-picture" style="background: transparent url('{{ helpers.get_image_name(section.image) }}') no-repeat scroll center top / cover;">
+{% set image = Image(section.image) %}
+{{ image.copy() }}
+<section class="full-picture" style="background: transparent url('{{ image }}') no-repeat scroll center top / cover;">
     {% if section.text %}
         <div class="picture-text">
             <div class="picture-text-column">
diff --git a/prosopopee/templates/sections/panorama.html b/prosopopee/templates/sections/panorama.html
index 3d260a3..a9e2767 100644
--- a/prosopopee/templates/sections/panorama.html
+++ b/prosopopee/templates/sections/panorama.html
@@ -1,4 +1,5 @@
-{{ helpers.copy_image(section.image) }}
+{% set image = Image(section.image) %}
+{{ image.copy() }}
 <section class="panorama">
-    <img src="{{ helpers.generate_thumbnail(section.image, "x800") }}">
+    <img src="{{ image.generate_thumbnail("x800") }}">
 </section>
diff --git a/prosopopee/templates/sections/pictures-group.html b/prosopopee/templates/sections/pictures-group.html
index acbe708..bc9a282 100644
--- a/prosopopee/templates/sections/pictures-group.html
+++ b/prosopopee/templates/sections/pictures-group.html
@@ -2,10 +2,11 @@
     {% for line in section.images %}
         <div class="pictures-line">
             {% for image in line %}
-                {{ helpers.copy_image(image) }}
+                {% set image = Image(image) %}
+                {{ image.copy() }}
                 <div class="picture">
-                    <a href="{{ helpers.get_image_name(image) }}">
-                        <img src="{{ helpers.generate_thumbnail(image, "x600") }}">
+                    <a href="{{ image }}">
+                        <img src="{{ image.generate_thumbnail("x600") }}">
                     </a>
                 </div>
             {% if not loop.last %}