diff --git a/library/Notifications/Widget/TimeGrid/Timescale.php b/library/Notifications/Widget/TimeGrid/Timescale.php
index 4f2565aec..c8881f9fe 100644
--- a/library/Notifications/Widget/TimeGrid/Timescale.php
+++ b/library/Notifications/Widget/TimeGrid/Timescale.php
@@ -66,13 +66,13 @@ public function assemble(): void
         $time = new DateTime();
         $dayTimestamps = [];
         for ($i = 0; $i < $timestampPerDay; $i++) {
-            // am-pm is separated by non-breaking whitespace
-            $parts = preg_split('/\s/u', $dateFormatter->format($time->setTime($i * $timeIntervals, 0)));
-
-            $stamp = [new HtmlElement('span', null, new Text($parts[0]))];
-            if (isset($parts[1])) {
-                $stamp[] = new HtmlElement('span', null, new Text($parts[1]));
-            }
+            $stamp = array_map(
+                function ($part) {
+                    return new HtmlElement('span', null, new Text($part));
+                },
+                // am-pm is separated by non-breaking whitespace
+                preg_split('/\s/u', $dateFormatter->format($time->setTime($i * $timeIntervals, 0)))
+            );
 
             $dayTimestamps[] = new HtmlElement('span', new Attributes(['class' => 'timestamp']), ...$stamp);
             $dayTimestamps[] = new HtmlElement('span', new Attributes(['class' => 'ticks']));
diff --git a/public/css/timeline.less b/public/css/timeline.less
index f64f54ead..8f3de51d6 100644
--- a/public/css/timeline.less
+++ b/public/css/timeline.less
@@ -74,7 +74,11 @@
 
     .timescale {
       display: grid;
-      grid-template-columns: repeat(~"calc(var(--primaryColumns) * var(--timestampsPerDay))", minmax(0,1fr));
+      grid-template-columns: repeat(
+        ~"calc(var(--primaryColumns) * var(--timestampsPerDay))",
+        minmax(~"calc(var(--minimumPrimaryColumnWidth) / var(--timestampsPerDay))", 1fr)
+      );
+
       border-left: 1px solid @gray-lighter; // this is required to maintain the grid layout
       grid-area: ~"4 / 2 / 4 / 3";
 
@@ -100,7 +104,7 @@
         align-items: center;
         margin-top: 0.5em;
         padding-top: 0.5em;
-        font-size: .5em;
+        font-size: .75em;
         position: relative;
         left: -50%;
         line-height: 1;
@@ -114,21 +118,21 @@
         }
       }
 
-      span:nth-last-of-type(2), // last .ticks before .midnight
-      .midnight {
+      > span.ticks:nth-last-of-type(2), // last .ticks and .midnight
+      > .timestamp.midnight {
         grid-area: ~"1 / -2 / 1 / -1";
       }
     }
 
     .clock {
       display: grid;
-      grid-template-columns: repeat(var(--primaryColumns), 1fr);
+      grid-template-columns: repeat(var(--primaryColumns), minmax(var(--minimumPrimaryColumnWidth), 1fr));
       grid-area: ~"3 / 2 / 4 / 3";
       border-top: 1px solid transparent; // left not required, otherwise the .time-hand is not aligned properly
 
       .current-day {
         display: grid;
-        grid-template-columns: repeat(var(--columnsPerStep), 1fr);
+        grid-template-columns: repeat(var(--columnsPerStep), minmax(var(--minimumStepColumnWidth), 1fr));
         grid-area: ~"1 / 1 / 2 / 2";
 
         .time-hand {