diff --git a/lib/Alchemy/Phrasea/Status/XmlStatusStructureProvider.php b/lib/Alchemy/Phrasea/Status/XmlStatusStructureProvider.php
index 0b860872e6..4103753942 100644
--- a/lib/Alchemy/Phrasea/Status/XmlStatusStructureProvider.php
+++ b/lib/Alchemy/Phrasea/Status/XmlStatusStructureProvider.php
@@ -220,13 +220,13 @@ class XmlStatusStructureProvider implements StatusStructureProviderInterface
         $status['searchable'] = (Boolean) $properties['searchable'];
         $status['printable'] = (Boolean) $properties['printable'];
 
-        if (!isset($properties['img_on'])) {
-            $status['img_on'] = null;
-        }
-
-        if (!isset($properties['img_off'])) {
-            $status['img_off'] = null;
-        }
+//        if (!isset($properties['img_on'])) {
+//            $status['img_on'] = null;
+//        }
+//
+//        if (!isset($properties['img_off'])) {
+//            $status['img_off'] = null;
+//        }
 
         $statusStructure->setStatus($bit, $status);
 
diff --git a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
index 0fef3ee23e..b9c92f5015 100644
--- a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
+++ b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
@@ -47,37 +47,12 @@ class PhraseanetExtension extends \Twig_Extension
             new \Twig_SimpleFunction('record_flags', array($this, 'getRecordFlags')),
             new \Twig_SimpleFunction('border_checker_from_fqcn', array($this, 'getCheckerFromFQCN')),
             new \Twig_SimpleFunction('caption_field', array($this, 'getCaptionField')),
-            new \Twig_SimpleFunction('caption_field_label', array($this, 'getCaptionFieldLabel')),
             new \Twig_SimpleFunction('caption_field_order', array($this, 'getCaptionFieldOrder')),
 
             new \Twig_SimpleFunction('flag_slugify', array(Flag::class, 'normalizeName')),
         );
     }
 
-    /**
-     * get localized field's label
-     * @param RecordInterface $record
-     * @param $fieldName
-     * @return string - the name label
-     */
-    public function getCaptionFieldLabel(RecordInterface $record, $fieldName)
-    {
-        if ($record) {
-            /** @var \appbox $appbox */
-            $appbox = $this->app['phraseanet.appbox'];
-            $databox = $appbox->get_databox($record->getDataboxId());
-
-            foreach ($databox->get_meta_structure() as $meta) {
-                /** @var \databox_field $meta */
-                if ($meta->get_name() === $fieldName) {
-                    return $meta->get_label($this->app['locale']);
-                }
-            }
-        }
-
-        return '';
-    }
-
     public function getCaptionField(RecordInterface $record, $field, $value)
     {
         if ($record instanceof ElasticsearchRecord) {
diff --git a/templates/web/common/macros.html.twig b/templates/web/common/macros.html.twig
index ecbcd92f6f..1683aa98c3 100644
--- a/templates/web/common/macros.html.twig
+++ b/templates/web/common/macros.html.twig
@@ -126,10 +126,10 @@
 
 {% macro caption(record, can_see_business, display_exif, limitedWidth = false) %}
     <dl class="{% if limitedWidth %}{% else %}dl-horizontal{% endif %}">
-    {% for name, value in record.getCaption(caption_field_order(record, can_see_business)) %}
-        <dt>{{ caption_field_label(record, name) }}</dt>
-        <dd>{{ caption_field(record, name, value)|e|highlight|parseColor }}</dd>
-    {% endfor %}
+        {% for field in record.get_caption().get_highlight_fields(null, can_see_business) %}
+            <dt>{{ field.label_name }}</dt>
+            <dd>{{ _self.caption_value(field, bounceable|default(true))|highlight|linkify|parseColor }}</dd>
+        {% endfor %}
     </dl>
     {% if display_exif|default(true) and app.getAuthenticator().user is not none and user_setting('technical_display') == 'group' %}
         <hr/>
diff --git a/templates/web/login/common/macros.html.twig b/templates/web/login/common/macros.html.twig
index 9cbf464f86..b659ef4b02 100644
--- a/templates/web/login/common/macros.html.twig
+++ b/templates/web/login/common/macros.html.twig
@@ -39,7 +39,7 @@
 {% macro checkboxInput(field, label = '') %}
     <label for="{{ field.vars.id }}" class="checkbox">
         {{ form_widget(field) }}
-        {{ label | default(field.vars.label) }}
+        {{ label | default(field.vars.label) | trans }}
     </label>
     <div class="error-view"></div>
     {{  form_errors(field) }}
diff --git a/templates/web/prod/results/record.html.twig b/templates/web/prod/results/record.html.twig
index bccf31775e..8f8dccbe1e 100644
--- a/templates/web/prod/results/record.html.twig
+++ b/templates/web/prod/results/record.html.twig
@@ -24,7 +24,7 @@
         {% set can_see_business = granted_on_collection(record.baseId, [constant('\\ACL::CANMODIFRECORD')]) %}
 
         <div class="thumb captionTips"
-             {% if settings.rollover_thumbnail == 'caption' %}title="{{ macro.caption(record, can_see_business, false) | e }}"{% endif %}
+             {% if settings.rollover_thumbnail == 'caption' %}tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId, 'context' : 'answer', 'number' : record.position|default(0) }) }}"{% endif %}
              {% if settings.rollover_thumbnail == 'preview' %}tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}"{% endif %}
              style="height:{{ settings.images_size }}px; z-index:90;">
             <div class="doc_infos">