diff --git a/src/ui/common/base.css b/src/ui/common/base.css
index b34f88b..ad38835 100644
--- a/src/ui/common/base.css
+++ b/src/ui/common/base.css
@@ -233,13 +233,22 @@ select {
   padding: 0 6px;
 }
 
+/* The orCAL name holds the top-left corner; the clock and the window controls
+   sit together on the right. At large text sizes they go under the name. */
 .status {
   display: flex;
+  flex-wrap: wrap;
   align-items: center;
-  justify-content: space-between;
   gap: 8px;
 }
 
+.status-end {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-left: auto;
+}
+
 .status-icons {
   display: flex;
   align-items: center;
@@ -299,7 +308,6 @@ select {
 
 /* The program's name: the way into Preferences (design/navigation.md). */
 .status-brand {
-  align-self: flex-start;
   display: inline-flex;
   align-items: center;
   gap: 8px;
diff --git a/src/ui/index.html b/src/ui/index.html
index 6f8eacf..6cb51e6 100644
--- a/src/ui/index.html
+++ b/src/ui/index.html
@@ -16,36 +16,38 @@
         <div class="drag-region" data-tauri-drag-region aria-hidden="true"></div>
         <header class="calculator-status" data-tauri-drag-region>
           <div class="status" data-tauri-drag-region>
-            <div class="status-time" data-tauri-drag-region aria-live="polite">--:--</div>
-            <div class="status-icons" role="group" data-i18n-aria-label="window_controls">
-              <button
-                class="status-icon-button glyph"
-                type="button"
-                data-action="switch-layout"
-                data-layout="tablet"
-                data-i18n-aria-label="layout_switch_tablet"
-                data-i18n-title="layout_switch_tablet"
-              >&#xf04f6;</button>
-              <button
-                class="status-icon-button glyph"
-                type="button"
-                data-action="minimize"
-                data-i18n-aria-label="window_minimize"
-                data-i18n-title="window_minimize"
-              >&#xf05b0;</button>
-              <button
-                class="status-icon-button glyph"
-                type="button"
-                data-action="close"
-                data-i18n-aria-label="window_close"
-                data-i18n-title="window_close"
-              >&#xf0156;</button>
+            <button class="status-brand" type="button" data-i18n-title="settings_title">
+              orCAL<span class="glyph" aria-hidden="true">&#xf013;</span>
+            </button>
+            <div class="status-end" data-tauri-drag-region>
+              <div class="status-time" data-tauri-drag-region aria-live="polite">--:--</div>
+              <div class="status-icons" role="group" data-i18n-aria-label="window_controls">
+                <button
+                  class="status-icon-button glyph"
+                  type="button"
+                  data-action="switch-layout"
+                  data-layout="tablet"
+                  data-i18n-aria-label="layout_switch_tablet"
+                  data-i18n-title="layout_switch_tablet"
+                >&#xf04f6;</button>
+                <button
+                  class="status-icon-button glyph"
+                  type="button"
+                  data-action="minimize"
+                  data-i18n-aria-label="window_minimize"
+                  data-i18n-title="window_minimize"
+                >&#xf05b0;</button>
+                <button
+                  class="status-icon-button glyph"
+                  type="button"
+                  data-action="close"
+                  data-i18n-aria-label="window_close"
+                  data-i18n-title="window_close"
+                >&#xf0156;</button>
+              </div>
             </div>
           </div>
           <div class="status-message" role="status" aria-live="polite"></div>
-          <button class="status-brand" type="button" data-i18n-title="settings_title">
-            orCAL<span class="glyph" aria-hidden="true">&#xf013;</span>
-          </button>
         </header>
 
         <section class="calculator-screen" aria-live="polite" data-calculator>
diff --git a/src/ui/tablet-mode/index.html b/src/ui/tablet-mode/index.html
index 7bb3aaf..16a275b 100644
--- a/src/ui/tablet-mode/index.html
+++ b/src/ui/tablet-mode/index.html
@@ -16,36 +16,38 @@
         <div class="drag-region" data-tauri-drag-region aria-hidden="true"></div>
         <header class="calculator-status" data-tauri-drag-region>
           <div class="status" data-tauri-drag-region>
-            <div class="status-time" data-tauri-drag-region aria-live="polite">--:--</div>
-            <div class="status-icons" role="group" data-i18n-aria-label="window_controls">
-              <button
-                class="status-icon-button glyph"
-                type="button"
-                data-action="switch-layout"
-                data-layout="phone"
-                data-i18n-aria-label="layout_switch_phone"
-                data-i18n-title="layout_switch_phone"
-              >&#xf011c;</button>
-              <button
-                class="status-icon-button glyph"
-                type="button"
-                data-action="minimize"
-                data-i18n-aria-label="window_minimize"
-                data-i18n-title="window_minimize"
-              >&#xf05b0;</button>
-              <button
-                class="status-icon-button glyph"
-                type="button"
-                data-action="close"
-                data-i18n-aria-label="window_close"
-                data-i18n-title="window_close"
-              >&#xf0156;</button>
+            <button class="status-brand" type="button" data-i18n-title="settings_title">
+              orCAL<span class="glyph" aria-hidden="true">&#xf013;</span>
+            </button>
+            <div class="status-end" data-tauri-drag-region>
+              <div class="status-time" data-tauri-drag-region aria-live="polite">--:--</div>
+              <div class="status-icons" role="group" data-i18n-aria-label="window_controls">
+                <button
+                  class="status-icon-button glyph"
+                  type="button"
+                  data-action="switch-layout"
+                  data-layout="phone"
+                  data-i18n-aria-label="layout_switch_phone"
+                  data-i18n-title="layout_switch_phone"
+                >&#xf011c;</button>
+                <button
+                  class="status-icon-button glyph"
+                  type="button"
+                  data-action="minimize"
+                  data-i18n-aria-label="window_minimize"
+                  data-i18n-title="window_minimize"
+                >&#xf05b0;</button>
+                <button
+                  class="status-icon-button glyph"
+                  type="button"
+                  data-action="close"
+                  data-i18n-aria-label="window_close"
+                  data-i18n-title="window_close"
+                >&#xf0156;</button>
+              </div>
             </div>
           </div>
           <div class="status-message" role="status" aria-live="polite"></div>
-          <button class="status-brand" type="button" data-i18n-title="settings_title">
-            orCAL<span class="glyph" aria-hidden="true">&#xf013;</span>
-          </button>
         </header>
 
         <section class="calculator-tablet-body" data-i18n-aria-label="calculator_scientific" data-calculator>