diff --git a/templates/admin/core_custom/custom-fields/element-data.html.twig b/templates/admin/core_custom/custom-fields/element-data.html.twig
index 4f5ec50e34c0b77a763b18790d0c133da1c411ce..f35a144a862ff4633f83e934164ba8eeea8317d3 100755
--- a/templates/admin/core_custom/custom-fields/element-data.html.twig
+++ b/templates/admin/core_custom/custom-fields/element-data.html.twig
@@ -49,7 +49,7 @@
   </tbody>
   </table>
   <button type="button" class="btn btn-add-field btn-default btn-sm" @click="addField()">
-    {{ 'elements.form.groups.addCustomField'|trans }}
+    {{ 'elements.form.addCustomField'|trans }}
   </button>
 </div>
 <h4>{{ 'elements.form.groups.specialFields'|trans }}</h4>
diff --git a/templates/admin/core_custom/custom-fields/form-builder.html.twig b/templates/admin/core_custom/custom-fields/form-builder.html.twig
index 346269590b0cb8e9eb435bfdbe8a602cef064711..dc33e109aea3e0ee7ff433f4ba70dc262defeb10 100755
--- a/templates/admin/core_custom/custom-fields/form-builder.html.twig
+++ b/templates/admin/core_custom/custom-fields/form-builder.html.twig
@@ -29,7 +29,7 @@
       var templates = {
         title: function(fieldData) { return { field: '<input id="' + fieldData.name + '"><span class="mandatory">' +t('js.form_builder.fields.title_help') + '</span>' }; },
         address: function(fieldData) { return { field: '<input id="' + fieldData.name + '"><span class="mandatory">' +t('js.form_builder.fields.address_help') + '</span>' }; },
-        taxonomy: function(fieldData) { return { field: '<select id="' + fieldData.name + '"><option>Choisissez une catégorie principale</option></select><span class="mandatory">' +t('js.form_builder.fields.taxonomy_help') + '</span>' }; },
+        taxonomy: function(fieldData) { return { field: '<select id="' + fieldData.name + '"><option>Choisissez une catégorie principale</option></select><span class="mandatory">' +t('js.form_builder.fields.taxonomy') + '</span>' }; },
         openhours: function(fieldData) { return { field: t('js.form_builder.fields.openhours_help') }; },
         separator: function(fieldData) { return { field: '<hr>' }; },
         checkbox: function(fieldData) { return { field: '<input id="' + fieldData.name + '"' + (fieldData.defaultvalue == "yes" ? 'checked="checked"' : '') + ' type="checkbox"/>' }; },
diff --git a/templates/admin/edit/edit_element_actions.html.twig b/templates/admin/edit/edit_element_actions.html.twig
index 02718578fc02fb147d80e7ca9994917039f41892..9afd685799565ac34b8229f78b89498fb947bd88 100755
--- a/templates/admin/edit/edit_element_actions.html.twig
+++ b/templates/admin/edit/edit_element_actions.html.twig
@@ -32,7 +32,7 @@
 
                 {% else %}
                     <button type="submit" class="btn btn-success" name="submit"><i class="fa fa-save" aria-hidden="true"></i>
-                     {{ (object.havePendingReports ? 'elements.action.edit.submit' : 'elements.action.edit.submit_resolve')|trans }}</button>
+                     {{ (object.havePendingReports ? 'elements.action.edit.submit_resolve' : 'elements.action.edit.submit')|trans }}</button>
 
                     {% if not object.havePendingReports %} 
                     <button type="submit" class="btn btn-success" name="submit_redirect" value="submit_redirect"><i class="fa fa-save"></i> <i class="fa fa-list" aria-hidden="true"></i>
@@ -43,12 +43,12 @@
                      {{ 'elements.action.edit.submit_delete'|trans }}</button>
                 {% endif %}                
 
-                <a href="{{ admin.generateObjectUrl('redirectShow', object) }}" class="btn btn-warning" target="_blank" title="{{ 'elements.showOnSite'|trans }}">
+                <a href="{{ admin.generateObjectUrl('redirectShow', object) }}" class="btn btn-warning" target="_blank">
                     <i class="fa fa-external-link" aria-hidden="true"></i><i class="fa fa-eye" aria-hidden="true"></i>
                     {{ 'elements.action.edit.showOnSite'|trans }}
                 </a>
 
-                <a href="{{ admin.generateObjectUrl('redirectEdit', object) }}" class="btn btn-warning" target="_blank" title="{{ 'elements.editOnSite'|trans }}">
+                <a href="{{ admin.generateObjectUrl('redirectEdit', object) }}" class="btn btn-warning" target="_blank">
                    <i class="fa fa-external-link" aria-hidden="true"></i><i class="fa fa-pencil" aria-hidden="true"></i>
                      {{ 'elements.action.edit.editOnSite'|trans }}
                 </a>
diff --git a/translations/admin+intl-icu.fr.yaml b/translations/admin+intl-icu.fr.yaml
index 0ec1f1dd2db506c7a9a7c93084d5d0d8bbbf562e..1abac883db4fbf0de03ee4fbcf80a9a9efd913bd 100755
--- a/translations/admin+intl-icu.fr.yaml
+++ b/translations/admin+intl-icu.fr.yaml
@@ -231,6 +231,9 @@ elements:
         json: "API JSON"
         osm: "OpenStreetMap"
   form:
+    duplicateOf: "Cet élément a été fusionné avec un autre :"
+    seeDuplicate: "voir l'élément fusionné"
+    addCustomField: "Ajouter un champ personnalisé"
     groups:
       general: "Informations générales"
       localisation: "Localisation"
@@ -239,10 +242,7 @@ elements:
       show_contributions: "Historique des contributions"
       pending: En attente
       seeOnOSM: "Voir cet élément sur OpenStreetMap"
-      customFields: "Champs Personnalisés"
-      duplicateOf: "Cet élément a été fusionné avec un autre :"
-      seeDuplicate: "voir l'élément fusionné"
-      addCustomField: "Ajouter un champ personnalisé"
+      customFields: "Champs Personnalisés"      
       specialFields: "Champs Spéciaux"
   filter:
     name: "Nom"