diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
index aa73af614b..9bc75fc4ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -145,8 +145,8 @@
                                     <th>Code</th>
                                     <th>Name</th>
                                     <th class="title-string">Last updated</th>
-                                    <th class="nosort">Copy notice</th>
-                                    <th class="nosort noExport">Actions</th>
+                                    <th class="NoSort noExport">Copy notice</th>
+                                    <th class="NoSort noExport">Actions</th>
                                 </tr>
                             </thead>
                             <tbody>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
index 3501c44763..8f428016de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
@@ -1,6 +1,7 @@
 [% USE raw %]
 [% USE Asset %]
 [% USE Koha %]
+[% USE TablesSettings %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 [% IF plugin %]
@@ -159,7 +160,7 @@
         <th>Category</th>
         [% IF !plugin %]<th>Public</th>[% END %]
         [% IF !plugin %]<th>Temporary</th>[% END %]
-        <th class="nosort noExport">Actions</th>
+        <th class="NoSort noExport">Actions</th>
     </tr>
     </thead>
     <tbody>
@@ -256,6 +257,7 @@
     [% Asset.js("js/tools-menu.js") | $raw %]
     [% INCLUDE 'datatables.inc' %]
     [% Asset.js("js/file-upload.js") | $raw %]
+    [% INCLUDE 'columns_settings.inc' %]
     <script>
         function StartUpload() {
             if( $('#fileToUpload').prop('files').length == 0 ) return;
@@ -382,12 +384,7 @@
             window.close();
         }
         $(document).ready(function() {
-            $("#uploadresults").dataTable($.extend(true, {}, dataTablesDefaults, {
-                "aoColumnDefs": [
-                    { 'bSortable': false, 'aTargets': [ 'nosort' ] }
-                ],
-                "sPaginationType": "full"
-            }));
+            KohaTable("uploadresults",{});
             [% IF msg %]
                 ShowAlerts( [% msg | html %] );
             [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/letter.js b/koha-tmpl/intranet-tmpl/prog/js/letter.js
index c2e353bfe8..84e63c9d96 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/letter.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/letter.js
@@ -45,11 +45,6 @@ $(document).ready(function() {
         "autoWidth": false,
         "paging": false,
         "aaSorting": [[ 3, "asc" ]],
-        "columnDefs": [
-            { "bSortable": false, "aTargets": [ "nosort" ] },
-            { "sType": "title-string", "aTargets" : [ "title-string"] }
-        ],
-        "exportColumns": [0,1,2,3],
     }, columns_settings);
 
     if( no_op_set ){