diff --git a/src/core/components/button-with-spinner/core-button-with-spinner.html b/src/core/components/button-with-spinner/core-button-with-spinner.html
index 3ce1927eb..7b4e27e24 100644
--- a/src/core/components/button-with-spinner/core-button-with-spinner.html
+++ b/src/core/components/button-with-spinner/core-button-with-spinner.html
@@ -1,5 +1,5 @@
 <div *ngIf="!loading" @coreShowHideAnimation>
-    <ng-content></ng-content>
+    <ng-content />
 </div>
 
 <!-- Spinner. -->
diff --git a/src/core/components/combobox/core-combobox.html b/src/core/components/combobox/core-combobox.html
index 212de4608..5cee5e9e6 100644
--- a/src/core/components/combobox/core-combobox.html
+++ b/src/core/components/combobox/core-combobox.html
@@ -5,7 +5,7 @@
         <ion-icon *ngIf="icon" [name]="icon" aria-hidden="true" />
     </div>
 
-    <ng-content></ng-content>
+    <ng-content />
 </ion-select>
 
 <ion-button *ngIf="interface === 'modal'" aria-haspopup="listbox" [attr.aria-controls]="listboxId" [attr.aria-owns]="listboxId"
diff --git a/src/core/components/context-menu/core-context-menu.html b/src/core/components/context-menu/core-context-menu.html
index 1c58d36f3..5041a3e4f 100644
--- a/src/core/components/context-menu/core-context-menu.html
+++ b/src/core/components/context-menu/core-context-menu.html
@@ -2,4 +2,4 @@
     [attr.aria-controls]="uniqueId">
     <ion-icon [name]="icon" slot="icon-only" aria-hidden="true" />
 </ion-button>
-<ng-content></ng-content>
+<ng-content />
diff --git a/src/core/components/dynamic-component/core-dynamic-component.html b/src/core/components/dynamic-component/core-dynamic-component.html
index 9baedda3d..bbab0ac5b 100644
--- a/src/core/components/dynamic-component/core-dynamic-component.html
+++ b/src/core/components/dynamic-component/core-dynamic-component.html
@@ -1,5 +1,5 @@
 <!-- Content to display if no dynamic component. -->
-<ng-content *ngIf="!instance"></ng-content>
+<ng-content *ngIf="!instance" />
 
 <!-- Container of the dynamic component -->
 <ng-container #dynamicComponent />
diff --git a/src/core/components/empty-box/core-empty-box.html b/src/core/components/empty-box/core-empty-box.html
index b40bb9da8..29d45bbee 100644
--- a/src/core/components/empty-box/core-empty-box.html
+++ b/src/core/components/empty-box/core-empty-box.html
@@ -1,4 +1,4 @@
 <img *ngIf="image && !icon" [src]="image" role="presentation" alt="">
 <ion-icon *ngIf="icon" [name]="icon" aria-hidden="true" />
 <p *ngIf="message">{{ message }}</p>
-<ng-content></ng-content>
+<ng-content />
diff --git a/src/core/components/loading/core-loading.html b/src/core/components/loading/core-loading.html
index 94bbb6b9d..cb7dc77d4 100644
--- a/src/core/components/loading/core-loading.html
+++ b/src/core/components/loading/core-loading.html
@@ -2,4 +2,4 @@
     <ion-spinner color="primary" aria-hidden="true" />
     <p class="core-loading-message" *ngIf="message" role="status">{{message}}</p>
 </div>
-<ng-content *ngIf="loaded" @coreShowHideAnimation></ng-content>
+<ng-content *ngIf="loaded" @coreShowHideAnimation />
diff --git a/src/core/components/mark-required/core-mark-required.html b/src/core/components/mark-required/core-mark-required.html
index d4466a62b..7508d79e3 100644
--- a/src/core/components/mark-required/core-mark-required.html
+++ b/src/core/components/mark-required/core-mark-required.html
@@ -1,3 +1,3 @@
-<ng-content></ng-content>
+<ng-content />
 <ion-icon *ngIf="coreMarkRequired" class="core-input-required-asterisk" name="fas-circle-exclamation" color="danger"
     [attr.aria-label]="requiredLabel" />
diff --git a/src/core/components/navbar-buttons/navbar-buttons.ts b/src/core/components/navbar-buttons/navbar-buttons.ts
index f2a5c1c86..349377eec 100644
--- a/src/core/components/navbar-buttons/navbar-buttons.ts
+++ b/src/core/components/navbar-buttons/navbar-buttons.ts
@@ -52,7 +52,7 @@ const BUTTON_HIDDEN_CLASS = 'core-navbar-button-hidden';
  */
 @Component({
     selector: 'core-navbar-buttons',
-    template: '<ng-content></ng-content><template #contextMenuContainer>-</template>',
+    template: '<ng-content/><template #contextMenuContainer>-</template>',
     styleUrls: ['navbar-buttons.scss'],
 })
 export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
diff --git a/src/core/components/split-view/split-view.html b/src/core/components/split-view/split-view.html
index 27aa94ddd..df5108b8c 100644
--- a/src/core/components/split-view/split-view.html
+++ b/src/core/components/split-view/split-view.html
@@ -1,5 +1,5 @@
 <ion-content class="menu">
-    <ng-content></ng-content>
+    <ng-content />
 </ion-content>
 <ion-router-outlet class="content-outlet" />
 <core-empty-box class="content-placeholder" icon="fas-circle-arrow-left" [message]="placeholderText | translate" [flipIconRtl]="true" />
diff --git a/src/core/components/tabs/core-tabs.html b/src/core/components/tabs/core-tabs.html
index f247419f8..b821e41ad 100644
--- a/src/core/components/tabs/core-tabs.html
+++ b/src/core/components/tabs/core-tabs.html
@@ -33,5 +33,5 @@
     </ng-container>
 </ion-tab-bar>
 <div class="core-tabs-content-container" #originalTabs>
-    <ng-content></ng-content>
+    <ng-content />
 </div>
diff --git a/src/core/components/user-avatar/core-user-avatar.html b/src/core/components/user-avatar/core-user-avatar.html
index a63a6c316..cb5b79b00 100644
--- a/src/core/components/user-avatar/core-user-avatar.html
+++ b/src/core/components/user-avatar/core-user-avatar.html
@@ -26,4 +26,4 @@
 <span *ngIf="checkOnline && isOnline()" class="contact-status online" role="status" [attr.aria-label]="'core.online' | translate">
 </span>
 
-<ng-content></ng-content>
+<ng-content />
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index e6674bba1..244e2d406 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -7,7 +7,7 @@
             <ion-icon name="fas-lock" *ngIf="module.visible === 0 || module.uservisible === false"
                 [attr.aria-label]="'core.restricted' | translate" />
         </h1>
-        <ng-content select="[title]"></ng-content>
+        <ng-content select="[title]" />
     </ion-label>
 </ion-item>
 
@@ -37,10 +37,10 @@
         <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module"
             [contextInstanceId]="module.id" [courseId]="courseId" [collapsible-item]="expandDescription ? null : ''" />
     </div>
-    <ng-content select="[description]"></ng-content>
+    <ng-content select="[description]" />
 </div>
 
-<ng-content></ng-content>
+<ng-content />
 
 <!-- Activity has something offline. -->
 <ion-card class="core-warning-card" *ngIf="hasDataToSync">
diff --git a/src/core/features/login/components/exceeded-attempts/exceeded-attempts.html b/src/core/features/login/components/exceeded-attempts/exceeded-attempts.html
index e5aca5070..6ab1f807a 100644
--- a/src/core/features/login/components/exceeded-attempts/exceeded-attempts.html
+++ b/src/core/features/login/components/exceeded-attempts/exceeded-attempts.html
@@ -3,7 +3,7 @@
         <ion-icon name="fas-triangle-exclamation" slot="start" aria-hidden="true" />
         <ion-label>
             <p>
-                <ng-content></ng-content>
+                <ng-content />
             </p>
             <ion-button *ngIf="canContactSupport" fill="outline" color="medium" (click)="contactSupport()">
                 {{ 'core.contactsupport' | translate }}
diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html
index efc616e35..1094c8257 100644
--- a/src/core/features/sitehome/pages/index/index.html
+++ b/src/core/features/sitehome/pages/index/index.html
@@ -26,19 +26,19 @@
                 <ng-container *ngFor="let item of items">
                     <ng-container [ngSwitch]="item">
                         <ng-container *ngSwitchCase="'LIST_OF_COURSE'">
-                            <ng-template *ngTemplateOutlet="allCourseList"></ng-template>
+                            <ng-template *ngTemplateOutlet="allCourseList" />
                         </ng-container>
                         <ng-container *ngSwitchCase="'LIST_OF_CATEGORIES'">
-                            <ng-template *ngTemplateOutlet="categories"></ng-template>
+                            <ng-template *ngTemplateOutlet="categories" />
                         </ng-container>
                         <ng-container *ngSwitchCase="'COURSE_SEARCH_BOX'">
-                            <ng-template *ngTemplateOutlet="courseSearch"></ng-template>
+                            <ng-template *ngTemplateOutlet="courseSearch" />
                         </ng-container>
                         <ng-container *ngSwitchCase="'ENROLLED_COURSES'">
-                            <ng-template *ngTemplateOutlet="enrolledCourseList"></ng-template>
+                            <ng-template *ngTemplateOutlet="enrolledCourseList" />
                         </ng-container>
                         <ng-container *ngSwitchCase="'NEWS_ITEMS'">
-                            <ng-template *ngTemplateOutlet="news"></ng-template>
+                            <ng-template *ngTemplateOutlet="news" />
                         </ng-container>
                     </ng-container>
                 </ng-container>