diff --git a/src/addons/privatefiles/pages/index/index.html b/src/addons/privatefiles/pages/index/index.html
index cc6728c7b..435540fae 100644
--- a/src/addons/privatefiles/pages/index/index.html
+++ b/src/addons/privatefiles/pages/index/index.html
@@ -49,7 +49,7 @@
     <!-- Upload a private file. -->
     <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end" *ngIf="showUpload && root != 'site' && !path">
         <ion-fab-button (click)="uploadFile()" [attr.aria-label]="'core.fileuploader.uploadafile' | translate">
-            <ion-icon name="fa-plus"></ion-icon>
+            <ion-icon name="fas-plus"></ion-icon>
         </ion-fab-button>
     </ion-fab>
 </ion-content>
diff --git a/src/core/components/icon/icon.ts b/src/core/components/icon/icon.ts
index 4d181a0a5..3774263f3 100644
--- a/src/core/components/icon/icon.ts
+++ b/src/core/components/icon/icon.ts
@@ -21,7 +21,7 @@ import { Component, Input, OnChanges, ElementRef, SimpleChange } from '@angular/
  *
  * Check available icons at https://fontawesome.com/icons?d=gallery&m=free
  *
- * @deprecated since 3.9.3. Please use <ion-icon name="fa-icon"> instead.
+ * @deprecated since 3.9.3. Please use <ion-icon name="fas-icon"> instead.
  */
 @Component({
     selector: 'core-icon',
diff --git a/src/core/components/recaptcha/core-recaptchamodal.html b/src/core/components/recaptcha/core-recaptchamodal.html
index e49d8989b..604fefa7c 100644
--- a/src/core/components/recaptcha/core-recaptchamodal.html
+++ b/src/core/components/recaptcha/core-recaptchamodal.html
@@ -4,11 +4,11 @@
 
         <ion-buttons slot="end">
             <ion-button (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
-                <ion-icon slot="icon-only" name="fa-times"></ion-icon>
+                <ion-icon slot="icon-only" name="fas-times"></ion-icon>
             </ion-button>
         </ion-buttons>
     </ion-toolbar>
 </ion-header>
 <ion-content>
     <core-iframe [src]="recaptchaUrl" (loaded)="loaded($event)"></core-iframe>
-</ion-content>
\ No newline at end of file
+</ion-content>
diff --git a/src/core/components/tabs/core-tabs.html b/src/core/components/tabs/core-tabs.html
index 731d8f3e6..17b75c825 100644
--- a/src/core/components/tabs/core-tabs.html
+++ b/src/core/components/tabs/core-tabs.html
@@ -3,7 +3,7 @@
         <ion-spinner *ngIf="!hideUntil"></ion-spinner>
         <ion-row *ngIf="hideUntil">
             <ion-col class="col-with-arrow ion-no-padding" (click)="slidePrev()" size="1">
-                <ion-icon *ngIf="showPrevButton" name="fa-chevron-left"></ion-icon>
+                <ion-icon *ngIf="showPrevButton" name="fas-chevron-left"></ion-icon>
             </ion-col>
             <ion-col class="ion-no-padding" size="10">
                 <ion-slides (ionSlideDidChange)="slideChanged()" [options]="slideOpts" [dir]="direction" role="tablist"
@@ -24,7 +24,7 @@
                 </ion-slides>
             </ion-col>
             <ion-col class="col-with-arrow ion-no-padding" (click)="slideNext()" size="1">
-                <ion-icon *ngIf="showNextButton" name="fa-chevron-right"></ion-icon>
+                <ion-icon *ngIf="showNextButton" name="fas-chevron-right"></ion-icon>
             </ion-col>
         </ion-row>
     </ion-tab-bar>
diff --git a/src/core/directives/fa-icon.ts b/src/core/directives/fa-icon.ts
index 38298a46b..0d9da145a 100644
--- a/src/core/directives/fa-icon.ts
+++ b/src/core/directives/fa-icon.ts
@@ -23,7 +23,7 @@ import { CoreConstants } from '@/core/constants';
  *
  * Example usage:
  *
- * <ion-icon name="fa-icon">
+ * <ion-icon name="fas-icon">
  */
 @Directive({
     selector: 'ion-icon[name]',
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index da1baf562..846165404 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -194,8 +194,8 @@ export class CoreFormatTextDirective implements OnChanges {
 
             anchor.classList.add('core-image-viewer-icon');
             anchor.setAttribute('aria-label', label);
-            // Add an ion-icon item to apply the right styles, but the ion-icon component won't be executed.
-            anchor.innerHTML = '<ion-icon name="search" class="icon icon-md ion-md-search"></ion-icon>';
+            // @todo Add an ion-icon item to apply the right styles, but the ion-icon component won't be executed.
+            anchor.innerHTML = '<ion-icon name="fas-search" class="icon icon-md ion-md-search"></ion-icon>';
 
             anchor.addEventListener('click', (e: Event) => {
                 e.preventDefault();
diff --git a/src/core/features/courses/components/self-enrol-password/self-enrol-password.html b/src/core/features/courses/components/self-enrol-password/self-enrol-password.html
index d3acbe66a..3012c1939 100644
--- a/src/core/features/courses/components/self-enrol-password/self-enrol-password.html
+++ b/src/core/features/courses/components/self-enrol-password/self-enrol-password.html
@@ -7,7 +7,7 @@
 
         <ion-buttons slot="end">
             <ion-button (click)="close()" [attr.aria-label]="'core.close' | translate">
-                <ion-icon name="close" slot="icon-only"></ion-icon>
+                <ion-icon name="fas-times" slot="icon-only"></ion-icon>
             </ion-button>
         </ion-buttons>
     </ion-toolbar>
diff --git a/src/core/features/courses/pages/categories/categories.html b/src/core/features/courses/pages/categories/categories.html
index 7af0a9e5b..1ff31c8ab 100644
--- a/src/core/features/courses/pages/categories/categories.html
+++ b/src/core/features/courses/pages/categories/categories.html
@@ -61,7 +61,7 @@
             </ion-item-divider>
             <core-courses-course-list-item *ngFor="let course of courses" [course]="course"></core-courses-course-list-item>
         </div>
-        <core-empty-box *ngIf="!categories.length && !courses.length" icon="ionic" [message]="'core.courses.nocoursesyet' | translate">
+        <core-empty-box *ngIf="!categories.length && !courses.length" icon="fas-graduation-cap" [message]="'core.courses.nocoursesyet' | translate">
         </core-empty-box>
     </core-loading>
 </ion-content>
diff --git a/src/core/features/courses/pages/my-courses/my-courses.html b/src/core/features/courses/pages/my-courses/my-courses.html
index dd07c029f..718968fd2 100644
--- a/src/core/features/courses/pages/my-courses/my-courses.html
+++ b/src/core/features/courses/pages/my-courses/my-courses.html
@@ -7,7 +7,7 @@
 
         <ion-buttons slot="end">
             <ion-button *ngIf="searchEnabled" (click)="openSearch()" [attr.aria-label]="'core.courses.searchcourses' | translate">
-                <ion-icon name="search" slot="icon-only"></ion-icon>
+                <ion-icon name="fas-search" slot="icon-only"></ion-icon>
             </ion-button>
             <ng-container *ngIf="downloadAllCoursesEnabled && courses && courses.length >= 2">
                 <ion-button *ngIf="!downloadAllCoursesLoading" (click)="prefetchCourses()"
diff --git a/src/core/features/emulator/components/capture-media/capture-media.html b/src/core/features/emulator/components/capture-media/capture-media.html
index fcd74424e..ef7d7d167 100644
--- a/src/core/features/emulator/components/capture-media/capture-media.html
+++ b/src/core/features/emulator/components/capture-media/capture-media.html
@@ -30,8 +30,8 @@
                 <!-- Button to start/stop in mobile devices. -->
                 <ion-button fill="clear" *ngIf="!hasCaptured && isCordovaAudioCapture" (click)="actionClicked()"
                     [attr.aria-label]="title">
-                    <ion-icon *ngIf="!isCapturing" name="fa-microphone" slot="icon-only"></ion-icon>
-                    <ion-icon *ngIf="isCapturing" name="fa-square" slot="icon-only"></ion-icon>
+                    <ion-icon *ngIf="!isCapturing" name="fas-microphone" slot="icon-only"></ion-icon>
+                    <ion-icon *ngIf="isCapturing" name="fas-square" slot="icon-only"></ion-icon>
                 </ion-button>
 
                 <!-- Audio player to listen to the result. -->
@@ -47,13 +47,13 @@
         <ion-col class="ion-text-center">
             <ion-button fill="clear" *ngIf="!hasCaptured && !isCordovaAudioCapture" (click)="actionClicked()"
                 [attr.aria-label]="title">
-                <ion-icon *ngIf="!isCapturing && isAudio" name="fa-microphone" slot="icon-only"></ion-icon>
-                <ion-icon *ngIf="!isCapturing && isVideo" name="fa-video" slot="icon-only"></ion-icon>
-                <ion-icon *ngIf="isImage" name="fa-camera" slot="icon-only"></ion-icon>
-                <ion-icon *ngIf="isCapturing" name="fa-square" slot="icon-only"></ion-icon>
+                <ion-icon *ngIf="!isCapturing && isAudio" name="fas-microphone" slot="icon-only"></ion-icon>
+                <ion-icon *ngIf="!isCapturing && isVideo" name="fas-video" slot="icon-only"></ion-icon>
+                <ion-icon *ngIf="isImage" name="fas-camera" slot="icon-only"></ion-icon>
+                <ion-icon *ngIf="isCapturing" name="fas-square" slot="icon-only"></ion-icon>
             </ion-button>
             <ion-button fill="clear" *ngIf="hasCaptured" (click)="discard()" [attr.aria-label]="'core.discard' | translate">
-                <ion-icon color="danger" name="fa-trash" slot="icon-only"></ion-icon>
+                <ion-icon color="danger" name="fas-trash" slot="icon-only"></ion-icon>
             </ion-button>
         </ion-col>
         <ion-col class="ion-padding ion-text-end chrono-container">
diff --git a/src/core/features/login/components/site-help/site-help.html b/src/core/features/login/components/site-help/site-help.html
index 5bc9e9615..6f01bc259 100644
--- a/src/core/features/login/components/site-help/site-help.html
+++ b/src/core/features/login/components/site-help/site-help.html
@@ -4,7 +4,7 @@
 
         <ion-buttons slot="end">
             <ion-button (click)="closeHelp()" [attr.aria-label]="'core.close' | translate">
-                <ion-icon slot="icon-only" name="fa-times"></ion-icon>
+                <ion-icon slot="icon-only" name="fas-times"></ion-icon>
             </ion-button>
         </ion-buttons>
     </ion-toolbar>
@@ -73,4 +73,4 @@
             </ion-label>
         </ion-item>
     </ion-list>
-</ion-content>
\ No newline at end of file
+</ion-content>
diff --git a/src/core/features/login/components/site-onboarding/site-onboarding.html b/src/core/features/login/components/site-onboarding/site-onboarding.html
index 0db7e52f6..850bfa635 100644
--- a/src/core/features/login/components/site-onboarding/site-onboarding.html
+++ b/src/core/features/login/components/site-onboarding/site-onboarding.html
@@ -2,7 +2,7 @@
     <ion-toolbar>
         <ion-buttons slot="start">
             <ion-button (click)="previous($event)" [attr.aria-label]="'core.back' | translate">
-                <ion-icon slot="icon-only" name="fa-arrow-left"></ion-icon>
+                <ion-icon slot="icon-only" name="fas-arrow-left"></ion-icon>
             </ion-button>
         </ion-buttons>
 
diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index c753c36c4..3ba70db0b 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -9,7 +9,7 @@
         <ion-buttons slot="end">
             <ion-button router-direction="forward" routerLink="/settings"
                 [attr.aria-label]="'core.settings.appsettings' | translate">
-                <ion-icon slot="icon-only" name="fa-cog"></ion-icon>
+                <ion-icon slot="icon-only" name="fas-cog"></ion-icon>
             </ion-button>
         </ion-buttons>
     </ion-toolbar>
@@ -53,7 +53,7 @@
             <ng-container *ngIf="showScanQR">
                 <div class="ion-text-center ion-padding">{{ 'core.login.or' | translate }}</div>
                 <ion-button expand="block" color="light" class="ion-margin" lines="none" (click)="showInstructionsAndScanQR()">
-                    <ion-icon slot="start" name="fa-qrcode" aria-hidden="true"></ion-icon>
+                    <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
                     <ion-label>{{ 'core.scanqr' | translate }}</ion-label>
                 </ion-button>
             </ng-container>
diff --git a/src/core/features/login/pages/site/site.html b/src/core/features/login/pages/site/site.html
index dfcc17abd..29def2140 100644
--- a/src/core/features/login/pages/site/site.html
+++ b/src/core/features/login/pages/site/site.html
@@ -9,7 +9,7 @@
         <ion-buttons slot="end">
             <ion-button router-direction="forward" routerLink="/settings"
                 [attr.aria-label]="'core.settings.appsettings' | translate">
-                <ion-icon slot="icon-only" name="fa-cog"></ion-icon>
+                <ion-icon slot="icon-only" name="fas-cog"></ion-icon>
             </ion-button>
         </ion-buttons>
     </ion-toolbar>
@@ -50,7 +50,7 @@
                 <ion-item button *ngIf="enteredSiteUrl" (click)="connect($event, enteredSiteUrl.url)"
                     [attr.aria-label]="'core.login.connect' | translate" detail-push class="core-login-entered-site">
                     <ion-thumbnail slot="start">
-                        <ion-icon name="fa-pencil-alt"></ion-icon>
+                        <ion-icon name="fas-pencil-alt"></ion-icon>
                     </ion-thumbnail>
                     <ion-label>
                         <h2 text-wrap>{{ 'core.login.yourenteredsite' | translate }}</h2>
@@ -98,7 +98,7 @@
     <ng-container *ngIf="showScanQR && !hasSites && !enteredSiteUrl">
         <div class="ion-text-center ion-padding ion-margin-top">{{ 'core.login.or' | translate }}</div>
         <ion-button expand="block" color="light" class="ion-margin" lines="none" (click)="showInstructionsAndScanQR()">
-            <ion-icon slot="start" name="fa-qrcode" aria-hidden="true"></ion-icon>
+            <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
             <ion-label>{{ 'core.scanqr' | translate }}</ion-label>
         </ion-button>
     </ng-container>
diff --git a/src/core/features/login/pages/sites/sites.html b/src/core/features/login/pages/sites/sites.html
index bd544d273..1b7069769 100644
--- a/src/core/features/login/pages/sites/sites.html
+++ b/src/core/features/login/pages/sites/sites.html
@@ -8,11 +8,11 @@
 
         <ion-buttons slot="end">
             <ion-button *ngIf="sites && sites.length > 0" (click)="toggleDelete()" [attr.aria-label]="'core.delete' | translate">
-                <ion-icon slot="icon-only" name="fa-pencil-alt"></ion-icon>
+                <ion-icon slot="icon-only" name="fas-pencil-alt"></ion-icon>
             </ion-button>
             <ion-button router-direction="forward" routerLink="/settings"
                 [attr.aria-label]="'core.settings.appsettings' | translate">
-                <ion-icon slot="icon-only" name="fa-cog"></ion-icon>
+                <ion-icon slot="icon-only" name="fas-cog"></ion-icon>
             </ion-button>
         </ion-buttons>
     </ion-toolbar>
@@ -32,13 +32,13 @@
             <ion-badge slot="end" *ngIf="!showDelete && site.badge">{{site.badge}}</ion-badge>
             <ion-button *ngIf="showDelete" slot="end" fill="clear" color="danger" (click)="deleteSite($event, site)"
                 [attr.aria-label]="'core.delete' | translate">
-                <ion-icon name="fa-trash" slot="icon-only"></ion-icon>
+                <ion-icon name="fas-trash" slot="icon-only"></ion-icon>
             </ion-button>
         </ion-item>
     </ion-list>
     <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end">
         <ion-fab-button (click)="add()" [attr.aria-label]="'core.add' | translate">
-            <ion-icon name="fa-plus"></ion-icon>
+            <ion-icon name="fas-plus"></ion-icon>
         </ion-fab-button>
     </ion-fab>
 </ion-content>
diff --git a/src/core/features/mainmenu/pages/menu/menu.html b/src/core/features/mainmenu/pages/menu/menu.html
index 65c5db9b6..148c37584 100644
--- a/src/core/features/mainmenu/pages/menu/menu.html
+++ b/src/core/features/mainmenu/pages/menu/menu.html
@@ -13,7 +13,7 @@
         </ion-tab-button>
 
         <ion-tab-button (ionTabButtonClick)="tabClicked($event, 'more')" [hidden]="!loaded" tab="more" layout="label-hide">
-            <ion-icon name="fa-bars"></ion-icon>
+            <ion-icon name="fas-bars"></ion-icon>
             <ion-label>{{ 'core.more' | translate }}</ion-label>
         </ion-tab-button>
     </ion-tab-bar>
diff --git a/src/core/features/mainmenu/pages/more/more.html b/src/core/features/mainmenu/pages/more/more.html
index 1fe0bd121..4776dc9b5 100644
--- a/src/core/features/mainmenu/pages/more/more.html
+++ b/src/core/features/mainmenu/pages/more/more.html
@@ -51,34 +51,34 @@
             </ion-item>
         </ng-container>
         <ion-item button *ngIf="showScanQR" (click)="scanQR()" detail>
-            <ion-icon name="fa-qrcode" slot="start" aria-hidden="true"></ion-icon>
+            <ion-icon name="fas-qrcode" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>
                 <h2>{{ 'core.scanqr' | translate }}</h2>
             </ion-label>
         </ion-item>
         <ion-item button *ngIf="showWeb && siteInfo" [href]="siteInfo.siteurl" core-link autoLogin="yes"
             title="{{ 'core.mainmenu.website' | translate }}" detail>
-            <ion-icon name="globe" slot="start" aria-hidden="true"></ion-icon>
+            <ion-icon name="fas-globe" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>
                 <h2>{{ 'core.mainmenu.website' | translate }}</h2>
             </ion-label>
         </ion-item>
         <ion-item button *ngIf="showHelp" [href]="docsUrl" core-link autoLogin="no"
             title="{{ 'core.mainmenu.help' | translate }}" detail>
-            <ion-icon name="help-buoy" slot="start" aria-hidden="true"></ion-icon>
+            <ion-icon name="far-life-ring" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>
                 <h2>{{ 'core.mainmenu.help' | translate }}</h2>
             </ion-label>
         </ion-item>
         <ion-item button router-direction="forward" routerLink="preferences"
             title="{{ 'core.settings.preferences' | translate }}" detail>
-            <ion-icon name="fa-wrench" slot="start"></ion-icon>
+            <ion-icon name="fas-wrench" slot="start"></ion-icon>
             <ion-label>
                 <h2>{{ 'core.settings.preferences' | translate }}</h2>
             </ion-label>
         </ion-item>
         <ion-item button (click)="logout()" title="{{ logoutLabel | translate }}" detail>
-            <ion-icon name="log-out" slot="start" aria-hidden="true"></ion-icon>
+            <ion-icon name="fas-sign-out-alt" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>
                 <h2>{{ logoutLabel | translate }}</h2>
             </ion-label>
@@ -86,7 +86,7 @@
         <ion-item-divider></ion-item-divider>
         <ion-item button router-direction="forward" routerLink="settings"
             title="{{ 'core.settings.appsettings' | translate }}" detail>
-            <ion-icon name="fa-cogs" slot="start"></ion-icon>
+            <ion-icon name="fas-cogs" slot="start"></ion-icon>
             <ion-label>
                 <h2>{{ 'core.settings.appsettings' | translate }}</h2>
             </ion-label>
diff --git a/src/core/features/search/components/search-box/core-search-box.html b/src/core/features/search/components/search-box/core-search-box.html
index 5d49f4c0c..e8f4b3aa5 100644
--- a/src/core/features/search/components/search-box/core-search-box.html
+++ b/src/core/features/search/components/search-box/core-search-box.html
@@ -19,7 +19,7 @@
         <ion-list class="core-search-history" [hidden]="!historyShown">
             <ion-item button class="ion-text-wrap" *ngFor="let item of history"
                 (click)="historyClicked($event, item.searchedtext)" tabindex="1" detail>
-                <ion-icon name="fa-history" slot="start">
+                <ion-icon name="fas-history" slot="start">
                 </ion-icon>
                 {{item.searchedtext}}
             </ion-item>
diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index 8a47fbf42..016f905de 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -18,11 +18,11 @@
         <ion-label>{{ 'core.settings.opensourcelicenses' | translate }}</ion-label>
     </ion-item>
     <ion-item button class="ion-text-wrap" *ngIf="privacyPolicy" [href]="privacyPolicy" core-link auto-login="no" detail>
-        <ion-icon name="fa-user-shield" slot="start"></ion-icon>
+        <ion-icon name="fas-user-shield" slot="start"></ion-icon>
         <ion-label>{{ 'core.settings.privacypolicy' | translate }}</ion-label>
     </ion-item>
     <ion-item button class="ion-text-wrap" (click)="openPage('deviceinfo')" detail>
-        <ion-icon name="fa-mobile" slot="start"></ion-icon>
+        <ion-icon name="fas-mobile" slot="start"></ion-icon>
         <ion-label>{{ 'core.settings.deviceinfo' | translate }}</ion-label>
     </ion-item>
 </ion-content>
diff --git a/src/core/features/settings/pages/app/app.html b/src/core/features/settings/pages/app/app.html
index c8150a9db..f97a0250f 100644
--- a/src/core/features/settings/pages/app/app.html
+++ b/src/core/features/settings/pages/app/app.html
@@ -10,25 +10,25 @@
 </ion-header>
 <ion-content>
     <ion-item button (click)="openSettings('general')" [class.core-split-item-selected]="'general' == selectedPage" detail>
-        <ion-icon name="fa-wrench" slot="start"></ion-icon>
+        <ion-icon name="fas-wrench" slot="start"></ion-icon>
         <ion-label>{{ 'core.settings.general' | translate }}</ion-label>
     </ion-item>
     <ion-item button (click)="openSettings('spaceusage')" [class.core-split-item-selected]="'spaceusage' == selectedPage"
         detail>
-        <ion-icon name="fa-tasks" slot="start"></ion-icon>
+        <ion-icon name="fas-tasks" slot="start"></ion-icon>
         <ion-label>{{ 'core.settings.spaceusage' | translate }}</ion-label>
     </ion-item>
     <ion-item button (click)="openSettings('sync')" [class.core-split-item-selected]="'sync' == selectedPage" detail>
-        <ion-icon name="fa-sync-alt" slot="start"></ion-icon>
+        <ion-icon name="fas-sync-alt" slot="start"></ion-icon>
         <ion-label>{{ 'core.settings.synchronization' | translate }}</ion-label>
     </ion-item>
     <ion-item button *ngIf="isIOS" (click)="openSettings('sharedfiles', {manage: true})"
         [class.core-split-item-selected]="'sharedfiles' == selectedPage" detail>
-        <ion-icon name="fa-folder" slot="start"></ion-icon>
+        <ion-icon name="fas-folder" slot="start"></ion-icon>
         <ion-label>{{ 'core.sharedfiles.sharedfiles' | translate }}</ion-label>
     </ion-item>
     <ion-item button (click)="openSettings('about')" [class.core-split-item-selected]="'about' == selectedPage" detail>
-        <ion-icon name="fa-id-card" slot="start"></ion-icon>
+        <ion-icon name="fas-id-card" slot="start"></ion-icon>
         <ion-label>{{ 'core.settings.about' | translate }}</ion-label>
     </ion-item>
 </ion-content>
diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.html b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
index b892896e3..2a7b2b42a 100644
--- a/src/core/features/settings/pages/deviceinfo/deviceinfo.html
+++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
@@ -8,7 +8,7 @@
         </ion-title>
         <ion-buttons slot="end">
             <ion-button (click)="copyInfo()" [attr.aria-label]="'core.settings.copyinfo' | translate">
-                <ion-icon slot="icon-only" name="fa-clipboard" color="light"></ion-icon>
+                <ion-icon slot="icon-only" name="fas-clipboard" color="light"></ion-icon>
             </ion-button>
         </ion-buttons>
     </ion-toolbar>
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index fff613a26..58715be87 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -73,7 +73,7 @@
 
 <ng-template #enrolledCourseList>
     <ion-item button class="ion-text-wrap" router-direction="forward" routerLink="/courses/my" detail>
-        <ion-icon name="fa-graduation-cap" fixed-width slot="start">
+        <ion-icon name="fas-graduation-cap" fixed-width slot="start">
         </ion-icon>
         <ion-label><h2>{{ 'core.courses.mycourses' | translate}}</h2></ion-label>
     </ion-item>
@@ -81,7 +81,7 @@
 
 <ng-template #courseSearch>
     <ion-item button class="ion-text-wrap" router-direction="forward" routerLink="/courses/search" detail>
-        <ion-icon name="search" slot="start"></ion-icon>
+        <ion-icon name="fas-search" slot="start"></ion-icon>
         <ion-label><h2>{{ 'core.courses.searchcourses' | translate}}</h2></ion-label>
     </ion-item>
 </ng-template>