diff --git a/data/gui/preferences_window.ui b/data/gui/preferences_window.ui
index 3fccff7e2..d46347613 100644
--- a/data/gui/preferences_window.ui
+++ b/data/gui/preferences_window.ui
@@ -1,18 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="value">20</property>
     <property name="lower">1</property>
     <property name="upper">1440</property>
+    <property name="value">20</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
-    <property name="value">12</property>
     <property name="lower">1</property>
     <property name="upper">720</property>
+    <property name="value">12</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
@@ -149,58 +148,82 @@
       </row>
     </data>
   </object>
+  <object class="GtkListStore" id="status_message_liststore">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name text -->
+      <column type="gchararray"/>
+      <!-- column-name activity -->
+      <column type="gchararray"/>
+      <!-- column-name sub_activity -->
+      <column type="gchararray"/>
+      <!-- column-name activity_text -->
+      <column type="gchararray"/>
+      <!-- column-name mood -->
+      <column type="gchararray"/>
+      <!-- column-name mood_text -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkWindow" id="preferences_window">
+    <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Preferences</property>
     <property name="role">preferences</property>
     <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="on_preferences_window_destroy"/>
-    <signal name="key_press_event" handler="on_preferences_window_key_press_event"/>
+    <signal name="destroy" handler="on_preferences_window_destroy" swapped="no"/>
+    <signal name="key-press-event" handler="on_preferences_window_key_press_event" swapped="no"/>
     <child>
       <object class="GtkVBox" id="vbox13">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkNotebook" id="preferences_notebook">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="show_border">False</property>
-            <signal name="switch_page" handler="on_preferences_notebook_switch_page"/>
+            <signal name="switch-page" handler="on_preferences_notebook_switch_page" swapped="no"/>
             <child>
               <object class="GtkVBox" id="vbox41">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkFrame" id="frame1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</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="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" id="vbox1">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="show_avatars_in_roster_checkbutton">
                                 <property name="label" translatable="yes">Display a_vatars of contacts in roster</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">If checked, Gajim will display avatars of contacts in roster window and in group chats</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_show_avatars_in_roster_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_show_avatars_in_roster_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -211,13 +234,16 @@
                             <child>
                               <object class="GtkCheckButton" id="show_status_msgs_in_roster_checkbutton">
                                 <property name="label" translatable="yes">Display status _messages of contacts in roster</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_show_status_msgs_in_roster_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_show_status_msgs_in_roster_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -228,13 +254,16 @@
                             <child>
                               <object class="GtkCheckButton" id="show_mood_in_roster_checkbutton">
                                 <property name="label" translatable="yes">Display m_ood of contacts in roster</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">If checked, Gajim will display the mood of contacts in the roster window</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_show_mood_in_roster_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_show_mood_in_roster_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -245,13 +274,16 @@
                             <child>
                               <object class="GtkCheckButton" id="show_activity_in_roster_checkbutton">
                                 <property name="label" translatable="yes">Display _activity of contacts in roster</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">If checked, Gajim will display the activity of contacts in the roster window</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_show_activity_in_roster_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_show_activity_in_roster_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -262,13 +294,16 @@
                             <child>
                               <object class="GtkCheckButton" id="show_tunes_in_roster_checkbutton">
                                 <property name="label" translatable="yes">Display _tunes of contacts in roster</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">If checked, Gajim will display the tunes of contacts in the roster window</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_show_tunes_in_roster_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_show_tunes_in_roster_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -279,14 +314,17 @@
                             <child>
                               <object class="GtkCheckButton" id="show_location_in_roster_checkbutton">
                                 <property name="label" translatable="yes">Display _location of contacts in roster</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="has_tooltip">True</property>
                                 <property name="tooltip_text" translatable="yes">If checked, Gajim will display the location of contacts in the roster window</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_show_location_in_roster_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_show_location_in_roster_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -297,48 +335,62 @@
                             <child>
                               <object class="GtkHBox" id="hbox3">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkLabel" id="label10">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">Sort contacts by status</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="sort_by_show_in_roster_checkbutton">
                                     <property name="label" translatable="yes">in _roster</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="on_sort_by_show_in_roster_checkbutton_toggled"/>
+                                    <signal name="toggled" handler="on_sort_by_show_in_roster_checkbutton_toggled" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="sort_by_show_in_muc_checkbutton">
                                     <property name="label" translatable="yes">in _group chats</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="on_sort_by_show_in_muc_checkbutton_toggled"/>
+                                    <signal name="toggled" handler="on_sort_by_show_in_muc_checkbutton_toggled" swapped="no"/>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">6</property>
                               </packing>
                             </child>
@@ -349,6 +401,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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" translatable="yes">&lt;b&gt;Roster Appearance&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -357,24 +410,28 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame2">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</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="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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="left_padding">12</property>
                         <child>
                           <object class="GtkTable" id="table1">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="n_rows">6</property>
                             <property name="n_columns">2</property>
@@ -383,6 +440,7 @@
                             <child>
                               <object class="GtkLabel" id="label379">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="xpad">1</property>
                                 <property name="label" translatable="yes">_Window behavior:</property>
@@ -398,7 +456,8 @@
                             <child>
                               <object class="GtkComboBox" id="emoticons_combobox">
                                 <property name="visible">True</property>
-                                <signal name="changed" handler="on_emoticons_combobox_changed"/>
+                                <property name="can_focus">False</property>
+                                <signal name="changed" handler="on_emoticons_combobox_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -408,10 +467,12 @@
                             <child>
                               <object class="GtkEventBox" id="eventbox5">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="tooltip_text" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property>
                                 <child>
                                   <object class="GtkLabel" id="label381">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="xpad">1</property>
                                     <property name="label" translatable="yes">_Emoticons:</property>
@@ -426,12 +487,15 @@
                             <child>
                               <object class="GtkCheckButton" id="compact_view_checkbutton">
                                 <property name="label" translatable="yes">Ma_ke message windows compact</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">Hide all buttons in chat windows</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_compact_view_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_compact_view_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="right_attach">2</property>
@@ -443,13 +507,16 @@
                             <child>
                               <object class="GtkCheckButton" id="xhtml_checkbutton">
                                 <property name="label" translatable="yes">_Ignore rich content in incoming messages</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_xhtml_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_xhtml_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="right_attach">2</property>
@@ -461,12 +528,15 @@
                             <child>
                               <object class="GtkCheckButton" id="speller_checkbutton">
                                 <property name="label" translatable="yes">_Highlight misspelled words</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_speller_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_speller_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="right_attach">2</property>
@@ -479,8 +549,9 @@
                               <object class="GtkComboBox" id="one_window_type_combobox">
                                 <property name="width_request">50</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="model">liststore6</property>
-                                <signal name="changed" handler="on_one_window_type_combo_changed"/>
+                                <signal name="changed" handler="on_one_window_type_combo_changed" swapped="no"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="cellrenderertext6"/>
                                   <attributes>
@@ -498,6 +569,7 @@
                             <child>
                               <object class="GtkLabel" id="label28">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="xpad">1</property>
                                 <property name="label" translatable="yes">_Show roster on startup:</property>
@@ -514,8 +586,9 @@
                               <object class="GtkComboBox" id="show_roster_on_startup">
                                 <property name="width_request">50</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="model">liststore7</property>
-                                <signal name="changed" handler="on_show_roster_on_startup_changed"/>
+                                <signal name="changed" handler="on_show_roster_on_startup_changed" swapped="no"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="cellrenderertext7"/>
                                   <attributes>
@@ -537,6 +610,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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" translatable="yes">&lt;b&gt;Chat Appearance&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -545,6 +619,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -553,6 +628,7 @@
             <child type="tab">
               <object class="GtkLabel" id="label74">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">General</property>
               </object>
               <packing>
@@ -562,47 +638,53 @@
             <child>
               <object class="GtkVBox" id="vbox42">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkFrame" id="frame29">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment58">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">6</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" id="vbox67">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkHBox" id="hbox1">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkLabel" id="label7">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">When new event is received:</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkComboBox" id="on_event_combobox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="model">liststore5</property>
-                                    <signal name="changed" handler="on_on_event_combobox_changed"/>
+                                    <signal name="changed" handler="on_on_event_combobox_changed" swapped="no"/>
                                     <child>
                                       <object class="GtkCellRendererText" id="cellrenderertext5"/>
                                       <attributes>
@@ -611,25 +693,31 @@
                                     </child>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="notify_on_signin_checkbutton">
                                 <property name="label" translatable="yes">Notify me about contacts that sign _in</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_notify_on_signin_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_notify_on_signin_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -640,13 +728,16 @@
                             <child>
                               <object class="GtkCheckButton" id="notify_on_signout_checkbutton">
                                 <property name="label" translatable="yes">Notify me about contacts that sign _out</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_notify_on_signout_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_notify_on_signout_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -657,12 +748,15 @@
                             <child>
                               <object class="GtkCheckButton" id="auto_popup_away_checkbutton">
                                 <property name="label" translatable="yes">Allow popup/notifications when I'm _away/na/busy/invisible</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_auto_popup_away_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_auto_popup_away_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -674,28 +768,33 @@
                               <object class="GtkFrame" id="frame_gmail">
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
+                                <property name="can_focus">False</property>
                                 <property name="no_show_all">True</property>
                                 <property name="label_xalign">0</property>
                                 <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkAlignment" id="alignment_gmail">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="left_padding">12</property>
                                     <child>
                                       <object class="GtkVBox" id="vbox_gmail">
                                         <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
+                                        <property name="can_focus">False</property>
                                         <property name="spacing">6</property>
                                         <child>
                                           <object class="GtkCheckButton" id="notify_gmail_checkbutton">
                                             <property name="label" translatable="yes">Notify on new _GMail email</property>
+                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
                                             <property name="tooltip_text" translatable="yes">If checked, Gajim will show a notification when a new e-mail is received via GMail</property>
+                                            <property name="use_action_appearance">False</property>
                                             <property name="use_underline">True</property>
+                                            <property name="xalign">0</property>
                                             <property name="draw_indicator">True</property>
-                                            <signal name="toggled" handler="on_notify_gmail_checkbutton_toggled"/>
+                                            <signal name="toggled" handler="on_notify_gmail_checkbutton_toggled" swapped="no"/>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -706,13 +805,16 @@
                                         <child>
                                           <object class="GtkCheckButton" id="notify_gmail_extra_checkbutton">
                                             <property name="label" translatable="yes">Display _extra email details</property>
+                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
                                             <property name="tooltip_text" translatable="yes">If checked, Gajim will also include information about the sender of the new emails</property>
+                                            <property name="use_action_appearance">False</property>
                                             <property name="use_underline">True</property>
+                                            <property name="xalign">0</property>
                                             <property name="draw_indicator">True</property>
-                                            <signal name="toggled" handler="on_notify_gmail_extra_checkbutton_toggled"/>
+                                            <signal name="toggled" handler="on_notify_gmail_extra_checkbutton_toggled" swapped="no"/>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -727,6 +829,7 @@
                                 <child type="label">
                                   <object class="GtkLabel" id="gmail_options_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">&lt;b&gt;GMail Options&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
                                   </object>
@@ -741,22 +844,26 @@
                             <child>
                               <object class="GtkHBox" id="hbox5">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkLabel" id="label11">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">Show notification area icon:</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkComboBox" id="systray_combobox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="model">liststore4</property>
-                                    <signal name="changed" handler="on_systray_combobox_changed"/>
+                                    <signal name="changed" handler="on_systray_combobox_changed" swapped="no"/>
                                     <child>
                                       <object class="GtkCellRendererText" id="cellrenderertext4"/>
                                       <attributes>
@@ -765,12 +872,15 @@
                                     </child>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">5</property>
                               </packing>
                             </child>
@@ -781,6 +891,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label240">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Visual Notifications&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -788,77 +899,93 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame5">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</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="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment5">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" id="vbox3">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkHBox" id="hbox4">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkCheckButton" id="play_sounds_checkbutton">
                                     <property name="label" translatable="yes">Play _sounds</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="on_play_sounds_checkbutton_toggled"/>
+                                    <signal name="toggled" handler="on_play_sounds_checkbutton_toggled" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="manage_sounds_button">
                                     <property name="label" translatable="yes">Ma_nage...</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
-                                    <signal name="clicked" handler="on_manage_sounds_button_clicked"/>
+                                    <signal name="clicked" handler="on_manage_sounds_button_clicked" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="sound_dnd_checkbutton">
                                 <property name="label" translatable="yes">Allow sound when I'm _busy</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_sound_dnd_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_sound_dnd_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -869,6 +996,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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" translatable="yes">&lt;b&gt;Sounds&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -877,6 +1005,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -888,6 +1017,7 @@
             <child type="tab">
               <object class="GtkLabel" id="label76">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="label" translatable="yes">Notifications</property>
               </object>
@@ -899,12 +1029,13 @@
             <child>
               <object class="GtkVBox" id="vbox11">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkFrame" id="frame13">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</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>
@@ -912,6 +1043,7 @@
                     <child>
                       <object class="GtkAlignment" id="alignment19">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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>
@@ -921,6 +1053,7 @@
                         <child>
                           <object class="GtkTable" id="table7">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="n_rows">2</property>
                             <property name="n_columns">2</property>
@@ -929,8 +1062,9 @@
                             <child>
                               <object class="GtkComboBox" id="displayed_chat_states_combobox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="model">liststore3</property>
-                                <signal name="changed" handler="on_displayed_chat_states_combobox_changed"/>
+                                <signal name="changed" handler="on_displayed_chat_states_combobox_changed" swapped="no"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="cellrenderertext3"/>
                                   <attributes>
@@ -949,10 +1083,12 @@
                             <child>
                               <object class="GtkEventBox" id="eventbox8">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="tooltip_text" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows.</property>
                                 <child>
                                   <object class="GtkLabel" id="label33">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_Display chat state notifications:</property>
                                     <property name="use_underline">True</property>
@@ -968,10 +1104,12 @@
                             <child>
                               <object class="GtkEventBox" id="eventbox9">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="tooltip_text" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party.</property>
                                 <child>
                                   <object class="GtkLabel" id="label34">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">_Send chat state notifications:</property>
                                     <property name="use_underline">True</property>
@@ -985,8 +1123,9 @@
                             <child>
                               <object class="GtkComboBox" id="outgoing_chat_states_combobox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="model">liststore2</property>
-                                <signal name="changed" handler="on_outgoing_chat_states_combobox_changed"/>
+                                <signal name="changed" handler="on_outgoing_chat_states_combobox_changed" swapped="no"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="cellrenderertext2"/>
                                   <attributes>
@@ -1007,6 +1146,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label35">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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" translatable="yes">&lt;b&gt;Chat state notifications&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -1015,6 +1155,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -1030,6 +1171,7 @@
             <child type="tab">
               <object class="GtkLabel" id="label9">
                 <property name="visible">True</property>
+                <property name="can_focus">False</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" translatable="yes">Personal Events</property>
               </object>
@@ -1041,23 +1183,26 @@
             <child>
               <object class="GtkVBox" id="status_vbox">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkFrame" id="frame81">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment_gmail1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">6</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkTable" id="autoaway_table">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="n_rows">2</property>
                             <property name="n_columns">4</property>
                             <property name="column_spacing">12</property>
@@ -1065,13 +1210,16 @@
                             <child>
                               <object class="GtkCheckButton" id="auto_away_checkbutton">
                                 <property name="label" translatable="yes">_Away after:</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_auto_away_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_auto_away_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
@@ -1081,13 +1229,16 @@
                             <child>
                               <object class="GtkCheckButton" id="auto_xa_checkbutton">
                                 <property name="label" translatable="yes">_Not available after:</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_auto_xa_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_auto_xa_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="top_attach">1</property>
@@ -1099,6 +1250,7 @@
                             <child>
                               <object class="GtkLabel" id="label77">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">minutes</property>
                               </object>
@@ -1112,6 +1264,7 @@
                             <child>
                               <object class="GtkLabel" id="label78">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">minutes</property>
                               </object>
@@ -1127,6 +1280,7 @@
                             <child>
                               <object class="GtkAlignment" id="alignment33">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">1</property>
                                 <property name="xscale">0</property>
                                 <child>
@@ -1136,7 +1290,7 @@
                                     <property name="can_focus">True</property>
                                     <property name="adjustment">adjustment2</property>
                                     <property name="climb_rate">1</property>
-                                    <signal name="value_changed" handler="on_auto_away_time_spinbutton_value_changed"/>
+                                    <signal name="value-changed" handler="on_auto_away_time_spinbutton_value_changed" swapped="no"/>
                                   </object>
                                 </child>
                               </object>
@@ -1150,6 +1304,7 @@
                             <child>
                               <object class="GtkAlignment" id="alignment34">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">1</property>
                                 <property name="xscale">0</property>
                                 <child>
@@ -1159,7 +1314,7 @@
                                     <property name="can_focus">True</property>
                                     <property name="adjustment">adjustment1</property>
                                     <property name="climb_rate">1</property>
-                                    <signal name="value_changed" handler="on_auto_xa_time_spinbutton_value_changed"/>
+                                    <signal name="value-changed" handler="on_auto_xa_time_spinbutton_value_changed" swapped="no"/>
                                   </object>
                                 </child>
                               </object>
@@ -1179,7 +1334,7 @@
                                 <property name="tooltip_text" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message
 $S will be replaced by previous status message
 $T will be replaced by auto-away timeout</property>
-                                <signal name="changed" handler="on_auto_away_message_entry_changed"/>
+                                <signal name="changed" handler="on_auto_away_message_entry_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">3</property>
@@ -1194,7 +1349,7 @@ $T will be replaced by auto-away timeout</property>
                                 <property name="tooltip_text" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message
 $S will be replaced by previous status message
 $T will be replaced by auto-not-available timeout</property>
-                                <signal name="changed" handler="on_auto_xa_message_entry_changed"/>
+                                <signal name="changed" handler="on_auto_xa_message_entry_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">3</property>
@@ -1211,6 +1366,7 @@ $T will be replaced by auto-not-available timeout</property>
                     <child type="label">
                       <object class="GtkLabel" id="label81">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Auto Status&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -1225,26 +1381,30 @@ $T will be replaced by auto-not-available timeout</property>
                 <child>
                   <object class="GtkFrame" id="frame8">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment8">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">6</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" id="vbox2">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkHBox" id="hbox2934">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkLabel" id="label214">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">Ask status message when I:</property>
                                   </object>
                                   <packing>
@@ -1256,16 +1416,20 @@ $T will be replaced by auto-not-available timeout</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox6">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">14</property>
                                     <child>
                                       <object class="GtkCheckButton" id="prompt_online_status_message_checkbutton">
                                         <property name="label" translatable="yes">Sign _in</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="on_prompt_online_status_message_checkbutton_toggled"/>
+                                        <signal name="toggled" handler="on_prompt_online_status_message_checkbutton_toggled" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1276,12 +1440,15 @@ $T will be replaced by auto-not-available timeout</property>
                                     <child>
                                       <object class="GtkCheckButton" id="prompt_offline_status_message_checkbutton">
                                         <property name="label" translatable="yes">Sign _out</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="on_prompt_offline_status_message_checkbutton_toggled"/>
+                                        <signal name="toggled" handler="on_prompt_offline_status_message_checkbutton_toggled" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1313,10 +1480,15 @@ $T will be replaced by auto-not-available timeout</property>
                                   <object class="GtkTreeView" id="default_msg_treeview">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection" id="treeview-selection1"/>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -1327,47 +1499,59 @@ $T will be replaced by auto-not-available timeout</property>
                     <child type="label">
                       <object class="GtkLabel" id="label12">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Status Messages&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame22">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment49">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">6</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkTable" id="table4">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="n_rows">2</property>
                             <property name="n_columns">2</property>
                             <property name="column_spacing">6</property>
                             <property name="row_spacing">6</property>
+                            <child>
+                              <placeholder/>
+                            </child>
                             <child>
                               <object class="GtkVButtonBox" id="vbuttonbox3">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">5</property>
                                 <property name="layout_style">start</property>
                                 <child>
                                   <object class="GtkButton" id="new_msg_button">
                                     <property name="label">gtk-new</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="can_default">True</property>
                                     <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="on_new_msg_button_clicked"/>
+                                    <signal name="clicked" handler="on_new_msg_button_clicked" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1378,12 +1562,14 @@ $T will be replaced by auto-not-available timeout</property>
                                 <child>
                                   <object class="GtkButton" id="delete_msg_button">
                                     <property name="label">gtk-delete</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="can_default">True</property>
                                     <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="on_delete_msg_button_clicked"/>
+                                    <signal name="clicked" handler="on_delete_msg_button_clicked" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1408,9 +1594,14 @@ $T will be replaced by auto-not-available timeout</property>
                                   <object class="GtkTreeView" id="msg_treeview">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="model">status_message_liststore</property>
                                     <property name="headers_visible">False</property>
-                                    <signal name="cursor_changed" handler="on_msg_treeview_cursor_changed"/>
-                                    <signal name="key_press_event" handler="on_msg_treeview_key_press_event"/>
+                                    <property name="headers_clickable">False</property>
+                                    <signal name="cursor-changed" handler="on_msg_treeview_cursor_changed" swapped="no"/>
+                                    <signal name="key-press-event" handler="on_msg_treeview_key_press_event" swapped="no"/>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection" id="treeview-selection2"/>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
@@ -1437,9 +1628,6 @@ $T will be replaced by auto-not-available timeout</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
-                            <child>
-                              <placeholder/>
-                            </child>
                           </object>
                         </child>
                       </object>
@@ -1447,12 +1635,15 @@ $T will be replaced by auto-not-available timeout</property>
                     <child type="label">
                       <object class="GtkLabel" id="label213">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Preset Status Messages&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -1464,6 +1655,7 @@ $T will be replaced by auto-not-available timeout</property>
             <child type="tab">
               <object class="GtkLabel" id="label80">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Status</property>
               </object>
               <packing>
@@ -1474,33 +1666,41 @@ $T will be replaced by auto-not-available timeout</property>
             <child>
               <object class="GtkVBox" id="vbox58">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkFrame" id="frame9">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment10">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">6</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkTable" id="table5">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="n_rows">2</property>
                             <property name="n_columns">2</property>
                             <property name="column_spacing">6</property>
                             <property name="row_spacing">6</property>
+                            <child>
+                              <placeholder/>
+                            </child>
                             <child>
                               <object class="GtkFontButton" id="conversation_fontbutton">
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <signal name="font_set" handler="on_conversation_fontbutton_font_set"/>
+                                <property name="use_action_appearance">False</property>
+                                <signal name="font-set" handler="on_conversation_fontbutton_font_set" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1510,12 +1710,15 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkCheckButton" id="default_chat_font">
                                 <property name="label" translatable="yes">Use system _default</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_default_chat_font_toggled"/>
+                                <signal name="toggled" handler="on_default_chat_font_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1527,6 +1730,7 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkLabel" id="label4">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</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" translatable="yes">Chat message:</property>
                               </object>
@@ -1535,9 +1739,6 @@ $T will be replaced by auto-not-available timeout</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
-                            <child>
-                              <placeholder/>
-                            </child>
                           </object>
                         </child>
                       </object>
@@ -1545,6 +1746,7 @@ $T will be replaced by auto-not-available timeout</property>
                     <child type="label">
                       <object class="GtkLabel" id="label23">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Font&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -1559,33 +1761,45 @@ $T will be replaced by auto-not-available timeout</property>
                 <child>
                   <object class="GtkFrame" id="frame3">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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="left_padding">12</property>
                         <child>
                           <object class="GtkTable" id="table2">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="n_rows">3</property>
                             <property name="n_columns">3</property>
                             <property name="column_spacing">6</property>
                             <property name="row_spacing">6</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
                             <child>
                               <object class="GtkCheckButton" id="transports_iconsets_checkbutton">
                                 <property name="label" translatable="yes">Use _transports icons</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1598,7 +1812,8 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkComboBox" id="iconset_combobox">
                                 <property name="visible">True</property>
-                                <signal name="changed" handler="on_iconset_combobox_changed"/>
+                                <property name="can_focus">False</property>
+                                <signal name="changed" handler="on_iconset_combobox_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1612,6 +1827,7 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkLabel" id="label174">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Status _iconset:</property>
                                 <property name="use_underline">True</property>
@@ -1627,7 +1843,8 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkComboBox" id="theme_combobox">
                                 <property name="visible">True</property>
-                                <signal name="changed" handler="on_theme_combobox_changed"/>
+                                <property name="can_focus">False</property>
+                                <signal name="changed" handler="on_theme_combobox_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1638,12 +1855,14 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkButton" id="manage_theme_button">
                                 <property name="label" translatable="yes">Ma_nage...</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">Configure color and font of the interface</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
-                                <signal name="clicked" handler="on_manage_theme_button_clicked"/>
+                                <signal name="clicked" handler="on_manage_theme_button_clicked" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">2</property>
@@ -1654,6 +1873,7 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkLabel" id="label249">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">T_heme:</property>
                                 <property name="use_underline">True</property>
@@ -1664,12 +1884,6 @@ $T will be replaced by auto-not-available timeout</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
                           </object>
                         </child>
                       </object>
@@ -1677,6 +1891,7 @@ $T will be replaced by auto-not-available timeout</property>
                     <child type="label">
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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" translatable="yes">&lt;b&gt;Themes&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -1685,22 +1900,26 @@ $T will be replaced by auto-not-available timeout</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame24">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment53">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">6</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkTable" id="table25">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="n_rows">4</property>
                             <property name="n_columns">4</property>
                             <property name="column_spacing">12</property>
@@ -1708,6 +1927,7 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkLabel" id="label72">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Contact's nickname:</property>
                                 <property name="use_underline">True</property>
@@ -1721,6 +1941,7 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkLabel" id="label70">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Your nickname:</property>
                                 <property name="use_underline">True</property>
@@ -1736,6 +1957,7 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkLabel" id="label71">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Status message:</property>
                                 <property name="use_underline">True</property>
@@ -1751,6 +1973,7 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkLabel" id="label371">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_URL highlight:</property>
                                 <property name="use_underline">True</property>
@@ -1767,34 +1990,42 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkHBox" id="hbox3022">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" id="label383">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
                                     <property name="fill">False</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="reset_colors_button">
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="focus_on_click">False</property>
-                                    <signal name="clicked" handler="on_reset_colors_button_clicked"/>
+                                    <signal name="clicked" handler="on_reset_colors_button_clicked" swapped="no"/>
                                     <child>
                                       <object class="GtkAlignment" id="alignment52">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xscale">0</property>
                                         <property name="yscale">0</property>
                                         <child>
                                           <object class="GtkHBox" id="hbox2936">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="spacing">2</property>
                                             <child>
                                               <object class="GtkImage" id="image439">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="stock">gtk-revert-to-saved</property>
                                               </object>
                                               <packing>
@@ -1806,6 +2037,7 @@ $T will be replaced by auto-not-available timeout</property>
                                             <child>
                                               <object class="GtkLabel" id="label217">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="label" translatable="yes">_Reset to Default Colors</property>
                                                 <property name="use_underline">True</property>
                                               </object>
@@ -1837,6 +2069,7 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkLabel" id="label13">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Contact's message:</property>
                               </object>
@@ -1850,6 +2083,7 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkLabel" id="label14">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Your message:</property>
                               </object>
@@ -1865,13 +2099,17 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkHBox" id="hbox8">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkCheckButton" id="incoming_msg_checkbutton">
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="xalign">0.5</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="on_incoming_msg_checkbutton_toggled"/>
+                                    <signal name="toggled" handler="on_incoming_msg_checkbutton_toggled" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1881,12 +2119,14 @@ $T will be replaced by auto-not-available timeout</property>
                                 </child>
                                 <child>
                                   <object class="GtkColorButton" id="incoming_msg_colorbutton">
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="xalign">0</property>
                                     <property name="color">#000000000000</property>
-                                    <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/>
+                                    <signal name="color-set" handler="on_incoming_msg_colorbutton_color_set" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1908,13 +2148,17 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkHBox" id="hbox9">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkCheckButton" id="outgoing_msg_checkbutton">
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="xalign">0.5</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="on_outgoing_msg_checkbutton_toggled"/>
+                                    <signal name="toggled" handler="on_outgoing_msg_checkbutton_toggled" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1924,12 +2168,14 @@ $T will be replaced by auto-not-available timeout</property>
                                 </child>
                                 <child>
                                   <object class="GtkColorButton" id="outgoing_msg_colorbutton">
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="xalign">0</property>
                                     <property name="color">#000000000000</property>
-                                    <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set"/>
+                                    <signal name="color-set" handler="on_outgoing_msg_colorbutton_color_set" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1951,20 +2197,24 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkHBox" id="hbox10">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <placeholder/>
                                 </child>
                                 <child>
                                   <object class="GtkColorButton" id="incoming_nick_colorbutton">
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="xalign">0</property>
                                     <property name="color">#000000000000</property>
-                                    <signal name="color_set" handler="on_incoming_nick_colorbutton_color_set"/>
+                                    <signal name="color-set" handler="on_incoming_nick_colorbutton_color_set" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="pack_type">end</property>
                                     <property name="position">1</property>
                                   </packing>
@@ -1980,17 +2230,21 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkHBox" id="hbox11">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkColorButton" id="status_msg_colorbutton">
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="xalign">0</property>
                                     <property name="color">#000000000000</property>
-                                    <signal name="color_set" handler="on_status_msg_colorbutton_color_set"/>
+                                    <signal name="color-set" handler="on_status_msg_colorbutton_color_set" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="pack_type">end</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -2008,20 +2262,24 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkHBox" id="hbox12">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <placeholder/>
                                 </child>
                                 <child>
                                   <object class="GtkColorButton" id="outgoing_nick_colorbutton">
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="xalign">0</property>
                                     <property name="color">#000000000000</property>
-                                    <signal name="color_set" handler="on_outgoing_nick_colorbutton_color_set"/>
+                                    <signal name="color-set" handler="on_outgoing_nick_colorbutton_color_set" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="pack_type">end</property>
                                     <property name="position">1</property>
                                   </packing>
@@ -2037,20 +2295,24 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkHBox" id="hbox13">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <placeholder/>
                                 </child>
                                 <child>
                                   <object class="GtkColorButton" id="url_msg_colorbutton">
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="xalign">0</property>
                                     <property name="color">#000000000000</property>
-                                    <signal name="color_set" handler="on_url_msg_colorbutton_color_set"/>
+                                    <signal name="color-set" handler="on_url_msg_colorbutton_color_set" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="pack_type">end</property>
                                     <property name="position">1</property>
                                   </packing>
@@ -2072,6 +2334,7 @@ $T will be replaced by auto-not-available timeout</property>
                     <child type="label">
                       <object class="GtkLabel" id="label228">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Chat Line Colors&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -2091,6 +2354,7 @@ $T will be replaced by auto-not-available timeout</property>
             <child type="tab">
               <object class="GtkLabel" id="label218">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Style</property>
               </object>
               <packing>
@@ -2101,18 +2365,20 @@ $T will be replaced by auto-not-available timeout</property>
             <child>
               <object class="GtkVBox" id="vbox4">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkFrame" id="audio_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</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="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
                         <property name="yscale">0</property>
@@ -2120,6 +2386,7 @@ $T will be replaced by auto-not-available timeout</property>
                         <child>
                           <object class="GtkTable" id="table6">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="n_rows">2</property>
                             <property name="n_columns">2</property>
                             <property name="column_spacing">6</property>
@@ -2127,7 +2394,8 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkComboBox" id="audio_input_combobox">
                                 <property name="visible">True</property>
-                                <signal name="changed" handler="on_audio_input_combobox_changed"/>
+                                <property name="can_focus">False</property>
+                                <signal name="changed" handler="on_audio_input_combobox_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -2138,7 +2406,8 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkComboBox" id="audio_output_combobox">
                                 <property name="visible">True</property>
-                                <signal name="changed" handler="on_audio_output_combobox_changed"/>
+                                <property name="can_focus">False</property>
+                                <signal name="changed" handler="on_audio_output_combobox_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -2151,6 +2420,7 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkLabel" id="label18">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Audio input device</property>
                               </object>
@@ -2161,6 +2431,7 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkLabel" id="label19">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Audio output device</property>
                               </object>
@@ -2177,6 +2448,7 @@ $T will be replaced by auto-not-available timeout</property>
                     <child type="label">
                       <object class="GtkLabel" id="label16">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Audio&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -2184,18 +2456,21 @@ $T will be replaced by auto-not-available timeout</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame6">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</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="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
                         <property name="yscale">0</property>
@@ -2203,6 +2478,7 @@ $T will be replaced by auto-not-available timeout</property>
                         <child>
                           <object class="GtkTable" id="table8">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="n_rows">4</property>
                             <property name="n_columns">2</property>
                             <property name="column_spacing">6</property>
@@ -2210,6 +2486,7 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkLabel" id="label20">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Video input device</property>
                               </object>
@@ -2220,6 +2497,7 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkLabel" id="label21">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Video output device</property>
                               </object>
@@ -2232,7 +2510,8 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkComboBox" id="video_input_combobox">
                                 <property name="visible">True</property>
-                                <signal name="changed" handler="on_video_input_combobox_changed"/>
+                                <property name="can_focus">False</property>
+                                <signal name="changed" handler="on_video_input_combobox_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -2243,7 +2522,8 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkComboBox" id="video_output_combobox">
                                 <property name="visible">True</property>
-                                <signal name="changed" handler="on_video_output_combobox_changed"/>
+                                <property name="can_focus">False</property>
+                                <signal name="changed" handler="on_video_output_combobox_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -2256,6 +2536,7 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkLabel" id="label26">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Video framerate</property>
                               </object>
@@ -2268,6 +2549,7 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkLabel" id="label27">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Video size</property>
                               </object>
@@ -2280,7 +2562,8 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkComboBox" id="video_framerate_combobox">
                                 <property name="visible">True</property>
-                                <signal name="changed" handler="on_video_framerate_combobox_changed"/>
+                                <property name="can_focus">False</property>
+                                <signal name="changed" handler="on_video_framerate_combobox_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -2293,7 +2576,8 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkComboBox" id="video_size_combobox">
                                 <property name="visible">True</property>
-                                <signal name="changed" handler="on_video_size_combobox_changed"/>
+                                <property name="can_focus">False</property>
+                                <signal name="changed" handler="on_video_size_combobox_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -2310,6 +2594,7 @@ $T will be replaced by auto-not-available timeout</property>
                     <child type="label">
                       <object class="GtkLabel" id="label17">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Video&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -2324,12 +2609,14 @@ $T will be replaced by auto-not-available timeout</property>
                 <child>
                   <object class="GtkFrame" id="frame7">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</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="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
                         <property name="yscale">0</property>
@@ -2337,12 +2624,14 @@ $T will be replaced by auto-not-available timeout</property>
                         <child>
                           <object class="GtkTable" id="table9">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="n_columns">4</property>
                             <property name="column_spacing">6</property>
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="label24">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">STUN server:</property>
                               </object>
@@ -2354,6 +2643,7 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <object class="GtkLabel" id="label25">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">&lt;i&gt;(example: stunserver.org)&lt;/i&gt;</property>
                                 <property name="use_markup">True</property>
                               </object>
@@ -2369,8 +2659,8 @@ $T will be replaced by auto-not-available timeout</property>
                                 <property name="can_focus">True</property>
                                 <property name="tooltip_text" translatable="yes">STUN server hostname. If none given, Gajim will try
 to discover one from server.</property>
-                                <property name="invisible_char">&#x25CF;</property>
-                                <signal name="changed" handler="stun_server_entry_changed"/>
+                                <property name="invisible_char">●</property>
+                                <signal name="changed" handler="stun_server_entry_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">2</property>
@@ -2380,11 +2670,14 @@ to discover one from server.</property>
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="stun_checkbutton">
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="xalign">0.5</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_stun_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_stun_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -2400,12 +2693,15 @@ to discover one from server.</property>
                     <child type="label">
                       <object class="GtkLabel" id="label22">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Connection&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -2421,6 +2717,7 @@ to discover one from server.</property>
             <child type="tab">
               <object class="GtkLabel" id="label15">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Audio / Video</property>
               </object>
               <packing>
@@ -2431,29 +2728,32 @@ to discover one from server.</property>
             <child>
               <object class="GtkVBox" id="vbox45">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkFrame" id="applications_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment89">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">6</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" id="vbox50">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkComboBox" id="applications_combobox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="model">liststore1</property>
-                                <signal name="changed" handler="on_applications_combobox_changed"/>
+                                <signal name="changed" handler="on_applications_combobox_changed" swapped="no"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="cellrenderertext1"/>
                                   <attributes>
@@ -2462,21 +2762,26 @@ to discover one from server.</property>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkFrame" id="custom_apps_frame">
+                                <property name="can_focus">False</property>
                                 <property name="label_xalign">0</property>
                                 <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkAlignment" id="alignment43">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="border_width">6</property>
                                     <property name="left_padding">12</property>
                                     <child>
                                       <object class="GtkTable" id="table22">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="n_rows">3</property>
                                         <property name="n_columns">2</property>
                                         <property name="column_spacing">12</property>
@@ -2485,7 +2790,7 @@ to discover one from server.</property>
                                           <object class="GtkEntry" id="custom_file_manager_entry">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <signal name="changed" handler="on_custom_file_manager_entry_changed"/>
+                                            <signal name="changed" handler="on_custom_file_manager_entry_changed" swapped="no"/>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
@@ -2498,6 +2803,7 @@ to discover one from server.</property>
                                         <child>
                                           <object class="GtkLabel" id="label355">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">_File manager:</property>
                                             <property name="use_underline">True</property>
@@ -2514,7 +2820,7 @@ to discover one from server.</property>
                                           <object class="GtkEntry" id="custom_browser_entry">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <signal name="changed" handler="on_custom_browser_entry_changed"/>
+                                            <signal name="changed" handler="on_custom_browser_entry_changed" swapped="no"/>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
@@ -2526,7 +2832,7 @@ to discover one from server.</property>
                                           <object class="GtkEntry" id="custom_mail_client_entry">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <signal name="changed" handler="on_custom_mail_client_entry_changed"/>
+                                            <signal name="changed" handler="on_custom_mail_client_entry_changed" swapped="no"/>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
@@ -2539,6 +2845,7 @@ to discover one from server.</property>
                                         <child>
                                           <object class="GtkLabel" id="label200">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">_Mail client:</property>
                                             <property name="use_underline">True</property>
@@ -2554,6 +2861,7 @@ to discover one from server.</property>
                                         <child>
                                           <object class="GtkLabel" id="label199">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">_Browser:</property>
                                             <property name="use_underline">True</property>
@@ -2571,12 +2879,15 @@ to discover one from server.</property>
                                 <child type="label">
                                   <object class="GtkLabel" id="label198">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes" comments="a header for custom browser/client/file manager. so translate sth like: Custom Settings">&lt;b&gt;Custom&lt;/b&gt;</property>
                                     <property name="use_markup">True</property>
                                   </object>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -2587,6 +2898,7 @@ to discover one from server.</property>
                     <child type="label">
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Applications&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -2601,18 +2913,21 @@ to discover one from server.</property>
                 <child>
                   <object class="GtkFrame" id="frame4">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</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="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment4">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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="left_padding">12</property>
                         <child>
                           <object class="GtkTable" id="table3">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="n_rows">6</property>
                             <property name="column_spacing">6</property>
@@ -2620,13 +2935,16 @@ to discover one from server.</property>
                             <child>
                               <object class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton">
                                 <property name="label" translatable="yes">_Ignore events from contacts not in the roster</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_ignore_events_from_unknown_contacts_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_ignore_events_from_unknown_contacts_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
@@ -2635,13 +2953,16 @@ to discover one from server.</property>
                             <child>
                               <object class="GtkCheckButton" id="send_os_info_checkbutton">
                                 <property name="label" translatable="yes">Allow client / _OS information to be sent</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">If checked, Gajim will allow others to detect the operation system you are using</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_send_os_info_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_send_os_info_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="top_attach">1</property>
@@ -2651,13 +2972,16 @@ to discover one from server.</property>
                             <child>
                               <object class="GtkCheckButton" id="send_time_info_checkbutton">
                                 <property name="label" translatable="yes">Allow local system time information to be sent</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">If checked, Gajim will allow others to detect the time on your system</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_send_time_info_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_send_time_info_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="top_attach">2</property>
@@ -2667,13 +2991,16 @@ to discover one from server.</property>
                             <child>
                               <object class="GtkCheckButton" id="log_encrypted_chats_checkbutton">
                                 <property name="label" translatable="yes">Log _encrypted chat session</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="tooltip_text" translatable="yes">If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged.</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="top_attach">3</property>
@@ -2683,12 +3010,15 @@ to discover one from server.</property>
                             <child>
                               <object class="GtkCheckButton" id="send_idle_time_checkbutton">
                                 <property name="label" translatable="yes">Allow my _idle time to be sent</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_send_idle_time_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_send_idle_time_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="top_attach">4</property>
@@ -2698,22 +3028,26 @@ to discover one from server.</property>
                             <child>
                               <object class="GtkHBox" id="box1">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkLabel" id="label29">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">Global proxy:</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkComboBox" id="proxies_combobox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="model">liststore8</property>
-                                    <signal name="changed" handler="on_proxies_combobox_changed"/>
+                                    <signal name="changed" handler="on_proxies_combobox_changed" swapped="no"/>
                                     <child>
                                       <object class="GtkCellRendererText" id="cellrenderertext8"/>
                                       <attributes>
@@ -2722,20 +3056,25 @@ to discover one from server.</property>
                                     </child>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="manage_proxies_button">
                                     <property name="label" translatable="yes">_Manage...</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
-                                    <signal name="clicked" handler="on_manage_proxies_button_clicked"/>
+                                    <signal name="clicked" handler="on_manage_proxies_button_clicked" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -2752,6 +3091,7 @@ to discover one from server.</property>
                     <child type="label">
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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" translatable="yes">&lt;b&gt;Privacy&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -2760,33 +3100,39 @@ to discover one from server.</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame27">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment56">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">6</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" id="vbox66">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="log_show_changes_checkbutton">
                                 <property name="label" translatable="yes">_Log status changes of contacts</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_log_show_changes_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_log_show_changes_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -2797,12 +3143,15 @@ to discover one from server.</property>
                             <child>
                               <object class="GtkCheckButton" id="check_default_client_checkbutton">
                                 <property name="label" translatable="yes">Check on startup if Gajim is the _default Jabber client</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_check_default_client_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_check_default_client_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -2817,6 +3166,7 @@ to discover one from server.</property>
                     <child type="label">
                       <object class="GtkLabel" id="label235">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Miscellaneous&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -2831,33 +3181,40 @@ to discover one from server.</property>
                 <child>
                   <object class="GtkFrame" id="frame31">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment64">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">6</property>
                         <property name="yscale">0</property>
                         <property name="left_padding">12</property>
                         <property name="right_padding">335</property>
                         <child>
                           <object class="GtkButton" id="open_advanced_editor_button">
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <signal name="clicked" handler="on_open_advanced_editor_button_clicked"/>
+                            <property name="use_action_appearance">False</property>
+                            <signal name="clicked" handler="on_open_advanced_editor_button_clicked" swapped="no"/>
                             <child>
                               <object class="GtkAlignment" id="alignment70">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xscale">0</property>
                                 <property name="yscale">0</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox2962">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">2</property>
                                     <child>
                                       <object class="GtkImage" id="image597">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="stock">gtk-open</property>
                                       </object>
                                       <packing>
@@ -2869,6 +3226,7 @@ to discover one from server.</property>
                                     <child>
                                       <object class="GtkLabel" id="label296">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">_Open...</property>
                                         <property name="use_underline">True</property>
                                       </object>
@@ -2889,6 +3247,7 @@ to discover one from server.</property>
                     <child type="label">
                       <object class="GtkLabel" id="label247">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Advanced Configuration Editor&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -2908,6 +3267,7 @@ to discover one from server.</property>
             <child type="tab">
               <object class="GtkLabel" id="label169">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Advanced</property>
               </object>
               <packing>
@@ -2917,23 +3277,28 @@ to discover one from server.</property>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkHButtonBox" id="hbuttonbox7">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="spacing">15</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="close_button">
                 <property name="label">gtk-close</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_close_button_clicked"/>
+                <signal name="clicked" handler="on_close_button_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -2944,6 +3309,7 @@ to discover one from server.</property>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/src/config.py b/src/config.py
index a2083454d..3e56fdec9 100644
--- a/src/config.py
+++ b/src/config.py
@@ -429,16 +429,13 @@ class PreferencesWindow:
 
         # Status messages
         self.msg_tree = self.xml.get_object('msg_treeview')
-        model = Gtk.ListStore(str, str, str, str, str, str, str)
-        self.msg_tree.set_model(model)
-        col = Gtk.TreeViewColumn('name')
-        self.msg_tree.append_column(col)
         renderer = Gtk.CellRendererText()
-        col.pack_start(renderer, True)
-        col.add_attribute(renderer, 'text', 0)
         renderer.connect('edited', self.on_msg_cell_edited)
         renderer.set_property('editable', True)
+        col = Gtk.TreeViewColumn('name', renderer, text=0)
+        self.msg_tree.append_column(col)
         self.fill_msg_treeview()
+
         buf = self.xml.get_object('msg_textview').get_buffer()
         buf.connect('changed', self.on_msg_textview_changed)
 
@@ -1098,8 +1095,10 @@ class PreferencesWindow:
                 # store mood / activity
                 for subname in ('activity', 'subactivity', 'activity_text',
                 'mood', 'mood_text'):
-                    gajim.config.set_per('statusmsg', val, subname,
-                        model[iter_][i].decode('utf-8'))
+                    val = model[iter_][i]
+                    if val:
+                        val = val.decode('utf-8')
+                    gajim.config.set_per('statusmsg', val, subname, val)
                     i += 1
             iter_ = model.iter_next(iter_)
 
@@ -4143,21 +4142,21 @@ class ManageSoundsWindow:
         renderer = Gtk.CellRendererToggle()
         renderer.set_property('activatable', True)
         renderer.connect('toggled', self.sound_toggled_cb)
-        col.pack_start(renderer, True, True, 0)
-        col.set_attributes(renderer, active = 0)
+        col.pack_start(renderer, True)
+        col.add_attribute(renderer, 'active', 0)
 
         col = Gtk.TreeViewColumn(_('Event'))
         self.sound_tree.append_column(col)
         renderer = Gtk.CellRendererText()
-        col.pack_start(renderer, True, True, 0)
-        col.set_attributes(renderer, text = 1)
+        col.pack_start(renderer, True)
+        col.add_attribute(renderer, 'text', 1)
 
         self.fill_sound_treeview()
 
         self.xml.connect_signals(self)
 
         self.sound_tree.get_model().connect('row-changed',
-                self.on_sounds_treemodel_row_changed)
+            self.on_sounds_treemodel_row_changed)
 
         self.window.show_all()