diff --git a/gajim/data/gui/advanced_configuration.ui b/gajim/data/gui/advanced_configuration.ui
index 53789d4624e45594fd9a2818d096616db261c961..2a83e1fe5be313dea3e65d08316c48eb2bf2bd2a 100644
--- a/gajim/data/gui/advanced_configuration.ui
+++ b/gajim/data/gui/advanced_configuration.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.36.0 -->
<interface>
- <requires lib="gtk+" version="3.20"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkBox" id="box">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -113,7 +113,6 @@
<object class="GtkTreeView" id="advanced_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="rules_hint">True</property>
<signal name="row-activated" handler="_on_treeview_row_activated" swapped="no"/>
<child internal-child="selection">
<object class="GtkTreeSelection">
diff --git a/gajim/data/gui/blocked_contacts_window.ui b/gajim/data/gui/blocked_contacts_window.ui
index 6fdcfbbcbd243bbf649f158627271025f9b4105d..ee9749943ad2614a91e164f9fd6158164eb1fbb7 100644
--- a/gajim/data/gui/blocked_contacts_window.ui
+++ b/gajim/data/gui/blocked_contacts_window.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.36.0 -->
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-remove</property>
+ <property name="icon_name">list-remove-symbolic</property>
</object>
<object class="GtkWindow" id="blocked_contacts_window">
<property name="visible">True</property>
@@ -33,7 +33,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
- <property name="rules_hint">True</property>
<signal name="row-activated" handler="on_contacts_treeview_row_activated" swapped="no"/>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
@@ -66,5 +65,8 @@
</child>
</object>
</child>
+ <child type="titlebar">
+ <placeholder/>
+ </child>
</object>
</interface>
diff --git a/gajim/data/gui/filetransfers.ui b/gajim/data/gui/filetransfers.ui
index 8840e300d836451c0ad07c532d7fc5d21568061e..d6c42583d1d369087338c83c9c90931b4ce75ddf 100644
--- a/gajim/data/gui/filetransfers.ui
+++ b/gajim/data/gui/filetransfers.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.36.0 -->
<interface>
- <requires lib="gtk+" version="3.20"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkAccelGroup" id="accelgroup1"/>
<object class="GtkMenu" id="file_transfers_menu">
<property name="can_focus">False</property>
@@ -60,9 +60,6 @@
<property name="type_hint">dialog</property>
<signal name="delete-event" handler="_on_file_transfers_dialog_delete_event" swapped="no"/>
<signal name="key-press-event" handler="_on_file_transfers_window_key_press_event" swapped="no"/>
- <child type="titlebar">
- <placeholder/>
- </child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@@ -201,6 +198,9 @@
</child>
</object>
</child>
+ <child type="titlebar">
+ <placeholder/>
+ </child>
<child internal-child="accessible">
<object class="AtkObject" id="file_transfers_window-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">File Transfers</property>
diff --git a/gajim/data/gui/history_manager.ui b/gajim/data/gui/history_manager.ui
index 417e16d0141f700405489b8af355b4920bb00b34..d24942c13869a6486a6bee051c56de07f730e1db 100644
--- a/gajim/data/gui/history_manager.ui
+++ b/gajim/data/gui/history_manager.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.36.0 -->
<interface>
- <requires lib="gtk+" version="3.20"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkMenu" id="context_menu">
<property name="can_focus">False</property>
<child>
@@ -31,9 +31,6 @@
<property name="default_width">1000</property>
<property name="default_height">500</property>
<signal name="delete-event" handler="on_history_manager_window_delete_event" swapped="no"/>
- <child>
- <placeholder/>
- </child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@@ -56,7 +53,6 @@
<object class="GtkTreeView" id="jids_listview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="rules_hint">True</property>
<signal name="button-press-event" handler="on_listview_button_press_event" swapped="no"/>
<signal name="key-press-event" handler="on_jids_listview_key_press_event" swapped="no"/>
<child internal-child="selection">
@@ -80,8 +76,8 @@
<object class="GtkBox" id="welcome_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">20</property>
- <property name="margin_right">20</property>
+ <property name="margin_start">20</property>
+ <property name="margin_end">20</property>
<property name="orientation">vertical</property>
<property name="spacing">10</property>
<child>
@@ -144,13 +140,12 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene
<object class="GtkScrolledWindow" id="logs_scrolledwindow">
<property name="can_focus">True</property>
<property name="no_show_all">True</property>
- <property name="margin_left">6</property>
+ <property name="margin_start">6</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="logs_listview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="rules_hint">True</property>
<property name="enable_search">False</property>
<signal name="button-press-event" handler="on_listview_button_press_event" swapped="no"/>
<signal name="key-press-event" handler="on_logs_listview_key_press_event" swapped="no"/>
@@ -170,13 +165,12 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene
<object class="GtkScrolledWindow" id="search_results_scrolledwindow">
<property name="can_focus">True</property>
<property name="no_show_all">True</property>
- <property name="margin_left">6</property>
+ <property name="margin_start">6</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="search_results_listview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="rules_hint">True</property>
<signal name="button-press-event" handler="on_listview_button_press_event" swapped="no"/>
<signal name="row-activated" handler="on_search_results_listview_row_activated" swapped="no"/>
<child internal-child="selection">
@@ -256,5 +250,8 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene
</child>
</object>
</child>
+ <child type="titlebar">
+ <placeholder/>
+ </child>
</object>
</interface>
diff --git a/gajim/data/gui/history_window.ui b/gajim/data/gui/history_window.ui
index 1a9158bcb4390363a95963806b315ff5e6056e37..741c46587ef8370cbcf0d25f361ea10406a90e0e 100644
--- a/gajim/data/gui/history_window.ui
+++ b/gajim/data/gui/history_window.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.36.0 -->
<interface>
- <requires lib="gtk+" version="3.20"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name gchararray1 -->
@@ -16,8 +16,8 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="margin_right">12</property>
+ <property name="margin_start">12</property>
+ <property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="orientation">vertical</property>
@@ -75,8 +75,8 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="margin_right">12</property>
+ <property name="margin_start">12</property>
+ <property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="orientation">vertical</property>
@@ -282,8 +282,8 @@
<property name="width_request">600</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">18</property>
- <property name="margin_right">18</property>
+ <property name="margin_start">18</property>
+ <property name="margin_end">18</property>
<property name="margin_top">18</property>
<property name="margin_bottom">18</property>
<property name="orientation">vertical</property>
@@ -328,7 +328,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="margin_left">6</property>
+ <property name="margin_start">6</property>
<property name="label" translatable="yes">Store History</property>
<style>
<class name="dim-label"/>
@@ -416,8 +416,8 @@
<object class="GtkLabel" id="date_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">3</property>
- <property name="margin_right">3</property>
+ <property name="margin_start">3</property>
+ <property name="margin_end">3</property>
</object>
<packing>
<property name="expand">False</property>
@@ -515,7 +515,6 @@
<object class="GtkTreeView" id="results_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="rules_hint">True</property>
<property name="hover_expand">True</property>
<signal name="cursor-changed" handler="on_results_treeview_cursor_changed" swapped="no"/>
<child internal-child="selection">
diff --git a/gajim/data/gui/preferences_window.ui b/gajim/data/gui/preferences_window.ui
index f9e027d95707c3f7f4036cb202a06f44e95f1295..1aea6a9acdabb7bfc77c05cf57968978da315945 100644
--- a/gajim/data/gui/preferences_window.ui
+++ b/gajim/data/gui/preferences_window.ui
@@ -862,72 +862,65 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="margin_top">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox">
+ <object class="GtkCheckButton" id="show_chatstate_in_tabs">
+ <property name="label" translatable="yes">Show chatstate in tabs</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="show_chatstate_in_tabs">
- <property name="label" translatable="yes">Show chatstate in tabs</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, the tab will be colored according to the current chatstate of the contact</property>
- <property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_show_chatstate_in_tabs_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="GtkCheckButton" id="show_chatstate_in_roster">
- <property name="label" translatable="yes">Show chatstate in contact list</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, the contact row will be colored according to the current chatstate of the contact</property>
- <property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_show_chatstate_in_roster_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="show_chatstate_in_banner">
- <property name="label" translatable="yes">Show chatstate in banner</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, a description of the contacts current chatstate is shown in the banner</property>
- <property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_show_chatstate_in_banner_toggled" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">If checked, the tab will be colored according to the current chatstate of the contact</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_show_chatstate_in_tabs_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="GtkCheckButton" id="show_chatstate_in_roster">
+ <property name="label" translatable="yes">Show chatstate in contact list</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, the contact row will be colored according to the current chatstate of the contact</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_show_chatstate_in_roster_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="show_chatstate_in_banner">
+ <property name="label" translatable="yes">Show chatstate in banner</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, a description of the contacts current chatstate is shown in the banner</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_show_chatstate_in_banner_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
</child>