diff --git a/src/style.css b/src/style.css
index fb8e8a3..f8fa650 100644
--- a/src/style.css
+++ b/src/style.css
@@ -53,3 +53,20 @@ port-handle {
     border-radius: 50%;
     background-color: @media-type-unknown;
 }
+
+button.rounded {
+    padding: 6px;
+    border-radius: 9999px;
+}
+
+entry.rounded {
+    border-radius: 9999px;
+}
+
+entry.rounded > :first-child {
+    padding-left: 12px;
+}
+
+entry.rounded > :nth-child(2) {
+    padding-right: 12px;
+}
diff --git a/src/ui/graph/zoomentry.rs b/src/ui/graph/zoomentry.rs
index 6c6a951..667236b 100644
--- a/src/ui/graph/zoomentry.rs
+++ b/src/ui/graph/zoomentry.rs
@@ -34,6 +34,7 @@ mod imp {
             menu.append(Some("200%"), Some("win.set-zoom(2.0)"));
             menu.append(Some("300%"), Some("win.set-zoom(3.0)"));
             let popover = gtk::PopoverMenu::from_model(Some(&menu));
+            popover.set_position(gtk::PositionType::Top);
 
             ZoomEntry {
                 graphview: Default::default(),
diff --git a/src/ui/graph/zoomentry.ui b/src/ui/graph/zoomentry.ui
index 975e971..def1a6a 100644
--- a/src/ui/graph/zoomentry.ui
+++ b/src/ui/graph/zoomentry.ui
@@ -1,26 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="HelvumZoomEntry" parent="GtkBox">
-    <child>
-      <object class="GtkButton" id="zoom_out_button">
-        <property name="icon-name">zoom-out-symbolic</property>
-        <property name="tooltip-text">Zoom out</property>
-      </object>
-    </child>
+    <property name="spacing">12</property>
     <child>
       <object class="GtkEntry" id="entry">
         <property name="secondary-icon-name">go-down-symbolic</property>
         <property name="input-purpose">digits</property>
+        <property name="max-width-chars">5</property>
+        <style>
+          <class name="osd"/>
+          <class name="rounded"/>
+        </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkButton" id="zoom_out_button">
+        <property name="icon-name">zoom-out-symbolic</property>
+        <property name="tooltip-text">Zoom out</property>
+        <style>
+          <class name="osd"/>
+          <class name="rounded"/>
+        </style>
       </object>
     </child>
     <child>
       <object class="GtkButton" id="zoom_in_button">
         <property name="icon-name">zoom-in-symbolic</property>
         <property name="tooltip-text">Zoom in</property>
+        <style>
+          <class name="osd"/>
+          <class name="rounded"/>
+        </style>
       </object>
     </child>
-    <style>
-      <class name="linked"/>
-    </style>
   </template>
-</interface>
\ No newline at end of file
+</interface>
diff --git a/src/ui/window.ui b/src/ui/window.ui
index ef2b72b..22d72f1 100644
--- a/src/ui/window.ui
+++ b/src/ui/window.ui
@@ -20,19 +20,9 @@
         <child>
           <object class="AdwHeaderBar" id="header_bar">
             <child type="end">
-              <object class="GtkBox">
-                <property name="spacing">6</property>
-                <child>
-                  <object class="HelvumZoomEntry">
-                    <property name="zoomed-widget">graph</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkMenuButton">
-                    <property name="icon-name">open-menu-symbolic</property>
-                    <property name="menu-model">primary_menu</property>
-                  </object>
-                </child>
+              <object class="GtkMenuButton">
+                <property name="icon-name">open-menu-symbolic</property>
+                <property name="menu-model">primary_menu</property>
               </object>
             </child>
           </object>
@@ -44,11 +34,24 @@
           </object>
         </child>
         <child>
-          <object class="GtkScrolledWindow">
+          <object class="GtkOverlay">
             <child>
-              <object class="HelvumGraphView" id="graph">
-                <property name="hexpand">true</property>
-                <property name="vexpand">true</property>
+              <object class="GtkScrolledWindow">
+                <child>
+                  <object class="HelvumGraphView" id="graph">
+                    <property name="hexpand">true</property>
+                    <property name="vexpand">true</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="overlay">
+              <object class="HelvumZoomEntry">
+                <property name="zoomed-widget">graph</property>
+                <property name="halign">end</property>
+                <property name="valign">end</property>
+                <property name="margin-end">24</property>
+                <property name="margin-bottom">24</property>
               </object>
             </child>
           </object>