diff --git a/data/gui/preferences_window.ui b/data/gui/preferences_window.ui
index 0136e037b..3fccff7e2 100644
--- a/data/gui/preferences_window.ui
+++ b/data/gui/preferences_window.ui
@@ -616,6 +616,7 @@
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
@@ -631,6 +632,8 @@
                                 <signal name="toggled" handler="on_notify_on_signin_checkbutton_toggled"/>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -840,6 +843,7 @@
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
@@ -854,6 +858,7 @@
                                 <signal name="toggled" handler="on_sound_dnd_checkbutton_toggled"/>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -902,12 +907,16 @@
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label_xalign">0</property>
+                    <property name="label_yalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment19">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="border_width">6</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="yscale">0</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkTable" id="table7">
@@ -934,6 +943,7 @@
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
@@ -987,6 +997,7 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                           </object>
@@ -1007,9 +1018,13 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
               <packing>
                 <property name="position">2</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child type="tab">
@@ -1577,6 +1592,7 @@ $T will be replaced by auto-not-available timeout</property>
                                 <property name="right_attach">3</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
@@ -1616,6 +1632,7 @@ $T will be replaced by auto-not-available timeout</property>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
@@ -1631,8 +1648,7 @@ $T will be replaced by auto-not-available timeout</property>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
@@ -1858,6 +1874,8 @@ $T will be replaced by auto-not-available timeout</property>
                                     <signal name="toggled" handler="on_incoming_msg_checkbutton_toggled"/>
                                   </object>
                                   <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
@@ -1872,6 +1890,7 @@ $T will be replaced by auto-not-available timeout</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">False</property>
                                     <property name="pack_type">end</property>
                                     <property name="position">1</property>
                                   </packing>
@@ -1882,7 +1901,7 @@ $T will be replaced by auto-not-available timeout</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options"/>
+                                <property name="x_options">GTK_FILL</property>
                                 <property name="y_options"/>
                               </packing>
                             </child>
@@ -1898,6 +1917,8 @@ $T will be replaced by auto-not-available timeout</property>
                                     <signal name="toggled" handler="on_outgoing_msg_checkbutton_toggled"/>
                                   </object>
                                   <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
@@ -1912,6 +1933,7 @@ $T will be replaced by auto-not-available timeout</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">False</property>
                                     <property name="pack_type">end</property>
                                     <property name="position">1</property>
                                   </packing>
@@ -1922,7 +1944,7 @@ $T will be replaced by auto-not-available timeout</property>
                                 <property name="right_attach">4</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options"/>
+                                <property name="x_options">GTK_FILL</property>
                                 <property name="y_options"/>
                               </packing>
                             </child>
@@ -1958,9 +1980,6 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkHBox" id="hbox11">
                                 <property name="visible">True</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
                                 <child>
                                   <object class="GtkColorButton" id="status_msg_colorbutton">
                                     <property name="visible">True</property>
@@ -1973,7 +1992,7 @@ $T will be replaced by auto-not-available timeout</property>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="pack_type">end</property>
-                                    <property name="position">1</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                               </object>
@@ -2089,10 +2108,14 @@ $T will be replaced by auto-not-available timeout</property>
                   <object class="GtkFrame" id="audio_frame">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
+                    <property name="label_yalign">1</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment6">
                         <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="yscale">0</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkTable" id="table6">
@@ -2109,6 +2132,7 @@ $T will be replaced by auto-not-available timeout</property>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
@@ -2121,6 +2145,7 @@ $T will be replaced by auto-not-available timeout</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
@@ -2166,10 +2191,14 @@ $T will be replaced by auto-not-available timeout</property>
                   <object class="GtkFrame" id="frame6">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
+                    <property name="label_yalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment7">
                         <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="yscale">0</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkTable" id="table8">
@@ -2208,6 +2237,7 @@ $T will be replaced by auto-not-available timeout</property>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
@@ -2220,6 +2250,7 @@ $T will be replaced by auto-not-available timeout</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
@@ -2256,6 +2287,7 @@ $T will be replaced by auto-not-available timeout</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
@@ -2268,6 +2300,7 @@ $T will be replaced by auto-not-available timeout</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">3</property>
                                 <property name="bottom_attach">4</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                           </object>
@@ -2284,6 +2317,7 @@ $T will be replaced by auto-not-available timeout</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -2291,10 +2325,14 @@ $T will be replaced by auto-not-available timeout</property>
                   <object class="GtkFrame" id="frame7">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
+                    <property name="label_yalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment9">
                         <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="yscale">0</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkTable" id="table9">
@@ -2310,6 +2348,7 @@ $T will be replaced by auto-not-available timeout</property>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
@@ -2336,6 +2375,7 @@ to discover one from server.</property>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
@@ -2350,6 +2390,7 @@ to discover one from server.</property>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                           </object>
@@ -2365,13 +2406,16 @@ to discover one from server.</property>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
               <packing>
                 <property name="position">5</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child type="tab">