diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
index 338b22b79b..ba15e6ebc2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
@@ -26,7 +26,7 @@
         [% END %]
         [% IF ( CAN_user_borrowers_edit_borrowers ) %]
             <li role="presentation">
-                <a title="Search patrons" href="#patron_search" aria-controls="patron_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-id-card-o"></i> <span class="tab-title">Search patrons</span></a>
+                <a title="Search patrons" href="#patron_search" aria-controls="patron_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-id-card"></i> <span class="tab-title">Search patrons</span></a>
             </li>
         [% END %]
     </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index e4be83f166..93e88cf964 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -21,7 +21,9 @@
 [% END %]
 [% Asset.css("lib/bootstrap/bootstrap.min.css") | $raw %]
 [% Asset.css("lib/bootstrap/bootstrap-theme.min.css") | $raw %]
-[% Asset.css("lib/font-awesome/css/font-awesome.min.css") | $raw %]
+[% Asset.css("lib/fontawesome/css/fontawesome.min.css") | $raw %]
+[% Asset.css("lib/fontawesome/css/brands.min.css.min.css") | $raw %]
+[% Asset.css("lib/fontawesome/css/solid.min.css") | $raw %]
 [% Asset.css("lib/datatables/datatables.min.css") | $raw %]
 [% Asset.css("css/print.css", { media = "print" }) | $raw %]
 [% INCLUDE intranetstylesheet.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
index 2430d1da77..7da514828d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
@@ -27,7 +27,7 @@
         [% END %]
         [% IF ( CAN_user_borrowers_edit_borrowers ) %]
             <li role="presentation">
-                <a title="Search patrons" href="#patron_search" aria-controls="patron_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-id-card-o"></i> <span class="tab-title">Search patrons</span></a>
+                <a title="Search patrons" href="#patron_search" aria-controls="patron_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-id-card"></i> <span class="tab-title">Search patrons</span></a>
             </li>
         [% END %]
         [% IF ( CAN_user_catalogue ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc
index e87135df8a..de3250c9fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc
@@ -15,7 +15,7 @@
     </div><!-- /.tab-content -->
     <ul class="nav nav-tabs" role="tablist">
         <li role="presentation" class="active">
-            <a title="Search patrons" href="#patron_search" aria-controls="patron_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-id-card-o"></i> <span class="tab-title">Search patrons</span></a>
+            <a title="Search patrons" href="#patron_search" aria-controls="patron_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-id-card"></i> <span class="tab-title">Search patrons</span></a>
         </li>
         [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
             <li role="presentation">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
index fb894e6d60..0bb3e3c9fb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
@@ -27,7 +27,7 @@
     </div> <!-- /.tab-content -->
     <ul class="nav nav-tabs" role="tablist">
         <li role="presentation" class="active">
-            <a title="Search patron categories" href="#patron_category_search" aria-controls="patron_category_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-id-card-o"></i> <span class="tab-title">Search patron categories</span></a>
+            <a title="Search patron categories" href="#patron_category_search" aria-controls="patron_category_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-id-card"></i> <span class="tab-title">Search patron categories</span></a>
         </li>
         [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
             <li role="presentation">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/shortcut.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/shortcut.inc
index 4289feb6cf..b602a2c21c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/shortcut.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/shortcut.inc
@@ -3,5 +3,5 @@
         [% INCLUDE 'last-borrower.inc' %]
     [% END %]
 
-    <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
+    <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa-solid fa-circle-question"></i> <span>Help</span></a>
 </nav>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
index 0bd97fed85..618bb936d4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
@@ -179,9 +179,9 @@
                                         <td>[%- PROCESS debit_type_description debit_type = debit_type -%]</td>
                                         <td>[% debit_type.default_amount | $Price %]</td>
                                         <td>[% IF debit_type.can_be_invoiced && debit_type.can_be_sold %]
-                                            <i class="fa fa-id-card-o"></i> Invoicing, <i class="fa fa-shopping-cart"></i> Sale
+                                            <i class="fa fa-id-card"></i> Invoicing, <i class="fa fa-shopping-cart"></i> Sale
                                             [% ELSIF debit_type.can_be_invoiced %]
-                                            <i class="fa fa-id-card-o"></i> Invoicing
+                                            <i class="fa fa-id-card"></i> Invoicing
                                             [% ELSIF debit_type.can_be_sold %]
                                             <i class="fa fa-shopping-cart"></i> Sale
                                             [% END %]
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 1cff66c922..00d705f14e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -331,7 +331,7 @@ function updateHeadingLinks(links) {
         subfield.val(heading.authid);
 
         // Add the new status
-        var image = '<i class="fa fa-close subfield_status no_matching_authority" </i> ';
+        var image = '<i class="fa fa-xmark subfield_status no_matching_authority" </i> ';
         var message = '';
         var field_class = 'no_matching_authority_field';
         switch(heading.status) {
@@ -509,11 +509,11 @@ function PopupMARCFieldDoc(field) {
         if( flag === true ){
             $(".marcdocs").show();
             Cookies.set("marcdocs_[% borrowernumber | html %]",'show', { path: "/", expires: 365, sameSite: 'Lax'  });
-            $("#marcDocsSelect i").addClass('fa-check-square-o').removeClass('fa-square-o');
+            $("#marcDocsSelect i").addClass('fa-check-square').removeClass('fa-square');
         } else {
             $(".marcdocs").hide();
             Cookies.set("marcdocs_[% borrowernumber | html %]",'hide', { path: "/", expires: 365, sameSite: 'Lax'  });
-            $("#marcDocsSelect i").removeClass('fa-check-square-o').addClass('fa-square-o');
+            $("#marcDocsSelect i").removeClass('fa-check-square').addClass('fa-square');
         }
     }
 
@@ -522,12 +522,12 @@ function PopupMARCFieldDoc(field) {
             $(".tagnum").show();
             $(".subfieldcode").show();
             Cookies.set("marctags_[% borrowernumber | html %]",'show', { path: "/", expires: 365, sameSite: 'Lax'  });
-            $("#marcTagsSelect i").addClass('fa-check-square-o').removeClass('fa-square-o');
+            $("#marcTagsSelect i").addClass('fa-check-square').removeClass('fa-square');
         } else {
             $(".tagnum").hide();
             $(".subfieldcode").hide();
             Cookies.set("marctags_[% borrowernumber | html %]",'hide', { path: "/", expires: 365, sameSite: 'Lax'  });
-            $("#marcTagsSelect i").removeClass('fa-check-square-o').addClass('fa-square-o');
+            $("#marcTagsSelect i").removeClass('fa-check-square').addClass('fa-square');
         }
     }
 
@@ -910,9 +910,9 @@ function PopupMARCFieldDoc(field) {
                             [% END %]
                             [% UNLESS advancedMARCEditor %]
                                 <li>
-                                    <a href="#" id="marcDocsSelect"><i class="fa fa-check-square-o"></i> Show MARC tag documentation links</a>
+                                    <a href="#" id="marcDocsSelect"><i class="fa fa-check-square"></i> Show MARC tag documentation links</a>
                                 <li>
-                                    <a href="#" id="marcTagsSelect"><i class="fa fa-check-square-o"></i> Show tags</a>
+                                    <a href="#" id="marcTagsSelect"><i class="fa fa-check-square"></i> Show tags</a>
                                 </li>
                             [% END %]
                             <li class="dropdown-header">Change framework</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index d42c06b6ea..671eb4c9ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -509,7 +509,7 @@
                                             [% ELSE %]
                                             <button type="submit" class="btn btn-default"><i class="fa fa-check"></i> Confirm inventory check and mark items as lost</button>
                                             [% END %]
-                                            <button type="button" data-dismiss="modal" class="btn btn-default"><i class="fa fa-close"></i> Cancel</button>
+                                            <button type="button" data-dismiss="modal" class="btn btn-default"><i class="fa fa-xmark"></i> Cancel</button>
                                         </div>
                                     </form>
                                 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
index 6734cd051a..952855ee53 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
@@ -29,12 +29,12 @@
 
                     <div id="steps">
                         <ol>
-                            <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Choose your language</li>
-                            <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Check Perl dependencies</li>
-                            <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Database settings</li>
-                            <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Set up database</li>
-                            <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Install basic configuration settings</li>
-                            <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding</li>
+                            <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Choose your language</li>
+                            <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Check Perl dependencies</li>
+                            <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Database settings</li>
+                            <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Set up database</li>
+                            <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Install basic configuration settings</li>
+                            <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding</li>
                         </ol>
                     </div>
 
@@ -70,12 +70,12 @@
 
                             <div id="steps">
                                 <ol>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Choose your language</li>
-                                    <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Check Perl dependencies</li>
-                                    <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Database settings</li>
-                                    <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Set up database</li>
-                                    <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Install basic configuration settings</li>
-                                    <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Choose your language</li>
+                                    <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Check Perl dependencies</li>
+                                    <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Database settings</li>
+                                    <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Set up database</li>
+                                    <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Install basic configuration settings</li>
+                                    <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding</li>
                                 </ol>
                             </div>
 
@@ -94,12 +94,12 @@
 
                             <div id="steps">
                                 <ol>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Choose your language</li>
-                                    <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Check Perl dependencies</li>
-                                    <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Database settings</li>
-                                    <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Set up database</li>
-                                    <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Install basic configuration settings</li>
-                                    <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Choose your language</li>
+                                    <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Check Perl dependencies</li>
+                                    <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Database settings</li>
+                                    <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Set up database</li>
+                                    <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Install basic configuration settings</li>
+                                    <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding</li>
                                 </ol>
                             </div>
 
@@ -120,12 +120,12 @@
 
                             <div id="steps">
                                 <ol>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Choose your language</li>
-                                    <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Check Perl dependencies</li>
-                                    <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Database settings</li>
-                                    <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Set up database</li>
-                                    <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Install basic configuration settings</li>
-                                    <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Choose your language</li>
+                                    <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Check Perl dependencies</li>
+                                    <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Database settings</li>
+                                    <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Set up database</li>
+                                    <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Install basic configuration settings</li>
+                                    <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding</li>
                                 </ol>
                             </div>
 
@@ -147,12 +147,12 @@
 
                         <div id="steps">
                             <ol>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Choose your language</li>
-                                <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Check Perl dependencies</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Database settings</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Set up database</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Install basic configuration settings</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Choose your language</li>
+                                <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Check Perl dependencies</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Database settings</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Set up database</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Install basic configuration settings</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding</li>
                             </ol>
                         </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
index d44cc4c2ad..d9e528cb1c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
@@ -14,12 +14,12 @@
 
                 <div id="steps">
                     <ol>
-                        <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Choose your language</li>
-                        <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Check Perl dependencies</li>
-                        <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Database settings</li>
-                        <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Set up database</li>
-                        <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Install basic configuration settings</li>
-                        <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding</li>
+                        <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Choose your language</li>
+                        <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Check Perl dependencies</li>
+                        <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Database settings</li>
+                        <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Set up database</li>
+                        <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Install basic configuration settings</li>
+                        <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding</li>
                     </ol>
                 </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
index 4462deb523..126c18ecc5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
@@ -46,12 +46,12 @@
 
                     <div id="steps">
                         <ol>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Choose your language</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Check Perl dependencies</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Database settings</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Set up database</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Install basic configuration settings</li>
-                            <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Choose your language</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Check Perl dependencies</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Database settings</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Set up database</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Install basic configuration settings</li>
+                            <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding</li>
                         </ol>
                     </div>
 
@@ -64,16 +64,16 @@
 
                     <div id="steps">
                         <ol>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Choose your language</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Check Perl dependencies</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Database settings</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Set up database</li>
-                            <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Install basic configuration settings</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Choose your language</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Check Perl dependencies</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Database settings</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Set up database</li>
+                            <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Install basic configuration settings</li>
                                 <ol>
-                                    <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Select your MARC flavor</li>
-                                    <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Selecting default settings</li>
+                                    <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Select your MARC flavor</li>
+                                    <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Selecting default settings</li>
                                 </ol>
-                            <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding</li>
+                            <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding</li>
                         </ol>
                     </div>
 
@@ -103,16 +103,16 @@
 
                     <div id="steps">
                         <ol>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Choose your language</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Check Perl dependencies</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Database settings</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Set up database</li>
-                            <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Install basic configuration settings</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Choose your language</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Check Perl dependencies</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Database settings</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Set up database</li>
+                            <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Install basic configuration settings</li>
                                 <ol>
-                                    <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Select your MARC flavor</li>
-                                    <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Selecting default settings</li>
+                                    <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Select your MARC flavor</li>
+                                    <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Selecting default settings</li>
                                 </ol>
-                            <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding</li>
+                            <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding</li>
                         </ol>
                     </div>
 
@@ -206,16 +206,16 @@
 
                     <div id="steps">
                         <ol>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Choose your language</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Check Perl dependencies</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Database settings</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Set up database</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Install basic configuration settings</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Choose your language</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Check Perl dependencies</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Database settings</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Set up database</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Install basic configuration settings</li>
                                 <ol>
-                                    <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Select your MARC flavor</li>
-                                    <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Selecting default settings</li>
+                                    <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Select your MARC flavor</li>
+                                    <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Selecting default settings</li>
                                 </ol>
-                            <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding</li>
+                            <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding</li>
                         </ol>
                     </div>
 
@@ -273,12 +273,12 @@
 
                         <div id="steps">
                             <ol>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Choose your language</li>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Check Perl dependencies</li>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Database settings</li>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Set up database</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Install basic configuration settings</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Choose your language</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Check Perl dependencies</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Database settings</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Set up database</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Install basic configuration settings</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding</li>
                             </ol>
                         </div>
 
@@ -294,12 +294,12 @@
 
                     <div id="steps">
                         <ol>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Choose your language</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Check Perl dependencies</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Database settings</li>
-                            <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Set up database</li>
-                            <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Install basic configuration settings</li>
-                            <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Choose your language</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Check Perl dependencies</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Database settings</li>
+                            <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Set up database</li>
+                            <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Install basic configuration settings</li>
+                            <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding</li>
                         </ol>
                     </div>
 
@@ -321,12 +321,12 @@
 
                         <div id="steps">
                             <ol>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Choose your language</li>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Check Perl dependencies</li>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Database settings</li>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Set up database</li>
-                                <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Install basic configuration settings</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Choose your language</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Check Perl dependencies</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Database settings</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Set up database</li>
+                                <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Install basic configuration settings</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding</li>
                             </ol>
                         </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
index 8f956fdc42..e283bcf984 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -63,7 +63,7 @@
 
                             [% IF CAN_user_borrowers_edit_borrowers %]
                             <li>
-                                <a class="icon_general icon_patrons" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-fw fa-id-card-o"></i>Patrons</a>
+                                <a class="icon_general icon_patrons" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-fw fa-id-card"></i>Patrons</a>
                             </li>
                             [% END %]
 
@@ -132,7 +132,7 @@
 
                             [% IF ( CAN_user_serials ) %]
                             <li>
-                                <a class="icon_general icon_serials" href="/cgi-bin/koha/serials/serials-home.pl"><i class="fa fa-fw fa-newspaper-o"></i>Serials</a>
+                                <a class="icon_general icon_serials" href="/cgi-bin/koha/serials/serials-home.pl"><i class="fa fa-fw fa-newspaper"></i>Serials</a>
                                 <span class="biglink"></span>
                             </li>
                             [% END %]
@@ -159,7 +159,7 @@
 
                             [% IF ( CAN_user_parameters ) %]
                             <li>
-                                <a class="icon_general icon_administration" href="/cgi-bin/koha/admin/admin-home.pl"><i class="fa fa-fw fa-cogs"></i>Koha administration</a>
+                                <a class="icon_general icon_administration" href="/cgi-bin/koha/admin/admin-home.pl"><i class="fa fa-solid fa-gears"></i>Koha administration</a>
                             </li>
                             [% END %]
                             <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
index 33c57a2c82..b1f36ca9a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
@@ -15,14 +15,14 @@
 
                 <div id="steps">
                     <ol>
-                        <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Installation</li>
-                        <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding
+                        <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Installation</li>
+                        <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding
                             <ol>
-                                <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Create a library</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Create a patron category</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Create Koha administrator patron</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Create a new item type</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Create a new circulation rule</li>
+                                <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Create a library</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Create a patron category</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Create Koha administrator patron</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Create a new item type</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Create a new circulation rule</li>
                             </ol>
                         </li>
                     </ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
index d84d0d7fe2..8105efb0aa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
@@ -25,14 +25,14 @@
 
                 <div id="steps">
                     <ol>
-                        <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Installation</li>
-                        <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding
+                        <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Installation</li>
+                        <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding
                             <ol>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Create a library</li>
-                                <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Create a patron category</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Create Koha administrator patron</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Create a new item type</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Create a new circulation rule</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Create a library</li>
+                                <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Create a patron category</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Create Koha administrator patron</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Create a new item type</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Create a new circulation rule</li>
                             </ol>
                         </li>
                     </ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
index 7fb6602397..4c96d28df9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
@@ -17,14 +17,14 @@
 
                 <div id="steps">
                     <ol>
-                        <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Installation</li>
-                        <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding
+                        <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Installation</li>
+                        <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding
                             <ol>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Create a library</li>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Create a patron category</li>
-                                <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Create Koha administrator patron</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Create a new item type</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Create a new circulation rule</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Create a library</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Create a patron category</li>
+                                <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Create Koha administrator patron</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Create a new item type</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Create a new circulation rule</li>
                             </ol>
                         </li>
                     </ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
index 4ed736a8f0..94ebc55255 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
@@ -14,14 +14,14 @@
 
                 <div id="steps">
                     <ol>
-                        <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Installation</li>
-                        <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding
+                        <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Installation</li>
+                        <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding
                             <ol>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Create a library</li>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Create a patron category</li>
-                                <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Create Koha administrator patron</li>
-                                <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Create a new item type</li>
-                                <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Create a new circulation rule</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Create a library</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Create a patron category</li>
+                                <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Create Koha administrator patron</li>
+                                <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Create a new item type</li>
+                                <li class="open"><i class="fa fa-square" aria-hidden="true"></i> Create a new circulation rule</li>
                             </ol>
                         </li>
                     </ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
index ed96a4fa73..9daf2d73c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
@@ -22,8 +22,8 @@
 
                     <div id="steps">
                         <ol>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Installation</li>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Onboarding</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Installation</li>
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Onboarding</li>
                         </ol>
                     </div>
 
@@ -38,14 +38,14 @@
 
                     <div id="steps">
                         <ol>
-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Installation</li>
-                            <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding
+                            <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Installation</li>
+                            <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Onboarding
                                 <ol>
-                                    <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Create a library</li>
-                                    <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Create a patron category</li>
-                                    <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Create Koha administrator patron</li>
-                                    <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Create a new item type</li>
-                                    <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Create a new circulation rule</li>
+                                    <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Create a library</li>
+                                    <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Create a patron category</li>
+                                    <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Create Koha administrator patron</li>
+                                    <li class="complete"><i class="fa fa-check-square" aria-hidden="true"></i> Create a new item type</li>
+                                    <li class="current open"><i class="fa fa-square" aria-hidden="true"></i> Create a new circulation rule</li>
                                 </ol>
                             </li>
                         </ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
index e259217ff9..3a7679caff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
@@ -187,7 +187,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
    <div class="description">Enter a word or phrase to check against approved/rejected lists: </div>
    <form method="post" action="/cgi-bin/koha/tags/review.pl">
    <input type="text" size="14" name="test" id="test" />
-   <fieldset class="action"><button type="submit" value="Test" class="approval_btn btn btn-default btn-sm" id="test_button" name="op-test"><i class="fa fa-check-square-o" aria-hidden="true"></i> Test</button></fieldset>
+   <fieldset class="action"><button type="submit" value="Test" class="approval_btn btn btn-default btn-sm" id="test_button" name="op-test"><i class="fa fa-check-square" aria-hidden="true"></i> Test</button></fieldset>
    <div id="verdict">
     [% IF ( test_term ) %]
     [% IF ( verdict_ok ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
index f121aeb66c..696467bba2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
@@ -218,14 +218,14 @@
                 <fieldset class="action">
                     [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%]
                         [% IF searchid %]
-                            <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a>
+                            <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]"><i class="fa fa-check-square"></i> Return to the record</a>
                         [% ELSE %]
-                            <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a>
+                            <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><i class="fa fa-check-square"></i> Return to the record</a>
                         [% END %]
                     [% ELSIF src %]
-                        <a class="btn btn-default" href="[% src | url %]"><i class="fa fa-check-square-o"></i> Return to where you were</a>
+                        <a class="btn btn-default" href="[% src | url %]"><i class="fa fa-check-square"></i> Return to where you were</a>
                     [% ELSE %]
-                        <a class="btn btn-default" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-check-square-o"></i> Return to batch item modification</a>
+                        <a class="btn btn-default" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-check-square"></i> Return to batch item modification</a>
                     [% END %]
                 </fieldset> <!-- /.action -->
             [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue
index 677cab82c6..a1f2622bd5 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue
@@ -166,7 +166,7 @@ export default {
                         if (row.is_selected) {
                             node +=
                                 " " +
-                                '<i class="fa fa-check-square-o" style="color: green; float: right;" title="' +
+                                '<i class="fa fa-check-square" style="color: green; float: right;" title="' +
                                 __("Is selected") +
                                 '" />'
                         }
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue
index a9a78235e5..551b19325c 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue
@@ -210,7 +210,7 @@ export default {
                         if (row.is_selected) {
                             node +=
                                 " " +
-                                '<i class="fa fa-check-square-o" style="color: green; float: right;" title="' +
+                                '<i class="fa fa-check-square" style="color: green; float: right;" title="' +
                                 __("Is selected") +
                                 '" />'
                         }
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlePackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlePackagesList.vue
index 8d7ee1e8c2..182a8274ed 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlePackagesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlePackagesList.vue
@@ -145,7 +145,7 @@ export default {
                                         n,
                                         " ",
                                         createVNode("i", {
-                                            class: "fa fa-check-square-o",
+                                            class: "fa fa-check-square",
                                             style: {
                                                 color: "green",
                                                 float: "right",
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue
index 7b446b4d8d..dc5cf89c7f 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue
@@ -233,7 +233,7 @@ export default {
                         if (row.is_selected) {
                             node +=
                                 " " +
-                                '<i class="fa fa-check-square-o" style="color: green; float: right;" title="' +
+                                '<i class="fa fa-check-square" style="color: green; float: right;" title="' +
                                 __("Is selected") +
                                 '" />'
                         }
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index dfb0a15fb4..e477f7e359 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -1095,13 +1095,13 @@
                             [% FOREACH network IN SocialNetworks.split(",") %]
                                 [% SWITCH network -%]
                                     [% CASE "facebook" -%]
-                                        <div><a id="facebook" href="https://www.facebook.com/sharer.php?u=[% current_url |url %]&amp;t=[% title |url %]" title="Share on Facebook"><i class="fa fa-facebook" aria-hidden="true"></i></a></div>
+                                        <div><a id="facebook" href="https://www.facebook.com/sharer.php?u=[% current_url |url %]&amp;t=[% title |url %]" title="Share on Facebook"><i class="fab fa-facebook" aria-hidden="true"></i></a></div>
                                     [% CASE "linkedin" -%]
-                                        <div><a id="linkedin" href="https://www.linkedin.com/shareArticle?mini=true&amp;url=[% current_url |url %]&amp;title=[% title |url %]" title="Share on LinkedIn"><i class="fa fa-linkedin" aria-hidden="true"></i></a></div>
+                                        <div><a id="linkedin" href="https://www.linkedin.com/shareArticle?mini=true&amp;url=[% current_url |url %]&amp;title=[% title |url %]" title="Share on LinkedIn"><i class="fab fa-linkedin" aria-hidden="true"></i></a></div>
                                     [% CASE "email" -%]
                                         <div><a id="email" href="mailto:?subject=[% title |url %]&amp;body=[% title |url %]%20([% current_url |url %])" title="Share by email"><i class="fa fa-envelope-o" aria-hidden="true"></i></a></div>
                                     [% CASE "twitter" -%]
-                                        <div><a id="twitter" href="https://twitter.com/share?url=[% current_url|url %]&text=[% title | uri %]" class="twitter-share-button" data-count="none" data-lang="[% lang | html %]" title="Share on Twitter"><i class="fa fa-twitter" aria-hidden="true"></i></a></div>
+                                        <div><a id="twitter" href="https://twitter.com/share?url=[% current_url|url %]&text=[% title | uri %]" class="twitter-share-button" data-count="none" data-lang="[% lang | html %]" title="Share on Twitter"><i class="fab fa-twitter" aria-hidden="true"></i></a></div>
                                 [% END # /SWITCH network -%]
                             [% END # /FOREACH network %]
                         </div> <!-- /#social_networks -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
index ea3a4aecf6..cc044a6845 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
@@ -144,7 +144,7 @@
                                         <input type="hidden" name="op" value="check_in" />
                                         <div id="button_bar">
                                             <button id="sci_checkin_button" type="submit" class="btn btn-primary" style="display: none;">
-                                                <i class="fa fa-check-square-o" aria-hidden="true"></i> <span>Check in</span>
+                                                <i class="fa fa-check-square" aria-hidden="true"></i> <span>Check in</span>
                                             </button>
                                             <a href="/cgi-bin/koha/sci/sci-main.pl" class="btn btn-danger" role="button" style="display: none;" id="sci_refresh_button">
                                                 <i class="fa fa-times" aria-hidden="true"></i> <span>Cancel</span>