diff --git a/src/addon/messages/pages/settings/settings.html b/src/addon/messages/pages/settings/settings.html
index 419d7ea71..8c0f58441 100644
--- a/src/addon/messages/pages/settings/settings.html
+++ b/src/addon/messages/pages/settings/settings.html
@@ -33,8 +33,9 @@
                             <ion-col col-2 text-center *ngFor="let state of ['loggedin', 'loggedoff']">
                                 <!-- If notifications not disabled, show toggle. -->
                                 <ion-spinner [hidden]="preferences.disableall || !(notification.updating && notification.updating[state])"></ion-spinner>
-                                <ion-toggle *ngIf="!preferences.disableall" [(ngModel)]="processor[state].checked" (ionChange)="changePreference(notification, state, processor)" [disabled]="processor.locked || (notification.updating && notification.updating[state])">
+                                <ion-toggle *ngIf="!preferences.disableall && !processor.locked" [(ngModel)]="processor[state].checked" (ionChange)="changePreference(notification, state, processor)" [disabled]="notification.updating && notification.updating[state]">
                                 </ion-toggle>
+                                <div padding class="text-gray" *ngIf="!preferences.disableall && processor.locked">{{'core.settings.locked' | translate }}</div>
                                 <!-- If notifications are disabled, show "Disabled" instead of toggle. -->
                                 <span *ngIf="preferences.disableall">{{ 'core.settings.disabled' | translate }}</span>
                             </ion-col>
@@ -45,8 +46,9 @@
                         <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" text-wrap class="hidden-tablet">
                             <ion-label>{{ 'core.settings.' + state | translate }}</ion-label>
                             <ion-spinner item-end *ngIf="!preferences.disableall && (notification.updating && notification.updating[state])"></ion-spinner>
-                            <ion-toggle item-end *ngIf="!preferences.disableall" [(ngModel)]="processor[state].checked" (ionChange)="changePreference(notification, state, processor)" [disabled]="processor.locked || (notification.updating && notification.updating[state])">
+                            <ion-toggle item-end *ngIf="!preferences.disableall && !processor.locked" [(ngModel)]="processor[state].checked" (ionChange)="changePreference(notification, state, processor)" [disabled]="notification.updating && notification.updating[state]">
                             </ion-toggle>
+                            <ion-note item-end *ngIf="!preferences.disableall && processor.locked">{{'core.settings.locked' | translate }}</ion-note>
                             <ion-note item-end *ngIf="preferences.disableall">{{ 'core.settings.disabled' | translate }}</ion-note>
                         </ion-item>
                     </ng-container>
diff --git a/src/addon/notifications/pages/settings/settings.html b/src/addon/notifications/pages/settings/settings.html
index e69bf1045..80ce698aa 100644
--- a/src/addon/notifications/pages/settings/settings.html
+++ b/src/addon/notifications/pages/settings/settings.html
@@ -34,9 +34,11 @@
             </ion-card>
 
             <!-- Show processor selector. -->
-            <ion-select *ngIf="preferences && preferences.processors && preferences.processors.length > 0" [ngModel]="currentProcessor.name" (ngModelChange)="changeProcessor($event)" interface="popover">
-                <ion-option *ngFor="let processor of preferences.processors" [value]="processor.name">{{ processor.displayname }}</ion-option>
-            </ion-select>
+            <div padding>
+                <ion-select *ngIf="preferences && preferences.processors && preferences.processors.length > 0" [ngModel]="currentProcessor.name" (ngModelChange)="changeProcessor($event)" interface="popover" class="core-button-select">
+                    <ion-option *ngFor="let processor of preferences.processors" [value]="processor.name">{{ processor.displayname }}</ion-option>
+                </ion-select>
+            </div>
 
             <ion-card list *ngFor="let component of components">
                 <ion-item-divider color="light" text-wrap>
@@ -53,8 +55,9 @@
                         <ion-col col-2 text-center *ngFor="let state of ['loggedin', 'loggedoff']">
                             <!-- If notifications not disabled, show toggle. -->
                             <ion-spinner [hidden]="preferences.disableall || !(notification.currentProcessor[state] && notification.currentProcessor[state].updating)"></ion-spinner>
-                            <ion-toggle *ngIf="!preferences.disableall" [(ngModel)]="notification.currentProcessor[state].checked" (ionChange)="changePreference(notification, state)" [disabled]="notification.currentProcessor.locked || notification.currentProcessor[state].updating">
+                            <ion-toggle *ngIf="!preferences.disableall && !notification.currentProcessor.locked" [(ngModel)]="notification.currentProcessor[state].checked" (ionChange)="changePreference(notification, state)" [disabled]="notification.currentProcessor[state].updating">
                             </ion-toggle>
+                            <div padding class="text-gray" *ngIf="!preferences.disableall && notification.currentProcessor.locked">{{'core.settings.locked' | translate }}</div>
                             <!-- If notifications are disabled, show "Disabled" instead of toggle. -->
                             <span *ngIf="preferences.disableall">{{ 'core.settings.disabled' | translate }}</span>
                         </ion-col>
@@ -65,8 +68,9 @@
                     <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" text-wrap class="hidden-tablet">
                         <ion-label>{{ 'core.settings.' + state | translate }}</ion-label>
                         <ion-spinner item-end *ngIf="!preferences.disableall && (notification.currentProcessor[state] && notification.currentProcessor[state].updating)"></ion-spinner>
-                        <ion-toggle item-end *ngIf="!preferences.disableall" [(ngModel)]="notification.currentProcessor[state].checked" (ionChange)="changePreference(notification, state)" [disabled]="notification.currentProcessor.locked || notification.currentProcessor[state].updating">
+                        <ion-toggle item-end *ngIf="!preferences.disableall && !notification.currentProcessor.locked" [(ngModel)]="notification.currentProcessor[state].checked" (ionChange)="changePreference(notification, state)" [disabled]="notification.currentProcessor[state].updating">
                         </ion-toggle>
+                        <ion-note item-end *ngIf="!preferences.disableall && notification.currentProcessor.locked">{{'core.settings.locked' | translate }}</ion-note>
                         <ion-note item-end *ngIf="preferences.disableall">{{ 'core.settings.disabled' | translate }}</ion-note>
                     </ion-item>
                 </ng-container>
diff --git a/src/core/settings/lang/en.json b/src/core/settings/lang/en.json
index 8cbe7c11a..86bbf006e 100644
--- a/src/core/settings/lang/en.json
+++ b/src/core/settings/lang/en.json
@@ -31,6 +31,7 @@
     "license": "License",
     "localnotifavailable": "Local notifications available",
     "locationhref": "Web view URL",
+    "locked": "Locked",
     "loggedin": "Online",
     "loggedoff": "Offline",
     "navigatorlanguage": "Navigator language",
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 2505ef59d..b83a4e539 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -153,6 +153,7 @@ $select-ios-placeholder-color: $core-select-placeholder-color;
 $radio-ios-disabled-opacity: .5 !default;
 $checkbox-ios-disabled-opacity: .5 !default;
 $toggle-ios-disabled-opacity: .5 !default;
+$note-ios-color: $gray-dark;
 
 // App Material Design Variables
 // --------------------------------------------------
@@ -171,6 +172,7 @@ $label-md-text-color: $text-color !default;
 $radio-md-disabled-opacity: .5 !default;
 $checkbox-md-disabled-opacity: .5 !default;
 $toggle-md-disabled-opacity: .5 !default;
+$note-md-color: $gray-dark;
 
 // App Windows Variables
 // --------------------------------------------------
@@ -188,6 +190,7 @@ $label-wp-text-color: $text-color !default;
 $radio-wp-disabled-opacity: .5 !default;
 $checkbox-wp-disabled-opacity: .5 !default;
 $toggle-wp-disabled-opacity: .5 !default;
+$note-wp-color: $gray-dark;
 
 // App Theme
 // --------------------------------------------------