diff --git a/Koha/UI/Form/Builder/Item.pm b/Koha/UI/Form/Builder/Item.pm
index 7a2f54466f..c636fd6b19 100644
--- a/Koha/UI/Form/Builder/Item.pm
+++ b/Koha/UI/Form/Builder/Item.pm
@@ -106,7 +106,7 @@ sub generate_subfield_form {
 
     $subfield_data{tag}           = $tag;
     $subfield_data{subfield}      = $subfieldtag;
-    $subfield_data{marc_lib}      = "<span title=\"" . $subfield->{lib} . "\">" . $subfield->{lib} . "</span>";
+    $subfield_data{marc_lib}      = $subfield->{lib};
     $subfield_data{mandatory}     = $subfield->{mandatory};
     $subfield_data{important}     = $subfield->{important};
     $subfield_data{repeatable}    = $subfield->{repeatable};
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
index df3909f064..36a01951e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
@@ -91,11 +91,7 @@
 
             <li>
                 <div class="subfield_line" style="[% subfield.visibility | html %]" id="subfield[% subfield.tag | html %][% subfield.subfield | html %][% subfield.random | html %]">
-                    [% IF ( subfield.mandatory ) %]
-                        <label class="required">[% subfield.subfield | html %] - [% subfield.marc_lib | $raw %]</label>
-                    [% ELSE %]
-                        <label>[% subfield.subfield | html %] - [% subfield.marc_lib | $raw %]</label>
-                    [% END %]
+                    <label [% IF subfield.mandatory %]class="required"[% END %]>[% subfield.subfield | html %] - <span title="[% subfield.marc_lib | html %]">[% subfield.marc_lib | $raw %]</span></label>
 
                     [% SET mv = subfield.marc_value %]
                     [% IF ( mv.type == 'hidden' ) %]