diff --git a/glade/preferences_dialog.glade b/glade/preferences_dialog.glade
index a1bffc7ae..fd26e17a1 100644
--- a/glade/preferences_dialog.glade
+++ b/glade/preferences_dialog.glade
@@ -11,10 +11,11 @@
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
+    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>
-        <property name="spacing">2</property>
+        <property name="spacing">1</property>
         <child>
           <widget class="GtkNotebook" id="notebook">
             <property name="visible">True</property>
@@ -38,6 +39,7 @@
                           <widget class="GtkFrame" id="frame1">
                             <property name="visible">True</property>
                             <property name="label_xalign">0</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment1">
                                 <property name="visible">True</property>
@@ -109,6 +111,7 @@
                           <widget class="GtkFrame" id="frame6">
                             <property name="visible">True</property>
                             <property name="label_xalign">0</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment6">
                                 <property name="visible">True</property>
@@ -172,6 +175,7 @@
                           <widget class="GtkFrame" id="frame7">
                             <property name="visible">True</property>
                             <property name="label_xalign">0</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment7">
                                 <property name="visible">True</property>
@@ -210,6 +214,7 @@
                           <widget class="GtkFrame" id="frame2">
                             <property name="visible">True</property>
                             <property name="label_xalign">0</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment2">
                                 <property name="visible">True</property>
@@ -288,6 +293,7 @@
                           <widget class="GtkFrame" id="frame11">
                             <property name="visible">True</property>
                             <property name="label_xalign">0</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment11">
                                 <property name="visible">True</property>
@@ -519,6 +525,7 @@
                           <widget class="GtkFrame" id="frame8">
                             <property name="visible">True</property>
                             <property name="label_xalign">0</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment8">
                                 <property name="visible">True</property>
@@ -649,6 +656,7 @@
                           <widget class="GtkFrame" id="frame9">
                             <property name="visible">True</property>
                             <property name="label_xalign">0</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment9">
                                 <property name="visible">True</property>
@@ -727,6 +735,7 @@
                               <widget class="GtkFrame" id="frame10">
                                 <property name="visible">True</property>
                                 <property name="label_xalign">0</property>
+                                <property name="shadow_type">GTK_SHADOW_NONE</property>
                                 <child>
                                   <widget class="GtkAlignment" id="alignment10">
                                     <property name="visible">True</property>
@@ -742,6 +751,7 @@
                                             <property name="sensitive">False</property>
                                             <property name="label" translatable="yes">UPnP</property>
                                             <property name="use_underline">True</property>
+                                            <property name="active">True</property>
                                             <property name="draw_indicator">True</property>
                                           </widget>
                                           <packing>
@@ -754,6 +764,7 @@
                                             <property name="sensitive">False</property>
                                             <property name="label" translatable="yes">NAT-PMP</property>
                                             <property name="use_underline">True</property>
+                                            <property name="active">True</property>
                                             <property name="draw_indicator">True</property>
                                           </widget>
                                           <packing>
@@ -767,6 +778,7 @@
                                             <property name="sensitive">False</property>
                                             <property name="label" translatable="yes">UT PeX</property>
                                             <property name="use_underline">True</property>
+                                            <property name="active">True</property>
                                             <property name="draw_indicator">True</property>
                                           </widget>
                                           <packing>
@@ -804,6 +816,7 @@
                           <widget class="GtkFrame" id="frame12">
                             <property name="visible">True</property>
                             <property name="label_xalign">0</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment12">
                                 <property name="visible">True</property>
@@ -971,6 +984,7 @@ Full Stream</property>
                           <widget class="GtkFrame" id="frame13">
                             <property name="visible">True</property>
                             <property name="label_xalign">0</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment13">
                                 <property name="visible">True</property>
@@ -1091,6 +1105,7 @@ Full Stream</property>
                         <child>
                           <widget class="GtkFrame" id="frame3">
                             <property name="label_xalign">0</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment3">
                                 <property name="visible">True</property>