diff --git a/ubl-settings-update-mirror-add.glade b/ubl-settings-update-mirror-add.glade
index 55209df..691d16e 100644
--- a/ubl-settings-update-mirror-add.glade
+++ b/ubl-settings-update-mirror-add.glade
@@ -167,6 +167,8 @@ mirrorlist - mirrors file, make sure server URL is NOT included in this file! Si
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="TypeButton">
+                                        <property name="width-request">28</property>
+                                        <property name="height-request">28</property>
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
                                         <property name="receives-default">True</property>
@@ -184,6 +186,8 @@ mirrorlist - mirrors file, make sure server URL is NOT included in this file! Si
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="AddButton">
+                                        <property name="width-request">28</property>
+                                        <property name="height-request">28</property>
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
                                         <property name="receives-default">True</property>
diff --git a/ubl-settings-update-mirror-configure.glade b/ubl-settings-update-mirror-configure.glade
index 93201c1..8a1d477 100644
--- a/ubl-settings-update-mirror-configure.glade
+++ b/ubl-settings-update-mirror-configure.glade
@@ -170,6 +170,8 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="CacheButton">
+                    <property name="width-request">28</property>
+                    <property name="height-request">28</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can-focus">True</property>
diff --git a/ubl-settings-update-mirror-path-add.glade b/ubl-settings-update-mirror-path-add.glade
index 13458d4..36a0308 100644
--- a/ubl-settings-update-mirror-path-add.glade
+++ b/ubl-settings-update-mirror-path-add.glade
@@ -19,6 +19,8 @@
     <property name="spacing">5</property>
     <child>
       <object class="GtkButton" id="PathRemoveButton">
+        <property name="width-request">28</property>
+        <property name="height-request">28</property>
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="receives-default">True</property>
@@ -55,6 +57,8 @@
     </child>
     <child>
       <object class="GtkButton" id="PathEditButton">
+        <property name="width-request">28</property>
+        <property name="height-request">28</property>
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="receives-default">True</property>
diff --git a/ubl-settings-update-repo-add.glade b/ubl-settings-update-repo-add.glade
index fcc0678..85357fb 100644
--- a/ubl-settings-update-repo-add.glade
+++ b/ubl-settings-update-repo-add.glade
@@ -116,7 +116,7 @@
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="label-xalign">0</property>
-                        <property name="shadow-type">in</property>
+                        <property name="shadow-type">none</property>
                         <child>
                           <object class="GtkAlignment">
                             <property name="visible">True</property>
@@ -187,6 +187,8 @@ Configuration - configuration path</property>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="RepoSourceButton">
+                                        <property name="width-request">28</property>
+                                        <property name="height-request">28</property>
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
                                         <property name="receives-default">True</property>
@@ -204,6 +206,8 @@ Configuration - configuration path</property>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="RepoSourceAddButton">
+                                        <property name="width-request">28</property>
+                                        <property name="height-request">28</property>
                                         <property name="visible">True</property>
                                         <property name="can-focus">True</property>
                                         <property name="receives-default">True</property>
diff --git a/ubl-settings-update-web-publication-add.glade b/ubl-settings-update-web-publication-add.glade
index 18285de..6f0966e 100644
--- a/ubl-settings-update-web-publication-add.glade
+++ b/ubl-settings-update-web-publication-add.glade
@@ -102,6 +102,8 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="PathButton">
+                    <property name="width-request">28</property>
+                    <property name="height-request">28</property>
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <property name="receives-default">True</property>
@@ -386,6 +388,8 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="PasswordButton">
+                                <property name="width-request">28</property>
+                                <property name="height-request">28</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can-focus">True</property>
diff --git a/ubl-settings-update.glade b/ubl-settings-update.glade
index 0bfe020..2743c34 100644
--- a/ubl-settings-update.glade
+++ b/ubl-settings-update.glade
@@ -553,7 +553,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                   <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="margin-start">3</property>
                     <property name="spacing">5</property>
                     <child>
                       <object class="GtkBox">
@@ -564,6 +563,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkButton" id="RepositoriesUpdateButton">
+                            <property name="width-request">26</property>
+                            <property name="height-request">26</property>
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">True</property>
@@ -581,6 +582,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         </child>
                         <child>
                           <object class="GtkButton" id="RepositoriesMoveUpButton">
+                            <property name="width-request">26</property>
+                            <property name="height-request">26</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can-focus">True</property>
@@ -615,6 +618,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         </child>
                         <child>
                           <object class="GtkButton" id="RepositoriesMoveDownButton">
+                            <property name="width-request">26</property>
+                            <property name="height-request">26</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can-focus">True</property>
@@ -648,6 +653,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         </child>
                         <child>
                           <object class="GtkButton" id="RepositoriesCreateButton">
+                            <property name="width-request">26</property>
+                            <property name="height-request">26</property>
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">True</property>
@@ -665,6 +672,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         </child>
                         <child>
                           <object class="GtkButton" id="RepositoriesEditButton">
+                            <property name="width-request">26</property>
+                            <property name="height-request">26</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can-focus">True</property>
@@ -683,6 +692,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         </child>
                         <child>
                           <object class="GtkButton" id="RepositoriesDeleteButton">
+                            <property name="width-request">26</property>
+                            <property name="height-request">26</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can-focus">True</property>
@@ -912,7 +923,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                               <object class="GtkBox">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
-                                <property name="margin-start">3</property>
                                 <property name="spacing">5</property>
                                 <child>
                                   <object class="GtkBox">
@@ -921,6 +931,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                                     <property name="orientation">vertical</property>
                                     <child>
                                       <object class="GtkButton" id="PublicationUpdateButton">
+                                        <property name="width-request">26</property>
+                                        <property name="height-request">26</property>
                                         <property name="visible">True</property>
                                         <property name="sensitive">False</property>
                                         <property name="can-focus">True</property>
@@ -1058,6 +1070,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkButton" id="WebPublicationUpdateButton">
+                            <property name="width-request">26</property>
+                            <property name="height-request">26</property>
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">True</property>
@@ -1075,6 +1089,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         </child>
                         <child>
                           <object class="GtkButton" id="WebPublicationAddButton">
+                            <property name="width-request">26</property>
+                            <property name="height-request">26</property>
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">True</property>
@@ -1092,6 +1108,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         </child>
                         <child>
                           <object class="GtkButton" id="WebPublicationEditButton">
+                            <property name="width-request">26</property>
+                            <property name="height-request">26</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can-focus">True</property>
@@ -1110,6 +1128,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         </child>
                         <child>
                           <object class="GtkButton" id="WebPublicationRemoveButton">
+                            <property name="width-request">26</property>
+                            <property name="height-request">26</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can-focus">True</property>
@@ -1369,11 +1389,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                       <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="margin-start">3</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkButton" id="MirrorUpdateButton">
+                            <property name="width-request">26</property>
+                            <property name="height-request">26</property>
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">True</property>
@@ -1391,6 +1412,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         </child>
                         <child>
                           <object class="GtkButton" id="MirrorAddButton">
+                            <property name="width-request">26</property>
+                            <property name="height-request">26</property>
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">True</property>
@@ -1408,6 +1431,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         </child>
                         <child>
                           <object class="GtkButton" id="MirrorEditButton">
+                            <property name="width-request">26</property>
+                            <property name="height-request">26</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can-focus">True</property>
@@ -1426,6 +1451,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         </child>
                         <child>
                           <object class="GtkButton" id="MirrorRemoveButton">
+                            <property name="width-request">26</property>
+                            <property name="height-request">26</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can-focus">True</property>
@@ -1444,6 +1471,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         </child>
                         <child>
                           <object class="GtkButton" id="MirrorConfigureButton">
+                            <property name="width-request">26</property>
+                            <property name="height-request">26</property>
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">True</property>