diff --git a/theme/boost/scss/moodle/blocks.scss b/theme/boost/scss/moodle/blocks.scss
index a23a3090677..ca882308520 100644
--- a/theme/boost/scss/moodle/blocks.scss
+++ b/theme/boost/scss/moodle/blocks.scss
@@ -309,25 +309,26 @@ $card-gutter : $card-deck-margin * 2;
 }
 .block_settings .block_tree [aria-expanded="true"] > p:before,
 .block_navigation .block_tree [aria-expanded="true"] > p:before {
-    content: $fa-var-angle-down;
+    @extend .fa-solid;
+    content: fa-content($fa-var-angle-down);
     margin-right: 0;
-    @include fa-icon();
     font-size: 16px;
     width: 16px;
 }
 
 .block_settings .block_tree [aria-expanded="false"] > p:before,
 .block_navigation .block_tree [aria-expanded="false"] > p:before {
-    content: $fa-var-angle-right;
+    @extend .fa-solid;
+    content: fa-content($fa-var-angle-right);
     margin-right: 0;
-    @include fa-icon();
     font-size: 16px;
     width: 16px;
 }
 .dir-rtl {
     .block_settings .block_tree [aria-expanded="false"] > p:before,
     .block_navigation .block_tree [aria-expanded="false"] > p:before {
-        content: $fa-var-angle-left;
+        @extend .fa-solid;
+        content: fa-content($fa-var-angle-left);
     }
 }
 
diff --git a/theme/boost/scss/moodle/contentbank.scss b/theme/boost/scss/moodle/contentbank.scss
index 8d6454a5a45..37dd9fd0531 100644
--- a/theme/boost/scss/moodle/contentbank.scss
+++ b/theme/boost/scss/moodle/contentbank.scss
@@ -55,12 +55,12 @@
 
         /* Display a centered eye slash on top of unlisted content icons. */
         .cb-unlisted::after {
+            @extend .fa-regular;
+            content: fa-content($fa-var-eye-slash);
             position: absolute;
             top: 20px;
             left: 0;
             width: 100%;
-            content: $fa-var-eye-slash;
-            font-family: FontAwesome;
             font-size: 26px;
             text-align: center;
             opacity: 0.9;
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 13944b40e73..af610d63b8b 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -2390,8 +2390,8 @@ $footer-link-color: $bg-inverse-link-color !default;
         display: flex;
         align-items: center;
         &:before {
-            @include fa-icon();
-            content: $fa-var-check;
+            @extend .fa-solid;
+            content: fa-content($fa-var-check);
             position: absolute;
             left: 0.4rem;
             font-size: 0.7rem;
@@ -2979,10 +2979,10 @@ body.dragging {
 }
 
 .dropdown-toggle::after {
-    content: $fa-var-chevron-down;
+    @extend .fa-solid;
+    content: fa-content($fa-var-chevron-down);
     margin-right: 0;
     margin-left: 4px;
-    @include fa-icon();
     font-size: 9px;
     width: 9px;
     border: 0;
@@ -2991,8 +2991,8 @@ body.dragging {
 
 .dropleft .dropdown-toggle::before {
     border: 0;
-    content: $fa-var-chevron-left;
-    @include fa-icon();
+    @extend .fa-solid;
+    content: fa-content($fa-var-chevron-left);
     font-size: 9px;
     margin-left: 0;
     margin-right: 4px;
@@ -3001,12 +3001,14 @@ body.dragging {
 
 .dropright .dropdown-toggle::after {
     border: 0;
-    content: $fa-var-chevron-right;
+    @extend .fa-solid;
+    content: fa-content($fa-var-chevron-right);
 }
 
 .dropup .dropdown-toggle::after {
     border: 0;
-    content: $fa-var-chevron-up;
+    @extend .fa-solid;
+    content: fa-content($fa-var-chevron-up);
 }
 
 .select-menu {
diff --git a/theme/boost/scss/moodle/course.scss b/theme/boost/scss/moodle/course.scss
index 1a4b18397dd..cce87aea339 100644
--- a/theme/boost/scss/moodle/course.scss
+++ b/theme/boost/scss/moodle/course.scss
@@ -219,11 +219,11 @@ body:not(.editing)  .sitetopic ul.section {
         }
 
         &:after {
+            @extend .fa-solid;
             position: absolute;
-            font-family: "FontAwesome";
             font-size: 20px;
             color: $gray-600;
-            content: "";
+            content: fa-content($fa-var-spinner);
             display: flex;
             justify-content: center;
             align-items: center;
diff --git a/theme/boost/scss/moodle/moremenu.scss b/theme/boost/scss/moodle/moremenu.scss
index 1e08f7065ca..3c41bacb83f 100644
--- a/theme/boost/scss/moodle/moremenu.scss
+++ b/theme/boost/scss/moodle/moremenu.scss
@@ -100,7 +100,8 @@
             }
         }
         &:before {
-            content: $fa-var-check;
+            @extend .fa-solid;
+            content: fa-content($fa-var-check);
         }
     }
 }
diff --git a/theme/boost/scss/moodle/navbar.scss b/theme/boost/scss/moodle/navbar.scss
index 263645f22ba..12dade818b4 100644
--- a/theme/boost/scss/moodle/navbar.scss
+++ b/theme/boost/scss/moodle/navbar.scss
@@ -62,8 +62,8 @@
             .dropdown-item {
                 padding: .25rem 1.75rem .25rem .75rem;
                 &.carousel-navigation-link::after {
-                    font-family: FontAwesome;
-                    content: $fa-var-caret-right;
+                    @extend .fa-solid;
+                    content: fa-content($fa-var-caret-right);
                     font-size: 1rem;
                     right: .75rem;
                     position: absolute;
@@ -83,8 +83,8 @@
                 .items {
                     .dropdown-item {
                         &[aria-current="true"]::before {
-                            font-family: FontAwesome;
-                            content: $fa-var-check;
+                            @extend .fa-solid;
+                            content: fa-content($fa-var-check);
                             font-size: 0.75rem;
                             padding-left: .25rem;
                         }
@@ -140,7 +140,8 @@
         .dropdown-menu {
             .dropdown-item {
                 &.carousel-navigation-link::after {
-                    content: $fa-var-caret-left;
+                    @extend .fa-solid;
+                    content: fa-content($fa-var-caret-left);
                 }
             }
             .carousel {
diff --git a/theme/boost/scss/moodle/toasts.scss b/theme/boost/scss/moodle/toasts.scss
index 0160f1b7487..7393105387e 100644
--- a/theme/boost/scss/moodle/toasts.scss
+++ b/theme/boost/scss/moodle/toasts.scss
@@ -1,7 +1,7 @@
 @mixin toast-icon($content) {
-    @include fa-icon();
+    @extend .fa-solid;
     margin: 2px 5px 0 0;
-    content: $content;
+    content: fa-content($content);
 }
 
 @mixin toast-variant($color) {
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 797c9930686..e7d782aa5bd 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -2043,7 +2043,8 @@
   src: url("[[font:core|fa-regular-400.woff2]]") format("woff2"), url("[[font:core|fa-regular-400.ttf]]") format("truetype");
 }
 .far,
-.fa-regular {
+.fa-regular,
+.content-bank-container.view-grid .cb-unlisted::after {
   font-weight: 400;
 }
 
@@ -2065,7 +2066,29 @@
   src: url("[[font:core|fa-solid-900.woff2]]") format("woff2"), url("[[font:core|fa-solid-900.ttf]]") format("truetype");
 }
 .fas,
-.fa-solid {
+.fa-solid,
+.moremenu .dropdown-item[aria-current=true]:before,
+.moremenu .dropdown-item.active:before,
+.dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after,
+.navbar.fixed-top .usermenu .dropdown-menu .submenu .items .dropdown-item[aria-current=true]::before,
+.navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after,
+.toast.toast-warning .toast-body:before,
+.toast.toast-info .toast-body:before,
+.toast.toast-danger .toast-body:before,
+.toast.toast-success .toast-body:before,
+.editing .editinprogress:after,
+.dir-rtl .block_settings .block_tree [aria-expanded=false] > p:before,
+.dir-rtl .block_navigation .block_tree [aria-expanded=false] > p:before,
+.block_settings .block_tree [aria-expanded=false] > p:before,
+.block_navigation .block_tree [aria-expanded=false] > p:before,
+.block_settings .block_tree [aria-expanded=true] > p:before,
+.block_navigation .block_tree [aria-expanded=true] > p:before,
+.dropup .dropdown-toggle::after,
+.dropright .dropdown-toggle::after,
+.dropleft .dropdown-toggle::before,
+.dropdown-toggle::after,
+.dropdown-item[aria-current=true]:before,
+.dropdown-item[aria-selected=true]:before {
   font-weight: 900;
 }
 
@@ -4915,8 +4938,31 @@
 .fa-sharp,
 .fas,
 .fa-solid,
+.moremenu .dropdown-item[aria-current=true]:before,
+.moremenu .dropdown-item.active:before,
+.dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after,
+.navbar.fixed-top .usermenu .dropdown-menu .submenu .items .dropdown-item[aria-current=true]::before,
+.navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after,
+.toast.toast-warning .toast-body:before,
+.toast.toast-info .toast-body:before,
+.toast.toast-danger .toast-body:before,
+.toast.toast-success .toast-body:before,
+.editing .editinprogress:after,
+.dir-rtl .block_settings .block_tree [aria-expanded=false] > p:before,
+.dir-rtl .block_navigation .block_tree [aria-expanded=false] > p:before,
+.block_settings .block_tree [aria-expanded=false] > p:before,
+.block_navigation .block_tree [aria-expanded=false] > p:before,
+.block_settings .block_tree [aria-expanded=true] > p:before,
+.block_navigation .block_tree [aria-expanded=true] > p:before,
+.dropup .dropdown-toggle::after,
+.dropright .dropdown-toggle::after,
+.dropleft .dropdown-toggle::before,
+.dropdown-toggle::after,
+.dropdown-item[aria-current=true]:before,
+.dropdown-item[aria-selected=true]:before,
 .far,
 .fa-regular,
+.content-bank-container.view-grid .cb-unlisted::after,
 .fab,
 .fa-brands {
   -moz-osx-font-smoothing: grayscale;
@@ -4931,8 +4977,31 @@
 .fas,
 .fa-classic,
 .fa-solid,
+.moremenu .dropdown-item[aria-current=true]:before,
+.moremenu .dropdown-item.active:before,
+.dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after,
+.navbar.fixed-top .usermenu .dropdown-menu .submenu .items .dropdown-item[aria-current=true]::before,
+.navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after,
+.toast.toast-warning .toast-body:before,
+.toast.toast-info .toast-body:before,
+.toast.toast-danger .toast-body:before,
+.toast.toast-success .toast-body:before,
+.editing .editinprogress:after,
+.dir-rtl .block_settings .block_tree [aria-expanded=false] > p:before,
+.dir-rtl .block_navigation .block_tree [aria-expanded=false] > p:before,
+.block_settings .block_tree [aria-expanded=false] > p:before,
+.block_navigation .block_tree [aria-expanded=false] > p:before,
+.block_settings .block_tree [aria-expanded=true] > p:before,
+.block_navigation .block_tree [aria-expanded=true] > p:before,
+.dropup .dropdown-toggle::after,
+.dropright .dropdown-toggle::after,
+.dropleft .dropdown-toggle::before,
+.dropdown-toggle::after,
+.dropdown-item[aria-current=true]:before,
+.dropdown-item[aria-selected=true]:before,
 .far,
-.fa-regular {
+.fa-regular,
+.content-bank-container.view-grid .cb-unlisted::after {
   font-family: "Font Awesome 6 Free";
 }
 
@@ -25148,14 +25217,7 @@ ul {
   align-items: center;
 }
 .dropdown-item[aria-current=true]:before, .dropdown-item[aria-selected=true]:before {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
-  content: \f00c;
+  content: "\f00c";
   position: absolute;
   left: 0.4rem;
   font-size: 0.7rem;
@@ -25749,16 +25811,9 @@ body.dragging .dragging {
 }
 
 .dropdown-toggle::after {
-  content: \f078;
+  content: "\f078";
   margin-right: 0;
   margin-left: 4px;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
   font-size: 9px;
   width: 9px;
   border: 0;
@@ -25766,14 +25821,7 @@ body.dragging .dragging {
 
 .dropleft .dropdown-toggle::before {
   border: 0;
-  content: \f053;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
+  content: "\f053";
   font-size: 9px;
   margin-left: 0;
   margin-right: 4px;
@@ -25782,12 +25830,12 @@ body.dragging .dragging {
 
 .dropright .dropdown-toggle::after {
   border: 0;
-  content: \f054;
+  content: "\f054";
 }
 
 .dropup .dropdown-toggle::after {
   border: 0;
-  content: \f077;
+  content: "\f077";
 }
 
 .select-menu li:first-child ul[role=group] {
@@ -26942,37 +26990,23 @@ aside[id^=block-region-side-] .block_recentlyaccesseditems .dashboard-card-deck
 
 .block_settings .block_tree [aria-expanded=true] > p:before,
 .block_navigation .block_tree [aria-expanded=true] > p:before {
-  content: \f107;
+  content: "\f107";
   margin-right: 0;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
   font-size: 16px;
   width: 16px;
 }
 
 .block_settings .block_tree [aria-expanded=false] > p:before,
 .block_navigation .block_tree [aria-expanded=false] > p:before {
-  content: \f105;
+  content: "\f105";
   margin-right: 0;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
   font-size: 16px;
   width: 16px;
 }
 
 .dir-rtl .block_settings .block_tree [aria-expanded=false] > p:before,
 .dir-rtl .block_navigation .block_tree [aria-expanded=false] > p:before {
-  content: \f104;
+  content: "\f104";
 }
 
 .block_navigation .block_tree p.hasicon,
@@ -27620,12 +27654,11 @@ table.calendartable caption {
   opacity: 0.15;
 }
 .content-bank-container.view-grid .cb-unlisted::after {
+  content: "\f070";
   position: absolute;
   top: 20px;
   left: 0;
   width: 100%;
-  content: \f070;
-  font-family: FontAwesome;
   font-size: 26px;
   text-align: center;
   opacity: 0.9;
@@ -27903,7 +27936,6 @@ body:not(.editing) .sitetopic ul.section .label .mod-indent-outer {
 }
 .editing .editinprogress:after {
   position: absolute;
-  font-family: "FontAwesome";
   font-size: 20px;
   color: #6a737b;
   content: "\f110";
@@ -36622,15 +36654,8 @@ div.editor_atto_toolbar button .icon {
   color: #1c3f1a;
 }
 .toast.toast-success .toast-body:before {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
   margin: 2px 5px 0 0;
-  content: \f058;
+  content: "\f058";
 }
 .toast.toast-danger {
   background-color: rgba(244, 214, 210, 0.95);
@@ -36640,15 +36665,8 @@ div.editor_atto_toolbar button .icon {
   color: #691911;
 }
 .toast.toast-danger .toast-body:before {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
   margin: 2px 5px 0 0;
-  content: \f057;
+  content: "\f057";
 }
 .toast.toast-info {
   background-color: rgba(204, 230, 234, 0.95);
@@ -36658,15 +36676,8 @@ div.editor_atto_toolbar button .icon {
   color: #00434e;
 }
 .toast.toast-info .toast-body:before {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
   margin: 2px 5px 0 0;
-  content: \f05a;
+  content: "\f05a";
 }
 .toast.toast-warning {
   background-color: rgba(252, 239, 220, 0.95);
@@ -36676,15 +36687,8 @@ div.editor_atto_toolbar button .icon {
   color: #7d5a29;
 }
 .toast.toast-warning .toast-body:before {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
   margin: 2px 5px 0 0;
-  content: \f06a;
+  content: "\f06a";
 }
 .toast .close {
   color: inherit;
@@ -36747,8 +36751,7 @@ div.editor_atto_toolbar button .icon {
   padding: 0.25rem 1.75rem 0.25rem 0.75rem;
 }
 .navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after {
-  font-family: FontAwesome;
-  content: \f0da;
+  content: "\f0da";
   font-size: 1rem;
   right: 0.75rem;
   position: absolute;
@@ -36764,8 +36767,7 @@ div.editor_atto_toolbar button .icon {
   margin: 0;
 }
 .navbar.fixed-top .usermenu .dropdown-menu .submenu .items .dropdown-item[aria-current=true]::before {
-  font-family: FontAwesome;
-  content: \f00c;
+  content: "\f00c";
   font-size: 0.75rem;
   padding-left: 0.25rem;
 }
@@ -36805,7 +36807,7 @@ div.editor_atto_toolbar button .icon {
 }
 
 .dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after {
-  content: \f0d9;
+  content: "\f0d9";
 }
 .dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .carousel .carousel-inner .carousel-item-prev.carousel-item-right,
 .dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .carousel .carousel-inner .carousel-item-next.carousel-item-left {
@@ -37523,7 +37525,7 @@ div.editor_atto_toolbar button .icon {
 }
 .moremenu .dropdown-item[aria-current=true]:before,
 .moremenu .dropdown-item.active:before {
-  content: \f00c;
+  content: "\f00c";
 }
 
 .primary-navigation .navigation {
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index e43785c68ef..399edec5c33 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -2043,7 +2043,8 @@
   src: url("[[font:core|fa-regular-400.woff2]]") format("woff2"), url("[[font:core|fa-regular-400.ttf]]") format("truetype");
 }
 .far,
-.fa-regular {
+.fa-regular,
+.content-bank-container.view-grid .cb-unlisted::after {
   font-weight: 400;
 }
 
@@ -2065,7 +2066,29 @@
   src: url("[[font:core|fa-solid-900.woff2]]") format("woff2"), url("[[font:core|fa-solid-900.ttf]]") format("truetype");
 }
 .fas,
-.fa-solid {
+.fa-solid,
+.moremenu .dropdown-item[aria-current=true]:before,
+.moremenu .dropdown-item.active:before,
+.dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after,
+.navbar.fixed-top .usermenu .dropdown-menu .submenu .items .dropdown-item[aria-current=true]::before,
+.navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after,
+.toast.toast-warning .toast-body:before,
+.toast.toast-info .toast-body:before,
+.toast.toast-danger .toast-body:before,
+.toast.toast-success .toast-body:before,
+.editing .editinprogress:after,
+.dir-rtl .block_settings .block_tree [aria-expanded=false] > p:before,
+.dir-rtl .block_navigation .block_tree [aria-expanded=false] > p:before,
+.block_settings .block_tree [aria-expanded=false] > p:before,
+.block_navigation .block_tree [aria-expanded=false] > p:before,
+.block_settings .block_tree [aria-expanded=true] > p:before,
+.block_navigation .block_tree [aria-expanded=true] > p:before,
+.dropup .dropdown-toggle::after,
+.dropright .dropdown-toggle::after,
+.dropleft .dropdown-toggle::before,
+.dropdown-toggle::after,
+.dropdown-item[aria-current=true]:before,
+.dropdown-item[aria-selected=true]:before {
   font-weight: 900;
 }
 
@@ -4915,8 +4938,31 @@
 .fa-sharp,
 .fas,
 .fa-solid,
+.moremenu .dropdown-item[aria-current=true]:before,
+.moremenu .dropdown-item.active:before,
+.dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after,
+.navbar.fixed-top .usermenu .dropdown-menu .submenu .items .dropdown-item[aria-current=true]::before,
+.navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after,
+.toast.toast-warning .toast-body:before,
+.toast.toast-info .toast-body:before,
+.toast.toast-danger .toast-body:before,
+.toast.toast-success .toast-body:before,
+.editing .editinprogress:after,
+.dir-rtl .block_settings .block_tree [aria-expanded=false] > p:before,
+.dir-rtl .block_navigation .block_tree [aria-expanded=false] > p:before,
+.block_settings .block_tree [aria-expanded=false] > p:before,
+.block_navigation .block_tree [aria-expanded=false] > p:before,
+.block_settings .block_tree [aria-expanded=true] > p:before,
+.block_navigation .block_tree [aria-expanded=true] > p:before,
+.dropup .dropdown-toggle::after,
+.dropright .dropdown-toggle::after,
+.dropleft .dropdown-toggle::before,
+.dropdown-toggle::after,
+.dropdown-item[aria-current=true]:before,
+.dropdown-item[aria-selected=true]:before,
 .far,
 .fa-regular,
+.content-bank-container.view-grid .cb-unlisted::after,
 .fab,
 .fa-brands {
   -moz-osx-font-smoothing: grayscale;
@@ -4931,8 +4977,31 @@
 .fas,
 .fa-classic,
 .fa-solid,
+.moremenu .dropdown-item[aria-current=true]:before,
+.moremenu .dropdown-item.active:before,
+.dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after,
+.navbar.fixed-top .usermenu .dropdown-menu .submenu .items .dropdown-item[aria-current=true]::before,
+.navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after,
+.toast.toast-warning .toast-body:before,
+.toast.toast-info .toast-body:before,
+.toast.toast-danger .toast-body:before,
+.toast.toast-success .toast-body:before,
+.editing .editinprogress:after,
+.dir-rtl .block_settings .block_tree [aria-expanded=false] > p:before,
+.dir-rtl .block_navigation .block_tree [aria-expanded=false] > p:before,
+.block_settings .block_tree [aria-expanded=false] > p:before,
+.block_navigation .block_tree [aria-expanded=false] > p:before,
+.block_settings .block_tree [aria-expanded=true] > p:before,
+.block_navigation .block_tree [aria-expanded=true] > p:before,
+.dropup .dropdown-toggle::after,
+.dropright .dropdown-toggle::after,
+.dropleft .dropdown-toggle::before,
+.dropdown-toggle::after,
+.dropdown-item[aria-current=true]:before,
+.dropdown-item[aria-selected=true]:before,
 .far,
-.fa-regular {
+.fa-regular,
+.content-bank-container.view-grid .cb-unlisted::after {
   font-family: "Font Awesome 6 Free";
 }
 
@@ -25148,14 +25217,7 @@ ul {
   align-items: center;
 }
 .dropdown-item[aria-current=true]:before, .dropdown-item[aria-selected=true]:before {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
-  content: \f00c;
+  content: "\f00c";
   position: absolute;
   left: 0.4rem;
   font-size: 0.7rem;
@@ -25749,16 +25811,9 @@ body.dragging .dragging {
 }
 
 .dropdown-toggle::after {
-  content: \f078;
+  content: "\f078";
   margin-right: 0;
   margin-left: 4px;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
   font-size: 9px;
   width: 9px;
   border: 0;
@@ -25766,14 +25821,7 @@ body.dragging .dragging {
 
 .dropleft .dropdown-toggle::before {
   border: 0;
-  content: \f053;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
+  content: "\f053";
   font-size: 9px;
   margin-left: 0;
   margin-right: 4px;
@@ -25782,12 +25830,12 @@ body.dragging .dragging {
 
 .dropright .dropdown-toggle::after {
   border: 0;
-  content: \f054;
+  content: "\f054";
 }
 
 .dropup .dropdown-toggle::after {
   border: 0;
-  content: \f077;
+  content: "\f077";
 }
 
 .select-menu li:first-child ul[role=group] {
@@ -26942,37 +26990,23 @@ aside[id^=block-region-side-] .block_recentlyaccesseditems .dashboard-card-deck
 
 .block_settings .block_tree [aria-expanded=true] > p:before,
 .block_navigation .block_tree [aria-expanded=true] > p:before {
-  content: \f107;
+  content: "\f107";
   margin-right: 0;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
   font-size: 16px;
   width: 16px;
 }
 
 .block_settings .block_tree [aria-expanded=false] > p:before,
 .block_navigation .block_tree [aria-expanded=false] > p:before {
-  content: \f105;
+  content: "\f105";
   margin-right: 0;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
   font-size: 16px;
   width: 16px;
 }
 
 .dir-rtl .block_settings .block_tree [aria-expanded=false] > p:before,
 .dir-rtl .block_navigation .block_tree [aria-expanded=false] > p:before {
-  content: \f104;
+  content: "\f104";
 }
 
 .block_navigation .block_tree p.hasicon,
@@ -27620,12 +27654,11 @@ table.calendartable caption {
   opacity: 0.15;
 }
 .content-bank-container.view-grid .cb-unlisted::after {
+  content: "\f070";
   position: absolute;
   top: 20px;
   left: 0;
   width: 100%;
-  content: \f070;
-  font-family: FontAwesome;
   font-size: 26px;
   text-align: center;
   opacity: 0.9;
@@ -27903,7 +27936,6 @@ body:not(.editing) .sitetopic ul.section .label .mod-indent-outer {
 }
 .editing .editinprogress:after {
   position: absolute;
-  font-family: "FontAwesome";
   font-size: 20px;
   color: #6a737b;
   content: "\f110";
@@ -36556,15 +36588,8 @@ div.editor_atto_toolbar button .icon {
   color: #1c3f1a;
 }
 .toast.toast-success .toast-body:before {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
   margin: 2px 5px 0 0;
-  content: \f058;
+  content: "\f058";
 }
 .toast.toast-danger {
   background-color: rgba(244, 214, 210, 0.95);
@@ -36574,15 +36599,8 @@ div.editor_atto_toolbar button .icon {
   color: #691911;
 }
 .toast.toast-danger .toast-body:before {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
   margin: 2px 5px 0 0;
-  content: \f057;
+  content: "\f057";
 }
 .toast.toast-info {
   background-color: rgba(204, 230, 234, 0.95);
@@ -36592,15 +36610,8 @@ div.editor_atto_toolbar button .icon {
   color: #00434e;
 }
 .toast.toast-info .toast-body:before {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
   margin: 2px 5px 0 0;
-  content: \f05a;
+  content: "\f05a";
 }
 .toast.toast-warning {
   background-color: rgba(252, 239, 220, 0.95);
@@ -36610,15 +36621,8 @@ div.editor_atto_toolbar button .icon {
   color: #7d5a29;
 }
 .toast.toast-warning .toast-body:before {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
   margin: 2px 5px 0 0;
-  content: \f06a;
+  content: "\f06a";
 }
 .toast .close {
   color: inherit;
@@ -36681,8 +36685,7 @@ div.editor_atto_toolbar button .icon {
   padding: 0.25rem 1.75rem 0.25rem 0.75rem;
 }
 .navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after {
-  font-family: FontAwesome;
-  content: \f0da;
+  content: "\f0da";
   font-size: 1rem;
   right: 0.75rem;
   position: absolute;
@@ -36698,8 +36701,7 @@ div.editor_atto_toolbar button .icon {
   margin: 0;
 }
 .navbar.fixed-top .usermenu .dropdown-menu .submenu .items .dropdown-item[aria-current=true]::before {
-  font-family: FontAwesome;
-  content: \f00c;
+  content: "\f00c";
   font-size: 0.75rem;
   padding-left: 0.25rem;
 }
@@ -36739,7 +36741,7 @@ div.editor_atto_toolbar button .icon {
 }
 
 .dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .dropdown-item.carousel-navigation-link::after {
-  content: \f0d9;
+  content: "\f0d9";
 }
 .dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .carousel .carousel-inner .carousel-item-prev.carousel-item-right,
 .dir-rtl .navbar.fixed-top .usermenu .dropdown-menu .carousel .carousel-inner .carousel-item-next.carousel-item-left {
@@ -37457,7 +37459,7 @@ div.editor_atto_toolbar button .icon {
 }
 .moremenu .dropdown-item[aria-current=true]:before,
 .moremenu .dropdown-item.active:before {
-  content: \f00c;
+  content: "\f00c";
 }
 
 .primary-navigation .navigation {
diff --git a/theme/upgrade.txt b/theme/upgrade.txt
index 54913f88126..5f59249af99 100644
--- a/theme/upgrade.txt
+++ b/theme/upgrade.txt
@@ -4,6 +4,7 @@ information provided here is intended especially for theme designer.
 === 4.2 ===
 * The moodle-core-popuphelp YUI modal has been removed. It has not been actively used in Moodle since 3.3. It should be replaced with appropriate ESM/AMD JavaScript.
 * The moodle-core-tooltip YUI modal has been removed. It should be replaced with appropriate ESM/AMD JavaScript.
+* The Font Awesome library has been upgraded from 4.7 to 6.3.0. The free version included in Moodle supports the solid and regular styles.
 
 === 4.1 ===
 * The function core_course_renderer::course_modchooser() has been finally deprecated and can not be used anymore.