diff --git a/gui/manager.glade b/gui/manager.glade
index b755f45..53d5eba 100644
--- a/gui/manager.glade
+++ b/gui/manager.glade
@@ -110,6 +110,8 @@
   </object>
   <object class="GtkWindow" id="ConfDialog">
     <property name="can_focus">False</property>
+    <property name="margin_top">5</property>
+    <property name="margin_bottom">5</property>
     <property name="title" translatable="yes"> </property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
@@ -210,7 +212,9 @@
           <object class="GtkButtonBox" id="buttonbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="spacing">6</property>
+            <property name="margin_left">7</property>
+            <property name="margin_right">7</property>
+            <property name="spacing">7</property>
             <property name="homogeneous">True</property>
             <property name="layout_style">end</property>
             <child>
@@ -283,6 +287,8 @@
                   <object class="GtkBox" id="box4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="margin_bottom">3</property>
+                    <property name="spacing">5</property>
                     <child>
                       <object class="GtkEntry" id="search_entry">
                         <property name="visible">True</property>
@@ -530,6 +536,9 @@
               <object class="GtkButtonBox" id="buttonbox2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_left">5</property>
+                <property name="margin_right">5</property>
+                <property name="margin_bottom">2</property>
                 <property name="spacing">5</property>
                 <property name="homogeneous">True</property>
                 <property name="layout_style">end</property>
diff --git a/gui/updater.glade b/gui/updater.glade
index 1912381..8f65d8c 100644
--- a/gui/updater.glade
+++ b/gui/updater.glade
@@ -18,7 +18,10 @@
           <object class="GtkButtonBox" id="buttonbox1">
             <property name="can_focus">True</property>
             <property name="has_focus">True</property>
-            <property name="spacing">5</property>
+            <property name="margin_left">7</property>
+            <property name="margin_right">7</property>
+            <property name="margin_bottom">2</property>
+            <property name="spacing">7</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="UpdaterRefreshButton">
@@ -78,6 +81,8 @@
           <object class="GtkBox" id="box2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="margin_left">7</property>
+            <property name="margin_right">7</property>
             <property name="spacing">10</property>
             <child>
               <object class="GtkImage" id="image1">