diff --git a/data/resources/ui/new_project.ui b/data/resources/ui/new_project.ui
index e985dd37d760755657b9f3453cfd06369eefd1fb..7cde1c2a1d6a0908146989bc8f7c1d05aae12c88 100644
--- a/data/resources/ui/new_project.ui
+++ b/data/resources/ui/new_project.ui
@@ -2,16 +2,13 @@
 <interface>
   <object class="AdwWindow" id="dialog">
     <property name="modal">True</property>
+    <property name="title" translatable="yes">New App Icon</property>
     <child>
       <object class="GtkBox">
         <property name="orientation">vertical</property>
         <child>
-          <object class="AdwHeaderBar">
-            <property name="title-widget">
-              <object class="AdwWindowTitle">
-                <property name="title" translatable="yes">New App Icon</property>
-              </object>
-            </property>
+          <object class="GtkHeaderBar">
+            <property name="show-title-buttons">False</property>
             <child>
               <object class="GtkButton" id="cancel_button">
                 <property name="use-underline">True</property>
@@ -28,9 +25,6 @@
                 </style>
               </object>
             </child>
-            <style>
-              <class name="titlebar"/>
-            </style>
           </object>
         </child>
         <child>
diff --git a/data/resources/ui/window.ui b/data/resources/ui/window.ui
index 718fc24f000a6447ad10f4edfd3d0f27b5eff6e2..2d2fc9ff4e422247ca53c164cba9144b87a59776 100644
--- a/data/resources/ui/window.ui
+++ b/data/resources/ui/window.ui
@@ -7,21 +7,19 @@
       <object class="GtkBox">
         <property name="orientation">vertical</property>
         <child>
-          <object class="AdwHeaderBar">
+          <object class="GtkHeaderBar">
             <child>
               <object class="GtkBox">
                 <child>
                   <object class="GtkButton">
                     <property name="label" translatable="yes">_Open</property>
                     <property name="use_underline">True</property>
-                    <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Open an icon</property>
                     <property name="action_name">win.open</property>
                   </object>
                 </child>
                 <child>
                   <object class="GtkMenuButton" id="recents_btn">
-                    <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Recent</property>
                     <property name="icon_name">pan-down-symbolic</property>
                   </object>
@@ -32,28 +30,19 @@
               </object>
             </child>
             <child type="end">
-              <object class="GtkBox">
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkMenuButton" id="export_btn">
-                    <property name="label" translatable="yes">_Export</property>
-                    <property name="use_underline">True</property>
-                    <property name="receives_default">True</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkMenuButton">
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Menu</property>
-                    <property name="icon_name">open-menu-symbolic</property>
-                    <property name="menu_model">menu_model</property>
-                  </object>
-                </child>
+              <object class="GtkMenuButton">
+                <property name="tooltip_text" translatable="yes">Menu</property>
+                <property name="icon_name">open-menu-symbolic</property>
+                <property name="menu_model">menu_model</property>
+              </object>
+            </child>
+            <child type="end">
+              <object class="GtkMenuButton" id="export_btn">
+                <property name="label" translatable="yes">_Export</property>
+                <property name="use_underline">True</property>
+                <property name="receives_default">True</property>
               </object>
             </child>
-            <style>
-              <class name="titlebar"/>
-            </style>
           </object>
         </child>
         <child>