diff --git a/src/addons/calendar/components/upcoming-events/upcoming-events.scss b/src/addons/calendar/components/upcoming-events/upcoming-events.scss
deleted file mode 100644
index 0113d9512..000000000
--- a/src/addons/calendar/components/upcoming-events/upcoming-events.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-:host {
-    .addon-calendar-event {
-        cursor: pointer;
-    }
-}
diff --git a/src/addons/calendar/components/upcoming-events/upcoming-events.ts b/src/addons/calendar/components/upcoming-events/upcoming-events.ts
index 909169ad8..862712285 100644
--- a/src/addons/calendar/components/upcoming-events/upcoming-events.ts
+++ b/src/addons/calendar/components/upcoming-events/upcoming-events.ts
@@ -36,7 +36,7 @@ import { Translate } from '@singletons';
 @Component({
     selector: 'addon-calendar-upcoming-events',
     templateUrl: 'addon-calendar-upcoming-events.html',
-    styleUrls: ['../../calendar-common.scss', 'upcoming-events.scss'],
+    styleUrls: ['../../calendar-common.scss'],
 })
 export class AddonCalendarUpcomingEventsComponent implements OnInit, DoCheck, OnDestroy {
 
diff --git a/src/theme/components/ion-alert.scss b/src/theme/components/ion-alert.scss
index 74c255a07..3c51f1847 100644
--- a/src/theme/components/ion-alert.scss
+++ b/src/theme/components/ion-alert.scss
@@ -73,3 +73,33 @@ ion-alert {
         padding-bottom: 0;
     }
 }
+
+ion-alert.core-alert-network-error .alert-head,
+div.core-iframe-network-error {
+    position: relative;
+    content: " ";
+    background: url("/assets/fonts/font-awesome/solid/wifi.svg") no-repeat 50% 50%;
+    margin: 25px auto;
+
+    h2 {
+        @include sr-only();
+    }
+
+    &::after {
+        content: " ";
+        position: absolute;
+        top: -20%;
+        right: -15%;
+        width: 50%;
+        height: 50%;
+        background-color: var(--danger);
+        -webkit-mask: url("/assets/fonts/font-awesome/solid/triangle-exclamation.svg") no-repeat 50% 50%;
+        mask: url("/assets/fonts/font-awesome/solid/triangle-exclamation.svg") no-repeat 50% 50%;
+    }
+}
+
+[dir=rtl] ion-alert.core-alert-network-error .alert-head::after,
+[dir=rtl] div.core-iframe-network-error::after {
+    right: unset;
+    left: -15%;
+}
diff --git a/src/theme/components/ion-button.scss b/src/theme/components/ion-button.scss
index 5fd9e9628..690456df3 100644
--- a/src/theme/components/ion-button.scss
+++ b/src/theme/components/ion-button.scss
@@ -103,3 +103,59 @@ ion-button {
         }
     }
 }
+
+ion-button,
+ion-fab-button,
+button,
+[role="button"] {
+    text-transform: none;
+    min-height: var(--a11y-sizing-minTargetSize);
+    min-width: var(--a11y-sizing-minTargetSize);
+
+    &.button-large {
+        min-height: 2.8em;
+        min-width: 2.8em
+    }
+}
+
+[role="button"],
+.clickable {
+    cursor: pointer;
+
+
+    [disabled],
+    [aria-disabled="true"] {
+        cursor: default;
+        opacity: var(--mdl-button-disabled-opacity);
+        pointer-events: none;
+    }
+}
+
+ion-button.core-button-as-link {
+    text-decoration: underline;
+    font-size: inherit;
+    font-weight: normal;
+    letter-spacing: normal;
+    white-space: break-spaces;
+}
+
+button.as-link {
+    display: inline;
+    min-height: auto;
+    min-width: auto;
+    color: var(--core-link-color);
+    background: none;
+    border: 0;
+    line-height: inherit;
+    margin: 0;
+    padding: 0;
+    text-align: start;
+    font-size: inherit;
+}
+
+
+button[disabled] {
+    cursor: default;
+    opacity: var(--mdl-button-disabled-opacity);
+    pointer-events: none;
+}
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index a25346d60..2223c7d5e 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -107,94 +107,6 @@ ion-footer {
     }
 }
 
-// Buttons.
-ion-button,
-ion-fab-button,
-button,
-[role="button"] {
-    text-transform: none;
-    min-height: var(--a11y-sizing-minTargetSize);
-    min-width: var(--a11y-sizing-minTargetSize);
-
-    &.button-large {
-        min-height: 2.8em;
-        min-width: 2.8em
-    }
-}
-
-[role="button"],
-.clickable {
-    cursor: pointer;
-
-
-    [disabled],
-    [aria-disabled="true"] {
-        cursor: default;
-        opacity: var(--mdl-button-disabled-opacity);
-        pointer-events: none;
-    }
-}
-
-button[disabled] {
-    cursor: default;
-    opacity: var(--mdl-button-disabled-opacity);
-    pointer-events: none;
-}
-
-ion-button.core-button-as-link {
-    text-decoration: underline;
-    font-size: inherit;
-    font-weight: normal;
-    letter-spacing: normal;
-    white-space: break-spaces;
-}
-
-button.as-link {
-    display: inline;
-    min-height: auto;
-    min-width: auto;
-    color: var(--core-link-color);
-    background: none;
-    border: 0;
-    line-height: inherit;
-    margin: 0;
-    padding: 0;
-    text-align: start;
-    font-size: inherit;
-}
-
-
-// Ionic alert.
-ion-alert.core-alert-network-error .alert-head,
-div.core-iframe-network-error {
-    position: relative;
-    content: " ";
-    background: url("/assets/fonts/font-awesome/solid/wifi.svg") no-repeat 50% 50%;
-    margin: 25px auto;
-
-    h2 {
-        @include sr-only();
-    }
-
-    &::after {
-        content: " ";
-        position: absolute;
-        top: -20%;
-        right: -15%;
-        width: 50%;
-        height: 50%;
-        background-color: var(--danger);
-        -webkit-mask: url("/assets/fonts/font-awesome/solid/triangle-exclamation.svg") no-repeat 50% 50%;
-        mask: url("/assets/fonts/font-awesome/solid/triangle-exclamation.svg") no-repeat 50% 50%;
-    }
-}
-
-[dir=rtl] ion-alert.core-alert-network-error .alert-head::after,
-[dir=rtl] div.core-iframe-network-error::after {
-    right: unset;
-    left: -15%;
-}
-
 // Ionic list.
 ion-list {
     padding: 0 !important;