diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade
index f32843f5..4bf7bb8c 100644
--- a/share/ocarina/ocarina6.glade
+++ b/share/ocarina/ocarina6.glade
@@ -198,15 +198,11 @@
   <object class="GtkImage" id="image6">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="xalign">0</property>
-    <property name="xpad">5</property>
     <property name="icon_name">emblem-favorite</property>
   </object>
   <object class="GtkImage" id="image7">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="xalign">0</property>
-    <property name="xpad">5</property>
     <property name="icon_name">window-close</property>
   </object>
   <object class="GtkAdjustment" id="o_progress">
@@ -254,13 +250,15 @@
                         <property name="can_focus">False</property>
                         <property name="halign">center</property>
                         <property name="valign">center</property>
-                        <property name="xpad">5</property>
-                        <property name="ypad">5</property>
+                        <property name="margin_left">5</property>
+                        <property name="margin_right">5</property>
+                        <property name="margin_top">5</property>
+                        <property name="margin_bottom">5</property>
                         <property name="icon_name">media-skip-backward</property>
                       </object>
                     </child>
-                    <accelerator key="AudioPrev" signal="clicked"/>
                     <accelerator key="n" signal="clicked" modifiers="GDK_SHIFT_MASK"/>
+                    <accelerator key="AudioPrev" signal="clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -286,14 +284,16 @@
                         <property name="can_focus">False</property>
                         <property name="halign">center</property>
                         <property name="valign">center</property>
-                        <property name="xpad">5</property>
-                        <property name="ypad">5</property>
+                        <property name="margin_left">5</property>
+                        <property name="margin_right">5</property>
+                        <property name="margin_top">5</property>
+                        <property name="margin_bottom">5</property>
                         <property name="icon_name">media-playback-start</property>
                         <property name="icon_size">5</property>
                       </object>
                     </child>
-                    <accelerator key="AudioPlay" signal="clicked"/>
                     <accelerator key="space" signal="clicked"/>
+                    <accelerator key="AudioPlay" signal="clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -318,14 +318,16 @@
                         <property name="can_focus">False</property>
                         <property name="halign">center</property>
                         <property name="valign">center</property>
-                        <property name="xpad">5</property>
-                        <property name="ypad">5</property>
+                        <property name="margin_left">5</property>
+                        <property name="margin_right">5</property>
+                        <property name="margin_top">5</property>
+                        <property name="margin_bottom">5</property>
                         <property name="icon_name">media-playback-pause</property>
                         <property name="icon_size">5</property>
                       </object>
                     </child>
-                    <accelerator key="AudioPlay" signal="clicked"/>
                     <accelerator key="space" signal="clicked"/>
+                    <accelerator key="AudioPlay" signal="clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -351,13 +353,15 @@
                         <property name="can_focus">False</property>
                         <property name="halign">center</property>
                         <property name="valign">center</property>
-                        <property name="xpad">5</property>
-                        <property name="ypad">5</property>
+                        <property name="margin_left">5</property>
+                        <property name="margin_right">5</property>
+                        <property name="margin_top">5</property>
+                        <property name="margin_bottom">5</property>
                         <property name="icon_name">media-playback-stop</property>
                       </object>
                     </child>
-                    <accelerator key="space" signal="clicked" modifiers="GDK_MOD1_MASK"/>
                     <accelerator key="AudioPlay" signal="clicked" modifiers="GDK_MOD1_MASK"/>
+                    <accelerator key="space" signal="clicked" modifiers="GDK_MOD1_MASK"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -383,13 +387,15 @@
                         <property name="can_focus">False</property>
                         <property name="halign">center</property>
                         <property name="valign">center</property>
-                        <property name="xpad">5</property>
-                        <property name="ypad">5</property>
+                        <property name="margin_left">5</property>
+                        <property name="margin_right">5</property>
+                        <property name="margin_top">5</property>
+                        <property name="margin_bottom">5</property>
                         <property name="icon_name">media-skip-forward</property>
                       </object>
                     </child>
-                    <accelerator key="AudioNext" signal="clicked"/>
                     <accelerator key="n" signal="clicked"/>
+                    <accelerator key="AudioNext" signal="clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -426,7 +432,6 @@
                             <property name="halign">center</property>
                             <property name="label" translatable="yes">&lt;span size='xx-large'&gt;&lt;/span&gt;</property>
                             <property name="use_markup">True</property>
-                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -441,7 +446,6 @@
                             <property name="halign">center</property>
                             <property name="label" translatable="yes">&lt;span size='x-large'&gt;&lt;/span&gt;</property>
                             <property name="use_markup">True</property>
-                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -456,7 +460,6 @@
                             <property name="halign">center</property>
                             <property name="label" translatable="yes">&lt;span size='x-large'&gt;&lt;/span&gt;</property>
                             <property name="use_markup">True</property>
-                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -848,7 +851,6 @@ Manager</property>
                 <property name="can_focus">False</property>
                 <property name="focus_on_click">False</property>
                 <property name="receives_default">False</property>
-                <property name="xalign">0.5</property>
                 <property name="draw_indicator">True</property>
                 <signal name="toggled" handler="__audio_pause_enabled" object="o_pause_count" swapped="no"/>
               </object>