diff --git a/scripts/langindex.json b/scripts/langindex.json
index aae5bdd55..40c4b9144 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -2162,6 +2162,7 @@
   "core.settings.disableall": "message",
   "core.settings.disabled": "lesson",
   "core.settings.disabledfeatures": "tool_mobile",
+  "core.settings.disallowed": "message",
   "core.settings.displayformat": "local_moodlemobileapp",
   "core.settings.enabledownloadsection": "local_moodlemobileapp",
   "core.settings.enablefirebaseanalytics": "local_moodlemobileapp",
@@ -2176,6 +2177,7 @@
   "core.settings.filesystemroot": "local_moodlemobileapp",
   "core.settings.fontsize": "local_moodlemobileapp",
   "core.settings.fontsizecharacter": "block_accessibility/char",
+  "core.settings.forced": "message",
   "core.settings.forcedsetting": "local_moodlemobileapp",
   "core.settings.forcesafeareamargins": "local_moodlemobileapp",
   "core.settings.general": "moodle",
@@ -2186,7 +2188,6 @@
   "core.settings.license": "moodle",
   "core.settings.localnotifavailable": "local_moodlemobileapp",
   "core.settings.locationhref": "local_moodlemobileapp",
-  "core.settings.locked": "admin",
   "core.settings.loggedin": "message",
   "core.settings.loggedoff": "message",
   "core.settings.navigatorlanguage": "local_moodlemobileapp",
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 1c23cf54f..50e95546f 100644
--- a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
+++ b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
@@ -1,6 +1,6 @@
 <ion-item-divider sticky="true">
     <ion-label>
-        <h2>{{ 'addon.block_activitymodules.pluginname' | translate }}</h2>
+        <h2>{{ 'addon.block_activitymodules.pluginname' | translate }}</h2>
     </ion-label>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
diff --git a/src/addons/block/myoverview/components/filteroptions/filteroptions.html b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
index 39dcd2491..8d747fcfe 100644
--- a/src/addons/block/myoverview/components/filteroptions/filteroptions.html
+++ b/src/addons/block/myoverview/components/filteroptions/filteroptions.html
@@ -41,12 +41,12 @@
 
         <core-spacer></core-spacer>
         <ion-item *ngIf="options.show.favourite">
-            <ion-label>{{ 'addon.block_myoverview.favouritesonly' | translate }}</ion-label>
+            <ion-label>{{ 'addon.block_myoverview.favouritesonly' | translate }}</ion-label>
             <ion-toggle [(ngModel)]="options.favouriteSelected"></ion-toggle>
         </ion-item>
 
         <ion-item *ngIf="options.show.hidden">
-            <ion-label>{{ 'addon.block_myoverview.aria:hiddencourses' | translate }}</ion-label>
+            <ion-label>{{ 'addon.block_myoverview.aria:hiddencourses' | translate }}</ion-label>
             <ion-toggle [(ngModel)]="options.hiddenSelected"></ion-toggle>
         </ion-item>
     </ion-list>
diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
index 6f10e6e92..113048db0 100644
--- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
+++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
@@ -1,6 +1,6 @@
 <ion-item-divider sticky="true">
     <ion-label>
-        <h2>{{ 'addon.block_recentlyaccessedcourses.pluginname' | translate }}</h2>
+        <h2>{{ 'addon.block_recentlyaccessedcourses.pluginname' | translate }}</h2>
     </ion-label>
     <div slot="end" class="flex-row">
         <core-horizontal-scroll-controls #scrollControls [aria-controls]="scrollElementId">
diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
index e93ac8cd1..14298293a 100644
--- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
+++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
@@ -1,6 +1,6 @@
 <ion-item-divider sticky="true">
     <ion-label>
-        <h2>{{ 'addon.block_recentlyaccesseditems.pluginname' | translate }}</h2>
+        <h2>{{ 'addon.block_recentlyaccesseditems.pluginname' | translate }}</h2>
     </ion-label>
     <div slot="end">
         <core-horizontal-scroll-controls #scrollControls [aria-controls]="scrollElementId">
diff --git a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
index de45bf3af..3ce510a26 100644
--- a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
+++ b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
@@ -1,6 +1,6 @@
 <ion-item-divider sticky="true">
     <ion-label>
-        <h2>{{ 'addon.block_sitemainmenu.pluginname' | translate }}</h2>
+        <h2>{{ 'addon.block_sitemainmenu.pluginname' | translate }}</h2>
     </ion-label>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
diff --git a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
index 3697b8439..fd6a1a860 100644
--- a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
+++ b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
@@ -1,6 +1,6 @@
 <ion-item-divider sticky="true">
     <ion-label>
-        <h2>{{ 'addon.block_starredcourses.pluginname' | translate }}</h2>
+        <h2>{{ 'addon.block_starredcourses.pluginname' | translate }}</h2>
     </ion-label>
     <div slot="end" class="flex-row">
         <core-horizontal-scroll-controls #scrollControls [aria-controls]="scrollElementId">
diff --git a/src/addons/block/timeline/components/timeline/addon-block-timeline.html b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
index a0774f1d9..a4155a94d 100644
--- a/src/addons/block/timeline/components/timeline/addon-block-timeline.html
+++ b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
@@ -1,6 +1,6 @@
 <ion-item-divider sticky="true">
     <ion-label>
-        <h2>{{ 'addon.block_timeline.pluginname' | translate }}</h2>
+        <h2>{{ 'addon.block_timeline.pluginname' | translate }}</h2>
     </ion-label>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" [fullscreen]="false">
diff --git a/src/addons/blog/pages/entries/entries.html b/src/addons/blog/pages/entries/entries.html
index 550ee3fd2..41697ecd3 100644
--- a/src/addons/blog/pages/entries/entries.html
+++ b/src/addons/blog/pages/entries/entries.html
@@ -17,7 +17,7 @@
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
         <ion-item *ngIf="showMyEntriesToggle">
-            <ion-label>{{ 'addon.blog.showonlyyourentries' | translate }}</ion-label>
+            <ion-label>{{ 'addon.blog.showonlyyourentries' | translate }}</ion-label>
             <ion-toggle [(ngModel)]="onlyMyEntries" (ionChange)="onlyMyEntriesToggleChanged(onlyMyEntries)"></ion-toggle>
         </ion-item>
         <core-empty-box *ngIf="entries && entries.length == 0" icon="far-newspaper" [message]="'addon.blog.noentriesyet' | translate">
diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index 0ba264922..4b536a12d 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -30,7 +30,7 @@
                 <ion-label position="stacked">
                     <p class="item-heading" [core-mark-required]="true">{{ 'core.date' | translate }}</p>
                 </ion-label>
-                <ion-datetime formControlName="timestart" [placeholder]="'core.date' | translate" [displayFormat]="dateFormat"
+                <ion-datetime formControlName="timestart" [placeholder]="'core.date' | translate" [displayFormat]="dateFormat"
                     [max]="maxDate" [min]="minDate" display-timezone="utc">
                 </ion-datetime>
                 <core-input-errors [control]="form.controls.timestart" [errorMessages]="errors"></core-input-errors>
@@ -156,7 +156,7 @@
                     <ion-item *ngIf="form.controls.duration.value === 1">
                         <ion-label position="stacked"></ion-label>
                         <ion-datetime formControlName="timedurationuntil" [max]="maxDate" [min]="minDate"
-                            [placeholder]="'addon.calendar.durationuntil' | translate" [displayFormat]="dateFormat" display-timezone="utc">
+                            [placeholder]="'addon.calendar.durationuntil' | translate" [displayFormat]="dateFormat" display-timezone="utc">
                         </ion-datetime>
                     </ion-item>
                     <ion-item lines="none">
diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index 2c85e5dbd..fe42e7ac1 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -40,10 +40,10 @@
             <core-context-menu-item [hidden]="isSelf || !muteEnabled || !conversation" [priority]="600" [content]="(conversation && conversation.ismuted ? 'addon.messages.unmuteconversation' :
                 'addon.messages.muteconversation') | translate" (action)="changeMute($event)" [closeOnClick]="false"
                 [iconAction]="muteIcon"></core-context-menu-item>
-            <core-context-menu-item [hidden]="!canDelete || !messages || !messages.length" [priority]="400"
+            <core-context-menu-item [hidden]="!canDelete || !messages || !messages.length" [priority]="400"
                 [content]="'addon.messages.showdeletemessages' | translate" iconAction="toggle" [(toggle)]="showDelete">
             </core-context-menu-item>
-            <core-context-menu-item [hidden]="!groupMessagingEnabled || !conversationId || isGroup || !messages || !messages.length"
+            <core-context-menu-item [hidden]="!groupMessagingEnabled || !conversationId || isGroup || !messages || !messages.length"
                 [priority]="200" [content]="'addon.messages.deleteconversation' | translate" (action)="deleteConversation($event)"
                 [closeOnClick]="false" [iconAction]="deleteIcon"></core-context-menu-item>
             <core-context-menu-item
diff --git a/src/addons/messages/pages/settings/settings.html b/src/addons/messages/pages/settings/settings.html
index 997cc0277..ef1d86892 100644
--- a/src/addons/messages/pages/settings/settings.html
+++ b/src/addons/messages/pages/settings/settings.html
@@ -16,7 +16,7 @@
         <!-- Contactable privacy. -->
         <ion-card>
             <ion-item *ngIf="!advancedContactable">
-                <ion-label>{{ 'addon.messages.blocknoncontacts' | translate }}</ion-label>
+                <ion-label>{{ 'addon.messages.blocknoncontacts' | translate }}</ion-label>
                 <ion-toggle [(ngModel)]="contactablePrivacy" (ngModelChange)="saveContactablePrivacy(contactablePrivacy)">
                 </ion-toggle>
             </ion-item>
@@ -46,88 +46,12 @@
 
         <!-- Notifications. -->
         <ng-container *ngIf="preferences">
-            <div *ngFor="let component of preferences.components">
-                <ion-card list *ngFor="let notification of component.notifications">
-                    <ion-item-divider class="ion-text-wrap">
-                        <ion-label>
-                            <ion-row class="ion-no-padding" *ngIf="!groupMessagingEnabled">
-                                <ion-col class="ion-no-padding">
-                                    <h2>{{ notification.displayname }}</h2>
-                                </ion-col>
-                                <ion-col size="2" class="ion-text-center ion-no-padding ion-hide-md-down">
-                                    <h2>{{ 'core.settings.loggedin' | translate }}</h2>
-                                </ion-col>
-                                <ion-col *ngIf="!groupMessagingEnabled" size="2" class="ion-text-center ion-no-padding
-                                    ion-hide-md-down">
-                                    <h2>{{ 'core.settings.loggedoff' | translate }}</h2>
-                                </ion-col>
-                            </ion-row>
-                            <h2 *ngIf="groupMessagingEnabled">{{ 'addon.notifications.notificationpreferences' | translate }}</h2>
-                        </ion-label>
-                    </ion-item-divider>
-                    <ng-container *ngFor="let processor of notification.processors">
-                        <!-- If group messaging is enabled, display a simplified view. -->
-                        <ng-container *ngIf="groupMessagingEnabled">
-                            <ion-item class="ion-text-wrap">
-                                <ion-label>{{ processor.displayname }}</ion-label>
-                                <core-button-with-spinner *ngIf="!preferences.disableall" [loading]="!!notification.updating" slot="end">
-                                    <ion-toggle *ngIf="!processor.locked" [(ngModel)]="processor.checked"
-                                        (ngModelChange)="changePreference(notification, '', processor)">
-                                    </ion-toggle>
-                                    <ion-note *ngIf="processor.locked">
-                                        {{ processor.lockedmessage }}
-                                    </ion-note>
-                                </core-button-with-spinner>
-                                <ion-note slot="end" *ngIf="preferences.disableall">
-                                    {{ 'core.settings.disabled' | translate }}
-                                </ion-note>
-                            </ion-item>
-                        </ng-container>
-
-                        <ng-container *ngIf="!groupMessagingEnabled">
-                            <!-- Tablet view -->
-                            <ion-row class="ion-text-wrap ion-hide-md-down ion-align-items-center">
-                                <ion-col class="ion-margin-horizontal">{{ processor.displayname }}</ion-col>
-                                <ion-col size="2" class="ion-text-center" *ngFor="let state of ['loggedin', 'loggedoff']">
-                                    <core-button-with-spinner *ngIf="!preferences.disableall"
-                                        [loading]="notification.updating && notification.updating[state]">
-                                        <!-- If notifications not disabled, show toggle. -->
-                                        <ion-toggle *ngIf="!processor.locked" [(ngModel)]="processor[state].checked"
-                                            (ngModelChange)="changePreference(notification, state, processor)">
-                                        </ion-toggle>
-                                        <div class="ion-padding text-gray" *ngIf="processor.locked">
-                                            {{'core.settings.locked' | translate }}
-                                        </div>
-                                    </core-button-with-spinner>
-                                    <!-- If notifications are disabled, show "Disabled" instead of toggle. -->
-                                    <span *ngIf="preferences.disableall">{{ 'core.settings.disabled' | translate }}</span>
-                                </ion-col>
-                            </ion-row>
-                            <!-- Phone view -->
-                            <ion-list-header class="ion-text-wrap ion-hide-md-up">
-                                <ion-label>{{ processor.displayname }}</ion-label>
-                            </ion-list-header>
-                            <!-- If notifications not disabled, show toggles.
-                                If notifications are disabled, show "Disabled" instead of toggle. -->
-                            <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" class="ion-text-wrap ion-hide-md-up">
-                                <ion-label>{{ 'core.settings.' + state | translate }}</ion-label>
-                                <core-button-with-spinner slot="end" *ngIf="!preferences.disableall"
-                                    [loading]="notification.updating && notification.updating[state]">
-                                    <ion-toggle *ngIf="!processor.locked" [(ngModel)]="processor[state].checked"
-                                        (ngModelChange)="changePreference(notification, state, processor)">
-                                    </ion-toggle>
-                                    <ion-note *ngIf="processor.locked">
-                                        {{'core.settings.locked' | translate }}
-                                    </ion-note>
-                                </core-button-with-spinner>
-                                <ion-note slot="end" *ngIf="preferences.disableall">
-                                    {{ 'core.settings.disabled' | translate }}
-                                </ion-note>
-                            </ion-item>
-                        </ng-container>
-                    </ng-container>
-                </ion-card>
-            </div>
+            <ng-container *ngIf="!groupMessagingEnabled">
+                <ng-container *ngTemplateOutlet="legacySettings; context: {preferences: preferences}"></ng-container>
+            </ng-container>
+            <ng-container *ngIf="groupMessagingEnabled">
+                <ng-container *ngTemplateOutlet="settings; context: {preferences: preferences}"></ng-container>
+            </ng-container>
         </ng-container>
 
         <!-- General settings. -->
@@ -148,3 +72,77 @@
         </ion-card>
     </core-loading>
 </ion-content>
+
+<!-- Only 3.5 version -->
+<ng-template #legacySettings let-preferences="preferences">
+    <ng-container *ngFor="let component of preferences.components">
+        <ion-card *ngFor="let notification of component.notifications">
+            <ion-card-header class="ion-no-padding">
+                <ion-item class="ion-text-wrap">
+                    <ion-label>
+                        <h2>{{ notification.displayname }}</h2>
+                    </ion-label>
+                </ion-item>
+            </ion-card-header>
+            <ion-card-content class="ion-no-padding">
+                <ng-container *ngFor="let processor of notification.processors">
+                    <ion-item-divider class="ion-text-wrap">
+                        <ion-label>
+                            <p class="item-heading">{{ processor.displayname }}</p>
+                        </ion-label>
+                    </ion-item-divider>
+                    <!-- If notifications not disabled, show toggles.
+                        If notifications are disabled, show "Disabled" instead of toggle. -->
+                    <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" class="ion-text-wrap">
+                        <ion-label>{{ 'core.settings.' + state | translate }}</ion-label>
+                        <ng-container *ngIf="!preferences.disableall">
+                            <!-- If notifications enabled, show toggle. -->
+                            <core-button-with-spinner *ngIf="!processor.locked" [loading]="notification['updating'+state]">
+                                <ion-toggle [(ngModel)]="processor[state].checked"
+                                    (ngModelChange)="changePreferenceLegacy(notification, processor, state)">
+                                </ion-toggle>
+                            </core-button-with-spinner>
+                            <span *ngIf="processor.locked && processor[state].checked" class="text-gray">
+                                {{'core.settings.forced' | translate }}
+                            </span>
+                            <span *ngIf="processor.locked && !processor[state].checked" class="text-gray">
+                                {{'core.settings.disallowed' | translate }}
+                            </span>
+                        </ng-container>
+                        <span *ngIf="preferences.disableall">{{ 'core.settings.disabled' | translate }}</span>
+                    </ion-item>
+                </ng-container>
+            </ion-card-content>
+        </ion-card>
+    </ng-container>
+</ng-template>
+
+
+<ng-template #settings let-preferences="preferences">
+    <ng-container *ngFor="let component of preferences.components">
+        <ion-card *ngFor="let notification of component.notifications">
+            <ion-item-divider class="ion-text-wrap">
+                <ion-label>
+                    <h2>{{ 'addon.notifications.notificationpreferences' | translate }}</h2>
+                </ion-label>
+            </ion-item-divider>
+            <ng-container *ngFor="let processor of notification.processors">
+                <!-- If group messaging is enabled, display a simplified view. -->
+                <ion-item class="ion-text-wrap">
+                    <ion-label>{{ processor.displayname }}</ion-label>
+                    <ng-container *ngIf="!preferences.disableall">
+                        <!-- If notifications enabled, show toggle. -->
+                        <core-button-with-spinner *ngIf="!processor.locked" [loading]="notification.updating">
+                            <ion-toggle [(ngModel)]="processor.enabled" (ngModelChange)="changePreference(notification, processor)">
+                            </ion-toggle>
+                        </core-button-with-spinner>
+                        <span class="text-gray" *ngIf="processor.locked">
+                            {{ processor.lockedmessage }}
+                        </span>
+                    </ng-container>
+                    <span *ngIf="preferences.disableall" class="text-gray">{{ 'core.settings.disabled' | translate }}</span>
+                </ion-item>
+            </ng-container>
+        </ion-card>
+    </ng-container>
+</ng-template>
diff --git a/src/addons/messages/pages/settings/settings.page.ts b/src/addons/messages/pages/settings/settings.page.ts
index b986e55b3..06b4902b1 100644
--- a/src/addons/messages/pages/settings/settings.page.ts
+++ b/src/addons/messages/pages/settings/settings.page.ts
@@ -27,6 +27,7 @@ import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreConstants } from '@/core/constants';
 import { IonRefresher } from '@ionic/angular';
+import { AddonNotificationsPreferencesNotificationProcessorState } from '@addons/notifications/services/notifications';
 
 /**
  * Page that displays the messages settings page.
@@ -50,14 +51,16 @@ export class AddonMessagesSettingsPage implements OnInit, OnDestroy {
     groupMessagingEnabled = false;
     sendOnEnter = false;
 
+    protected loggedInOffLegacyMode = false;
     protected previousContactableValue?: number | boolean;
 
     constructor() {
 
-        const currentSite = CoreSites.getCurrentSite();
-        this.advancedContactable = !!currentSite?.isVersionGreaterEqualThan('3.6');
-        this.allowSiteMessaging = !!currentSite?.canUseAdvancedFeature('messagingallusers');
+        const currentSite = CoreSites.getRequiredCurrentSite();
+        this.advancedContactable = !!currentSite.isVersionGreaterEqualThan('3.6');
+        this.allowSiteMessaging = !!currentSite.canUseAdvancedFeature('messagingallusers');
         this.groupMessagingEnabled = AddonMessages.isGroupMessagingEnabled();
+        this.loggedInOffLegacyMode = !currentSite.isVersionGreaterEqualThan('4.0');
 
         this.asyncInit();
     }
@@ -90,13 +93,16 @@ export class AddonMessagesSettingsPage implements OnInit, OnDestroy {
                     component.notifications = component.notifications.filter((notification) =>
                         notification.preferencekey == AddonMessagesProvider.NOTIFICATION_PREFERENCES_KEY);
 
-                    component.notifications.forEach((notification) => {
-                        notification.processors.forEach(
-                            (processor: AddonMessagesMessagePreferencesNotificationProcessorFormatted) => {
-                                processor.checked = processor.loggedin.checked || processor.loggedoff.checked;
-                            },
-                        );
-                    });
+                    if (this.loggedInOffLegacyMode) {
+                        // Load enabled from loggedin / loggedoff values.
+                        component.notifications.forEach((notification) => {
+                            notification.processors.forEach(
+                                (processor) => {
+                                    processor.enabled = processor.loggedin.checked || processor.loggedoff.checked;
+                                },
+                            );
+                        });
+                    }
                 }
             }
 
@@ -165,74 +171,70 @@ export class AddonMessagesSettingsPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Change the value of a certain preference.
+     * Change the value of a certain preference. Versions 3.6 onwards.
      *
      * @param notification Notification object.
-     * @param state State name, ['loggedin', 'loggedoff'].
      * @param processor Notification processor.
      */
     async changePreference(
         notification: AddonMessagesMessagePreferencesNotificationFormatted,
-        state: string,
-        processor: AddonMessagesMessagePreferencesNotificationProcessorFormatted,
+        processor: AddonMessagesMessagePreferencesNotificationProcessor,
     ): Promise<void> {
+        // Update both states at the same time.
+        let value = notification.processors
+            .filter((processor) => processor.enabled)
+            .map((processor) => processor.name)
+            .join(',');
 
-        const valueArray: string[] = [];
-        let value = 'none';
+        if (value == '') {
+            value = 'none';
+        }
 
-        if (this.groupMessagingEnabled) {
-            // Update both states at the same time.
-            const promises: Promise<void>[] = [];
-
-            notification.processors.forEach((processor: AddonMessagesMessagePreferencesNotificationProcessorFormatted) => {
-                if (processor.checked) {
-                    valueArray.push(processor.name);
-                }
-            });
-
-            if (value.length > 0) {
-                value = valueArray.join(',');
-            }
-
-            notification.updating = true;
+        notification.updating = true;
 
+        const promises: Promise<void>[] = [];
+        if (this.loggedInOffLegacyMode) {
             promises.push(CoreUser.updateUserPreference(notification.preferencekey + '_loggedin', value));
             promises.push(CoreUser.updateUserPreference(notification.preferencekey + '_loggedoff', value));
-
-            try {
-                await Promise.all(promises);
-                // Update the preferences since they were modified.
-                this.updatePreferencesAfterDelay();
-            } catch (error) {
-                // Show error and revert change.
-                CoreDomUtils.showErrorModal(error);
-                processor.checked = !processor.checked;
-            } finally {
-                notification.updating = false;
-            }
-
-            return;
+        }  else {
+            promises.push(CoreUser.updateUserPreference(notification.preferencekey + '_enabled', value));
         }
 
+        try {
+            await Promise.all(promises);
+            // Update the preferences since they were modified.
+            this.updatePreferencesAfterDelay();
+        } catch (error) {
+            // Show error and revert change.
+            CoreDomUtils.showErrorModal(error);
+            processor.enabled = !processor.enabled;
+        } finally {
+            notification.updating = false;
+        }
+    }
+
+    /**
+     * Change the value of a certain preference. Only on version 3.5.
+     *
+     * @param notification Notification object.
+     * @param processor Notification processor.
+     * @param state State name, ['loggedin', 'loggedoff'].
+     */
+    async changePreferenceLegacy(
+        notification: AddonMessagesMessagePreferencesNotificationFormatted,
+        processor: AddonMessagesMessagePreferencesNotificationProcessor,
+        state: 'loggedin' | 'loggedoff',
+    ): Promise<void> {
         // Update only the specified state.
-        const processorState = processor[state];
+        const processorState: AddonNotificationsPreferencesNotificationProcessorState = processor[state];
         const preferenceName = notification.preferencekey + '_' + processorState.name;
 
-        notification.processors.forEach((processor) => {
-            if (processor[state].checked) {
-                valueArray.push(processor.name);
-            }
-        });
+        const value = notification.processors
+            .filter((processor) => processor[state].checked)
+            .map((processor) => processor.name)
+            .join(',');
 
-        if (value.length > 0) {
-            value = valueArray.join(',');
-        }
-
-        if (!notification.updating) {
-            notification.updating = {};
-        }
-
-        notification.updating[state] = true;
+        notification['updating'+state] = true;
         try {
             await CoreUser.updateUserPreference(preferenceName, value);
             // Update the preferences since they were modified.
@@ -242,7 +244,7 @@ export class AddonMessagesSettingsPage implements OnInit, OnDestroy {
             CoreDomUtils.showErrorModal(error);
             processorState.checked = !processorState.checked;
         } finally {
-            notification.updating[state] = false;
+            notification['updating'+state] = false;
         }
     }
 
@@ -288,12 +290,7 @@ export class AddonMessagesSettingsPage implements OnInit, OnDestroy {
  * Message preferences notification with some caclulated data.
  */
 type AddonMessagesMessagePreferencesNotificationFormatted = AddonMessagesMessagePreferencesNotification & {
-    updating?: boolean | {[state: string]: boolean}; // Calculated in the app. Whether the notification is being updated.
-};
-
-/**
- * Message preferences notification processor with some caclulated data.
- */
-type AddonMessagesMessagePreferencesNotificationProcessorFormatted = AddonMessagesMessagePreferencesNotificationProcessor & {
-    checked?: boolean; // Calculated in the app. Whether the processor is checked either for loggedin or loggedoff.
+    updating?: boolean; // Calculated in the app. Whether the notification is being updated.
+    updatingloggedin?: boolean; // Calculated in the app. Whether the notification is being updated.
+    updatingloggedoff?: boolean; // Calculated in the app. Whether the notification is being updated.
 };
diff --git a/src/addons/messages/services/messages.ts b/src/addons/messages/services/messages.ts
index ba07393c5..c53ddfac3 100644
--- a/src/addons/messages/services/messages.ts
+++ b/src/addons/messages/services/messages.ts
@@ -32,6 +32,7 @@ import { makeSingleton } from '@singletons';
 import { CoreError } from '@classes/errors/error';
 import { AddonMessagesSyncEvents, AddonMessagesSyncProvider } from './messages-sync';
 import { CoreWSError } from '@classes/errors/wserror';
+import { AddonNotificationsPreferencesNotificationProcessorState } from '@addons/notifications/services/notifications';
 
 const ROOT_CACHE_KEY = 'mmaMessages:';
 
@@ -3047,16 +3048,9 @@ export type AddonMessagesMessagePreferencesNotificationProcessor = {
     locked: boolean; // Is locked by admin?.
     lockedmessage?: string; // @since 3.6. Text to display if locked.
     userconfigured: number; // Is configured?.
-    loggedin: {
-        name: string; // Name.
-        displayname: string; // Display name.
-        checked: boolean; // Is checked?.
-    };
-    loggedoff: {
-        name: string; // Name.
-        displayname: string; // Display name.
-        checked: boolean; // Is checked?.
-    };
+    enabled?: boolean; // @since 4.0. Processor enabled.
+    loggedin: AddonNotificationsPreferencesNotificationProcessorState; // @deprecated removed on 4.0.
+    loggedoff: AddonNotificationsPreferencesNotificationProcessorState; // @deprecated removed on 4.0.
 };
 
 /**
diff --git a/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html b/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
index f17a5dca5..639d40c26 100644
--- a/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
+++ b/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
@@ -20,7 +20,7 @@
     </ion-item-divider>
     <ion-item class="ion-text-wrap" *ngIf="wordLimitEnabled && words >= 0">
         <ion-label>
-            <h2>{{ 'addon.mod_assign.wordlimit' | translate }}</h2>
+            <h2>{{ 'addon.mod_assign.wordlimit' | translate }}</h2>
             <p>{{ 'core.numwords' | translate: {'$a': words + ' / ' + wordLimit} }}</p>
         </ion-label>
     </ion-item>
diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html
index 09ea67c71..c23057906 100644
--- a/src/addons/mod/forum/components/post/post.html
+++ b/src/addons/mod/forum/components/post/post.html
@@ -1,5 +1,5 @@
 <div class="addon-mod_forum-post">
-    <ng-container *ngIf="!formData.isEditing || !showForm">
+    <ng-container *ngIf="!formData.isEditing || !showForm">
         <ion-card-header class="ion-text-wrap ion-no-padding" id="addon-mod_forum-post-{{post.id}}">
             <ion-item class="ion-text-wrap" [class.highlight]="highlight" lines="none">
                 <ion-label>
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index bdeaa056d..bbad8ec56 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -101,7 +101,7 @@
                 </ng-container>
             </ion-button>
 
-            <ion-button *ngIf="isIOS && (!shouldOpenInBrowser || !isOnline)" expand="block" class="ion-margin"
+            <ion-button *ngIf="isIOS && (!shouldOpenInBrowser || !isOnline)" expand="block" class="ion-margin"
                 (click)="open(openFileAction.OPEN_WITH)">
                 <ion-icon name="far-share-square" slot="start" aria-hidden="true"></ion-icon>
                 {{ 'core.openwith' | translate }}
diff --git a/src/addons/notifications/pages/settings/settings.html b/src/addons/notifications/pages/settings/settings.html
index cafdb246d..6bd5e89d8 100644
--- a/src/addons/notifications/pages/settings/settings.html
+++ b/src/addons/notifications/pages/settings/settings.html
@@ -35,75 +35,144 @@
         </ion-card>
 
         <!-- Show processor selector. -->
-        <core-combobox *ngIf="preferences && preferences.processors && preferences.processors.length > 0"
-            [selection]="currentProcessor!.name" (onChange)="changeProcessor($event)">
+        <core-combobox *ngIf="preferences && preferences.processors && preferences.processors.length > 0" [selection]="currentProcessorName"
+            (onChange)="changeProcessor($event)">
             <ion-select-option class="ion-text-wrap" *ngFor="let processor of preferences.processors" [value]="processor.name">
                 {{ processor.displayname }}
             </ion-select-option>
         </core-combobox>
 
-        <ion-card list *ngFor="let component of components" class="ion-margin-top">
-            <ion-item-divider class="ion-text-wrap">
-                <ion-grid class="ion-no-padding">
-                    <ion-row class="ion-no-padding">
-                        <ion-col class="ion-no-padding">{{ component.displayname }}</ion-col>
-                        <ion-col size="2" class="ion-text-center ion-no-padding ion-hide-md-down">
-                            {{ 'core.settings.loggedin' | translate }}
-                        </ion-col>
-                        <ion-col size="2" class="ion-text-center ion-no-padding ion-hide-md-down">
-                            {{ 'core.settings.loggedoff' | translate }}
-                        </ion-col>
-                    </ion-row>
-                </ion-grid>
-            </ion-item-divider>
-            <ng-container *ngFor="let notification of component.notifications">
-                <!-- Tablet view -->
-                <ion-grid class="ion-text-wrap ion-hide-md-down addon-notifications-table-content">
-                    <ion-row class="ion-align-items-center">
-                        <ion-col class="ion-margin-horizontal">{{ notification.displayname }}</ion-col>
-                        <ion-col size="2" class="ion-text-center" *ngFor="let state of ['loggedin', 'loggedoff']">
-                            <!-- If notifications enabled, show toggle. -->
-                            <ion-spinner [hidden]="!preferences!.enableall ||
-                                !(notification.processorsByName[currentProcessor!.name][state] &&
-                                notification.processorsByName[currentProcessor!.name][state].updating)">
-                            </ion-spinner>
-                            <ion-toggle *ngIf="preferences!.enableall && !notification.processorsByName[currentProcessor!.name].locked"
-                                [(ngModel)]="notification.processorsByName[currentProcessor!.name][state].checked"
-                                (ngModelChange)="changePreference(notification, state)"
-                                [disabled]="notification.processorsByName[currentProcessor!.name][state].updating">
-                            </ion-toggle>
-                            <span class="text-gray"
-                                *ngIf="preferences!.enableall && notification.processorsByName[currentProcessor!.name].locked">
-                                {{'core.settings.locked' | translate }}
-                            </span>
-                            <!-- If notifications are disabled, show "Disabled" instead of toggle. -->
-                            <span *ngIf="!preferences!.enableall">{{ 'core.settings.disabled' | translate }}</span>
-                        </ion-col>
-                    </ion-row>
-                </ion-grid>
+        <ng-container *ngIf="loggedInOffLegacyMode">
+            <ng-container *ngTemplateOutlet="legacySettings; context: {preferences: preferences}"></ng-container>
+        </ng-container>
 
-                <!-- Phone view -->
-                <ion-list-header class="ion-text-wrap ion-no-margin ion-hide-md-up">
-                    {{ notification.displayname }}
-                </ion-list-header>
-                <!-- If notifications enabled, show toggles. If disabled, show "Disabled" instead of toggle. -->
-                <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" class="ion-text-wrap ion-hide-md-up" lines="none">
-                    <ion-label>{{ 'core.settings.' + state | translate }}</ion-label>
-                    <ion-spinner slot="end" *ngIf="preferences!.enableall && (notification.processorsByName[currentProcessor!.name][state] &&
-                        notification.processorsByName[currentProcessor!.name][state].updating)">
-                    </ion-spinner>
-                    <ion-toggle slot="end" *ngIf="preferences!.enableall && !notification.processorsByName[currentProcessor!.name].locked"
-                        [(ngModel)]="notification.processorsByName[currentProcessor!.name][state].checked"
-                        (ngModelChange)="changePreference(notification, state)"
-                        [disabled]="notification.processorsByName[currentProcessor!.name][state].updating">
-                    </ion-toggle>
-                    <span slot="end" *ngIf="preferences!.enableall && notification.processorsByName[currentProcessor!.name].locked"
-                        class="text-gray">
-                        {{'core.settings.locked' | translate }}
-                    </span>
-                    <ion-note slot="end" *ngIf="!preferences!.enableall">{{ 'core.settings.disabled' | translate }}</ion-note>
-                </ion-item>
-            </ng-container>
-        </ion-card>
+        <ng-container *ngIf="!loggedInOffLegacyMode">
+            <ng-container *ngTemplateOutlet="settings; context: {preferences: preferences}"></ng-container>
+        </ng-container>
     </core-loading>
 </ion-content>
+
+
+<!-- 3.11 or downwards version -->
+<ng-template #legacySettings let-preferences="preferences">
+    <ion-card *ngFor="let component of components" class="ion-margin-top">
+        <ion-card-header class="ion-no-padding">
+            <ion-item class="ion-text-wrap divider">
+                <ion-label class="ion-text-wrap">
+                    <ion-row class="ion-no-padding">
+                        <ion-col class="ion-no-padding">
+                            <p class="item-heading">{{ component.displayname }}</p>
+                        </ion-col>
+                        <ion-col size="2" class="ion-text-center ion-no-padding ion-hide-md-down">
+                            <p>{{ 'core.settings.loggedin' | translate }}</p>
+                        </ion-col>
+                        <ion-col size="2" class="ion-text-center ion-no-padding ion-hide-md-down">
+                            <p>{{ 'core.settings.loggedoff' | translate }}</p>
+                        </ion-col>
+                    </ion-row>
+                </ion-label>
+            </ion-item>
+        </ion-card-header>
+        <ng-container *ngFor="let notification of component.notifications">
+            <!-- Tablet view -->
+            <ion-item class="ion-text-wrap ion-hide-md-down addon-notifications-table-content only-links">
+                <ion-label>
+                    <ion-row class="ion-no-padding ion-align-items-center">
+                        <ion-col class="ion-margin-horizontal ion-no-padding">
+                            <p class="item-heading">{{ notification.displayname }}</p>
+                        </ion-col>
+                        <ion-col size="2" class="ion-text-center ion-no-padding" *ngFor="let state of ['loggedin', 'loggedoff']">
+                            <ng-container *ngIf="preferences!.enableall && notification.processorsByName[currentProcessorName][state]">
+                                <!-- If notifications enabled, show toggle. -->
+                                <core-button-with-spinner *ngIf="!notification.processorsByName[currentProcessorName].locked"
+                                    [loading]="notification.processorsByName[currentProcessorName][state].updating">
+                                    <ion-toggle [(ngModel)]="notification.processorsByName[currentProcessorName][state].checked"
+                                        (ngModelChange)="changePreferenceLegacy(notification, state)">
+                                    </ion-toggle>
+                                </core-button-with-spinner>
+                                <span class="text-gray" *ngIf="notification.processorsByName[currentProcessorName].locked &&
+                                    notification.processorsByName[currentProcessorName][state].checked">
+                                    {{'core.settings.forced' | translate }}
+                                </span>
+                                <span class="text-gray" *ngIf="notification.processorsByName[currentProcessorName].locked &&
+                                    !notification.processorsByName[currentProcessorName][state].checked">
+                                    {{'core.settings.disallowed' | translate }}
+                                </span>
+                            </ng-container>
+                            <!-- If notifications are disabled, show "Disabled" instead of toggle. -->
+                            <span *ngIf="!preferences!.enableall" class="text-gray">{{ 'core.settings.disabled' | translate }}</span>
+                        </ion-col>
+                    </ion-row>
+                </ion-label>
+            </ion-item>
+
+            <!-- Phone view -->
+            <ion-item class="ion-text-wrap ion-no-margin ion-hide-md-up" lines="none">
+                <p class="item-heading">{{ notification.displayname }}</p>
+            </ion-item>
+            <!-- If notifications enabled, show toggles. If disabled, show "Disabled" instead of toggle. -->
+            <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" class="ion-text-wrap ion-hide-md-up" lines="none">
+                <ion-label class="ion-margin-horizontal">
+                    <p>{{ 'core.settings.' + state | translate }}</p>
+                </ion-label>
+                <div slot="end" *ngIf="preferences!.enableall && notification.processorsByName[currentProcessorName][state]">
+                    <core-button-with-spinner *ngIf="!notification.processorsByName[currentProcessorName].locked"
+                        [loading]="notification.processorsByName[currentProcessorName][state].updating">
+                        <ion-toggle *ngIf="!notification.processorsByName[currentProcessorName].locked"
+                            [(ngModel)]="notification.processorsByName[currentProcessorName][state].checked"
+                            (ngModelChange)="changePreferenceLegacy(notification, state)">
+                        </ion-toggle>
+                    </core-button-with-spinner>
+                    <span class="text-gray" *ngIf="notification.processorsByName[currentProcessorName].locked &&
+                        notification.processorsByName[currentProcessorName][state].checked">
+                        {{'core.settings.forced' | translate }}
+                    </span>
+                    <span class="text-gray" *ngIf="notification.processorsByName[currentProcessorName].locked &&
+                        !notification.processorsByName[currentProcessorName][state].checked">
+                        {{'core.settings.disallowed' | translate }}
+                    </span>
+                </div>
+                <span class="text-gray" slot="end" *ngIf="!preferences!.enableall">{{ 'core.settings.disabled' | translate }}</span>
+            </ion-item>
+        </ng-container>
+    </ion-card>
+</ng-template>
+
+<!-- 4.0 or downwards version -->
+<ng-template #settings let-preferences="preferences">
+    <ion-card *ngFor="let component of components" class="ion-margin-top">
+        <ion-item-divider class="ion-text-wrap">
+            <ion-label>
+                <p class="item-heading">{{ component.displayname }}</p>
+            </ion-label>
+        </ion-item-divider>
+        <ng-container *ngFor="let notification of component.notifications">
+            <!-- If notifications enabled, show toggles. If disabled, show "Disabled" instead of toggle. -->
+            <ion-item class="ion-text-wrap" lines="none">
+                <ion-label>
+                    <p>{{ notification.displayname }}</p>
+                </ion-label>
+
+                <div slot="end" *ngIf="preferences!.enableall">
+                    <core-button-with-spinner *ngIf="!notification.processorsByName[currentProcessorName].locked"
+                        [loading]="notification.processorsByName[currentProcessorName].updating">
+                        <ion-toggle *ngIf="!notification.processorsByName[currentProcessorName].locked"
+                            [(ngModel)]="notification.processorsByName[currentProcessorName].enabled"
+                            (ngModelChange)="changePreference(notification)">
+                        </ion-toggle>
+                    </core-button-with-spinner>
+                    <span class="text-gray" *ngIf=" notification.processorsByName[currentProcessorName].locked &&
+                        notification.processorsByName[currentProcessorName].enabled">
+                        {{'core.settings.forced' | translate }}
+                    </span>
+                    <span class="text-gray" *ngIf=" notification.processorsByName[currentProcessorName].locked &&
+                        !notification.processorsByName[currentProcessorName].enabled">
+                        {{'core.settings.disallowed' | translate }}
+                    </span>
+                </div>
+                <span class="text-gray" slot="end" *ngIf="!preferences!.enableall">{{ 'core.settings.disabled' | translate }}</span>
+            </ion-item>
+        </ng-container>
+    </ion-card>
+
+</ng-template>
diff --git a/src/addons/notifications/pages/settings/settings.scss b/src/addons/notifications/pages/settings/settings.scss
index 8fea99c17..d224357cb 100644
--- a/src/addons/notifications/pages/settings/settings.scss
+++ b/src/addons/notifications/pages/settings/settings.scss
@@ -1,5 +1,3 @@
-:host {
-    .addon-notifications-table-content ion-row {
-        min-height: 35px;
-    }
+.addon-notifications-table-content ion-row {
+    min-height: 35px;
 }
diff --git a/src/addons/notifications/pages/settings/settings.ts b/src/addons/notifications/pages/settings/settings.ts
index d8cc886d3..a9fbe1210 100644
--- a/src/addons/notifications/pages/settings/settings.ts
+++ b/src/addons/notifications/pages/settings/settings.ts
@@ -27,7 +27,6 @@ import { CoreError } from '@classes/errors/error';
 import { CoreEvents } from '@singletons/events';
 import {
     AddonNotifications,
-    AddonNotificationsPreferencesProcessor,
     AddonNotificationsPreferencesNotificationProcessorState,
 } from '../../services/notifications';
 import {
@@ -51,16 +50,20 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
 
     preferences?: AddonNotificationsPreferencesFormatted;
     components?: AddonNotificationsPreferencesComponentFormatted[];
-    currentProcessor?: AddonNotificationsPreferencesProcessor;
+    currentProcessorName = 'airnotifier';
     preferencesLoaded = false;
     notificationSound = false;
     canChangeSound: boolean;
     processorHandlers: AddonMessageOutputHandlerData[] = [];
+    loggedInOffLegacyMode = false;
 
     protected updateTimeout?: number;
 
     constructor() {
         this.canChangeSound = CoreLocalNotifications.canDisableSound();
+
+        const currentSite = CoreSites.getRequiredCurrentSite();
+        this.loggedInOffLegacyMode = !currentSite.isVersionGreaterEqualThan('4.0');
     }
 
     /**
@@ -83,20 +86,20 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
         try {
             const preferences = await AddonNotifications.getNotificationPreferences();
 
-            if (!this.currentProcessor) {
-                // Initialize current processor. Load "Mobile" (airnotifier) if available.
-                this.currentProcessor = AddonNotificationsHelper.getProcessor(preferences.processors, 'airnotifier');
+            // Initialize current processor. Load "Mobile" (airnotifier) if available.
+            let currentProcessor = preferences.processors.find((processor) => processor.name == this.currentProcessorName);
+            if (!currentProcessor) {
+                currentProcessor = preferences.processors[0];
             }
 
-            if (!this.currentProcessor) {
+            if (!currentProcessor) {
                 // Shouldn't happen.
                 throw new CoreError('No processor found');
             }
 
             preferences.enableall = !preferences.disableall;
             this.preferences = AddonNotificationsHelper.formatPreferences(preferences);
-            this.loadProcessor(this.currentProcessor);
-
+            this.loadProcessor(currentProcessor);
         } catch (error) {
             CoreDomUtils.showErrorModal(error);
         } finally {
@@ -114,7 +117,7 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
             return;
         }
 
-        this.currentProcessor = processor;
+        this.currentProcessorName = processor.name;
         this.processorHandlers = [];
         this.components = AddonNotificationsHelper.getProcessorComponents(
             processor.name,
@@ -199,27 +202,21 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
      * @param state State name, ['loggedin', 'loggedoff'].
      * @return Promise resolved when done.
      */
-    async changePreference(notification: AddonNotificationsPreferencesNotificationFormatted, state: string): Promise<void> {
-        const processor = notification.processorsByName?.[this.currentProcessor?.name || ''];
+    async changePreferenceLegacy(notification: AddonNotificationsPreferencesNotificationFormatted, state: string): Promise<void> {
+        const processor = notification.processorsByName?.[this.currentProcessorName];
         if (!processor) {
             return;
         }
 
         const processorState: ProcessorStateFormatted = processor[state];
         const preferenceName = notification.preferencekey + '_' + processorState.name;
-        let value: string | undefined;
 
-        notification.processors.forEach((processor) => {
-            if (processor[state].checked) {
-                if (!value) {
-                    value = processor.name;
-                } else {
-                    value += ',' + processor.name;
-                }
-            }
-        });
+        let value = notification.processors
+            .filter((processor) => processor[state].checked)
+            .map((processor) => processor.name)
+            .join(',');
 
-        if (!value) {
+        if (value == '') {
             value = 'none';
         }
 
@@ -239,6 +236,45 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
         }
     }
 
+    /**
+     * Change the value of a certain preference.
+     *
+     * @param notification Notification object.
+     * @return Promise resolved when done.
+     */
+    async changePreference(notification: AddonNotificationsPreferencesNotificationFormatted): Promise<void> {
+        const processor = notification.processorsByName?.[this.currentProcessorName];
+        if (!processor) {
+            return;
+        }
+
+        const preferenceName = notification.preferencekey + '_enabled';
+
+        let value = notification.processors
+            .filter((processor) => processor.enabled)
+            .map((processor) => processor.name)
+            .join(',');
+
+        if (value == '') {
+            value = 'none';
+        }
+
+        processor.updating = true;
+
+        try {
+            await CoreUser.updateUserPreference(preferenceName, value);
+
+            // Update the preferences since they were modified.
+            this.updatePreferencesAfterDelay();
+        } catch (error) {
+            // Show error and revert change.
+            CoreDomUtils.showErrorModal(error);
+            processor.enabled = !processor.enabled;
+        } finally {
+            processor.updating = false;
+        }
+    }
+
     /**
      * Enable all notifications changed.
      *
@@ -294,6 +330,8 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy {
 
 /**
  * State in notification processor in notification preferences component with some calculated data.
+ *
+ * @deprecated 4.0
  */
 type ProcessorStateFormatted = AddonNotificationsPreferencesNotificationProcessorState & {
     updating?: boolean; // Calculated in the app. Whether the state is being updated.
diff --git a/src/addons/notifications/services/notifications-helper.ts b/src/addons/notifications/services/notifications-helper.ts
index 8ccd98f55..8eb24bfdc 100644
--- a/src/addons/notifications/services/notifications-helper.ts
+++ b/src/addons/notifications/services/notifications-helper.ts
@@ -77,34 +77,6 @@ export class AddonNotificationsHelperProvider {
         return formattedPreferences;
     }
 
-    /**
-     * Get a certain processor from a list of processors.
-     *
-     * @param processors List of processors.
-     * @param name Name of the processor to get.
-     * @param fallback True to return first processor if not found, false to not return any. Defaults to true.
-     * @return Processor.
-     */
-    getProcessor(
-        processors: AddonNotificationsPreferencesProcessor[],
-        name: string,
-        fallback: boolean = true,
-    ): AddonNotificationsPreferencesProcessor | undefined {
-        if (!processors || !processors.length) {
-            return;
-        }
-
-        const processor = processors.find((processor) => processor.name == name);
-        if (processor) {
-            return processor;
-        }
-
-        // Processor not found, return first if requested.
-        if (fallback) {
-            return processors[0];
-        }
-    }
-
     /**
      * Return the components and notifications that have a certain processor.
      *
@@ -166,7 +138,11 @@ export type AddonNotificationsPreferencesComponentFormatted = Omit<AddonNotifica
  * Preferences notification with some calculated data.
  */
 export type AddonNotificationsPreferencesNotificationFormatted = AddonNotificationsPreferencesNotification & {
-    processorsByName?: Record<string, AddonNotificationsPreferencesNotificationProcessor>; // Calculated in the app.
+    processorsByName?: Record<string, AddonNotificationsPreferencesNotificationProcessorFormatted>; // Calculated in the app.
+};
+
+type AddonNotificationsPreferencesNotificationProcessorFormatted = AddonNotificationsPreferencesNotificationProcessor & {
+    updating?: boolean; // Calculated in the app. Whether the state is being updated.
 };
 
 /**
diff --git a/src/addons/notifications/services/notifications.ts b/src/addons/notifications/services/notifications.ts
index 86b5f5f49..1fab101db 100644
--- a/src/addons/notifications/services/notifications.ts
+++ b/src/addons/notifications/services/notifications.ts
@@ -435,19 +435,24 @@ export type AddonNotificationsPreferencesNotificationProcessor = {
     locked: boolean; // Is locked by admin?.
     lockedmessage?: string; // @since 3.6. Text to display if locked.
     userconfigured: number; // Is configured?.
-    loggedin: AddonNotificationsPreferencesNotificationProcessorState;
-    loggedoff: AddonNotificationsPreferencesNotificationProcessorState;
+    enabled?: boolean; // @since 4.0. Processor enabled.
+    loggedin: AddonNotificationsPreferencesNotificationProcessorState; // @deprecated removed on 4.0.
+    loggedoff: AddonNotificationsPreferencesNotificationProcessorState; // @deprecated removed on 4.0.
 };
 
 /**
  * State in notification processor in notification preferences component.
+ *
+ * @deprecated removed on 4.0.
  */
 export type AddonNotificationsPreferencesNotificationProcessorState = {
-    name: string; // Name.
+    name: 'loggedoff' | 'loggedin'; // Name.
     displayname: string; // Display name.
     checked: boolean; // Is checked?.
 };
 
+export type AddonNotificationsPreferencesNotificationProcessorStateSetting = 'loggedoff' | 'loggedin' | 'enabled';
+
 /**
  * Params of core_message_get_messages WS.
  */
diff --git a/src/addons/qtype/essay/component/addon-qtype-essay.html b/src/addons/qtype/essay/component/addon-qtype-essay.html
index dffb87858..5fb2e2e29 100644
--- a/src/addons/qtype/essay/component/addon-qtype-essay.html
+++ b/src/addons/qtype/essay/component/addon-qtype-essay.html
@@ -69,7 +69,7 @@
     <!-- Reviewing the question. -->
     <ng-container *ngIf="review">
         <!-- Answer to the question and attachments (reviewing). -->
-        <ion-item class="ion-text-wrap" *ngIf="essayQuestion.answer || essayQuestion.answer == ''">
+        <ion-item class="ion-text-wrap" *ngIf="essayQuestion.answer || essayQuestion.answer == ''">
             <ion-label>
                 <core-format-text [ngClass]='{"core-monospaced": essayQuestion.isMonospaced}' [component]="component"
                     [componentId]="componentId" [text]="essayQuestion.answer" [contextLevel]="contextLevel"
diff --git a/src/addons/userprofilefield/datetime/component/addon-user-profile-field-datetime.html b/src/addons/userprofilefield/datetime/component/addon-user-profile-field-datetime.html
index 98a7e153b..77f12bae2 100644
--- a/src/addons/userprofilefield/datetime/component/addon-user-profile-field-datetime.html
+++ b/src/addons/userprofilefield/datetime/component/addon-user-profile-field-datetime.html
@@ -11,7 +11,7 @@
     <ion-label position="stacked">
         <span [core-mark-required]="required">{{ field.name }}</span>
     </ion-label>
-    <ion-datetime [formControlName]="modelName" [placeholder]="'core.choosedots' | translate" [displayFormat]="format" [max]="max"
+    <ion-datetime [formControlName]="modelName" [placeholder]="'core.choosedots' | translate" [displayFormat]="format" [max]="max"
         [min]="min" [monthNames]="monthNames">
     </ion-datetime>
     <core-input-errors [control]="form.controls[modelName]"></core-input-errors>
diff --git a/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html b/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html
index b31734b71..3816c2090 100644
--- a/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html
+++ b/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html
@@ -14,9 +14,9 @@
     <ion-label position="stacked">
         <span [core-mark-required]="required">{{ field.name }}</span>
     </ion-label>
-    <ion-select [formControlName]="modelName" [placeholder]="'core.choosedots' | translate" interface="action-sheet"
+    <ion-select [formControlName]="modelName" [placeholder]="'core.choosedots' | translate" interface="action-sheet"
         [interfaceOptions]="{header: field.name}">
-        <ion-select-option value="">{{ 'core.choosedots' | translate }}</ion-select-option>
+        <ion-select-option value="">{{ 'core.choosedots' | translate }}</ion-select-option>
         <ion-select-option *ngFor="let option of options" [value]="option">{{option}}</ion-select-option>
     </ion-select>
     <core-input-errors [control]="form.controls[modelName]"></core-input-errors>
diff --git a/src/core/components/attachments/core-attachments.html b/src/core/components/attachments/core-attachments.html
index 46fbc7693..f18d06124 100644
--- a/src/core/components/attachments/core-attachments.html
+++ b/src/core/components/attachments/core-attachments.html
@@ -1,7 +1,7 @@
 <ion-item class="ion-text-wrap">
     <ion-label>
         <span *ngIf="maxSubmissionsReadable">
-            {{ 'core.maxsizeandattachments' | translate:{$a: {size: maxSizeReadable, attachments: maxSubmissionsReadable} } }}
+            {{ 'core.maxsizeandattachments' | translate:{$a: {size: maxSizeReadable, attachments: maxSubmissionsReadable} } }}
         </span>
         <span *ngIf="!maxSubmissionsReadable">{{ 'core.maxfilesize' | translate:{$a: maxSizeReadable} }}</span>
         <span [core-mark-required]="required" class="core-mark-required"></span>
diff --git a/src/core/components/combobox/combobox.scss b/src/core/components/combobox/combobox.scss
index 2548e9f1b..bef06c30c 100644
--- a/src/core/components/combobox/combobox.scss
+++ b/src/core/components/combobox/combobox.scss
@@ -28,7 +28,6 @@
         --padding-top: 8px;
         --padding-end: 8px;
         --padding-bottom: 8px;
-        --padding-start: 8px;
 
         &.md {
             --background-activated-opacity: 0;
@@ -40,6 +39,14 @@
             --background-focused-opacity: .15;
         }
     }
+
+    ion-button {
+        --padding-start: 8px;
+    }
+
+    ion-select {
+        --padding-start: 16px;
+    }
 }
 
 ion-select,
@@ -48,7 +55,7 @@ ion-button {
     color: var(--color);
     text-overflow: ellipsis;
     white-space: nowrap;
-    min-height: 25px;
+    min-height: 26px;
     overflow: hidden;
     margin: 8px;
     box-shadow: var(--box-shadow);
@@ -109,7 +116,7 @@ ion-button {
     }
 
     .select-text {
-        margin-inline-end: auto;
+        @include margin-horizontal(null, auto);
         overflow: hidden;
         text-overflow: ellipsis;
     }
diff --git a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
index a55256ca3..4fd22a35d 100644
--- a/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
+++ b/src/core/features/course/components/unsupported-module/core-course-unsupported-module.html
@@ -1,6 +1,6 @@
 <div class="ion-padding">
     <h2 *ngIf="!isDisabledInSite && isSupportedByTheApp">{{ 'core.whoops' | translate }}</h2>
-    <h2 *ngIf="isDisabledInSite || !isSupportedByTheApp">{{ 'core.uhoh' | translate }}</h2>
+    <h2 *ngIf="isDisabledInSite || !isSupportedByTheApp">{{ 'core.uhoh' | translate }}</h2>
 
     <p class="core-big" *ngIf="isDisabledInSite">{{ 'core.course.activitydisabled' | translate }}</p>
     <p class="core-big" *ngIf="!isDisabledInSite && isSupportedByTheApp">
@@ -9,7 +9,7 @@
     <p class="core-big" *ngIf="!isDisabledInSite && !isSupportedByTheApp">
         {{ 'core.course.activitynotyetviewableremoteaddon' | translate }}
     </p>
-    <p *ngIf="isDisabledInSite || !isSupportedByTheApp"><strong>{{ 'core.course.askadmintosupport' | translate }}</strong></p>
+    <p *ngIf="isDisabledInSite || !isSupportedByTheApp"><strong>{{ 'core.course.askadmintosupport' | translate }}</strong></p>
 
     <div *ngIf="module && module.url">
         <p><strong>{{ 'core.course.useactivityonbrowser' | translate }}</strong></p>
diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html
index 4cb9bad62..476c38c92 100644
--- a/src/core/features/course/pages/preview/preview.html
+++ b/src/core/features/course/pages/preview/preview.html
@@ -100,7 +100,7 @@
                 </ion-item>
                 <ion-item class="ion-text-wrap" *ngIf="paypalEnabled">
                     <ion-label>
-                        <p class="item-heading">{{ 'core.courses.paypalaccepted' | translate }}</p>
+                        <p class="item-heading">{{ 'core.courses.paypalaccepted' | translate }}</p>
                         <p *ngIf="isMobile">{{ 'core.paymentinstant' | translate }}</p>
                         <ion-button *ngIf="isMobile" expand="block" class="ion-margin-top" (click)="paypalEnrol()">
                             {{ 'core.courses.sendpaymentbutton' | translate }}
diff --git a/src/core/features/settings/lang.json b/src/core/features/settings/lang.json
index edaa16204..a7fe5e31f 100644
--- a/src/core/features/settings/lang.json
+++ b/src/core/features/settings/lang.json
@@ -29,6 +29,7 @@
     "disableall": "Disable notifications",
     "disabled": "Disabled",
     "disabledfeatures": "Disabled features",
+    "disallowed": "Disallowed",
     "displayformat": "Display format",
     "enabledownloadsection": "Enable download sections",
     "enablefirebaseanalytics": "Enable Firebase analytics",
@@ -43,6 +44,7 @@
     "filesystemroot": "File system root",
     "fontsize": "Text size",
     "fontsizecharacter": "A",
+    "forced": "Locked",
     "forcedsetting": "This setting has been forced by your site configuration.",
     "forcesafeareamargins": "Force safe area margins",
     "general": "General",
@@ -53,7 +55,6 @@
     "license": "Licence",
     "localnotifavailable": "Local notifications available",
     "locationhref": "Web view URL",
-    "locked": "Locked",
     "loggedin": "Online",
     "loggedoff": "Offline",
     "navigatorlanguage": "Navigator language",
diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.html b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
index ed8401cd8..54ffba79a 100644
--- a/src/core/features/settings/pages/deviceinfo/deviceinfo.html
+++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
@@ -33,7 +33,7 @@
         <ion-item (longPress)="copyItemInfo($event)" (click)="enableDevOptions()">
             <ion-label class="ion-text-wrap">
                 <h2>{{ 'core.settings.compilationinfo' | translate }}</h2>
-                <p *ngIf="deviceInfo.compilationTime">{{ deviceInfo.compilationTime | coreFormatDate: "LLL Z": false }}</p>
+                <p *ngIf="deviceInfo.compilationTime">{{ deviceInfo.compilationTime | coreFormatDate: "LLL Z": false }}</p>
                 <p *ngIf="deviceInfo.lastCommit">{{ deviceInfo.lastCommit }}</p>
             </ion-label>
         </ion-item>
diff --git a/src/core/features/settings/pages/site/site.html b/src/core/features/settings/pages/site/site.html
index 3361e02ab..24043ef35 100644
--- a/src/core/features/settings/pages/site/site.html
+++ b/src/core/features/settings/pages/site/site.html
@@ -18,7 +18,7 @@
         <core-loading [hideUntil]="handlers.loaded">
             <ion-list>
                 <ion-item *ngFor="let handler of handlers.items" [ngClass]="['core-settings-handler', handler.class]"
-                    [attr.aria-label]="handler.title | translate" detail="true" (click)="handlers.select(handler)" button
+                    [attr.aria-label]="handler.title | translate" detail="true" (click)="handlers.select(handler)" button
                     [attr.aria-current]="handlers.getItemAriaCurrent(handler)">
                     <ion-icon [name]="handler.icon" slot="start" *ngIf="handler.icon" aria-hidden="true">
                     </ion-icon>