diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html
index 5177df833..4ca58a438 100644
--- a/src/addons/calendar/pages/day/day.html
+++ b/src/addons/calendar/pages/day/day.html
@@ -53,7 +53,7 @@
             </ion-item>
         </ion-card>
 
-        <core-empty-box *ngIf="!filteredEvents || !filteredEvents.length" icon="fas-calendar"
+        <core-empty-box *ngIf="!filteredEvents || !filteredEvents.length" icon="fas-calendar" inline="true"
             [message]="'addon.calendar.noevents' | translate">
         </core-empty-box>
 
diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index 4cadd853f..98f596285 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -47,10 +47,6 @@
         @include margin(10px, 0, 0, 0);
     }
 
-    .core-loading-content {
-        display: contents;
-    }
-
     &.core-loading-noheight .core-loading-content {
         height: auto;
     }
diff --git a/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html b/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
index e3422805d..c3ce29d1c 100644
--- a/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
+++ b/src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html
@@ -48,7 +48,7 @@
             </button>
         </ion-slide>
         <ion-slide>
-            <button [disabled]="!rteEnabled" [attr.aria-pressed]="toolbarStyles.em" [title]=" 'core.editor.italic' | translate"
+            <button [disabled]="!rteEnabled" [attr.aria-pressed]="toolbarStyles.em" [title]="'core.editor.italic' | translate"
                 (click)="buttonAction($event, 'italic', 'em')" (keyup)="buttonAction($event, 'italic', 'em')"
                 (mousedown)="downAction($event)" (keydown)="downAction($event)">
                 <ion-icon name="fas-italic" aria-hidden="true"></ion-icon>
@@ -129,14 +129,14 @@
             </button>
         </ion-slide>
         <ion-slide>
-            <button [attr.aria-pressed]="!rteEnabled" [title]=" 'core.editor.toggle' | translate"
+            <button [attr.aria-pressed]="!rteEnabled" [title]="'core.editor.toggle' | translate"
                 (click)="toggleEditor($event)" (keyup)="toggleEditor($event)"
                 (mousedown)="downAction($event)" (keydown)="downAction($event)">
                 <ion-icon name="fas-code" aria-hidden="true"></ion-icon>
             </button>
         </ion-slide>
         <ion-slide *ngIf="isPhone">
-            <button [title]=" 'core.editor.hidetoolbar' | translate"
+            <button [title]="'core.editor.hidetoolbar' | translate"
                 (click)="hideToolbar($event)" (keyup)="hideToolbar($event)"
                 (mousedown)="downAction($event)" (keydown)="downAction($event)">
                 <ion-icon name="fas-times" aria-hidden="true"></ion-icon>
diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
index 4ccb65ab5..294d029f3 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
@@ -168,3 +168,7 @@
 :host-context(.keyboard-is-open) {
     min-height: 200px;
 }
+
+:host-context(.item-label-stacked) {
+    margin-top: 10px;
+}
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index 5330f6576..3f7715dd1 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -277,12 +277,21 @@ ion-button.button-clear {
 .clickable {
     cursor: pointer;
 
+
     [disabled],
     [aria-disabled="true"] {
-        cursor: auto;
+        cursor: default;
+        opacity: .4;
+        pointer-events: none;
     }
 }
 
+button[disabled] {
+    cursor: default;
+    opacity: .4;
+    pointer-events: none;
+}
+
 ion-button.core-button-as-link {
     text-transform: none;
     text-decoration: underline;