diff --git a/data/gtk/image_view.ui b/data/gtk/image_view.ui
index 5b55581..397ed73 100644
--- a/data/gtk/image_view.ui
+++ b/data/gtk/image_view.ui
@@ -17,12 +17,15 @@
         </child>
         <child type="overlay">
           <object class="GtkBox" id="controls_box">
-            <property name="halign">center</property>
             <property name="valign">end</property>
+            <property name="margin-start">18</property>
+            <property name="margin-end">18</property>
+            <property name="margin-top">18</property>
             <property name="margin-bottom">18</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkButton" id="prev_button">
+                <property name="halign">start</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>
@@ -43,6 +46,25 @@
                 </style>
               </object>
             </child>
+            <child>
+              <object class="GtkButton" id="fullscreen_button">
+                <property name="hexpand">True</property>
+                <property name="halign">end</property>
+                <binding name="icon-name">
+                  <closure type="gchararray" function="get_fullscreen_icon">
+                    <lookup type="GtkWindow" name="fullscreened">
+                      <lookup type="GtkWidget" name="root">LpImageView</lookup>
+                    </lookup>
+                  </closure>
+                </binding>
+                <property name="action-name">win.toggle-fullscreen</property>
+                <property name="tooltip-text" translatable="yes">Toggle Fullscreen</property>
+                <style>
+                  <class name="osd"/>
+                  <class name="circular"/>
+                </style>
+              </object>
+            </child>
           </object>
         </child>
       </object>
diff --git a/data/gtk/window.ui b/data/gtk/window.ui
index 52db0f3..2ceed00 100644
--- a/data/gtk/window.ui
+++ b/data/gtk/window.ui
@@ -30,13 +30,6 @@
                 <property name="tooltip-text" translatable="yes">Primary Menu</property>
               </object>
             </child>
-            <child type="end">
-              <object class="GtkButton" id="fullscreen_button">
-                <property name="icon-name">view-fullscreen-symbolic</property>
-                <property name="action-name">win.toggle-fullscreen</property>
-                <property name="tooltip-text" translatable="yes">Toggle Fullscreen</property>
-              </object>
-            </child>
           </object>
         </property>
         <property name="content">
diff --git a/src/widgets/image_view.rs b/src/widgets/image_view.rs
index ec13b5f..d7fbfb3 100644
--- a/src/widgets/image_view.rs
+++ b/src/widgets/image_view.rs
@@ -349,6 +349,15 @@ impl LpImageView {
         }
     }
 
+    #[template_callback]
+    fn get_fullscreen_icon(&self, fullscreened: bool) -> &'static str {
+        if fullscreened {
+            "view-restore-symbolic"
+        } else {
+            "view-fullscreen-symbolic"
+        }
+    }
+
     pub fn set_wallpaper(&self) -> anyhow::Result<()> {
         let wallpaper = self.uri().context("No URI for current file")?;
         let ctx = glib::MainContext::default();
diff --git a/src/window.rs b/src/window.rs
index 827f89e..663ff79 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -62,8 +62,6 @@ mod imp {
         #[template_child]
         pub menu_button: TemplateChild<gtk::MenuButton>,
         #[template_child]
-        pub fullscreen_button: TemplateChild<gtk::Button>,
-        #[template_child]
         pub toast_overlay: TemplateChild<adw::ToastOverlay>,
         #[template_child]
         pub stack: TemplateChild<gtk::Stack>,
@@ -219,20 +217,9 @@ impl LpWindow {
         if fullscreen {
             imp.flap.set_fold_policy(adw::FlapFoldPolicy::Always);
             imp.headerbar.add_css_class("osd");
-            imp.menu_button.unparent();
-            imp.fullscreen_button.unparent();
-            imp.headerbar.pack_end(&*imp.fullscreen_button);
-            imp.headerbar.pack_end(&*imp.menu_button);
-            imp.fullscreen_button.set_icon_name("view-restore-symbolic");
         } else {
             imp.flap.set_fold_policy(adw::FlapFoldPolicy::Never);
             imp.headerbar.remove_css_class("osd");
-            imp.menu_button.unparent();
-            imp.fullscreen_button.unparent();
-            imp.headerbar.pack_end(&*imp.menu_button);
-            imp.headerbar.pack_end(&*imp.fullscreen_button);
-            imp.fullscreen_button
-                .set_icon_name("view-fullscreen-symbolic");
         }
 
         self.set_fullscreened(fullscreen);