diff --git a/lib/classes/output/core_renderer.php b/lib/classes/output/core_renderer.php
index 479f8711260..cee0c875cd1 100644
--- a/lib/classes/output/core_renderer.php
+++ b/lib/classes/output/core_renderer.php
@@ -331,7 +331,7 @@ class core_renderer extends renderer_base {
             $timeleft = $CFG->maintenance_later - time();
             // If timeleft less than 30 sec, set the class on block to error to highlight.
             $errorclass = ($timeleft < 30) ? 'alert-error alert-danger' : 'alert-warning';
-            $output .= $this->box_start($errorclass . ' moodle-has-zindex maintenancewarning m-3 alert');
+            $output .= $this->box_start($errorclass . ' moodle-has-zindex maintenancewarning alert');
             $a = new stdClass();
             $a->hour = (int)($timeleft / 3600);
             $a->min = (int)(floor($timeleft / 60) % 60);
diff --git a/theme/boost/scss/moodle/admin.scss b/theme/boost/scss/moodle/admin.scss
index c8204d1a0a4..ee00a8feeff 100644
--- a/theme/boost/scss/moodle/admin.scss
+++ b/theme/boost/scss/moodle/admin.scss
@@ -614,9 +614,13 @@
     position: fixed;
     bottom: 0;
     right: 0;
+    margin: 1rem;
     overflow: hidden;
     z-index: $zindex-dropdown;
 }
+.jsenabled .maintenancewarning {
+    @include transition(0.2s);
+}
 
 .modal.modal-in-page {
     z-index: 0;
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index aa3d07559da..4654a772372 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -2220,6 +2220,10 @@ $footer-link-color: $bg-inverse-link-color !default;
     bottom: calc(4rem + #{$stickyfooter-height});
 }
 
+.hasstickyfooter .maintenancewarning {
+    bottom: #{$stickyfooter-height};
+}
+
 .popover.footer {
     .popover-body {
         padding: 0;
@@ -2251,6 +2255,10 @@ $footer-link-color: $bg-inverse-link-color !default;
         display: block;
         z-index: $zindex-dropdown;
     }
+    .jsenabled .maintenancewarning,
+    .jsenabled.hasstickyfooter:has(.drawer-right-toggle) .maintenancewarning {
+        right: 5rem;
+    }
 }
 
 .bg-inverse a {
diff --git a/theme/boost/scss/moodle/layout.scss b/theme/boost/scss/moodle/layout.scss
index 332e5e3e3f6..613587efeec 100644
--- a/theme/boost/scss/moodle/layout.scss
+++ b/theme/boost/scss/moodle/layout.scss
@@ -162,6 +162,12 @@
             visibility: hidden;
         }
     }
+    .hasstickyfooter:has(.drawer-right-toggle) .maintenancewarning {
+        right: 2rem;
+    }
+    .hasstickyfooter:has(.drawer-left-toggle) .maintenancewarning {
+        margin-left: 3.5rem;
+    }
 }
 
 @include media-breakpoint-up(sm) {
@@ -220,6 +226,9 @@
             .jsenabled & .btn-footer-communication {
                 right: calc(#{$drawer-right-width} + 2rem);
             }
+            .jsenabled:has(&) .maintenancewarning {
+                right: calc(#{$drawer-right-width} + 5rem);
+            }
         }
         &.show-drawer-left.show-drawer-right {
             margin-left: $drawer-left-width;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 21ae2b0f0ba..dbb257faa98 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -27749,6 +27749,10 @@ dd:after {
   bottom: calc(4rem + max(80px, 0.9375rem * 3));
 }
 
+.hasstickyfooter .maintenancewarning {
+  bottom: max(80px, 0.9375rem * 3);
+}
+
 .popover.footer .popover-body {
   padding: 0;
 }
@@ -27776,6 +27780,10 @@ dd:after {
     display: block;
     z-index: 1000;
   }
+  .jsenabled .maintenancewarning,
+  .jsenabled.hasstickyfooter:has(.drawer-right-toggle) .maintenancewarning {
+    right: 5rem;
+  }
 }
 .bg-inverse a {
   color: #fff;
@@ -29506,10 +29514,20 @@ img.icon {
   position: fixed;
   bottom: 0;
   right: 0;
+  margin: 1rem;
   overflow: hidden;
   z-index: 1000;
 }
 
+.jsenabled .maintenancewarning {
+  transition: 0.2s;
+}
+@media (prefers-reduced-motion: reduce) {
+  .jsenabled .maintenancewarning {
+    transition: none;
+  }
+}
+
 .modal.modal-in-page {
   z-index: 0;
 }
@@ -39121,6 +39139,12 @@ body.tox-fullscreen .tox.tox-tinymce-aux {
     pointer-events: auto;
     visibility: hidden;
   }
+  .hasstickyfooter:has(.drawer-right-toggle) .maintenancewarning {
+    right: 2rem;
+  }
+  .hasstickyfooter:has(.drawer-left-toggle) .maintenancewarning {
+    margin-left: 3.5rem;
+  }
 }
 @media (min-width: 576px) {
   #page.drawers .main-inner {
@@ -39180,6 +39204,9 @@ body.tox-fullscreen .tox.tox-tinymce-aux {
   .jsenabled #page.drawers.show-drawer-right .popover-process-monitor, .jsenabled #page.drawers.show-drawer-right .btn-footer-popover, .jsenabled #page.drawers.show-drawer-right .btn-footer-communication {
     right: calc(315px + 2rem);
   }
+  .jsenabled:has(#page.drawers.show-drawer-right) .maintenancewarning {
+    right: calc(315px + 5rem);
+  }
 }
 @media (min-width: 992px) {
   #page.drawers.show-drawer-left.show-drawer-right {
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index a2420a2c109..f4f560c35ed 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -27749,6 +27749,10 @@ dd:after {
   bottom: calc(4rem + max(80px, 0.9375rem * 3));
 }
 
+.hasstickyfooter .maintenancewarning {
+  bottom: max(80px, 0.9375rem * 3);
+}
+
 .popover.footer .popover-body {
   padding: 0;
 }
@@ -27776,6 +27780,10 @@ dd:after {
     display: block;
     z-index: 1000;
   }
+  .jsenabled .maintenancewarning,
+  .jsenabled.hasstickyfooter:has(.drawer-right-toggle) .maintenancewarning {
+    right: 5rem;
+  }
 }
 .bg-inverse a {
   color: #fff;
@@ -29506,10 +29514,20 @@ img.icon {
   position: fixed;
   bottom: 0;
   right: 0;
+  margin: 1rem;
   overflow: hidden;
   z-index: 1000;
 }
 
+.jsenabled .maintenancewarning {
+  transition: 0.2s;
+}
+@media (prefers-reduced-motion: reduce) {
+  .jsenabled .maintenancewarning {
+    transition: none;
+  }
+}
+
 .modal.modal-in-page {
   z-index: 0;
 }
@@ -39055,6 +39073,12 @@ body.tox-fullscreen .tox.tox-tinymce-aux {
     pointer-events: auto;
     visibility: hidden;
   }
+  .hasstickyfooter:has(.drawer-right-toggle) .maintenancewarning {
+    right: 2rem;
+  }
+  .hasstickyfooter:has(.drawer-left-toggle) .maintenancewarning {
+    margin-left: 3.5rem;
+  }
 }
 @media (min-width: 576px) {
   #page.drawers .main-inner {
@@ -39114,6 +39138,9 @@ body.tox-fullscreen .tox.tox-tinymce-aux {
   .jsenabled #page.drawers.show-drawer-right .popover-process-monitor, .jsenabled #page.drawers.show-drawer-right .btn-footer-popover, .jsenabled #page.drawers.show-drawer-right .btn-footer-communication {
     right: calc(315px + 2rem);
   }
+  .jsenabled:has(#page.drawers.show-drawer-right) .maintenancewarning {
+    right: calc(315px + 5rem);
+  }
 }
 @media (min-width: 992px) {
   #page.drawers.show-drawer-left.show-drawer-right {