diff --git a/src/addons/badges/pages/user-badges/user-badges.html b/src/addons/badges/pages/user-badges/user-badges.html
index 965f35d70..a04a3e761 100644
--- a/src/addons/badges/pages/user-badges/user-badges.html
+++ b/src/addons/badges/pages/user-badges/user-badges.html
@@ -18,7 +18,7 @@
 
             <ion-list *ngIf="!badges.empty" class="ion-no-margin">
                 <ion-item button class="ion-text-wrap" *ngFor="let badge of badges.items" [attr.aria-label]="badge.name"
-                    (click)="badges.select(badge)" [attr.aria-current]="badges.getItemAriaCurrent(badge)">
+                    (click)="badges.select(badge)" [attr.aria-current]="badges.getItemAriaCurrent(badge)" detail="true">
                     <ion-avatar slot="start">
                         <img [src]="badge.badgeurl" [alt]="badge.name" core-external-content>
                     </ion-avatar>
diff --git a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
index c23efa667..1f39261b4 100644
--- a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
+++ b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
@@ -4,7 +4,7 @@
     </ion-label>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false" class="margin">
-    <ion-item class="ion-text-wrap item-media" *ngFor="let entry of entries" detail="false" button
+    <ion-item class="ion-text-wrap item-media" *ngFor="let entry of entries" detail="true" button
         (click)="gotoCoureListModType(entry)">
         <img slot="start" [src]="entry.icon" alt="" role="presentation" class="core-module-icon">
         <ion-label>{{ entry.name }}</ion-label>
diff --git a/src/addons/blog/pages/entries/entries.html b/src/addons/blog/pages/entries/entries.html
index 94e0fb5e2..73b15a137 100644
--- a/src/addons/blog/pages/entries/entries.html
+++ b/src/addons/blog/pages/entries/entries.html
@@ -54,22 +54,18 @@
                             <core-tag-list [tags]="entry.tags"></core-tag-list>
                         </ion-label>
                     </ion-item>
-                    <ion-item *ngIf="commentsEnabled" detail="true">
-                        <ion-label>
-                            <core-comments [component]="this.component" [itemId]="entry.id" area="format_blog"
-                                [instanceId]="entry.userid" contextLevel="user">
-                            </core-comments>
-                        </ion-label>
-                    </ion-item>
+                    <core-comments *ngIf="commentsEnabled" [component]="this.component" [itemId]="entry.id" area="format_blog"
+                        [instanceId]="entry.userid" contextLevel="user" [showItem]="true">
+                    </core-comments>
                     <core-file *ngFor="let file of entry.attachmentfiles" [file]="file" [component]="this.component"
                         [componentId]="entry.id">
                     </core-file>
-                    <ion-item *ngIf="entry.uniquehash" [href]="entry.uniquehash" core-link>
+                    <ion-item *ngIf="entry.uniquehash" [href]="entry.uniquehash" core-link detail="true">
                         <ion-label>{{ 'addon.blog.linktooriginalentry' | translate }}</ion-label>
                     </ion-item>
                 </ion-card-content>
-                <ion-row class="ion-text-center">
-                    <ion-col *ngIf="entry.lastmodified > entry.created">
+                <ion-row class="ion-text-center" *ngIf="entry.lastmodified > entry.created">
+                    <ion-col>
                         <ion-note>
                             <ion-icon name="fas-clock"
                                 [attr.aria-label]="'core.lastmodified' | translate"></ion-icon> {{entry.lastmodified | coreTimeAgo}}
diff --git a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
index 46de2aacf..315e8e624 100644
--- a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
+++ b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
@@ -5,7 +5,7 @@
     <ion-list *ngIf="filteredEvents && filteredEvents.length" class="ion-no-margin">
         <ng-container *ngFor="let event of filteredEvents">
             <ion-item class="ion-text-wrap addon-calendar-event" [attr.aria-label]="event.name" (click)="eventClicked(event)" button
-                [ngClass]="['addon-calendar-eventtype-'+event.eventtype]">
+                [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" detail="true">
                 <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" slot="start" class="core-module-icon" alt=""
                     role="presentation">
                 <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start" aria-hidden="true">
diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html
index c548b1e84..4ca58a438 100644
--- a/src/addons/calendar/pages/day/day.html
+++ b/src/addons/calendar/pages/day/day.html
@@ -60,7 +60,7 @@
         <ion-list *ngIf="filteredEvents && filteredEvents.length" class="ion-no-margin">
             <ng-container *ngFor="let event of filteredEvents">
                 <ion-item class="addon-calendar-event ion-text-wrap" [attr.aria-label]="event.name" (click)="gotoEvent(event.id)"
-                [class.item-dimmed]="event.ispast" [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button>
+                [class.item-dimmed]="event.ispast" [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button detail="true">
                     <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" slot="start" class="core-module-icon" alt=""
                         role="presentation">
                     <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start" aria-hidden="true">
diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index f970a57e6..f989bda39 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -101,7 +101,7 @@
             </ng-container>
 
             <!-- Advanced options. -->
-            <ion-item button class="ion-text-wrap core-expandable divider" (click)="toggleAdvanced()">
+            <ion-item button class="ion-text-wrap core-expandable divider" (click)="toggleAdvanced()" detail="false">
                 <ion-icon *ngIf="!advanced" name="fas-caret-right" slot="start" aria-hidden="true"></ion-icon>
                 <ion-icon *ngIf="advanced" name="fas-caret-down" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>
@@ -138,7 +138,7 @@
                             <ion-radio slot="end" value="0"></ion-radio>
                             <ion-label>{{ 'addon.calendar.durationnone' | translate }}</ion-label>
                         </ion-item>
-                        <ion-item button (click)="selectDuration('1')">
+                        <ion-item button (click)="selectDuration('1')" detail="false">
                             <ion-radio slot="end" value="1"></ion-radio>
                             <ion-label>{{ 'addon.calendar.durationuntil' | translate }}</ion-label>
                             <ion-datetime formControlName="timedurationuntil" [max]="maxDate" [min]="minDate"
@@ -146,7 +146,7 @@
                                 [displayFormat]="dateFormat" [disabled]="form.controls.duration.value != 1">
                             </ion-datetime>
                         </ion-item>
-                        <ion-item button (click)="selectDuration('2')">
+                        <ion-item button (click)="selectDuration('2')" detail="false">
                             <ion-radio slot="end" value="2"></ion-radio>
                             <ion-label>{{ 'addon.calendar.durationminutes' | translate }}</ion-label>
                             <ion-input type="number" name="timedurationminutes" slot="end"
diff --git a/src/addons/calendar/pages/index/index.page.ts b/src/addons/calendar/pages/index/index.page.ts
index b125e259a..a3329f19a 100644
--- a/src/addons/calendar/pages/index/index.page.ts
+++ b/src/addons/calendar/pages/index/index.page.ts
@@ -166,12 +166,13 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
     ngOnInit(): void {
         this.notificationsEnabled = CoreLocalNotifications.isAvailable();
 
+        this.loadUpcoming = !!CoreNavigator.getRouteBooleanParam('upcoming');
+        this.showCalendar = !this.loadUpcoming;
+
         this.route.queryParams.subscribe(async () => {
             this.filter.courseId = CoreNavigator.getRouteNumberParam('courseId');
             this.year = CoreNavigator.getRouteNumberParam('year');
             this.month = CoreNavigator.getRouteNumberParam('month');
-            this.loadUpcoming = !!CoreNavigator.getRouteBooleanParam('upcoming');
-            this.showCalendar = !this.loadUpcoming;
             this.filter.filtered = !!this.filter.courseId;
 
             this.fetchData(true, false);
diff --git a/src/addons/calendar/pages/list/list.html b/src/addons/calendar/pages/list/list.html
index 55fc48d6d..b90389929 100644
--- a/src/addons/calendar/pages/list/list.html
+++ b/src/addons/calendar/pages/list/list.html
@@ -44,7 +44,7 @@
                     </ion-item-divider>
                     <ion-item class="addon-calendar-event ion-text-wrap" [attr.aria-label]="event.name" (click)="gotoEvent(event.id)"
                         [attr.aria-current]="event.id == eventId ? 'page' : 'false'"
-                        [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button>
+                        [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button detail="true">
                         <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" slot="start" class="core-module-icon" alt=""
                             role="presentation">
                         <ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" slot="start"
diff --git a/src/addons/competency/pages/competencies/competencies.html b/src/addons/competency/pages/competencies/competencies.html
index 516b5f6f6..c2b651541 100644
--- a/src/addons/competency/pages/competencies/competencies.html
+++ b/src/addons/competency/pages/competencies/competencies.html
@@ -15,7 +15,7 @@
             <ion-list>
                 <ion-item class="ion-text-wrap" *ngFor="let competency of competencies.items"
                     [attr.aria-label]="competency.competency.shortname" (click)="competencies.select(competency)"
-                    [attr.aria-current]="competencies.getItemAriaCurrent(competency)" button>
+                    [attr.aria-current]="competencies.getItemAriaCurrent(competency)" button detail="true">
                     <ion-label>
                         <p class="item-heading">{{ competency.competency.shortname }} <em>{{competency.competency.idnumber}}</em></p>
                     </ion-label>
diff --git a/src/addons/competency/pages/competency/competency.html b/src/addons/competency/pages/competency/competency.html
index f093e2a13..0406897e2 100644
--- a/src/addons/competency/pages/competency/competency.html
+++ b/src/addons/competency/pages/competency/competency.html
@@ -28,47 +28,50 @@
                     </core-format-text>
                 </ion-label>
             </ion-item>
-            <ion-item class="ion-text-wrap">
+            <ion-item class="ion-text-wrap only-links">
                 <ion-label>
-                    <strong>{{ 'addon.competency.path' | translate }}</strong>
-                    <a *ngIf="competency.competency.comppath.showlinks"
-                        [href]="competency.competency.comppath.pluginbaseurl + '/competencies.php?competencyframeworkid=' +
-                        competency.competency.comppath.framework.id + '&pagecontextid=' +
-                        competency.competency.comppath.pagecontextid"
-                        core-link [title]="competency.competency.comppath.framework.name">
-                        {{ competency.competency.comppath.framework.name }}
-                    </a>
-                    <ng-container *ngIf="!competency.competency.comppath.showlinks">
-                        {{ competency.competency.comppath.framework.name }}
-                    </ng-container>
-                    &nbsp;/&nbsp;
-                    <span *ngFor="let ancestor of competency.competency.comppath.ancestors">
-                        <a *ngIf="competency.competency.comppath.showlinks" (click)="openCompetencySummary(ancestor.id)">
-                            {{ ancestor.name }}
+                    <p class="item-heading">{{ 'addon.competency.path' | translate }}</p>
+                    <p>
+                        <a *ngIf="competency.competency.comppath.showlinks"
+                            [href]="competency.competency.comppath.pluginbaseurl + '/competencies.php?competencyframeworkid=' +
+                            competency.competency.comppath.framework.id + '&pagecontextid=' +
+                            competency.competency.comppath.pagecontextid"
+                            core-link>
+                            {{ competency.competency.comppath.framework.name }}
                         </a>
-                        <ng-container *ngIf="!competency.competency.comppath.showlinks">{{ ancestor.name }}</ng-container>
-                        <ng-container *ngIf="!ancestor.last">&nbsp;/&nbsp;</ng-container>
-                    </span>
+                        <ng-container *ngIf="!competency.competency.comppath.showlinks">
+                            {{ competency.competency.comppath.framework.name }}
+                        </ng-container>
+                        &nbsp;/&nbsp;
+                        <ng-container *ngFor="let ancestor of competency.competency.comppath.ancestors">
+                            <button *ngIf="competency.competency.comppath.showlinks" (click)="openCompetencySummary(ancestor.id)"
+                                class="as-link">
+                                {{ ancestor.name }}
+                            </button>
+                            <ng-container *ngIf="!competency.competency.comppath.showlinks">{{ ancestor.name }}</ng-container>
+                            <ng-container *ngIf="!ancestor.last">&nbsp;/&nbsp;</ng-container>
+                        </ng-container>
+                    </p>
                 </ion-label>
             </ion-item>
             <ion-item class="ion-text-wrap">
                 <ion-label>
-                    <strong>{{ 'addon.competency.crossreferencedcompetencies' | translate }}</strong>:
-                    <div *ngIf="!competency.competency.hasrelatedcompetencies">
+                    <p class="item-heading">{{ 'addon.competency.crossreferencedcompetencies' | translate }}</p>
+                    <p *ngIf="!competency.competency.hasrelatedcompetencies">
                         {{ 'addon.competency.nocrossreferencedcompetencies' | translate }}
-                    </div>
-                    <div *ngIf="competency.competency.hasrelatedcompetencies">
+                    </p>
+                    <ng-container *ngIf="competency.competency.hasrelatedcompetencies">
                         <p *ngFor="let relatedcomp of competency.competency.relatedcompetencies">
-                            <a (click)="openCompetencySummary(relatedcomp.id)">
+                            <button (click)="openCompetencySummary(relatedcomp.id)" class="as-link">
                                 {{ relatedcomp.shortname }} - {{ relatedcomp.idnumber }}
-                            </a>
+                            </button>
                         </p>
-                    </div>
+                    </ng-container>
                 </ion-label>
             </ion-item>
             <ion-item class="ion-text-wrap" *ngIf="coursemodules">
                 <ion-label>
-                    <strong>{{ 'addon.competency.activities' | translate }}</strong>
+                    <p class="item-heading">{{ 'addon.competency.activities' | translate }}</p>
                     <p *ngIf="coursemodules.length == 0">
                         {{ 'addon.competency.noactivities' | translate }}
                     </p>
@@ -87,13 +90,13 @@
             <ng-container *ngIf="userCompetency">
                 <ion-item class="ion-text-wrap" *ngIf="competency.usercompetency && competency.usercompetency!.status">
                     <ion-label>
-                        <strong>{{ 'addon.competency.reviewstatus' | translate }}</strong>
-                        {{ competency.usercompetency!.statusname }}
+                        <p class="item-heading">{{ 'addon.competency.reviewstatus' | translate }}</p>
+                        <p>{{ competency.usercompetency!.statusname }}</p>
                     </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap">
                     <ion-label>
-                        <strong>{{ 'addon.competency.proficient' | translate }}</strong>
+                        <p class="item-heading">{{ 'addon.competency.proficient' | translate }}</p>
                     </ion-label>
                     <ion-badge slot="end" color="success" *ngIf="userCompetency.proficiency">
                         {{ 'core.yes' | translate }}
@@ -104,7 +107,7 @@
                 </ion-item>
                 <ion-item class="ion-text-wrap">
                     <ion-label>
-                        <strong>{{ 'addon.competency.rating' | translate }}</strong>
+                        <p class="item-heading">{{ 'addon.competency.rating' | translate }}</p>
                     </ion-label>
                     <ion-badge color="dark" slot="end">{{ userCompetency.gradename }}</ion-badge>
                 </ion-item>
diff --git a/src/addons/competency/pages/competencysummary/competencysummary.html b/src/addons/competency/pages/competencysummary/competencysummary.html
index f497b008c..664344804 100644
--- a/src/addons/competency/pages/competencysummary/competencysummary.html
+++ b/src/addons/competency/pages/competencysummary/competencysummary.html
@@ -23,11 +23,15 @@
             </ion-item>
             <ion-item class="ion-text-wrap">
                 <ion-label>
-                    <strong>{{ 'addon.competency.path' | translate }}</strong>
-                    {{ competency.comppath.framework.name }}
-                    <span *ngFor="let ancestor of competency.comppath.ancestors">
-                        &nbsp;/&nbsp;<a (click)="openCompetencySummary(ancestor.id)">{{ ancestor.name }}</a>
-                    </span>
+                    <p class="item-heading">{{ 'addon.competency.path' | translate }}</p>
+                    <p>{{ competency.comppath.framework.name }}
+                        <ng-container *ngFor="let ancestor of competency.comppath.ancestors">
+                            &nbsp;/&nbsp;
+                            <button class="as-link" (click)="openCompetencySummary(ancestor.id)">
+                                {{ ancestor.name }}
+                            </button>
+                        </ng-container>
+                    </p>
                 </ion-label>
             </ion-item>
         </ion-card>
diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
index ad3af37bb..de2b0bb59 100644
--- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
+++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
@@ -34,11 +34,11 @@
             <ion-item class="ion-text-wrap"
                 *ngIf="competencies.statistics.canmanagecoursecompetencies && competencies.statistics.leastproficientcount > 0">
                 <ion-label>
-                    <strong>{{ 'addon.competency.competenciesmostoftennotproficientincourse' | translate }}</strong>:
+                    <p class="item-heading">{{ 'addon.competency.competenciesmostoftennotproficientincourse' | translate }}</p>
                     <p *ngFor="let comp of competencies.statistics.leastproficient">
-                        <a (click)="openCompetencySummary(comp.id)">
+                        <button class="as-link" (click)="openCompetencySummary(comp.id)">
                             {{ comp.shortname }} - {{ comp.idnumber }}
-                        </a>
+                        </button>
                     </p>
                 </ion-label>
             </ion-item>
@@ -63,7 +63,7 @@
                     [attr.aria-label]="competency.competency.shortname" detail="true" button>
                     <ion-label>
                         <p class="item-heading">
-                            <strong>{{competency.competency.shortname}} <em>{{competency.competency.idnumber}}</em></strong>
+                            {{competency.competency.shortname}} <em>{{competency.competency.idnumber}}</em>
                         </p>
                     </ion-label>
                     <ion-badge slot="end" *ngIf="competency.usercompetencycourse && competency.usercompetencycourse.gradename"
@@ -79,33 +79,36 @@
                             </core-format-text>
                         </p>
                         <div>
-                            <strong>{{ 'addon.competency.path' | translate }}</strong>
-                            <a *ngIf="competency.comppath.showlinks"
-                                [href]="competency.comppath.pluginbaseurl + '/competencies.php?competencyframeworkid=' +
-                                competency.comppath.framework.id + '&pagecontextid=' + competency.comppath.pagecontextid"
-                                core-link [title]="competency.comppath.framework.name">
-                                {{ competency.comppath.framework.name }}
-                            </a>
-                            <ng-container *ngIf="!competency.comppath.showlinks">
-                                {{ competency.comppath.framework.name }}
-                            </ng-container>
-                            &nbsp;/&nbsp;
-                            <span *ngFor="let ancestor of competency.comppath.ancestors">
-                                <a *ngIf="competency.comppath.showlinks" (click)="openCompetencySummary(ancestor.id)">
-                                    {{ ancestor.name }}
+                            <p class="item-heading">{{ 'addon.competency.path' | translate }}</p>
+                            <p>
+                                <a *ngIf="competency.comppath.showlinks"
+                                    [href]="competency.comppath.pluginbaseurl + '/competencies.php?competencyframeworkid=' +
+                                    competency.comppath.framework.id + '&pagecontextid=' + competency.comppath.pagecontextid"
+                                    core-link [title]="competency.comppath.framework.name">
+                                    {{ competency.comppath.framework.name }}
                                 </a>
-                                <ng-container *ngIf="!competency.comppath.showlinks">{{ ancestor.name }}</ng-container>
-                                <ng-container *ngIf="!ancestor.last">&nbsp;/&nbsp;</ng-container>
-                            </span>
+                                <ng-container *ngIf="!competency.comppath.showlinks">
+                                    {{ competency.comppath.framework.name }}
+                                </ng-container>
+                                &nbsp;/&nbsp;
+                                <ng-container *ngFor="let ancestor of competency.comppath.ancestors">
+                                    <button class="as-link" *ngIf="competency.comppath.showlinks"
+                                        (click)="openCompetencySummary(ancestor.id)">
+                                        {{ ancestor.name }}
+                                    </button>
+                                    <ng-container *ngIf="!competency.comppath.showlinks">{{ ancestor.name }}</ng-container>
+                                    <ng-container *ngIf="!ancestor.last">&nbsp;/&nbsp;</ng-container>
+                                </ng-container>
+                            </p>
                         </div>
                         <div *ngIf="competencies.statistics.canmanagecoursecompetencies">
-                            <strong>{{ 'addon.competency.uponcoursecompletion' | translate }}</strong>
+                            <p class="item-heading">{{ 'addon.competency.uponcoursecompletion' | translate }}</p>
                              <ng-container *ngFor="let ruleoutcome of competency.ruleoutcomeoptions">
                                 <span *ngIf="ruleoutcome.selected">{{ ruleoutcome.text }}</span>
                             </ng-container>
                         </div>
                         <div>
-                            <strong>{{ 'addon.competency.activities' | translate }}</strong>
+                            <p class="item-heading">{{ 'addon.competency.activities' | translate }}</p>
                             <p *ngIf="competency.coursemodules.length == 0">
                                 {{ 'addon.competency.noactivities' | translate }}
                             </p>
@@ -121,7 +124,7 @@
                             </ion-item>
                         </div>
                         <div *ngIf="competency.plans">
-                            <strong>{{ 'addon.competency.userplans' | translate }}</strong>
+                            <p class="item-heading">{{ 'addon.competency.userplans' | translate }}</p>
                             <p *ngIf="competency.plans.length == 0">
                                 {{ 'addon.competency.nouserplanswithcompetency' | translate }}
                             </p>
diff --git a/src/addons/competency/pages/plan/plan.html b/src/addons/competency/pages/plan/plan.html
index 0331c370a..edebcf7ba 100644
--- a/src/addons/competency/pages/plan/plan.html
+++ b/src/addons/competency/pages/plan/plan.html
@@ -23,37 +23,35 @@
             <ion-list>
                 <ion-item class="ion-text-wrap" *ngIf="plan.plan.description" lines="none">
                     <ion-label>
-                        <core-format-text [text]="plan.plan.description" contextLevel="user"
-                            [contextInstanceId]="plan.plan.userid">
-                        </core-format-text>
+                        <p>
+                            <core-format-text [text]="plan.plan.description" contextLevel="user"
+                                [contextInstanceId]="plan.plan.userid">
+                            </core-format-text>
+                        </p>
                     </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" lines="none">
                     <ion-label>
-                        <p>
-                            <strong>{{ 'addon.competency.status' | translate }}</strong>: {{ plan.plan.statusname }}
-                        </p>
+                        <p class="item-heading">{{ 'addon.competency.status' | translate }}</p>
+                        <p>{{ plan.plan.statusname }}</p>
                     </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="plan.plan.duedate > 0" lines="none">
                     <ion-label>
-                        <p>
-                            <strong>{{ 'addon.competency.duedate' | translate }}</strong>:
-                            {{ plan.plan.duedate * 1000 | coreFormatDate }}
-                        </p>
+                        <p class="item-heading">{{ 'addon.competency.duedate' | translate }}</p>
+                        <p>{{ plan.plan.duedate * 1000 | coreFormatDate }}</p>
                     </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="plan.plan.template" lines="none">
                     <ion-label>
-                        <p>
-                            <strong>{{ 'addon.competency.template' | translate }}</strong>: {{ plan.plan.template.shortname }}
-                        </p>
+                        <p class="item-heading">{{ 'addon.competency.template' | translate }}</p>
+                        <p>{{ plan.plan.template.shortname }}</p>
                     </ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" lines="none">
-                    <ion-label>
-                        <p id="addon-competency-plan-{{plan.plan.id}}-progress">
-                            <strong>{{ 'addon.competency.progress' | translate }}</strong>:
+                    <ion-label id="addon-competency-plan-{{plan.plan.id}}-progress">
+                        <p class="item-heading">{{ 'addon.competency.progress' | translate }}</p>
+                        <p>
                             {{ 'addon.competency.xcompetenciesproficientoutofy' | translate:
                                 {$a: {x: plan.proficientcompetencycount, y: plan.competencycount} } }}
                         </p>
diff --git a/src/addons/competency/pages/planlist/planlist.html b/src/addons/competency/pages/planlist/planlist.html
index b25476471..1b037fe48 100644
--- a/src/addons/competency/pages/planlist/planlist.html
+++ b/src/addons/competency/pages/planlist/planlist.html
@@ -17,7 +17,7 @@
             </core-empty-box>
             <ion-list *ngIf="!plans.empty" class="ion-no-margin">
                 <ion-item class="ion-text-wrap" *ngFor="let plan of plans.items" [attr.aria-label]="plan.name"
-                    (click)="plans.select(plan)" [attr.aria-current]="plans.getItemAriaCurrent(plan)" button>
+                    (click)="plans.select(plan)" [attr.aria-current]="plans.getItemAriaCurrent(plan)" button detail="true">
                     <ion-label>
                         <p class="item-heading">{{ plan.name }}</p>
                         <p *ngIf="plan.duedate > 0">
diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index cffcc0f16..55faa023b 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -8,10 +8,9 @@
                 alt="" onError="this.src='assets/img/group-avatar.png'" core-external-content role="presentation"
                 [siteId]="siteId || null">
             <core-user-avatar *ngIf="loaded && otherMember" class="core-bar-button-image" [user]="otherMember"
-                [linkProfile]="false" [checkOnline]="otherMember.showonlinestatus" (click)="showInfo && viewInfo()">
+                [linkProfile]="false" [checkOnline]="otherMember.showonlinestatus">
             </core-user-avatar>
-            <core-format-text [text]="title" contextLevel="system" [contextInstanceId]="0"
-                (click)="showInfo && !isGroup && viewInfo()"></core-format-text>
+            <core-format-text [text]="title" contextLevel="system" [contextInstanceId]="0"></core-format-text>
             <ion-icon *ngIf="conversation && conversation.isfavourite" name="fas-star"
                 [attr.aria-label]="'core.favourites' | translate">
             </ion-icon>
diff --git a/src/addons/messages/pages/discussion/discussion.page.ts b/src/addons/messages/pages/discussion/discussion.page.ts
index 8bec7da83..a9531d9b0 100644
--- a/src/addons/messages/pages/discussion/discussion.page.ts
+++ b/src/addons/messages/pages/discussion/discussion.page.ts
@@ -1302,7 +1302,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView
     async viewInfo(): Promise<void> {
         if (this.isGroup) {
             // Display the group information.
-            const userId = await CoreDomUtils.openModal<number>({
+            const userId = await CoreDomUtils.openSideModal<number>({
                 component: AddonMessagesConversationInfoComponent,
                 componentProps: {
                     conversationId: this.conversationId,
diff --git a/src/addons/messages/pages/discussions-35/discussions.html b/src/addons/messages/pages/discussions-35/discussions.html
index 7340b0c1a..36e69fa31 100644
--- a/src/addons/messages/pages/discussions-35/discussions.html
+++ b/src/addons/messages/pages/discussions-35/discussions.html
@@ -23,7 +23,7 @@
 
         <core-loading [hideUntil]="loaded" [message]="loadingMessage">
 
-            <ion-list   class="ion-no-margin">
+            <ion-list class="ion-no-margin">
 
                 <ion-item class="ion-text-wrap addon-message-discussion" (click)="gotoContacts()"
                     [attr.aria-label]="'addon.messages.contacts' | translate" detail="true" button>
@@ -40,7 +40,7 @@
                     </ion-item-divider>
                     <ion-item class="ion-text-wrap addon-message-discussion" *ngFor="let result of search.results" button
                         [attr.aria-label]="result.fullname" (click)="gotoDiscussion(result.userid, result.messageid)"
-                        [attr.aria-current]="result.userid == discussionUserId ? 'page' : 'false'">
+                        [attr.aria-current]="result.userid == discussionUserId ? 'page' : 'false'" detail="false">
                         <core-user-avatar [user]="result" slot="start" [checkOnline]="result.showonlinestatus"></core-user-avatar>
                         <ion-label>
                             <p class="item-heading">{{ result.fullname }}</p>
diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
index 57360cf57..d992ec91a 100644
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@@ -40,7 +40,8 @@
         <ion-item class="ion-text-wrap">
             <ion-label>
                 <core-format-text [text]="description" [component]="component" [componentId]="componentId" maxHeight="120"
-                    contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId" (click)="expandDescription($event)">
+                    contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"
+                    (onClick)="expandDescription($event)">
                 </core-format-text>
             </ion-label>
         </ion-item>
diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.html b/src/addons/mod/assign/pages/submission-list/submission-list.html
index b8c02f174..e79b970bb 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.html
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.html
@@ -40,7 +40,7 @@
                 <!-- List of submissions. -->
                 <ng-container *ngFor="let submission of submissions.items">
                     <ion-item class="ion-text-wrap" (click)="submissions.select(submission)" button
-                        [attr.aria-current]="submissions.getItemAriaCurrent(submission)">
+                        [attr.aria-current]="submissions.getItemAriaCurrent(submission)" detail="true">
                         <core-user-avatar [user]="submission" [linkProfile]="false" slot="start"></core-user-avatar>
                         <ion-label>
                             <p class="item-heading" *ngIf="submission.userfullname">{{submission.userfullname}}</p>
diff --git a/src/addons/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html b/src/addons/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html
index 565702191..882718fc8 100644
--- a/src/addons/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html
+++ b/src/addons/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html
@@ -1,4 +1,4 @@
-<ion-item *ngIf="commentsEnabled" class="ion-text-wrap" (click)="showComments($event)" detail="false" button>
+<ion-item *ngIf="commentsEnabled" class="ion-text-wrap" (click)="showComments($event)" detail="true" button>
     <ion-label>
         <h2>{{plugin.name}}</h2>
         <core-comments contextLevel="module" [instanceId]="assign.cmid" component="assignsubmission_comments"
diff --git a/src/addons/mod/book/components/toc/toc.html b/src/addons/mod/book/components/toc/toc.html
index 7c40642a7..7c7432906 100644
--- a/src/addons/mod/book/components/toc/toc.html
+++ b/src/addons/mod/book/components/toc/toc.html
@@ -13,11 +13,11 @@
         <ion-list>
             <ion-item class="ion-text-wrap" *ngFor="let chapter of chapters" (click)="loadChapter(chapter.id)"
                 [attr.aria-current]="selected == chapter.id ? 'page' : 'false'" button
-                [class.item-dimmed]="chapter.hidden">
+                [class.item-dimmed]="chapter.hidden" detail="false">
                 <ion-label>
-                    <p [class.ion-padding-left]="addPadding && chapter.level == 1 ? true : null">
-                        <span *ngIf="showNumbers" class="addon-mod-book-number">{{chapter.indexNumber}}</span>
-                        <span *ngIf="showBullets" class="addon-mod-book-bullet">&bull;</span>
+                    <p [class.ion-padding-left]="addPadding && chapter.level == 1 ? true : null" class="item-heading">
+                        <span *ngIf="showNumbers" class="addon-mod-book-number">{{chapter.indexNumber}}&nbsp;</span>
+                        <span *ngIf="showBullets" class="addon-mod-book-bullet">&bull;&nbsp;</span>
                         <core-format-text [text]="chapter.title" contextLevel="module" [contextInstanceId]="moduleId"
                             [courseId]="courseId">
                         </core-format-text>
diff --git a/src/addons/mod/chat/pages/sessions/sessions.html b/src/addons/mod/chat/pages/sessions/sessions.html
index cdd256681..c574fd6a8 100644
--- a/src/addons/mod/chat/pages/sessions/sessions.html
+++ b/src/addons/mod/chat/pages/sessions/sessions.html
@@ -30,7 +30,7 @@
                 <ion-toggle [(ngModel)]="showAll" (ionChange)="fetchSessions(true)"></ion-toggle>
             </ion-item>
 
-            <ion-card *ngFor="let session of sessions.items" (click)="sessions.select(session)"
+            <ion-card *ngFor="let session of sessions.items" (click)="sessions.select(session)" button
                 [attr.aria-current]="sessions.getItemAriaCurrent(session)"
                 [class.addon-mod-chat-session-show-more]="session.sessionusers.length < session.allsessionusers.length">
 
@@ -47,11 +47,10 @@
                         </ion-label>
                     </ion-item>
                 </ion-card-content>
-                <div *ngIf="session.sessionusers.length < session.allsessionusers.length">
-                    <ion-button fill="clear" (click)="showMoreUsers(session, $event)">
-                        {{ 'core.showmore' | translate }}
-                    </ion-button>
-                </div>
+                <ion-button *ngIf="session.sessionusers.length < session.allsessionusers.length" fill="clear" expand="block"
+                    (click)="showMoreUsers(session, $event)">
+                    {{ 'core.showmore' | translate }}
+                </ion-button>
             </ion-card>
 
             <core-empty-box *ngIf="sessions.empty" icon="far-comments" [message]="'addon.mod_chat.nosessionsfound' | translate">
diff --git a/src/addons/mod/data/components/field-plugin/addon-mod-data-field-plugin.html b/src/addons/mod/data/components/field-plugin/addon-mod-data-field-plugin.html
index 44e4d82a5..c738b7d01 100644
--- a/src/addons/mod/data/components/field-plugin/addon-mod-data-field-plugin.html
+++ b/src/addons/mod/data/components/field-plugin/addon-mod-data-field-plugin.html
@@ -1,5 +1,4 @@
 <core-dynamic-component [component]="fieldComponent" [data]="pluginData">
     <!-- This content will be replaced by the component if found. -->
-    <core-loading [hideUntil]="fieldLoaded">
-    </core-loading>
+    <core-loading [hideUntil]="fieldLoaded" [fullscreen]="false"></core-loading>
 </core-dynamic-component>
diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html
index 14a74c9a1..6485aa73f 100644
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@@ -103,16 +103,18 @@
 
     <!-- Reset search. -->
     <ng-container *ngIf="search.searching && !isEmpty">
-        <ion-item *ngIf="!foundRecordsTranslationData">
-            <ion-label>
-                <a (click)="searchReset()">{{ 'addon.mod_data.resetsettings' | translate}}</a>
+        <ion-item (click)="searchReset()" button detail="false">
+            <ion-label color="primary">
+                {{ 'addon.mod_data.resetsettings' | translate}}
             </ion-label>
         </ion-item>
 
-        <ion-card class="core-success-card" *ngIf="foundRecordsTranslationData" (click)="searchReset()">
-            <ion-item><ion-label>
-            <p [innerHTML]="'addon.mod_data.foundrecords' | translate:{$a: foundRecordsTranslationData}"></p>
-            </ion-label></ion-item>
+        <ion-card class="core-success-card" *ngIf="foundRecordsTranslationData">
+            <ion-item (click)="searchReset()" button detail="false">
+                <ion-label>
+                    <p [innerHTML]="'addon.mod_data.foundrecords' | translate:{$a: foundRecordsTranslationData}"></p>
+                </ion-label>
+            </ion-item>
         </ion-card>
     </ng-container>
 
@@ -144,7 +146,7 @@
 
     <core-empty-box *ngIf="isEmpty && search.searching" icon="fas-database" [message]="'addon.mod_data.nomatch' | translate"
         class="core-empty-box-clickable">
-        <a (click)="searchReset()">{{ 'addon.mod_data.resetsettings' | translate}}</a>
+        <button class="as-link" (click)="searchReset()">{{ 'addon.mod_data.resetsettings' | translate}}</button>
     </core-empty-box>
 
 </core-loading>
diff --git a/src/addons/mod/data/components/index/index.ts b/src/addons/mod/data/components/index/index.ts
index fc1e1d686..4f27405a5 100644
--- a/src/addons/mod/data/components/index/index.ts
+++ b/src/addons/mod/data/components/index/index.ts
@@ -48,6 +48,8 @@ import { AddonModDataPrefetchHandler } from '../../services/handlers/prefetch';
 import { AddonModDataComponentsCompileModule } from '../components-compile.module';
 import { AddonModDataSearchComponent } from '../search/search';
 
+const contentToken = '<!-- CORE-DATABASE-CONTENT-GOES-HERE -->';
+
 /**
  * Component that displays a data index page.
  */
@@ -318,12 +320,22 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         if (!this.isEmpty) {
             this.entries = (entries.offlineEntries || []).concat(entries.entries);
 
-            let entriesHTML = AddonModDataHelper.getTemplate(
+            let headerAndFooter = AddonModDataHelper.getTemplate(
                 this.database!,
                 AddonModDataTemplateType.LIST_HEADER,
                 this.fieldsArray,
             );
 
+            headerAndFooter += contentToken;
+
+            headerAndFooter += AddonModDataHelper.getTemplate(
+                this.database!,
+                AddonModDataTemplateType.LIST_FOOTER,
+                this.fieldsArray,
+            );
+
+            headerAndFooter = CoreDomUtils.fixHtml(headerAndFooter);
+
             // Get first entry from the whole list.
             if (!this.search.searching || !this.firstEntry) {
                 this.firstEntry = this.entries[0].id;
@@ -331,6 +343,8 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
 
             const template = AddonModDataHelper.getTemplate(this.database!, AddonModDataTemplateType.LIST, this.fieldsArray);
 
+            let entriesHTML = '';
+
             const entriesById: Record<number, AddonModDataEntry> = {};
             this.entries.forEach((entry, index) => {
                 entriesById[entry.id] = entry;
@@ -349,9 +363,8 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
                     actions,
                 );
             });
-            entriesHTML += AddonModDataHelper.getTemplate(this.database!, AddonModDataTemplateType.LIST_FOOTER, this.fieldsArray);
 
-            this.entriesRendered = CoreDomUtils.fixHtml(entriesHTML);
+            this.entriesRendered = headerAndFooter.replace(contentToken, entriesHTML);
 
             // Pass the input data to the component.
             this.jsData = {
diff --git a/src/addons/mod/data/data.scss b/src/addons/mod/data/data.scss
index 59fe03bd5..6b7862a8d 100644
--- a/src/addons/mod/data/data.scss
+++ b/src/addons/mod/data/data.scss
@@ -12,6 +12,10 @@ $grid-column-paddings: (
   xl: var(--ion-grid-column-padding-xl, $grid-column-padding)
 ) !default;
 
+:host {
+    --border-color: var(--gray);
+}
+
 .addon-data-contents {
     overflow: visible;
     white-space: normal;
@@ -19,9 +23,7 @@ $grid-column-paddings: (
     padding: 16px;
 
     background-color: var(--ion-item-background);
-    border-width: 1px 0;
-    border-style: solid;
-    border-color: var(--gray-dark);
+    border-bottom: 1px solid var(--border-color);
 
     ::ng-deep {
         table, tbody {
diff --git a/src/addons/mod/data/fields/picture/component/addon-mod-data-field-picture.html b/src/addons/mod/data/fields/picture/component/addon-mod-data-field-picture.html
index edfd06cfe..d00754fdc 100644
--- a/src/addons/mod/data/fields/picture/component/addon-mod-data-field-picture.html
+++ b/src/addons/mod/data/fields/picture/component/addon-mod-data-field-picture.html
@@ -14,9 +14,9 @@
     <ion-input type="text" [formControlName]="'f_'+field.id" [placeholder]="field.name"></ion-input>
 </span>
 
-<span *ngIf="listMode && imageUrl" (click)="gotoEntry.emit(entryId)">
+<button class="as-link" *ngIf="listMode && imageUrl" (click)="navigateEntry()">
     <img [src]="imageUrl" [alt]="title" class="core-media-adapt-width listMode_picture" core-external-content/>
-</span>
+</button>
 
 <img *ngIf="showMode && imageUrl" [src]="imageUrl" [alt]="title" class="core-media-adapt-width listMode_picture"
     [attr.width]="width" [attr.height]="height" core-external-content/>
diff --git a/src/addons/mod/data/fields/picture/component/picture.ts b/src/addons/mod/data/fields/picture/component/picture.ts
index fe7cad78a..af3cdafcd 100644
--- a/src/addons/mod/data/fields/picture/component/picture.ts
+++ b/src/addons/mod/data/fields/picture/component/picture.ts
@@ -138,4 +138,11 @@ export class AddonModDataFieldPictureComponent extends AddonModDataFieldPluginCo
         }
     }
 
+    /**
+     * Navigate to the entry.
+     */
+    navigateEntry(): void {
+        this.gotoEntry.emit(this.entryId);
+    }
+
 }
diff --git a/src/addons/mod/data/pages/entry/entry.html b/src/addons/mod/data/pages/entry/entry.html
index 36ae9d58c..9229f6c15 100644
--- a/src/addons/mod/data/pages/entry/entry.html
+++ b/src/addons/mod/data/pages/entry/entry.html
@@ -37,7 +37,7 @@
             </ion-select>
         </ion-item>
 
-        <div class="addon-data-contents addon-data-entries-{{database.id}}" *ngIf="database && entry">
+        <div class="addon-data-contents addon-data-entry addon-data-entries-{{database.id}}" *ngIf="database && entry">
             <core-style [css]="database.csstemplate" prefix=".addon-data-entries-{{database.id}}"></core-style>
 
             <core-compile-html [text]="entryHtml" [jsData]="jsData" [extraImports]="extraImports"
@@ -54,13 +54,10 @@
             [scaleId]="database.scale">
         </core-rating-aggregate>
 
-        <ion-item *ngIf="database && database.comments && entry && entry.id > 0 && commentsEnabled">
-            <ion-label>
-                <core-comments contextLevel="module" [instanceId]="database.coursemodule" component="mod_data" [itemId]="entry.id"
-                    area="database_entry" [displaySpinner]="false" [courseId]="courseId" (onLoading)="setLoadingComments($event)">
-                </core-comments>
-            </ion-label>
-        </ion-item>
+        <core-comments *ngIf="database && database.comments && entry && entry.id > 0 && commentsEnabled"
+            contextLevel="module" [instanceId]="database.coursemodule" component="mod_data" [itemId]="entry.id"
+            area="database_entry" [courseId]="courseId" (onLoading)="setLoadingComments($event)" [showItem]="true">
+        </core-comments>
 
         <ion-grid *ngIf="hasPrevious || hasNext">
             <ion-row class="ion-align-items-center">
diff --git a/src/addons/mod/data/services/data-helper.ts b/src/addons/mod/data/services/data-helper.ts
index 566504941..ee4ef04e3 100644
--- a/src/addons/mod/data/services/data-helper.ts
+++ b/src/addons/mod/data/services/data-helper.ts
@@ -658,7 +658,7 @@ export class AddonModDataHelperProvider {
         // Add core-link directive to links.
         template = template.replace(
             /<a ([^>]*href="[^>]*)>/ig,
-            (match, attributes) => '<a core-link capture="true" ' + attributes + '>',
+            (match, attributes) => '<button class="as-link" core-link capture="true" ' + attributes + '>',
         );
 
         return template;
diff --git a/src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.html b/src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.html
index c4d151ceb..058320906 100644
--- a/src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.html
+++ b/src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.html
@@ -1,36 +1,38 @@
-<ion-item class="ion-text-wrap" (click)="setLockState(true)" *ngIf="discussion.canlock && !discussion.locked">
+<ion-item button class="ion-text-wrap" (click)="setLockState(true)" *ngIf="discussion.canlock && !discussion.locked" detail="false">
     <ion-icon name="fa-lock" slot="start" aria-hidden="true"></ion-icon>
     <ion-label>
-        <h2>{{ 'addon.mod_forum.lockdiscussion' | translate }}</h2>
+        <p class="item-heading">{{ 'addon.mod_forum.lockdiscussion' | translate }}</p>
     </ion-label>
 </ion-item>
-<ion-item class="ion-text-wrap" (click)="setLockState(false)" *ngIf="discussion.canlock && discussion.locked">
+<ion-item button class="ion-text-wrap" (click)="setLockState(false)" *ngIf="discussion.canlock && discussion.locked" detail="false">
     <ion-icon name="fa-unlock" slot="start" aria-hidden="true"></ion-icon>
     <ion-label>
-        <h2>{{ 'addon.mod_forum.unlockdiscussion' | translate }}</h2>
+        <p class="item-heading">{{ 'addon.mod_forum.unlockdiscussion' | translate }}</p>
     </ion-label>
 </ion-item>
-<ion-item class="ion-text-wrap" (click)="setPinState(true)" *ngIf="canPin && !discussion.pinned">
+<ion-item button class="ion-text-wrap" (click)="setPinState(true)" *ngIf="canPin && !discussion.pinned" detail="false">
     <ion-icon name="fa-map-pin" slot="start" aria-hidden="true"></ion-icon>
     <ion-label>
-        <h2>{{ 'addon.mod_forum.pindiscussion' | translate }}</h2>
+        <p class="item-heading">{{ 'addon.mod_forum.pindiscussion' | translate }}</p>
     </ion-label>
 </ion-item>
-<ion-item class="ion-text-wrap" (click)="setPinState(false)" *ngIf="canPin && discussion.pinned">
+<ion-item button class="ion-text-wrap" (click)="setPinState(false)" *ngIf="canPin && discussion.pinned" detail="false">
     <ion-icon name="fa-map-pin" slot="start" class="icon-slash" aria-hidden="true"></ion-icon>
     <ion-label>
-        <h2>{{ 'addon.mod_forum.unpindiscussion' | translate }}</h2>
+        <p class="item-heading">{{ 'addon.mod_forum.unpindiscussion' | translate }}</p>
     </ion-label>
 </ion-item>
-<ion-item class="ion-text-wrap" (click)="toggleFavouriteState(true)" *ngIf="discussion.canfavourite && !discussion.starred">
+<ion-item button class="ion-text-wrap" (click)="toggleFavouriteState(true)" *ngIf="discussion.canfavourite && !discussion.starred"
+    detail="false">
     <ion-icon name="fa-star" slot="start" aria-hidden="true"></ion-icon>
     <ion-label>
-        <h2>{{ 'addon.mod_forum.addtofavourites' | translate }}</h2>
+        <p class="item-heading">{{ 'addon.mod_forum.addtofavourites' | translate }}</p>
     </ion-label>
 </ion-item>
-<ion-item class="ion-text-wrap" (click)="toggleFavouriteState(false)" *ngIf="discussion.canfavourite && discussion.starred">
+<ion-item button class="ion-text-wrap" (click)="toggleFavouriteState(false)" *ngIf="discussion.canfavourite && discussion.starred"
+    detail="false">
     <ion-icon name="fa-star" slot="start" class="icon-slash" aria-hidden="true"></ion-icon>
     <ion-label>
-        <h2>{{ 'addon.mod_forum.removefromfavourites' | translate }}</h2>
+        <p class="item-heading">{{ 'addon.mod_forum.removefromfavourites' | translate }}</p>
     </ion-label>
 </ion-item>
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 480f040e2..ddfce64b9 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -23,7 +23,7 @@
             (action)="prefetch($event)">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="size"
-            iconDescription="cube" iconAction="trash"
+            iconDescription="fas-archive" iconAction="trash"
             [priority]="400" [content]="'core.clearstoreddata' | translate:{$a: size}" [closeOnClick]="false"
             (action)="removeFiles($event)">
         </core-context-menu-item>
diff --git a/src/addons/mod/forum/components/post-options-menu/post-options-menu.html b/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
index dab0fd266..81d22d13e 100644
--- a/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
+++ b/src/addons/mod/forum/components/post-options-menu/post-options-menu.html
@@ -1,26 +1,26 @@
 <core-loading [hideUntil]="loaded" [fullscreen]="false" class="margin">
-    <ion-item class="ion-text-wrap" (click)="editPost()" *ngIf="offlinePost || (canEdit && isOnline)">
+    <ion-item button class="ion-text-wrap" (click)="editPost()" *ngIf="offlinePost || (canEdit && isOnline)" detail="false">
         <ion-icon name="fas-pen" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
-            <h2>{{ 'addon.mod_forum.edit' | translate }}</h2>
+            <p class="item-heading">{{ 'addon.mod_forum.edit' | translate }}</p>
         </ion-label>
     </ion-item>
-    <ion-item class="ion-text-wrap" (click)="deletePost()" *ngIf="offlinePost || (canDelete && isOnline)">
+    <ion-item button class="ion-text-wrap" (click)="deletePost()" *ngIf="offlinePost || (canDelete && isOnline)" detail="false">
         <ion-icon name="fas-trash" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
-            <h2 *ngIf="!offlinePost">{{ 'addon.mod_forum.delete' | translate }}</h2>
-            <h2 *ngIf="offlinePost">{{ 'core.discard' | translate }}</h2>
+            <p  class="item-heading" *ngIf="!offlinePost">{{ 'addon.mod_forum.delete' | translate }}</p>
+            <p  class="item-heading" *ngIf="offlinePost">{{ 'core.discard' | translate }}</p>
         </ion-label>
     </ion-item>
-    <ion-item class="ion-text-wrap" (click)="dismiss()" *ngIf="wordCount">
+    <ion-item class="ion-text-wrap" *ngIf="wordCount">
         <ion-label>
-            <h2>{{ 'core.numwords' | translate: {'$a': wordCount} }}</h2>
+            <p  class="item-heading">{{ 'core.numwords' | translate: {'$a': wordCount} }}</p>
         </ion-label>
     </ion-item>
-    <ion-item class="ion-text-wrap" [href]="url" *ngIf="url" core-link capture="false">
+    <ion-item class="ion-text-wrap" [href]="url" *ngIf="url" core-link capture="false" button detail="false">
         <ion-icon name="fas-external-link-alt" slot="start" aria-hidden="true"></ion-icon>
         <ion-label>
-            <h2>{{ 'core.openinbrowser' | translate }}</h2>
+            <p  class="item-heading">{{ 'core.openinbrowser' | translate }}</p>
         </ion-label>
     </ion-item>
 </core-loading>
diff --git a/src/addons/mod/glossary/pages/entry/entry.html b/src/addons/mod/glossary/pages/entry/entry.html
index 836e8bd5b..4e644e998 100644
--- a/src/addons/mod/glossary/pages/entry/entry.html
+++ b/src/addons/mod/glossary/pages/entry/entry.html
@@ -58,13 +58,10 @@
             <ion-item class="ion-text-wrap" *ngIf="!entry.approved">
                 <ion-label><p><em>{{ 'addon.mod_glossary.entrypendingapproval' | translate }}</em></p></ion-label>
             </ion-item>
-            <ion-item *ngIf="glossary && glossary.allowcomments && entry && entry.id > 0 && commentsEnabled">
-                <ion-label>
-                    <core-comments contextLevel="module" [instanceId]="glossary.coursemodule" component="mod_glossary"
-                        [itemId]="entry.id" area="glossary_entry" [courseId]="glossary.course">
-                    </core-comments>
-                </ion-label>
-            </ion-item>
+            <core-comments *ngIf="glossary && glossary.allowcomments && entry && entry.id > 0 && commentsEnabled"
+                contextLevel="module" [instanceId]="glossary.coursemodule" component="mod_glossary"
+                [itemId]="entry.id" area="glossary_entry" [courseId]="glossary.course" [showItem]="true">
+            </core-comments>
             <core-rating-rate *ngIf="glossary && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module"
                 [instanceId]="glossary.coursemodule" [itemId]="entry.id" [itemSetId]="0" [courseId]="glossary.course"
                 [aggregateMethod]="glossary.assessed" [scaleId]="glossary.scale" [userId]="entry.userid"
diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html
index 85afe5c01..f643a4047 100644
--- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html
+++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html
@@ -63,7 +63,7 @@
                         <ion-label>
                             <h2>{{ 'addon.mod_h5pactivity.outcome' | translate }}</h2>
                             <p *ngIf="attempt.success !== null && attempt.success" >
-                                <ion-icon name="fa-check-circle" aria-hidden="true"></ion-icon>
+                                <ion-icon name="fas-check-circle" aria-hidden="true"></ion-icon>
                                 {{ 'addon.mod_h5pactivity.attempt_success_pass' | translate }}
                             </p>
                             <p *ngIf="attempt.success !== null && !attempt.success" >
@@ -166,12 +166,12 @@
 <!-- Template to render an answer. -->
 <ng-template #answerTemplate let-answer="answer">
     <p *ngIf="answer.correct">
-        <ion-icon name="fa-check" [attr.aria-label]="'addon.mod_h5pactivity.answer_correct' | translate" color="success">
+        <ion-icon name="fas-check" [attr.aria-label]="'addon.mod_h5pactivity.answer_correct' | translate" color="success">
         </ion-icon>
         {{ answer.answer }}
     </p>
     <p *ngIf="answer.incorrect">
-        <ion-icon name="fa-remove" [attr.aria-label]="'addon.mod_h5pactivity.answer_incorrect' | translate" color="danger">
+        <ion-icon name="fas-times" [attr.aria-label]="'addon.mod_h5pactivity.answer_incorrect' | translate" color="danger">
         </ion-icon>
         {{ answer.answer }}
     </p>
@@ -179,15 +179,15 @@
         {{ answer.answer }}
     </p>
     <p *ngIf="answer.checked">
-        <ion-icon name="fa-check-circle" [attr.aria-label]="'addon.mod_h5pactivity.answer_checked' | translate">
+        <ion-icon name="fas-check-circle" [attr.aria-label]="'addon.mod_h5pactivity.answer_checked' | translate">
         </ion-icon>
     </p>
     <p *ngIf="answer.pass">
-        <ion-icon name="fa-check" [attr.aria-label]="'addon.mod_h5pactivity.answer_pass' | translate" color="success">
+        <ion-icon name="fas-check" [attr.aria-label]="'addon.mod_h5pactivity.answer_pass' | translate" color="success">
         </ion-icon>
     </p>
     <p *ngIf="answer.fail">
-        <ion-icon name="fa-remove" [attr.aria-label]="'addon.mod_h5pactivity.answer_fail' | translate" color="danger">
+        <ion-icon name="fas-times" [attr.aria-label]="'addon.mod_h5pactivity.answer_fail' | translate" color="danger">
         </ion-icon>
     </p>
 </ng-template>
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 8ac65463c..f397e6b5e 100644
--- a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
+++ b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
@@ -99,7 +99,7 @@
                         [alt]="'addon.mod_h5pactivity.attempt_completion_no' | translate">
                 </ion-col>
                 <ion-col class="ion-text-center addon-mod_h5pactivity-table-success-col">
-                    <ion-icon *ngIf="attempt.success !== null && attempt.success" name="fa-check-circle"
+                    <ion-icon *ngIf="attempt.success !== null && attempt.success" name="fas-check-circle"
                         [attr.aria-label]="'addon.mod_h5pactivity.attempt_success_pass' | translate">
                     </ion-icon>
                     <ion-icon *ngIf="attempt.success !== null && !attempt.success" name="far-circle"
diff --git a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
index 54bd8124d..0397e0b29 100644
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -1,6 +1,6 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button (click)="showToc()" aria-haspopup="true" [attr.aria-label]="'addon.mod_imscp.toc' | translate">
+    <ion-button *ngIf="loaded" (click)="showToc()" aria-haspopup="true" [attr.aria-label]="'addon.mod_imscp.toc' | translate">
         <ion-icon name="fas-bookmark" slot="icon-only" aria-hidden="true"></ion-icon>
     </ion-button>
     <core-context-menu>
diff --git a/src/addons/mod/imscp/components/toc/toc.html b/src/addons/mod/imscp/components/toc/toc.html
index 6255e5c4a..bbe96f73e 100644
--- a/src/addons/mod/imscp/components/toc/toc.html
+++ b/src/addons/mod/imscp/components/toc/toc.html
@@ -12,9 +12,12 @@
     <nav>
         <ion-list>
             <ion-item *ngFor="let item of items" (click)="loadItem(item.href)"
-                [attr.aria-current]="selected == item.href ? 'page' : 'false'" button>
+                [attr.aria-current]="selected == item.href ? 'page' : 'false'" button detail="false">
                 <ion-label [class.core-bold]="!item.href">
-                    <span class="ion-padding-left" *ngFor="let i of getNumberForPadding(item.level)"></span>{{item.title}}
+                    <p class="item-heading">
+                        <span class="ion-padding-left" *ngFor="let i of getNumberForPadding(item.level)"></span>
+                        {{item.title}}
+                    </p>
                 </ion-label>
             </ion-item>
         </ion-list>
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 7e8898808..d951354cf 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
@@ -296,7 +296,7 @@
                         </ion-card-header>
 
                         <ion-item class="ion-text-wrap" *ngFor="let student of overview.students" button
-                            (click)="openRetake(student.id)">
+                            (click)="openRetake(student.id)" detail="true">
                             <core-user-avatar [user]="student" slot="start" [userId]="student.id" [courseId]="courseId">
                             </core-user-avatar>
                             <ion-label>
diff --git a/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html b/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
index 7f2b2f447..676df5862 100644
--- a/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
+++ b/src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
@@ -27,7 +27,7 @@
 
             <ion-item button class="ion-text-wrap {{question.stateClass}}" *ngFor="let question of navigation"
                 [attr.aria-current]="!summaryShown && currentPage == question.page ? 'page' : 'false'"
-                (click)="loadPage(question.page, question.slot)" detail="true">
+                (click)="loadPage(question.page, question.slot)" detail="false">
 
                 <ion-label>
                     <span *ngIf="question.number">{{ 'core.question.questionno' | translate:{$a: question.number} }}</span>
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index c1718f7bd..77b2771ed 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -158,11 +158,11 @@
                                 <ion-icon *ngIf="sco.icon" [name]="sco.icon.icon" [attr.aria-label]="sco.icon.description"
                                     slot="start">
                                 </ion-icon>
-                                <a *ngIf="sco.prereq && sco.launch" (click)="open($event, false, sco.id)" tappable="true">
+                                <button class="as-link" *ngIf="sco.prereq && sco.launch" (click)="open($event, false, sco.id)">
                                     <core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="module.id"
                                         [courseId]="courseId">
                                     </core-format-text>
-                                </a>
+                                </button>
                                 <span *ngIf="!sco.prereq || !sco.launch">
                                     <core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="module.id"
                                         [courseId]="courseId">
diff --git a/src/addons/mod/wiki/components/map/map.html b/src/addons/mod/wiki/components/map/map.html
index d76be6836..3a205d1c8 100644
--- a/src/addons/mod/wiki/components/map/map.html
+++ b/src/addons/mod/wiki/components/map/map.html
@@ -12,7 +12,7 @@
     <nav>
         <ion-list>
             <!-- Go to "home". -->
-            <ion-item class="ion-text-wrap" *ngIf="homeView" (click)="goToWikiHome()" button>
+            <ion-item class="ion-text-wrap" *ngIf="homeView" (click)="goToWikiHome()" button detail="true">
                 <ion-icon name="fas-home" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label>{{ 'addon.mod_wiki.gowikihome' | translate }}</ion-label>
             </ion-item>
@@ -21,7 +21,7 @@
                     <ion-label><h2>{{ letter.label }}</h2></ion-label>
                 </ion-item-divider>
                 <ion-item class="ion-text-wrap" *ngFor="let page of letter.pages" (click)="goToPage(page)"
-                    [attr.aria-current]="selectedTitle == page.title ? 'page' : 'false'" button>
+                    [attr.aria-current]="selectedTitle == page.title ? 'page' : 'false'" button detail="false">
                     <ion-icon name="fas-home" slot="start" *ngIf="page.firstpage" aria-hidden="true"></ion-icon>
                     <ion-label>
                         <core-format-text [text]="page.title" contextLevel="module" [contextInstanceId]="moduleId"
diff --git a/src/core/components/combobox/combobox.scss b/src/core/components/combobox/combobox.scss
index 2d81ae419..974e201f9 100644
--- a/src/core/components/combobox/combobox.scss
+++ b/src/core/components/combobox/combobox.scss
@@ -84,6 +84,7 @@ ion-button {
         text-transform: none;
         font-weight: 400;
         font-size: 16px;
+        line-height: 20px;
     }
 
     .select-text {
diff --git a/src/core/components/context-menu/context-menu-popover.scss b/src/core/components/context-menu/context-menu-popover.scss
index 4efe68f89..6461e72ef 100644
--- a/src/core/components/context-menu/context-menu-popover.scss
+++ b/src/core/components/context-menu/context-menu-popover.scss
@@ -1,5 +1,11 @@
-:host {
-    ion-list {
-        padding: 0;
-    }
+@import "~theme/globals";
+
+ion-list {
+    padding: 0;
+}
+
+ion-icon[slot=start] {
+    @include margin-horizontal(0, 10px);
+    width: 0.8em;
+    height: 0.8em;
 }
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 64a3bacf2..10608cfe2 100644
--- a/src/core/components/context-menu/core-context-menu-popover.html
+++ b/src/core/components/context-menu/core-context-menu-popover.html
@@ -7,7 +7,9 @@
         [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>
-        <ion-label><core-format-text [clean]="true" [text]="item.content" [filter]="false"></core-format-text></ion-label>
+        <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">
         </ion-icon>
diff --git a/src/core/components/tabs-outlet/core-tabs-outlet.html b/src/core/components/tabs-outlet/core-tabs-outlet.html
index a7d721128..0c5ce4ea6 100644
--- a/src/core/components/tabs-outlet/core-tabs-outlet.html
+++ b/src/core/components/tabs-outlet/core-tabs-outlet.html
@@ -2,7 +2,7 @@
     <ion-tab-bar slot="top" class="core-tabs-bar" [hidden]="!tabs || numTabsShown <= 1" #tabBar>
         <ion-spinner *ngIf="!hideUntil"></ion-spinner>
         <ion-row *ngIf="hideUntil">
-            <ion-col class="col-with-arrow ion-no-padding" (click)="slidePrev()" size="1">
+            <ion-col class="col-with-arrow ion-no-padding" (click)="slidePrev()" size="1" [class.clickable]="showPrevButton">
                 <ion-icon *ngIf="showPrevButton" name="fas-chevron-left" [attr.aria-label]="'core.previous' | translate"></ion-icon>
             </ion-col>
             <ion-col class="ion-no-padding" size="10">
@@ -41,7 +41,7 @@
                     </ng-container>
                 </ion-slides>
             </ion-col>
-            <ion-col class="col-with-arrow ion-no-padding" (click)="slideNext()" size="1">
+            <ion-col class="col-with-arrow ion-no-padding" (click)="slideNext()" size="1" [class.clickable]="showNextButton">
                 <ion-icon *ngIf="showNextButton" name="fas-chevron-right" [attr.aria-label]="'core.next' | translate"></ion-icon>
             </ion-col>
         </ion-row>
diff --git a/src/core/components/tabs/core-tabs.html b/src/core/components/tabs/core-tabs.html
index 940758613..6f2edfc8b 100644
--- a/src/core/components/tabs/core-tabs.html
+++ b/src/core/components/tabs/core-tabs.html
@@ -1,7 +1,7 @@
 <ion-tab-bar slot="top" class="core-tabs-bar" [hidden]="!tabs || numTabsShown <= 1" #tabBar>
     <ion-spinner *ngIf="!hideUntil"></ion-spinner>
     <ion-row *ngIf="hideUntil">
-        <ion-col class="col-with-arrow ion-no-padding" (click)="slidePrev()" size="1">
+        <ion-col class="col-with-arrow ion-no-padding" (click)="slidePrev()" size="1" [class.clickable]="showPrevButton">
             <ion-icon *ngIf="showPrevButton" name="fas-chevron-left" [attr.aria-label]="'core.previous' | translate"></ion-icon>
         </ion-col>
         <ion-col class="ion-no-padding" size="10">
@@ -39,7 +39,7 @@
                 </ng-container>
             </ion-slides>
         </ion-col>
-        <ion-col class="col-with-arrow ion-no-padding" (click)="slideNext()" size="1">
+        <ion-col class="col-with-arrow ion-no-padding" (click)="slideNext()" size="1" [class.clickable]="showNextButton">
             <ion-icon *ngIf="showNextButton" name="fas-chevron-right" [attr.aria-label]="'core.next' | translate"></ion-icon>
         </ion-col>
     </ion-row>
diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts
index f1b03f971..5709b6b16 100644
--- a/src/core/directives/format-text.ts
+++ b/src/core/directives/format-text.ts
@@ -80,6 +80,7 @@ export class CoreFormatTextDirective implements OnChanges {
     @Input() maxHeight?: number;
 
     @Output() afterRender: EventEmitter<void>; // Called when the data is rendered.
+    @Output() onClick: EventEmitter<void> = new EventEmitter(); // Called when clicked.
 
     protected element: HTMLElement;
     protected showMoreDisplayed = false;
@@ -286,6 +287,13 @@ export class CoreFormatTextDirective implements OnChanges {
             // Ignore it if the event was prevented by some other listener.
             return;
         }
+
+        if (this.onClick.observers.length > 0) {
+            this.onClick.emit();
+
+            return;
+        }
+
         if (!this.text) {
             return;
         }
diff --git a/src/core/directives/link.ts b/src/core/directives/link.ts
index 2c125c170..49d296352 100644
--- a/src/core/directives/link.ts
+++ b/src/core/directives/link.ts
@@ -57,34 +57,62 @@ export class CoreLinkDirective implements OnInit {
     ngOnInit(): void {
         this.inApp = typeof this.inApp == 'undefined' ? this.inApp : CoreUtils.isTrueOrOne(this.inApp);
 
+        if (this.element.tagName != 'BUTTON' && this.element.tagName != 'A') {
+            this.element.setAttribute('tabindex', '0');
+            this.element.setAttribute('role', 'button');
+        }
+
         this.element.addEventListener('click', async (event) => {
-            if (event.defaultPrevented) {
-                return; // Link already treated, stop.
-            }
+            this.performAction(event);
+        });
 
-            let href = this.href || this.element.getAttribute('href') || this.element.getAttribute('xlink:href');
-
-            if (!href || CoreUrlUtils.getUrlScheme(href) == 'javascript') {
-                return;
-            }
-
-            event.preventDefault();
-            event.stopPropagation();
-
-            const openIn = this.element.getAttribute('data-open-in');
-
-            if (CoreUtils.isTrueOrOne(this.capture)) {
-                href = CoreTextUtils.decodeURI(href);
-
-                const treated = await CoreContentLinksHelper.handleLink(href, undefined, true, true);
-
-                if (!treated) {
-                    this.navigate(href, openIn);
-                }
-            } else {
-                this.navigate(href, openIn);
+        this.element.addEventListener('keydown', (event: KeyboardEvent) => {
+            if ((event.key == ' ' || event.key == 'Enter')) {
+                event.preventDefault();
+                event.stopPropagation();
             }
         });
+
+        this.element.addEventListener('keyup', (event: KeyboardEvent) => {
+            if ((event.key == ' ' || event.key == 'Enter')) {
+                this.performAction(event);
+            }
+        });
+    }
+
+    /**
+     * Perform "click" action.
+     *
+     * @param event Event.
+     * @returns Resolved when done.
+     */
+    protected async performAction(event: Event): Promise<void> {
+        if (event.defaultPrevented) {
+            return; // Link already treated, stop.
+        }
+
+        let href = this.href || this.element.getAttribute('href') || this.element.getAttribute('xlink:href');
+
+        if (!href || CoreUrlUtils.getUrlScheme(href) == 'javascript') {
+            return;
+        }
+
+        event.preventDefault();
+        event.stopPropagation();
+
+        const openIn = this.element.getAttribute('data-open-in');
+
+        if (CoreUtils.isTrueOrOne(this.capture)) {
+            href = CoreTextUtils.decodeURI(href);
+
+            const treated = await CoreContentLinksHelper.handleLink(href, undefined, true, true);
+
+            if (!treated) {
+                this.navigate(href, openIn);
+            }
+        } else {
+            this.navigate(href, openIn);
+        }
     }
 
     /**
diff --git a/src/core/features/comments/components/comments/comments.scss b/src/core/features/comments/components/comments/comments.scss
deleted file mode 100644
index e78db5e81..000000000
--- a/src/core/features/comments/components/comments/comments.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.core-comments-clickable {
-    pointer-events: auto;
-    cursor: pointer;
-}
diff --git a/src/core/features/comments/components/comments/comments.ts b/src/core/features/comments/components/comments/comments.ts
index 15a06523f..8e8683cac 100644
--- a/src/core/features/comments/components/comments/comments.ts
+++ b/src/core/features/comments/components/comments/comments.ts
@@ -29,7 +29,6 @@ import { ContextLevel } from '@/core/constants';
 @Component({
     selector: 'core-comments',
     templateUrl: 'core-comments.html',
-    styleUrls: ['comments.scss'],
 })
 export class CoreCommentsCommentsComponent implements OnInit, OnChanges, OnDestroy {
 
@@ -39,9 +38,9 @@ export class CoreCommentsCommentsComponent implements OnInit, OnChanges, OnDestr
     @Input() itemId!: number;
     @Input() area = '';
     @Input() title?: string;
-    @Input() displaySpinner = true; // Whether to display the loading spinner.
-    @Output() onLoading: EventEmitter<boolean>; // Eevent that indicates whether the component is loading data.
+    @Output() onLoading: EventEmitter<boolean>; // Event that indicates whether the component is loading data.
     @Input() courseId?: number; // Course ID the comments belong to. It can be used to improve performance with filters.
+    @Input() showItem = false; // Show button as an item.
 
     commentsLoaded = false;
     commentsCount = '';
diff --git a/src/core/features/comments/components/comments/core-comments.html b/src/core/features/comments/components/comments/core-comments.html
index 0269f7ce6..a3fe16111 100644
--- a/src/core/features/comments/components/comments/core-comments.html
+++ b/src/core/features/comments/components/comments/core-comments.html
@@ -1,8 +1,27 @@
-<core-loading *ngIf="!disabled" [hideUntil]="commentsLoaded || !displaySpinner" [fullscreen]="false">
-    <div *ngIf="!countError" (click)="openComments($event)" [class.core-comments-clickable]="!disabled">
-        {{ 'core.comments.commentscount' | translate : {'$a': commentsCount} }}
-    </div>
-    <div *ngIf="countError">
-        {{ 'core.comments.commentsnotworking' | translate }}
-    </div>
-</core-loading>
+<ng-container *ngIf="!disabled">
+    <core-loading *ngIf="!showItem" [hideUntil]="commentsLoaded" [fullscreen]="false" class="margin">
+        <button *ngIf="!countError" (click)="openComments($event)" class="as-link">
+            {{ 'core.comments.commentscount' | translate : {'$a': commentsCount} }}
+        </button>
+        <div *ngIf="countError">
+            {{ 'core.comments.commentsnotworking' | translate }}
+        </div>
+    </core-loading>
+    <ion-item
+        *ngIf="showItem"
+        button
+        [detail]="!countError && commentsLoaded"
+        (click)="openComments($event)"
+        [disabled]="countError">
+        <core-loading [hideUntil]="commentsLoaded" [fullscreen]="false">
+            <ion-label>
+                <p *ngIf="!countError" class="item-heading">
+                    {{ 'core.comments.commentscount' | translate : {'$a': commentsCount} }}
+                </p>
+                <p *ngIf="countError">
+                    {{ 'core.comments.commentsnotworking' | translate }}
+                </p>
+            </ion-label>
+        </core-loading>
+    </ion-item>
+</ng-container>
diff --git a/src/core/features/course/components/tag-area/core-course-tag-area.html b/src/core/features/course/components/tag-area/core-course-tag-area.html
index c6a412e44..adfc48551 100644
--- a/src/core/features/course/components/tag-area/core-course-tag-area.html
+++ b/src/core/features/course/components/tag-area/core-course-tag-area.html
@@ -1,5 +1,5 @@
 <ion-item class="ion-text-wrap" *ngFor="let item of items" (click)="openCourse(item.courseId)" [attr.aria-label]="item.courseName"
-    button>
+    button detail="true">
     <ion-icon name="fas-graduation-cap" slot="start" aria-hidden="true"></ion-icon>
     <ion-label>
         <p class="item-heading">{{ item.courseName }}</p>
diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html
index dadee07f0..5110889f4 100644
--- a/src/core/features/course/pages/preview/preview.html
+++ b/src/core/features/course/pages/preview/preview.html
@@ -114,11 +114,12 @@
                 <ion-spinner *ngIf="prefetchCourseData.loading" slot="start"></ion-spinner>
                 <ion-label><h2>{{ 'core.course.downloadcourse' | translate }}</h2></ion-label>
             </ion-item>
-            <ion-item button (click)="openCourse()" [attr.aria-label]="course.fullname" *ngIf="!avoidOpenCourse && canAccessCourse">
+            <ion-item button (click)="openCourse()" [attr.aria-label]="course.fullname" *ngIf="!avoidOpenCourse && canAccessCourse"
+                detail="true">
                 <ion-icon name="fas-briefcase" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label><h2>{{ 'core.course.contents' | translate }}</h2></ion-label>
             </ion-item>
-            <ion-item [href]="courseUrl" core-link [attr.aria-label]="course.fullname">
+            <ion-item [href]="courseUrl" core-link [attr.aria-label]="course.fullname" button detail="false">
                 <ion-icon name="fas-external-link-alt" slot="start" aria-hidden="true"></ion-icon>
                 <ion-label><h2>{{ 'core.openinbrowser' | translate }}</h2></ion-label>
             </ion-item>
diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
index 16b4872d8..aead6199e 100644
--- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html
@@ -1,5 +1,5 @@
 <ion-item class="ion-text-wrap" (click)="openCourse()" [class.item-disabled]="course.visible == 0"
-[attr.aria-label]="course.displayname || course.fullname" detail="true" button>
+    [attr.aria-label]="course.displayname || course.fullname" detail="true" button>
     <ion-icon *ngIf="!course.courseImage" name="fas-graduation-cap" slot="start" class="course-icon"
         [attr.course-color]="course.color ? null : course.colorNumber" [style.color]="course.color"></ion-icon>
     <ion-avatar *ngIf="course.courseImage" slot="start">
diff --git a/src/core/features/grades/pages/course/course.html b/src/core/features/grades/pages/course/course.html
index bd5b09d97..c4d8ee0fd 100644
--- a/src/core/features/grades/pages/course/course.html
+++ b/src/core/features/grades/pages/course/course.html
@@ -32,7 +32,9 @@
                     <tbody>
                         <tr
                             *ngFor="let row of grades.rows"
-                            (click)="row.itemtype != 'category' && grades.select(row)"
+                            role="button row"
+                            [attr.tabindex]="row.itemtype != 'category' ? 0 : null"
+                            (ariaButtonClick)="row.itemtype != 'category' && grades.select(row)"
                             [class]="row.rowclass"
                             [ngClass]='{"core-grades-grade-clickable": row.itemtype != "category"}'
                         >
diff --git a/src/core/features/grades/pages/course/course.scss b/src/core/features/grades/pages/course/course.scss
index 601e79771..aca518a0f 100644
--- a/src/core/features/grades/pages/course/course.scss
+++ b/src/core/features/grades/pages/course/course.scss
@@ -4,13 +4,28 @@
     --header-background: var(--white);
     --odd-cell-background: var(--gray-lighter);
     --even-cell-background: var(--white);
+    --odd-cell-hover: var(--gray-light);
+    --even-cell-hover: var(--gray-lighter);
     --icon-color: #999999;
+
+    .odd {
+        --cell-background: var(--odd-cell-background);
+        --cell-hover: var(--odd-cell-hover);
+    }
+
+    .even {
+        --cell-background: var(--even-cell-background);
+        --cell-hover: var(--even-cell-hover);
+    }
+
 }
 
 :host-context(body.dark) {
     --header-background: var(--black);
     --odd-cell-background: var(--gray-darker);
     --even-cell-background: var(--black);
+    --odd-cell-hover: var(--gray-dark);
+    --even-cell-hover: var(--gray-darker);
     --icon-color: #eeeeee;
 }
 
@@ -91,21 +106,19 @@
         opacity: .7;
     }
 
-    .odd {
+    .odd, .even {
         td, th, th[aria-current="page"] {
-            background-color: var(--odd-cell-background);
-        }
-
-    }
-
-    .even {
-        td, th, th[aria-current="page"] {
-            background-color: var(--even-cell-background);
+            background-color: var(--cell-background);
         }
     }
 
     .core-grades-grade-clickable {
         cursor: pointer;
+        &:hover {
+            td, th, th[aria-current="page"] {
+                background-color: var(--cell-hover);
+            }
+        }
     }
 
 }
diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index 6ca872e41..94761a0de 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -78,7 +78,7 @@
                 <ion-label><h3 class="item-heading">{{ 'core.login.potentialidps' | translate }}</h3></ion-label>
             </ion-item>
             <ion-item button *ngFor="let provider of identityProviders" class="ion-text-wrap core-oauth-icon"
-                (click)="oauthClicked(provider)" [attr.aria-label]="provider.name">
+                (click)="oauthClicked(provider)" [attr.aria-label]="provider.name" detail="false">
                 <img [src]="provider.iconurl" alt="" width="32" height="32" slot="start">
                 <ion-label>{{provider.name}}</ion-label>
             </ion-item>
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index e97773e35..03de280fa 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -88,7 +88,7 @@
             <ion-label><h3 class="item-heading">{{ 'core.login.potentialidps' | translate }}</h3></ion-label>
         </ion-item>
         <ion-item button *ngFor="let provider of identityProviders" class="ion-text-wrap core-oauth-icon"
-            (click)="oauthClicked(provider)">
+            (click)="oauthClicked(provider)" detail="false">
             <img [src]="provider.iconurl" alt="" role="presentation" width="32" height="32" slot="start">
             <ion-label>{{provider.name}}</ion-label>
         </ion-item>
diff --git a/src/core/features/login/pages/sites/sites.html b/src/core/features/login/pages/sites/sites.html
index 83c1bfb20..280e50172 100644
--- a/src/core/features/login/pages/sites/sites.html
+++ b/src/core/features/login/pages/sites/sites.html
@@ -19,7 +19,7 @@
 </ion-header>
 <ion-content>
     <ion-list>
-        <ion-item button (click)="login(site.id)" *ngFor="let site of sites">
+        <ion-item button (click)="login(site.id)" *ngFor="let site of sites" detail="true">
             <ion-avatar slot="start">
                 <img [src]="site.avatar" core-external-content [siteId]="site.id"
                     alt="{{ 'core.pictureof' | translate:{$a: site.fullName} }}" onError="this.src='assets/img/user-avatar.png'">
diff --git a/src/core/features/mainmenu/pages/more/more.html b/src/core/features/mainmenu/pages/more/more.html
index 1ff87ac11..eeb136a71 100644
--- a/src/core/features/mainmenu/pages/more/more.html
+++ b/src/core/features/mainmenu/pages/more/more.html
@@ -25,7 +25,7 @@
             <ion-label><ion-spinner></ion-spinner></ion-label>
         </ion-item>
         <ion-item button *ngFor="let handler of handlers" [ngClass]="['core-moremenu-handler', handler.class || '']"
-            (click)="openHandler(handler)" [attr.aria-label]="handler.title | translate" detail="true" detail="true">
+            (click)="openHandler(handler)" [attr.aria-label]="handler.title | translate" detail="true">
             <ion-icon [name]="handler.icon" slot="start" aria-hidden="true"></ion-icon>
             <ion-label>
                 <p class="item-heading">{{ handler.title | translate}}</p>
diff --git a/src/core/features/settings/pages/site/site.html b/src/core/features/settings/pages/site/site.html
index 1bd209ba2..996e96866 100644
--- a/src/core/features/settings/pages/site/site.html
+++ b/src/core/features/settings/pages/site/site.html
@@ -17,7 +17,7 @@
             <ion-list>
                 <ion-item *ngIf="siteInfo" class="ion-text-wrap">
                     <ion-label>
-                        <h2>{{siteInfo!.fullname}}</h2>
+                        <p class="item-heading">{{siteInfo!.fullname}}</p>
                         <p>
                             <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"
                                 [wsNotFiltered]="true"></core-format-text>
@@ -33,19 +33,19 @@
                     <ion-icon [name]="handler.icon" slot="start" *ngIf="handler.icon" aria-hidden="true">
                     </ion-icon>
                     <ion-label>
-                        <h2>{{ handler.title | translate}}</h2>
+                        <p class="item-heading">{{ handler.title | translate}}</p>
                     </ion-label>
                 </ion-item>
 
                 <ion-card>
                     <ion-item class="ion-text-wrap" *ngIf="spaceUsage">
                         <ion-label>
-                            <h2 class="ion-text-wrap">{{ 'core.settings.spaceusage' | translate }} <ion-icon
-                                    name="fas-info-circle" color="info" [attr.aria-label]="'core.info' | translate"
-                                    (click)="showSpaceInfo()"></ion-icon>
-                            </h2>
+                            <p class="item-heading ion-text-wrap">{{ 'core.settings.spaceusage' | translate }}</p>
                             <p *ngIf="spaceUsage.spaceUsage">{{ spaceUsage.spaceUsage | coreBytesToSize }}</p>
                         </ion-label>
+                        <ion-button fill="clear" [attr.aria-label]="'core.info' | translate" (click)="showSpaceInfo()" slot="end">
+                            <ion-icon name="fas-info-circle" color="info" slot="icon-only"></ion-icon>
+                        </ion-button>
                         <ion-button fill="clear" color="danger" slot="end" (click)="deleteSiteStorage()"
                             [hidden]="spaceUsage.spaceUsage! + spaceUsage.cacheEntries! <= 0"
                             [attr.aria-label]="'core.settings.deletesitefilestitle' | translate">
@@ -54,13 +54,13 @@
                     </ion-item>
                     <ion-item class="ion-text-wrap">
                         <ion-label>
-                            <h2>{{ 'core.settings.synchronizenow' | translate }} <ion-icon name="fas-info-circle"
-                                    color="info" [attr.aria-label]="'core.info' | translate" (click)="showSyncInfo()">
-                                </ion-icon>
-                            </h2>
+                            <p class="item-heading">{{ 'core.settings.synchronizenow' | translate }}</p>
                         </ion-label>
+                        <ion-button fill="clear" [attr.aria-label]="'core.info' | translate" (click)="showSyncInfo()" slot="end">
+                            <ion-icon name="fas-info-circle" color="info" slot="icon-only"></ion-icon>
+                        </ion-button>
                         <ion-button fill="clear" slot="end" *ngIf="!isSynchronizing()" (click)="synchronize()"
-                            [title]="siteName" [attr.aria-label]="'core.settings.synchronizenow' | translate">
+                            [attr.aria-label]="'core.settings.synchronizenow' | translate">
                             <ion-icon name="fas-sync-alt" slot="icon-only" aria-hidden="true"></ion-icon>
                         </ion-button>
                         <ion-spinner slot="end" *ngIf="isSynchronizing()"></ion-spinner>
diff --git a/src/core/features/sharedfiles/components/list/list.html b/src/core/features/sharedfiles/components/list/list.html
index f41a0080a..2bdcaf4a2 100644
--- a/src/core/features/sharedfiles/components/list/list.html
+++ b/src/core/features/sharedfiles/components/list/list.html
@@ -13,7 +13,7 @@
                 (onClick)="filePicked(file)" (onDelete)="fileDeleted(idx)" (onRename)="fileRenamed(idx, $event)">
             </core-local-file>
 
-            <ion-item button *ngIf="!file.isFile" class="ion-text-wrap item-file" (click)="openFolder(file)">
+            <ion-item button *ngIf="!file.isFile" class="ion-text-wrap item-file" (click)="openFolder(file)" detail="true">
                 <ion-thumbnail slot="start" aria-hidden="true">
                     <img src="assets/img/files/folder-64.png" alt="">
                 </ion-thumbnail>
diff --git a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
index 03f022807..930a6e0a0 100644
--- a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
+++ b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
@@ -20,7 +20,7 @@
         </core-context-menu-item>
         <core-context-menu-item [hidden]="!displaySize || !size || (
             content?.compileComponent?.componentInstance?.displaySize === false)" [priority]="500"
-            [content]="'core.clearstoreddata' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()"
+            [content]="'core.clearstoreddata' | translate:{$a: size}" [iconDescription]="'fas-archive'" (action)="removeFiles()"
             iconAction="fas-trash" [closeOnClick]="false">
         </core-context-menu-item>
     </core-context-menu>
diff --git a/src/core/features/tag/pages/index/index.html b/src/core/features/tag/pages/index/index.html
index 542b064af..afa93e4a8 100644
--- a/src/core/features/tag/pages/index/index.html
+++ b/src/core/features/tag/pages/index/index.html
@@ -19,7 +19,8 @@
                     <ion-label class="ion-text-wrap">{{ 'core.tag.warningareasnotsupported' | translate }}</ion-label>
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngFor="let area of areas" [attr.aria-label]="area.nameKey | translate"
-                    (click)="openArea(area)" [attr.aria-current]="area!.id == selectedAreaId ? 'page' : 'false'" button>
+                    (click)="openArea(area)" [attr.aria-current]="area!.id == selectedAreaId ? 'page' : 'false'" button
+                    detail="true">
                     <ion-label>
                         <h2>{{ area!.nameKey | translate }}</h2>
                     </ion-label>
diff --git a/src/core/features/user/pages/participants/participants.html b/src/core/features/user/pages/participants/participants.html
index 64e449fa5..c52e9cecb 100644
--- a/src/core/features/user/pages/participants/participants.html
+++ b/src/core/features/user/pages/participants/participants.html
@@ -29,7 +29,7 @@
             <ion-list *ngIf="!participants.empty">
                 <ion-item *ngFor="let participant of participants.items"
                     class="ion-text-wrap" [attr.aria-current]="participants.getItemAriaCurrent(participant)"
-                    [attr.aria-label]="participant.fullname" (click)="participants.select(participant)" button>
+                    [attr.aria-label]="participant.fullname" (click)="participants.select(participant)" button detail="true">
 
                     <core-user-avatar [user]="participant" [linkProfile]="false" [checkOnline]="true" slot="start">
                     </core-user-avatar>
diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index 8531c49c2..0f4ffc582 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -78,6 +78,8 @@ core-format-text {
         }
 
         &.core-expand-in-fullview {
+            cursor: pointer;
+
             .core-show-more {
                 @include push-arrow-color(626262, true);
                 @include padding-horizontal(null, 5px);
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index a01a65d6b..1640b53e4 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -137,16 +137,6 @@ ion-item.ion-text-wrap ion-label {
     white-space: normal !important;
 }
 
-// It fixes the click on links where ion-ripple-effect is present.
-.ion-activatable ion-label,
-.item-multiple-items ion-label {
-    z-index: 3;
-    pointer-events: none;
-    ion-anchor, ion-button, a, button {
-        pointer-events: visible;
-    }
-}
-
 @each $color-name, $value in $colors {
     $value: map-get($colors, $color-name);
     $base: map-get($value, base);
@@ -238,7 +228,8 @@ button,
     min-width: var(--a11y-min-target-size);
 }
 
-[role="button"] {
+[role="button"],
+.clickable {
     cursor: pointer;
 
     [disabled],
@@ -256,6 +247,21 @@ ion-button.core-button-as-link {
     white-space: break-spaces;
 }
 
+button.as-link {
+    display: inline;
+    min-height: auto;
+    min-width: auto;
+    color: var(--core-link-color);
+    background: none;
+    border: 0;
+    line-height: inherit;
+    margin: 0;
+    padding: 0;
+    text-align: start;
+    font-size: inherit;
+}
+
+
 // Ionic alert.
 ion-alert.core-alert-network-error .alert-head,
 div.core-iframe-network-error {
@@ -658,8 +664,11 @@ audio.core-media-adapt-width {
     }
 }
 
+
+// It fixes the click on links where ion-ripple-effect is present.
 // Make links clickable when inside radio or checkbox items. Pointer and cursor part.
-ion-item.item-multiple-inputs {
+ion-item.item-multiple-inputs:not(.only-links),
+ion-item.ion-activatable:not(.only-links) {
     cursor: pointer;
     ion-label {
         z-index: 3;
@@ -677,6 +686,12 @@ ion-item.item-multiple-inputs {
     }
 }
 
+ion-item.item-multiple-inputs.only-links {
+    a {
+        cursor: pointer;
+    }
+}
+
 // Case with ion-input + ion-select inside.
 ion-item.item-input.item-multiple-inputs {
     .flex-row {