diff --git a/lib/Alchemy/Phrasea/Helper/Record/Edit.php b/lib/Alchemy/Phrasea/Helper/Record/Edit.php
index 41939c2b39..79a55c5146 100644
--- a/lib/Alchemy/Phrasea/Helper/Record/Edit.php
+++ b/lib/Alchemy/Phrasea/Helper/Record/Edit.php
@@ -283,7 +283,7 @@ class Edit extends RecordHelper
                 , 'h'   => $thumbnail->get_height()
             );
 
-            $_lst[$indice]['preview'] = $twig->render('common/preview.html', array('record' => $record));
+            $_lst[$indice]['preview'] = $twig->render('common/preview.html.twig', array('record' => $record));
 
             $_lst[$indice]['type'] = $record->get_type();
         }
diff --git a/templates/web/common/dialog_export.html.twig b/templates/web/common/dialog_export.html.twig
index b8ac0a0b45..f459b5436a 100644
--- a/templates/web/common/dialog_export.html.twig
+++ b/templates/web/common/dialog_export.html.twig
@@ -1,4 +1,4 @@
-{% import 'common/thumbnail.html' as thumbnail %}
+{% import 'common/thumbnail.html.twig' as thumbnail %}
 
 {% macro print_ftp_form(datas) %}
     <div class="ftp_form ftp_form_{{datas.usr_id}}">
diff --git a/templates/web/common/preview.html.twig b/templates/web/common/preview.html.twig
index cadcdec94f..d5b9f0d760 100644
--- a/templates/web/common/preview.html.twig
+++ b/templates/web/common/preview.html.twig
@@ -1,5 +1,5 @@
 
-{% import 'common/thumbnail.html' as thumbnail %}
+{% import 'common/thumbnail.html.twig' as thumbnail %}
 
 {% if not_wrapped is defined and not_wrapped %}
     {% set wrap = false %}
diff --git a/templates/web/lightbox/IE6/feed.twig b/templates/web/lightbox/IE6/feed.twig
index deb0c02805..465495c057 100644
--- a/templates/web/lightbox/IE6/feed.twig
+++ b/templates/web/lightbox/IE6/feed.twig
@@ -1,6 +1,6 @@
 {% extends "common/index_bootstrap.html.twig" %}
 
-{% import 'common/thumbnail.html' as thumbnail %}
+{% import 'common/thumbnail.html.twig' as thumbnail %}
 {% import 'common/caption_templates/preview.html.twig' as caption %}
 
 {% block javascript %}
diff --git a/templates/web/lightbox/IE6/index.twig b/templates/web/lightbox/IE6/index.twig
index 6017d89a1e..99622d6dfb 100644
--- a/templates/web/lightbox/IE6/index.twig
+++ b/templates/web/lightbox/IE6/index.twig
@@ -1,6 +1,6 @@
 {% extends "common/index_bootstrap.html.twig" %}
 
-{% import 'common/thumbnail.html' as thumbnail %}
+{% import 'common/thumbnail.html.twig' as thumbnail %}
 
 {% block javascript %}
     <script type="text/javascript" src="/include/jslibs/jquery-1.7.1.js"></script>
diff --git a/templates/web/lightbox/IE6/validate.twig b/templates/web/lightbox/IE6/validate.twig
index a5278fa0f1..35bc908bcb 100644
--- a/templates/web/lightbox/IE6/validate.twig
+++ b/templates/web/lightbox/IE6/validate.twig
@@ -1,6 +1,6 @@
 {% extends "common/index_bootstrap.html.twig" %}
 
-{% import 'common/thumbnail.html' as thumbnail %}
+{% import 'common/thumbnail.html.twig' as thumbnail %}
 {% import 'common/caption_templates/preview.html.twig' as caption %}
 
 {% block javascript %}
diff --git a/templates/web/lightbox/basket_content_report.twig b/templates/web/lightbox/basket_content_report.twig
index eb598a7b3a..2ff1a655e7 100644
--- a/templates/web/lightbox/basket_content_report.twig
+++ b/templates/web/lightbox/basket_content_report.twig
@@ -1,5 +1,5 @@
 
-{% import 'common/thumbnail.html' as thumbnail %}
+{% import 'common/thumbnail.html.twig' as thumbnail %}
 
 <div style="margin:0 7px;overflow:hidden;">
     {% for basket_element in basket.getElements() %}
diff --git a/templates/web/lightbox/feed.twig b/templates/web/lightbox/feed.twig
index 6617cd2349..cc0cb3b6d5 100644
--- a/templates/web/lightbox/feed.twig
+++ b/templates/web/lightbox/feed.twig
@@ -1,6 +1,6 @@
 {% extends "common/index_bootstrap.html.twig" %}
 
-{% import 'common/thumbnail.html' as thumbnail %}
+{% import 'common/thumbnail.html.twig' as thumbnail %}
 {% import 'common/caption_templates/preview.html.twig' as caption %}
 
 {% block javascript %}
diff --git a/templates/web/lightbox/index.twig b/templates/web/lightbox/index.twig
index b4f809043b..91bfbfab3c 100644
--- a/templates/web/lightbox/index.twig
+++ b/templates/web/lightbox/index.twig
@@ -1,6 +1,6 @@
 {% extends "common/index_bootstrap.html.twig" %}
 
-{% import 'common/thumbnail.html' as thumbnail %}
+{% import 'common/thumbnail.html.twig' as thumbnail %}
 
 {% block javascript %}
     <script type="text/javascript" src="/include/jslibs/jquery-1.7.1.js"></script>
diff --git a/templates/web/lightbox/validate.twig b/templates/web/lightbox/validate.twig
index ecaeec2e8f..d7dbd51d9d 100644
--- a/templates/web/lightbox/validate.twig
+++ b/templates/web/lightbox/validate.twig
@@ -1,6 +1,6 @@
 {% extends "common/index_bootstrap.html.twig" %}
 
-{% import 'common/thumbnail.html' as thumbnail %}
+{% import 'common/thumbnail.html.twig' as thumbnail %}
 {% import 'common/caption_templates/preview.html.twig' as caption %}
 
 {% block javascript %}
diff --git a/templates/web/overview.html.twig b/templates/web/overview.html.twig
index cf8f3f884e..949031341e 100644
--- a/templates/web/overview.html.twig
+++ b/templates/web/overview.html.twig
@@ -80,7 +80,7 @@
         <div id="page">
       <h1>{{record.get_title()}}</h1>
       <div class="preview enhancable">
-        {% import 'common/thumbnail.html' as thumbnail %}
+        {% import 'common/thumbnail.html.twig' as thumbnail %}
         {% set subdef = record.get_subdef(subdef_name) %}
 
         {{ thumbnail.format(subdef, subdef.get_width(), subdef.get_height(), '', session, true) }}
diff --git a/templates/web/prod/Baskets/Reorder.html.twig b/templates/web/prod/Baskets/Reorder.html.twig
index f685bce94c..765bb70576 100644
--- a/templates/web/prod/Baskets/Reorder.html.twig
+++ b/templates/web/prod/Baskets/Reorder.html.twig
@@ -1,4 +1,4 @@
-{% import 'common/thumbnail.html' as thumbnail %}
+{% import 'common/thumbnail.html.twig' as thumbnail %}
 <div id="reorder_box" class="PNB" style="top:10px; overflow:auto; padding:10px;">
     <div id="reorder_options" style="height:32px; margin-bottom:10px;">
         <span>{% trans 'Reordonner automatiquement' %}</span>
diff --git a/templates/web/prod/Story/Reorder.html.twig b/templates/web/prod/Story/Reorder.html.twig
index 3fc4541027..b153ce9cce 100644
--- a/templates/web/prod/Story/Reorder.html.twig
+++ b/templates/web/prod/Story/Reorder.html.twig
@@ -1,4 +1,4 @@
-{% import 'common/thumbnail.html' as thumbnail %}
+{% import 'common/thumbnail.html.twig' as thumbnail %}
 <div id="reorder_options" class="PNB" style="height:30px;bottom:auto;">
     <span>{% trans 'Reordonner automatiquement' %}</span>
     <select id="auto_order">
diff --git a/templates/web/prod/Tooltip/Basket.html.twig b/templates/web/prod/Tooltip/Basket.html.twig
index cdf3405a90..47c25058f7 100644
--- a/templates/web/prod/Tooltip/Basket.html.twig
+++ b/templates/web/prod/Tooltip/Basket.html.twig
@@ -1,4 +1,4 @@
-{% import 'common/thumbnail.html' as thumbnail %}
+{% import 'common/thumbnail.html.twig' as thumbnail %}
 
 {% extends 'prod/Tooltip/Tooltip.html.twig'%}
 
diff --git a/templates/web/prod/Tooltip/Preview.html.twig b/templates/web/prod/Tooltip/Preview.html.twig
index 20a21b25fb..0d2d1fbe94 100644
--- a/templates/web/prod/Tooltip/Preview.html.twig
+++ b/templates/web/prod/Tooltip/Preview.html.twig
@@ -5,5 +5,5 @@
 {% set maxwidth = null %}
 
 {% block content %}
-    {% include 'common/preview.html' %}
+    {% include 'common/preview.html.twig' %}
 {% endblock %}
diff --git a/templates/web/prod/Tooltip/Story.html.twig b/templates/web/prod/Tooltip/Story.html.twig
index be3328070f..1f7599dd98 100644
--- a/templates/web/prod/Tooltip/Story.html.twig
+++ b/templates/web/prod/Tooltip/Story.html.twig
@@ -1,4 +1,4 @@
-{% import 'common/thumbnail.html' as thumbnail %}
+{% import 'common/thumbnail.html.twig' as thumbnail %}
 
 {% extends 'prod/Tooltip/Tooltip.html.twig'%}
 
diff --git a/templates/web/prod/Tooltip/TechnicalDatas.html.twig b/templates/web/prod/Tooltip/TechnicalDatas.html.twig
index 764325a321..98649cdd7a 100644
--- a/templates/web/prod/Tooltip/TechnicalDatas.html.twig
+++ b/templates/web/prod/Tooltip/TechnicalDatas.html.twig
@@ -5,5 +5,5 @@
 {% set maxwidth = null %}
 
 {% block content %}
-    {% include 'common/technical_datas.twig' %}
+    {% include 'common/technical_datas.html.twig' %}
 {% endblock %}
diff --git a/templates/web/prod/WorkZone/Browser/Basket.html.twig b/templates/web/prod/WorkZone/Browser/Basket.html.twig
index 0eb974da4f..3e1f5efb8b 100644
--- a/templates/web/prod/WorkZone/Browser/Basket.html.twig
+++ b/templates/web/prod/WorkZone/Browser/Basket.html.twig
@@ -94,7 +94,7 @@
   {% set top = top + 40 %}
 
 
-  {% import 'common/thumbnail.html' as thumbnail %}
+  {% import 'common/thumbnail.html.twig' as thumbnail %}
 
 
   <div class="PNB" style="top:{{ top }}px;">
diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig
index b74a89dce8..b649882cee 100644
--- a/templates/web/prod/WorkZone/Browser/Results.html.twig
+++ b/templates/web/prod/WorkZone/Browser/Results.html.twig
@@ -1,4 +1,4 @@
-{% import 'common/thumbnail.html' as thumbnail %}
+{% import 'common/thumbnail.html.twig' as thumbnail %}
 
 <div class="PNB header">
   <table>
diff --git a/templates/web/prod/WorkZone/Macros.twig b/templates/web/prod/WorkZone/Macros.twig
index e5f095da68..74434f1c95 100644
--- a/templates/web/prod/WorkZone/Macros.twig
+++ b/templates/web/prod/WorkZone/Macros.twig
@@ -248,7 +248,7 @@
       {% set box_height = (box_height + 20) %}
   {% endif %}
 
-  {% import 'common/thumbnail.html' as thumbnail %}
+  {% import 'common/thumbnail.html.twig' as thumbnail %}
 
   <div ondblclick="{% if wz_scope == 'groupings' %}openPreview('REG',{{ ord }},'{{container.get_sbas_id()}}_{{container.get_record_id()}}');{% else %}openPreview('BASK',{{ ord }},{{container.getId()}});{% endif %}"
        class="CHIM diapo CHIM_{{record.get_serialize_key()}}" style="height:{{box_height}}px;"
diff --git a/templates/web/prod/actions/Bridge/Flickr/upload.twig b/templates/web/prod/actions/Bridge/Flickr/upload.twig
index 5dc1db2f46..8f966483ff 100644
--- a/templates/web/prod/actions/Bridge/Flickr/upload.twig
+++ b/templates/web/prod/actions/Bridge/Flickr/upload.twig
@@ -1,5 +1,5 @@
 {% extends "prod/actions/Bridge/wrapper.twig"%}
-{% import "common/thumbnail.html" as thumb %}
+{% import "common/thumbnail.html.twig" as thumb %}
 {% import "prod/actions/Bridge/macro_error_form.twig" as error_form %}
 
 {% block menu %}
diff --git a/templates/web/prod/actions/Bridge/index.twig b/templates/web/prod/actions/Bridge/index.twig
index 99fc6d9e46..c5b27367e7 100644
--- a/templates/web/prod/actions/Bridge/index.twig
+++ b/templates/web/prod/actions/Bridge/index.twig
@@ -1,5 +1,5 @@
 
-{% import "common/thumbnail.html" as thumb %}
+{% import "common/thumbnail.html.twig" as thumb %}
 
 <div class="PNB" id='dialog_publicator'>
     <div id='publicator_selection' class="PNB10 ui-corner-all">
diff --git a/templates/web/prod/actions/Bridge/records_list.twig b/templates/web/prod/actions/Bridge/records_list.twig
index cdc272697e..7aabdd7d69 100644
--- a/templates/web/prod/actions/Bridge/records_list.twig
+++ b/templates/web/prod/actions/Bridge/records_list.twig
@@ -1,5 +1,5 @@
 {% extends "prod/actions/Bridge/wrapper.twig" %}
-{% import "common/thumbnail.html" as thumb %}
+{% import "common/thumbnail.html.twig" as thumb %}
 
 
 
diff --git a/templates/web/prod/actions/publish/publish.html b/templates/web/prod/actions/publish/publish.html
index 5cbcebc62a..aac2047059 100644
--- a/templates/web/prod/actions/publish/publish.html
+++ b/templates/web/prod/actions/publish/publish.html
@@ -1,5 +1,5 @@
 {% macro format_diapo(record, session) %}
-    {% import 'common/thumbnail.html' as thumbnail %}
+    {% import 'common/thumbnail.html.twig' as thumbnail %}
     <div class="diapo">
         {{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true)}}
     </div>
diff --git a/templates/web/prod/actions/publish/publish_edit.html b/templates/web/prod/actions/publish/publish_edit.html
index 3342358a02..2ff21da251 100644
--- a/templates/web/prod/actions/publish/publish_edit.html
+++ b/templates/web/prod/actions/publish/publish_edit.html
@@ -1,6 +1,6 @@
 
 {% macro format_diapo(record, session) %}
-  {% import 'common/thumbnail.html' as thumbnail %}
+  {% import 'common/thumbnail.html.twig' as thumbnail %}
   <div class="diapo">
     {{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true)}}
   </div>
diff --git a/templates/web/prod/orders/order_item.twig b/templates/web/prod/orders/order_item.twig
index b9add58859..b2d5861735 100644
--- a/templates/web/prod/orders/order_item.twig
+++ b/templates/web/prod/orders/order_item.twig
@@ -1,4 +1,4 @@
-{% import 'common/thumbnail.html' as thumbnail %}
+{% import 'common/thumbnail.html.twig' as thumbnail %}
 
 <div>
     <div>
diff --git a/templates/web/prod/preview/caption.html b/templates/web/prod/preview/caption.html
index 931f7b7fe7..786387175e 100644
--- a/templates/web/prod/preview/caption.html
+++ b/templates/web/prod/preview/caption.html
@@ -18,4 +18,4 @@
     {{caption.format_caption(record, highlight, searchEngine, business)}}
   {% endif %}
   <hr style="margin:10px 0;"/>
-  {% include 'common/technical_datas.twig' %}
\ No newline at end of file
+  {% include 'common/technical_datas.html.twig' %}
\ No newline at end of file
diff --git a/templates/web/prod/results/record.html b/templates/web/prod/results/record.html
index 98227f626b..3ff64f7a77 100644
--- a/templates/web/prod/results/record.html
+++ b/templates/web/prod/results/record.html
@@ -1,5 +1,5 @@
 {% macro block(record, user, session, highlight, searchEngine, prefix, entry_id)%}
-    {% import 'common/thumbnail.html' as thumbnail %}
+    {% import 'common/thumbnail.html.twig' as thumbnail %}
     {% import 'common/doctype_icons.html.twig' as doctype_icons %}
     {% import 'common/drop_down_options.html.twig' as drop_down %}
     {% set th_size = user.getPrefs('images_size')%}
diff --git a/templates/web/prod/upload/lazaret.html.twig b/templates/web/prod/upload/lazaret.html.twig
index aa34e3ff87..58be9ab039 100644
--- a/templates/web/prod/upload/lazaret.html.twig
+++ b/templates/web/prod/upload/lazaret.html.twig
@@ -199,7 +199,7 @@
 </script>
 
 {% macro lazaretElement(file) %}
-    {% import "common/thumbnail.html" as thumb %}
+    {% import "common/thumbnail.html.twig" as thumb %}
     {% set records = file.getRecordsToSubstitute() %}
     <div class="lazaret-file span4">
         <h5>{% trans "Last uploaded version" %}</h5>
diff --git a/www/client/answer.php b/www/client/answer.php
index 6616c9f7ae..730d1e8341 100644
--- a/www/client/answer.php
+++ b/www/client/answer.php
@@ -301,7 +301,7 @@ if (count($result->get_datas()) > 0) {
 
         try {
             $record->get_subdef('document');
-            $light_info = $twig->render('common/technical_datas.twig', array('record' => $record));
+            $light_info = $twig->render('common/technical_datas.html.twig', array('record' => $record));
         } catch (\Exception $e) {
             $light_info = '';
         }
diff --git a/www/client/clientFeedBack.php b/www/client/clientFeedBack.php
index eacd2542f4..d96b7092b1 100644
--- a/www/client/clientFeedBack.php
+++ b/www/client/clientFeedBack.php
@@ -79,7 +79,7 @@ switch ($parm['action']) {
                         , 'searchEngine' => $search_engine
                         )
                     )
-                    , "html_preview" => $twig->render('common/preview.html', array('record' => $record)
+                    , "html_preview" => $twig->render('common/preview.html.twig', array('record' => $record)
                     )
                     , "others" => $twig->render('prod/preview/appears_in.html', array(
                         'parents' => $record->get_grouping_parents(),