diff --git a/data/gtk/image_view.ui b/data/gtk/image_view.ui
index 88af8a3..5b55581 100644
--- a/data/gtk/image_view.ui
+++ b/data/gtk/image_view.ui
@@ -16,34 +16,33 @@
           </object>
         </child>
         <child type="overlay">
-          <object class="GtkButton" id="prev_button">
-            <property name="halign">start</property>
-            <property name="valign">center</property>
-            <property name="margin-start">18</property>
-            <property name="margin-end">18</property>
-            <property name="icon-name">go-previous-symbolic</property>
-            <property name="action-name">iv.previous</property>
-            <property name="tooltip-text" translatable="yes">Previous Image</property>
-            <style>
-              <class name="osd"/>
-              <class name="circular"/>
-            </style>
-          </object>
-        </child>
-        <child type="overlay">
-          <object class="GtkButton" id="next_button">
-            <property name="hexpand">True</property>
-            <property name="halign">end</property>
-            <property name="valign">center</property>
-            <property name="margin-start">18</property>
-            <property name="margin-end">18</property>
-            <property name="icon-name">go-next-symbolic</property>
-            <property name="action-name">iv.next</property>
-            <property name="tooltip-text" translatable="yes">Next Image</property>
-            <style>
-              <class name="osd"/>
-              <class name="circular"/>
-            </style>
+          <object class="GtkBox" id="controls_box">
+            <property name="halign">center</property>
+            <property name="valign">end</property>
+            <property name="margin-bottom">18</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkButton" id="prev_button">
+                <property name="icon-name">go-previous-symbolic</property>
+                <property name="action-name">iv.previous</property>
+                <property name="tooltip-text" translatable="yes">Previous Image</property>
+                <style>
+                  <class name="osd"/>
+                  <class name="circular"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="next_button">
+                <property name="icon-name">go-next-symbolic</property>
+                <property name="action-name">iv.next</property>
+                <property name="tooltip-text" translatable="yes">Next Image</property>
+                <style>
+                  <class name="osd"/>
+                  <class name="circular"/>
+                </style>
+              </object>
+            </child>
           </object>
         </child>
       </object>