diff --git a/src/addons/messages/pages/discussions-35/discussions.html b/src/addons/messages/pages/discussions-35/discussions.html
index b32c97873..ed02b96d8 100644
--- a/src/addons/messages/pages/discussions-35/discussions.html
+++ b/src/addons/messages/pages/discussions-35/discussions.html
@@ -81,7 +81,7 @@
             <core-empty-box *ngIf="(!discussions || discussions.length <= 0) && !search.showResults" icon="far-comments"
                 [message]="'addon.messages.nomessagesfound' | translate"></core-empty-box>
 
-            <core-empty-box *ngIf="(!search.results || search.results.length <= 0) && search.showResults" icon="search"
+            <core-empty-box *ngIf="(!search.results || search.results.length <= 0) && search.showResults" icon="fas-search"
                 [message]="'core.noresults' | translate"></core-empty-box>
         </core-loading>
     </core-split-view>
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index ddfce64b9..5e3d2bbf4 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -2,7 +2,7 @@
 <core-navbar-buttons slot="end">
     <core-context-menu>
         <core-context-menu-item *ngIf="externalUrl"
-            [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl" iconAction="open">
+            [priority]="900" [content]="'core.openinbrowser' | translate" [href]="externalUrl" iconAction="fas-external-link-alt">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="description"
             [priority]="800" [content]="'core.moduleintro' | translate" (action)="expandDescription()" [iconAction]="'arrow-forward'">
@@ -23,7 +23,7 @@
             (action)="prefetch($event)">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="size"
-            iconDescription="fas-archive" iconAction="trash"
+            iconDescription="fas-archive" iconAction="fas-trash"
             [priority]="400" [content]="'core.clearstoreddata' | translate:{$a: size}" [closeOnClick]="false"
             (action)="removeFiles($event)">
         </core-context-menu-item>
@@ -69,7 +69,8 @@
         </ion-card>
 
         <ng-container *ngIf="forum">
-            <core-empty-box *ngIf="discussions.empty" icon="chatbubbles" [message]="'addon.mod_forum.forumnodiscussionsyet' | translate">
+            <core-empty-box *ngIf="discussions.empty" icon="far-comments"
+                [message]="'addon.mod_forum.forumnodiscussionsyet' | translate">
             </core-empty-box>
 
             <div *ngIf="!discussions.empty && sortingAvailable && selectedSortOrder" class="ion-text-wrap">
diff --git a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
index f397e6b5e..776466587 100644
--- a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
+++ b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
@@ -54,7 +54,7 @@
         </ion-list>
 
         <!-- No attempts. -->
-        <core-empty-box *ngIf="attemptsData && (!attemptsData.attempts || !attemptsData.attempts.length)" icon="stats-chart"
+        <core-empty-box *ngIf="attemptsData && (!attemptsData.attempts || !attemptsData.attempts.length)" icon="fas-chart-bar"
             [message]="'addon.mod_h5pactivity.attempts_none' | translate">
         </core-empty-box>
     </core-loading>
diff --git a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
index d951354cf..9643f3d90 100644
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -174,10 +174,10 @@
                     </ion-item>
 
                     <!-- No lesson retakes. -->
-                    <core-empty-box *ngIf="!overview && selectedGroupName" icon="stats-chart"
+                    <core-empty-box *ngIf="!overview && selectedGroupName" icon="fas-chart-bar"
                         [message]="'addon.mod_lesson.nolessonattemptsgroup' | translate:{$a: selectedGroupName}">
                     </core-empty-box>
-                    <core-empty-box *ngIf="!overview && !selectedGroupName" icon="stats-chart"
+                    <core-empty-box *ngIf="!overview && !selectedGroupName" icon="fas-chart-bar"
                         [message]="'addon.mod_lesson.nolessonattempts' | translate">
                     </core-empty-box>
 
diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html
index 2afd03877..836702d62 100644
--- a/src/addons/notifications/pages/list/list.html
+++ b/src/addons/notifications/pages/list/list.html
@@ -58,7 +58,7 @@
             </addon-notifications-actions>
         </ion-card>
 
-        <core-empty-box *ngIf="!notifications || notifications.length <= 0" icon="notifications"
+        <core-empty-box *ngIf="!notifications || notifications.length <= 0" icon="far-bell"
             [message]="'addon.notifications.therearentnotificationsyet' | translate">
         </core-empty-box>
 
diff --git a/src/core/components/context-menu/context-menu-item.ts b/src/core/components/context-menu/context-menu-item.ts
index 10e9da41d..4c104231d 100644
--- a/src/core/components/context-menu/context-menu-item.ts
+++ b/src/core/components/context-menu/context-menu-item.ts
@@ -41,7 +41,6 @@ export class CoreContextMenuItemComponent implements OnInit, OnDestroy, OnChange
     // If no icon or spinner is selected, no action or link will work.
     // If href but no iconAction is provided arrow-right will be used.
     @Input() iconSlash?: boolean; // Display a red slash over the icon.
-    @Input() ariaDescription?: string; // Aria label to add to iconDescription.
     @Input() ariaAction?: string; // Aria label to add to iconAction. If not set, it will be equal to content.
     @Input() href?: string; // Link to go if no action provided.
     @Input() captureLink?: boolean | string; // Whether the link needs to be captured by the app.
diff --git a/src/core/components/context-menu/core-context-menu-popover.html b/src/core/components/context-menu/core-context-menu-popover.html
index 10608cfe2..e9d0ad39d 100644
--- a/src/core/components/context-menu/core-context-menu-popover.html
+++ b/src/core/components/context-menu/core-context-menu-popover.html
@@ -5,13 +5,13 @@
     <ion-item class="ion-text-wrap" *ngFor="let item of items" core-link [capture]="item.captureLink" [autoLogin]="item.autoLogin"
         [href]="item.href" (click)="itemClicked($event, item)" [attr.aria-label]="item.ariaAction" [hidden]="item.hidden"
         [detail]="(item.href && !item.iconAction) || null" role="menuitem" [button]="(item.href && !item.iconAction)">
-        <ion-icon *ngIf="item.iconDescription" [name]="item.iconDescription" [attr.aria-label]="item.ariaDescription" slot="start">
+        <ion-icon *ngIf="item.iconDescription" [name]="item.iconDescription" aria-hidden="true" slot="start">
         </ion-icon>
         <ion-label>
             <p class="item-heading"><core-format-text [clean]="true" [text]="item.content" [filter]="false"></core-format-text></p>
         </ion-label>
         <ion-icon *ngIf="(item.href || item.action) && item.iconAction && item.iconAction != 'spinner'" [name]="item.iconAction"
-            [class.icon-slash]="item.iconSlash" slot="end">
+            [class.icon-slash]="item.iconSlash" slot="end" aria-hidden="true">
         </ion-icon>
         <ion-spinner *ngIf="(item.href || item.action) && item.iconAction == 'spinner'" slot="end"></ion-spinner>
         <ion-badge class="{{item.badgeClass}}" slot="end" *ngIf="item.badge">
diff --git a/src/core/components/empty-box/empty-box.ts b/src/core/components/empty-box/empty-box.ts
index dccd1df0c..3b9cf13f5 100644
--- a/src/core/components/empty-box/empty-box.ts
+++ b/src/core/components/empty-box/empty-box.ts
@@ -20,7 +20,7 @@ import { Component, Input } from '@angular/core';
  * Use class="core-empty-box-clickable" if you want to add some clickable elements to the box.
  *
  * Usage:
- * <core-empty-box *ngIf="empty" icon="bell" [message]="'core.emptymessage' | translate"></core-empty-box>
+ * <core-empty-box *ngIf="empty" icon="far-bell" [message]="'core.emptymessage' | translate"></core-empty-box>
  */
 @Component({
     selector: 'core-empty-box',
diff --git a/src/core/features/course/pages/list-mod-type/list-mod-type.html b/src/core/features/course/pages/list-mod-type/list-mod-type.html
index 831d6939d..4466314bd 100644
--- a/src/core/features/course/pages/list-mod-type/list-mod-type.html
+++ b/src/core/features/course/pages/list-mod-type/list-mod-type.html
@@ -11,7 +11,7 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
-        <core-empty-box *ngIf="!sections || !sections.length" icon="qr-scanner"
+        <core-empty-box *ngIf="!sections || !sections.length" icon="fas-box-open"
             [message]="'core.course.nocontentavailable' | translate">
         </core-empty-box>
 
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index bb99d57cc..799dede96 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -53,7 +53,7 @@
                         </ng-container>
                     </ng-container>
                 </ion-list>
-            <core-empty-box *ngIf="!hasContent" icon="qr-scanner" [message]="'core.course.nocontentavailable' | translate">
+            <core-empty-box *ngIf="!hasContent" icon="fas-box-open" [message]="'core.course.nocontentavailable' | translate">
 
             </core-empty-box>
         </core-loading>
diff --git a/src/core/features/user/pages/participants/participants.html b/src/core/features/user/pages/participants/participants.html
index c52e9cecb..073b09582 100644
--- a/src/core/features/user/pages/participants/participants.html
+++ b/src/core/features/user/pages/participants/participants.html
@@ -18,11 +18,11 @@
         </core-search-box>
 
         <core-loading [hideUntil]="participants.loaded">
-            <core-empty-box *ngIf="participants.empty && !searchInProgress && !searchQuery" icon="person"
+            <core-empty-box *ngIf="participants.empty && !searchInProgress && !searchQuery" icon="far-user"
                 [message]="'core.user.noparticipants' | translate">
             </core-empty-box>
 
-            <core-empty-box *ngIf="participants.empty && !searchInProgress && searchQuery" icon="search"
+            <core-empty-box *ngIf="participants.empty && !searchInProgress && searchQuery" icon="fas-search"
                 [message]="'core.noresults' | translate">
             </core-empty-box>
 
diff --git a/src/core/features/user/pages/profile/profile.html b/src/core/features/user/pages/profile/profile.html
index b575e6e3d..0b7059da2 100644
--- a/src/core/features/user/pages/profile/profile.html
+++ b/src/core/features/user/pages/profile/profile.html
@@ -86,10 +86,10 @@
             </ion-item>
         </ion-list>
 
-        <core-empty-box *ngIf="!user && !isDeleted && isEnrolled" icon="fa-user"
+        <core-empty-box *ngIf="!user && !isDeleted && isEnrolled" icon="far-user"
             [message]=" 'core.user.detailsnotavailable' | translate">
         </core-empty-box>
-        <core-empty-box *ngIf="isDeleted" icon="fa-user" [message]="'core.userdeleted' | translate"></core-empty-box>
-        <core-empty-box *ngIf="!isEnrolled" icon="fa-user" [message]="'core.notenrolledprofile' | translate"></core-empty-box>
+        <core-empty-box *ngIf="isDeleted" icon="far-user" [message]="'core.userdeleted' | translate"></core-empty-box>
+        <core-empty-box *ngIf="!isEnrolled" icon="far-user" [message]="'core.notenrolledprofile' | translate"></core-empty-box>
     </core-loading>
 </ion-content>