diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index e912c667cb..b4d1e99d14 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -388,8 +388,8 @@ sub create_input {
                     size=\"67\"
                     maxlength=\"$max_length\"
                     \/>
-                    <a href=\"#\" class=\"buttonDot\"
-                        onclick=\"openAuth(this.parentNode.getElementsByTagName('input')[1].id,'".$tagslib->{$tag}->{$subfield}->{authtypecode}."'); return false;\" tabindex=\"1\" title=\"Tag Editor\">...</a>
+                    <span class=\"subfield_controls\"><a href=\"#\" class=\"buttonDot\"
+                       onclick=\"openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id,'".$tagslib->{$tag}->{$subfield}->{authtypecode}."'); return false;\" tabindex=\"1\" title=\"Tag Editor\"><img src=\"/intranet-tmpl/prog/img/edit-tag.png\" alt=\"Tag Editor\" /></a></span>
             ";
       } else {
         $subfield_data{marc_value} =
@@ -402,8 +402,8 @@ sub create_input {
                     size=\"67\"
                     maxlength=\"$max_length\"
                     readonly=\"readonly\"
-                    \/><a href=\"#\" class=\"buttonDot\"
-                        onclick=\"openAuth(this.parentNode.getElementsByTagName('input')[1].id,'".$tagslib->{$tag}->{$subfield}->{authtypecode}."'); return false;\" tabindex=\"1\" title=\"Tag Editor\">...</a>
+                    \/><span class=\"subfield_controls\"><a href=\"#\" class=\"buttonDot\"
+                        onclick=\"openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id,'".$tagslib->{$tag}->{$subfield}->{authtypecode}."'); return false;\" tabindex=\"1\" title=\"Tag Editor\"><img src=\"/intranet-tmpl/prog/img/edit-tag.png\" alt=\"Tag Editor\" /></a></span>
             ";
       }
     # it's a plugin field
@@ -433,7 +433,7 @@ sub create_input {
                             size=\"67\"
                             maxlength=\"$max_length\"
                             onblur=\"Blur$function_name($index_tag); \" \/>
-                            <a href=\"#\" class=\"buttonDot\" onclick=\"Clic$function_name('$subfield_data{id}'); return false;\" tabindex=\"1\" title=\"Tag Editor\">...</a>
+                            <span class=\"subfield_controls\"><a href=\"#\" class=\"buttonDot\" onclick=\"Clic$function_name('$subfield_data{id}'); return false;\" tabindex=\"1\" title=\"Tag Editor\"><img src=\"/intranet-tmpl/prog/img/edit-tag.png\" alt=\"Tag Editor\" /></a></span>
                     $javascript";
         } else {
             warn "Plugin Failed: $plugin";
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
index ffe7d3c0f0..71e61335ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -845,9 +845,10 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
 	            <a href="#" tabindex="1" class="expandfield" onclick="ExpandField('tag_[% innerloo.tag %]_[% innerloo.index %][% innerloo.random %]'); return false;" title="Click to Expand this Tag">[% innerloo.tag_lib %]</a>
             [% END %]
             [% IF ( innerloo.repeatable ) %]
-                <a href="#" tabindex="1" class="buttonPlus" onclick="CloneField('tag_[% innerloo.tag %]_[% innerloo.index %][% innerloo.random %]'); return false;" title="Repeat this Tag">+</a>
+                <span class="subfield_controls"><a href="#" tabindex="1" class="buttonPlus" onclick="CloneField('tag_[% innerloo.tag %]_[% innerloo.index %][% innerloo.random %]'); return false;" title="Repeat this Tag"><img src="/intranet-tmpl/prog/img/repeat-tag.png" alt="Repeat this Tag" /></a>
             [% END %]
-                <a href="#" tabindex="1" class="buttonMinus" onclick="UnCloneField('tag_[% innerloo.tag %]_[% innerloo.index %][% innerloo.random %]'); return false;" title="Delete this Tag">&#8722;</a>
+                <a href="#" tabindex="1" class="buttonMinus" onclick="UnCloneField('tag_[% innerloo.tag %]_[% innerloo.index %][% innerloo.random %]'); return false;" title="Delete this Tag"><img src="/intranet-tmpl/prog/img/delete-tag.png" alt="Delete this Tag" /></a></span>
+
             
         </div>
 	
diff --git a/koha-tmpl/intranet-tmpl/prog/img/delete-tag.png b/koha-tmpl/intranet-tmpl/prog/img/delete-tag.png
new file mode 100644
index 0000000000..ca56230b73
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/delete-tag.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/img/edit-tag.png b/koha-tmpl/intranet-tmpl/prog/img/edit-tag.png
new file mode 100644
index 0000000000..b887870911
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/edit-tag.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/img/repeat-tag.png b/koha-tmpl/intranet-tmpl/prog/img/repeat-tag.png
new file mode 100644
index 0000000000..83a373167a
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/repeat-tag.png differ