diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
index 56de788a6a..deaaadb982 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
@@ -103,7 +103,7 @@
                                     [Overridden]
                                 </span>
                             [% END %]
-						</label>
+                        </label>
                         [% UNLESS ( loop.last ) %]<br />[% END %]
                         [% END %]
                     </code>
@@ -154,9 +154,9 @@
                         [% IF ( CHUNK.syntax == "text/html" && Koha.Preference('UseWYSIWYGinSystemPreferences') ) %]
                             <textarea name="pref_[% CHUNK.name | html %]" id="pref_[% CHUNK.name | html %]" class="preference preference-[% CHUNK.class or "short" | html %] mce" rows="20" cols="60">[% CHUNK.value | html %]</textarea>
                         [% ELSE %]
-                            <a class="expand-textarea" id="expand_[% CHUNK.name | html %]" data-target="[% CHUNK.name | html %]" data-syntax="[% CHUNK.syntax | html %]" href="#">Click to edit</a>
+                            <a class="expand-textarea" id="expand_[% CHUNK.name | html %]" data-target="[% CHUNK.name | html %]" data-syntax="[% CHUNK.syntax | html %]" href="#">Edit</a>
                             <textarea style="display:none" name="pref_[% CHUNK.name | html %]" id="pref_[% CHUNK.name | html %]" class="preference preference-[% CHUNK.class or "short" | html %] codemirror" rows="10" cols="40">[% CHUNK.value | html %]</textarea>
-                            <a class="collapse-textarea" id="collapse_[% CHUNK.name | html %]" data-target="[% CHUNK.name | html %]" data-syntax="[% CHUNK.syntax | html %]" style="display:none" href="#">Click to collapse</br></a>
+                            <a class="collapse-textarea" id="collapse_[% CHUNK.name | html %]" data-target="[% CHUNK.name | html %]" data-syntax="[% CHUNK.syntax | html %]" style="display:none" href="#">Collapse</br></a>
                         [% END %]
                     [% ELSIF ( CHUNK.type_languages ) %]
                         <ul class="sortable">
diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js b/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js
index 53a0db82ea..d13ec127c3 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js
@@ -211,17 +211,17 @@ $( document ).ready( function () {
 
     addCollapseHandler();
 
-    $("h3").attr("class", "expanded").attr("title", __("Click to collapse this section"));
+    $("h3").attr("class", "expanded").attr("title", __("Collapse this section"));
     var collapsible = $(".collapsed,.expanded");
 
     $(collapsible).on("click",function(){
         var h3Id = $(this).attr("id");
         var panel = $("#collapse_" + h3Id);
         if(panel.is(":visible")){
-            $(this).addClass("collapsed").removeClass("expanded").attr("title", __("Click to expand this section") );
+            $(this).addClass("collapsed").removeClass("expanded").attr("title", __("Expand this section") );
             panel.hide();
         } else {
-            $(this).addClass("expanded").removeClass("collapsed").attr("title", __("Click to collapse this section") );
+            $(this).addClass("expanded").removeClass("collapsed").attr("title", __("Collapse this section") );
             panel.show();
         }
     });
@@ -233,7 +233,7 @@ $( document ).ready( function () {
         href = href.replace("#","");
         var panel = $("#collapse_" + href );
         if( panel.is(":hidden") ){
-            $("#" + href).addClass("expanded").removeClass("collapsed").attr("title", __("Click to collapse this section") );
+            $("#" + href).addClass("expanded").removeClass("collapsed").attr("title", __("Collapse this section") );
             panel.show();
         }
     });
@@ -406,8 +406,8 @@ $( document ).ready( function () {
                '    <div class="consentRow codeRow">' +
                '        <textarea style="display:none;" id="pref_' + id + '" class="preference preference-code codemirror" rows="10" cols="40">' + code + '</textarea>' +
                '        <div>' +
-               '            <a id="expand_' + id + '" class="expand-textarea" data-target="' + id + '" data-syntax="javascript" href="#">' + __('Click to expand') + '</a>' +
-               '            <a id="collapse_' + id + '" class="collapse-textarea" data-target="' + id + '" data-syntax="javascript" href="#" style="display:none">' + __('Click to collapse') + '</a>' +
+               '            <a id="expand_' + id + '" class="expand-textarea" data-target="' + id + '" data-syntax="javascript" href="#">' + __('Expand') + '</a>' +
+               '            <a id="collapse_' + id + '" class="collapse-textarea" data-target="' + id + '" data-syntax="javascript" href="#" style="display:none">' + __('Collapse') + '</a>' +
                '        </div >' +
                '    </div>' +
                '    <a class="consentDelete" data-target="' + id + '" href="#">' + __('Delete') + '</a>' +