diff --git a/templates/web/client/baskets.html.twig b/templates/web/client/baskets.html.twig
index e409a7574b..2dc571e244 100644
--- a/templates/web/client/baskets.html.twig
+++ b/templates/web/client/baskets.html.twig
@@ -94,14 +94,14 @@
 
             {% set tooltip = '' %}
             {% if app['conf'].get(['registry', 'classic', 'basket-rollover']) %}
-                {% set tooltip = 'tooltipsrc="' ~ path('prod_tooltip_caption', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id(), 'context' : 'basket', 'number' : record.get_number() }) ~ '"' %}
+                {% set tooltip = path('prod_tooltip_caption', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id(), 'context' : 'basket', 'number' : record.get_number() }) %}
             {% endif %}
 
             <div class="diapochu">
                 <div class="image">
                     <img
                         onclick="openPreview('BASK',{{ record.get_number() }}, {{ selected_basket.getId() }}); return(false);"
-                        {{ tooltip }}
+                        {% if tooltip %}tooltipsrc="{{ tooltip }}"{% endif %}
                         style="position:relative; top:{{ top }}px; {{ dim }}"
                         class="{{ thumbnail.get_height() > 42 ? 'hThumbnail' : 'vThumbnail' }} baskTips"
                         src="{{ thumbnail.get_url() }}"
diff --git a/templates/web/client/index.html.twig b/templates/web/client/index.html.twig
index af80a53390..fc8883b9e1 100644
--- a/templates/web/client/index.html.twig
+++ b/templates/web/client/index.html.twig
@@ -202,7 +202,7 @@
                                                                                         <tr>
                                                                                             <td style="width:50%" nowrap>
                                                                                                 <input class="checkbox" db="{{ sbasId }}" onchange="checkFilters();" type="checkbox" name="status[]" id="statusfil_{{ sbasId }}_off{{ sbasId }}" value="{{ sbasId }}_of{{ sbasId }}"/>
-                                                                                                <label title="{{ data['labels_off_i18n'][app['locale']] }}" for="statusfil_{{ sbasId }}_off{{ bit }}">{% if data['img_off'] %}<img src="'{{ data['img_off'] }}" title="{{ data['labels_off_i18n'][app['locale']] }}" style="width:16px;height:16px;vertical-align:bottom" />{% endif %}{{ data['labels_off_i18n'][app['locale']] }}</label>
+                                                                                                <label title="{{ data['labels_off_i18n'][app['locale']] }}" for="statusfil_{{ sbasId }}_off{{ bit }}">{% if data['img_off'] %}<img src="{{ data['img_off'] }}" title="{{ data['labels_off_i18n'][app['locale']] }}" style="width:16px;height:16px;vertical-align:bottom" />{% endif %}{{ data['labels_off_i18n'][app['locale']] }}</label>
                                                                                             </td>
                                                                                             <td style="width:50%" nowrap>
                                                                                                 <input class="checkbox" db="{{ sbasId }}" onchange="checkFilters();" type="checkbox" name="status[]" id="statusfil_{{ sbasId }}_on{{ sbasId }}" value="{{ sbasId }}_on{{ sbasId }}"/>
diff --git a/templates/web/prod/preview/basket_train.html.twig b/templates/web/prod/preview/basket_train.html.twig
index 477f75c9dc..0d9a3a46b0 100644
--- a/templates/web/prod/preview/basket_train.html.twig
+++ b/templates/web/prod/preview/basket_train.html.twig
@@ -18,7 +18,7 @@
 
       {% set tooltip = '' %}
       {% if app['conf'].get(['registry', 'classic', 'stories-preview']) %}
-        {% set tooltip = 'tooltipsrc="' ~ path('prod_tooltip_caption', { 'sbas_id' : child.getRecord(app).get_sbas_id(), 'record_id' : child.getRecord(app).get_record_id(), 'context' : 'basket' }) ~ '"' %}
+        {% set tooltip = path('prod_tooltip_caption', { 'sbas_id' : child.getRecord(app).get_sbas_id(), 'record_id' : child.getRecord(app).get_record_id(), 'context' : 'basket' }) %}
       {% endif %}
 
       {% set class = '' %}
@@ -27,7 +27,7 @@
       {% endif %}
 
       <li class="{{class}} prevTrainCurrent">
-        <img {{tooltip|raw}} jsargs="BASK|{{child.getOrd()}}|{{record.get_container().getId()}}"
+        <img {% if tooltip %}tooltipsrc="{{ tooltip }}"{% endif %} jsargs="BASK|{{child.getOrd()}}|{{record.get_container().getId()}}"
           class="openPreview prevRegToolTip" return(false);" src="{{thumbnail.get_url()}}"
             style="{{style}}margin:7px;position:relative;"/></li>
     {% endfor %}
diff --git a/templates/web/prod/preview/feed_train.html.twig b/templates/web/prod/preview/feed_train.html.twig
index 21fe150091..d6535074e9 100644
--- a/templates/web/prod/preview/feed_train.html.twig
+++ b/templates/web/prod/preview/feed_train.html.twig
@@ -18,7 +18,7 @@
 
       {% set tooltip = '' %}
       {% if app['conf'].get(['registry', 'classic', 'stories-preview']) %}
-        {% set tooltip = 'tooltipsrc="' ~ path('prod_tooltip_preview', { 'sbas_id' : child.getRecord(app).get_sbas_id(), 'record_id' : child.get_record().get_record_id() }) ~ '"' %}
+        {% set tooltip = path('prod_tooltip_preview', { 'sbas_id' : child.get_record().get_sbas_id(), 'record_id' : child.get_record().get_record_id() }) %}
       {% endif %}
 
       {% set class = '' %}
@@ -27,7 +27,7 @@
       {% endif %}
 
       <li class="{{class}} prevTrainCurrent">
-        <img {{tooltip|raw}} jsargs="FEED|{{child.get_ord()}}|{{record.get_container().getId()}}"
+        <img {% if tooltip %}tooltipsrc="{{ tooltip }}"{% endif %} jsargs="FEED|{{child.get_ord()}}|{{record.get_container().getId()}}"
           class="openPreview prevRegToolTip" return(false);" src="{{thumbnail.get_url()}}"
             style="{{style}}margin:7px;position:relative;"/></li>
     {% endfor %}
diff --git a/templates/web/prod/preview/reg_train.html.twig b/templates/web/prod/preview/reg_train.html.twig
index 6c5ef236b6..6dbb115d0a 100644
--- a/templates/web/prod/preview/reg_train.html.twig
+++ b/templates/web/prod/preview/reg_train.html.twig
@@ -37,7 +37,7 @@
 
       {% set tooltip = '' %}
       {% if app['conf'].get(['registry', 'classic', 'stories-preview']) %}
-        {% set tooltip = 'tooltipsrc="' ~ path('prod_tooltip_caption', { 'sbas_id' : contained.get_sbas_id(), 'record_id' : contained.get_record_id(), 'context' : 'preview', 'number' : contained.get_number() }) ~ '"' %}
+        {% set tooltip = path('prod_tooltip_caption', { 'sbas_id' : contained.get_sbas_id(), 'record_id' : contained.get_record_id(), 'context' : 'preview', 'number' : contained.get_number() }) %}
       {% endif %}
 
       {% set class = '' %}
@@ -46,7 +46,7 @@
       {% endif %}
 
       <li class="{{class}} prevTrainCurrent" style="">
-        <img {{tooltip}} jsargs="REG|{{loop.index}}|{{regroupement.get_serialize_key}}"
+        <img {% if tooltip %}tooltipsrc="{{ tooltip }}"{% endif %} jsargs="REG|{{loop.index}}|{{regroupement.get_serialize_key}}"
           class="openPreview prevRegToolTip" src="{{thumbnail.get_url()}}"
           style="{{style}}margin:7px;position:relative;"/></li>
     {% endfor %}