diff --git a/library/Notifications/Widget/Timeline.php b/library/Notifications/Widget/Timeline.php
index c190acb10..4e7e9c111 100644
--- a/library/Notifications/Widget/Timeline.php
+++ b/library/Notifications/Widget/Timeline.php
@@ -411,15 +411,19 @@ protected function assemble()
                     new HtmlElement(
                         'div',
                         Attributes::create(['class' => 'new-rotation-content']),
-                        TemplateString::create(
-                            $newRotationMsg,
-                            [
-                                'button' => (new Link(
-                                    new Icon('circle-plus'),
-                                    Links::rotationAdd($this->scheduleId),
-                                    ['class' => empty($this->rotations) ? 'btn-primary' : null]
-                                ))->openInModal()
-                            ]
+                        new HtmlElement(
+                            'span',
+                            null,
+                            TemplateString::create(
+                                $newRotationMsg,
+                                [
+                                    'button' => (new Link(
+                                        new Icon('circle-plus'),
+                                        Links::rotationAdd($this->scheduleId),
+                                        ['class' => empty($this->rotations) ? 'btn-primary' : null]
+                                    ))->openInModal()
+                                ]
+                            )
                         )
                     )
                 ))
diff --git a/public/css/calendar.less b/public/css/calendar.less
index a5147702e..9dd330acf 100644
--- a/public/css/calendar.less
+++ b/public/css/calendar.less
@@ -344,7 +344,6 @@
   .entry {
     border: 1px solid var(--entry-border-color);
     background-color: var(--entry-bg);
-    mix-blend-mode: screen;
     .rounded-corners();
 
     a:hover {
@@ -382,9 +381,3 @@
     color: @text-color-light;
   }
 }
-
-@light-mode: {
-  .time-grid .entry {
-    mix-blend-mode: revert;
-  }
-};
diff --git a/public/css/timeline.less b/public/css/timeline.less
index 2ab53fdea..7afe37b15 100644
--- a/public/css/timeline.less
+++ b/public/css/timeline.less
@@ -146,7 +146,6 @@
         }
 
         &:hover {
-          mix-blend-mode: normal;
           .rotation-info {
             z-index: 1;
             display: flex;
@@ -301,7 +300,6 @@
 
       .new-rotation-content {
         pointer-events: all;
-        z-index: 2; // Grid gaps must not bleed through, in day mode the time-hand must be below the button
         height: var(--stepRowHeight);
         display: flex;
         align-items: baseline;
@@ -309,6 +307,10 @@
         align-content: center;
         flex-wrap: wrap;
         gap: .417em;
+
+        > span {
+          z-index: 2; // Grid gaps must not bleed through, in day mode the time-hand must be below the button
+        }
       }
     }
   }