diff --git a/data/gui/account_creation_wizard_window.ui b/data/gui/account_creation_wizard_window.ui
index c6a3ec35aa2e847002b9c6d01ecc1d855593d2a8..d8109c9ac1fcf80b5039de45f80b4ef6667e7bf0 100644
--- a/data/gui/account_creation_wizard_window.ui
+++ b/data/gui/account_creation_wizard_window.ui
@@ -6,6 +6,7 @@
<property name="border_width">12</property>
<property name="title" translatable="yes">Gajim: Account Creation Wizard</property>
<property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_wizard_window_destroy"/>
<child>
<object class="GtkVBox" id="vbox77">
diff --git a/data/gui/accounts_window.ui b/data/gui/accounts_window.ui
index 6062613982dc5e3f74a35283cd1b036a45b477d6..4cbdba7ceacf8287202f7d5b109a8bed3b7fc301 100644
--- a/data/gui/accounts_window.ui
+++ b/data/gui/accounts_window.ui
@@ -18,6 +18,7 @@
<property name="border_width">12</property>
<property name="title" translatable="yes">Accounts</property>
<property name="default_width">800</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_accounts_window_destroy"/>
<signal name="key_press_event" handler="on_accounts_window_key_press_event"/>
<child>
diff --git a/data/gui/add_new_contact_window.ui b/data/gui/add_new_contact_window.ui
index b44993135d4103d52125eabd1dc22945de555298..d75e50b58dd9f39b55a2b324c31ccfce3317a41e 100644
--- a/data/gui/add_new_contact_window.ui
+++ b/data/gui/add_new_contact_window.ui
@@ -6,6 +6,7 @@
<property name="border_width">6</property>
<property name="title" translatable="yes">Add New Contact</property>
<property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_add_new_contact_window_destroy"/>
<signal name="key_press_event" handler="on_add_new_contact_window_key_press_event"/>
<child>
diff --git a/data/gui/adhoc_commands_window.ui b/data/gui/adhoc_commands_window.ui
index 0f0819dd52ab87865fe3cc580b03221b80cd23e1..9c51ceb2b9b63d70f04d1154dc59682f7fa3d5d6 100644
--- a/data/gui/adhoc_commands_window.ui
+++ b/data/gui/adhoc_commands_window.ui
@@ -6,6 +6,7 @@
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Ad-hoc Commands - Gajim</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_adhoc_commands_window_destroy"/>
<child>
<object class="GtkVBox" id="vbox1">
diff --git a/data/gui/advanced_configuration_window.ui b/data/gui/advanced_configuration_window.ui
index 1286efe8e98301eb04584a9e6deb699c2e171229..db5b1e9cb968514024806d4ca7b4495b6c00397f 100644
--- a/data/gui/advanced_configuration_window.ui
+++ b/data/gui/advanced_configuration_window.ui
@@ -8,6 +8,7 @@
<property name="role">ace</property>
<property name="default_width">650</property>
<property name="default_height">540</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_advanced_configuration_window_destroy"/>
<child>
<object class="GtkVBox" id="vbox70">
diff --git a/data/gui/blocked_contacts_window.ui b/data/gui/blocked_contacts_window.ui
index c2035ca83754be12830e32508d1915bd77129e45..2f9f371273b065b0570e34af6f0b582c9c1af9e0 100644
--- a/data/gui/blocked_contacts_window.ui
+++ b/data/gui/blocked_contacts_window.ui
@@ -5,6 +5,7 @@
<object class="GtkWindow" id="blocked_contacts_window">
<property name="visible">True</property>
<property name="title" translatable="yes">Blocked Contacts</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_blocked_contacts_window_destroy"/>
<child>
<object class="GtkVBox" id="vbox1">
diff --git a/data/gui/chat_to_muc_window.ui b/data/gui/chat_to_muc_window.ui
index 5fda89d8e7ca6cf436832f74540bab7990af6ba6..0c0c36e7e1ab57660aefd6adf91b172db414eb78 100644
--- a/data/gui/chat_to_muc_window.ui
+++ b/data/gui/chat_to_muc_window.ui
@@ -6,6 +6,7 @@
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Invite Friends!</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_chat_to_muc_window_destroy"/>
<signal name="key_press_event" handler="on_chat_to_muc_window_key_press_event"/>
<child>
diff --git a/data/gui/data_form_window.ui b/data/gui/data_form_window.ui
index 55bf176e2fc0b68e038dab929adc8bb3c285a9cc..b94dc12d1e17d8d6a3a5e298f8b7b0613ed07465 100644
--- a/data/gui/data_form_window.ui
+++ b/data/gui/data_form_window.ui
@@ -7,6 +7,7 @@
<property name="title" translatable="yes">Room Configuration</property>
<property name="default_width">650</property>
<property name="default_height">450</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_data_form_window_destroy"/>
<child>
<object class="GtkVBox" id="vbox68">
diff --git a/data/gui/edit_groups_dialog.ui b/data/gui/edit_groups_dialog.ui
index 0f61221fc7c1f61661bf22c4c46889fe53e2b737..d53d5257b78e6200edfa417810d00d62775bde2f 100644
--- a/data/gui/edit_groups_dialog.ui
+++ b/data/gui/edit_groups_dialog.ui
@@ -7,7 +7,7 @@
<property name="title" translatable="yes">Edit Groups</property>
<property name="modal">True</property>
<property name="default_height">290</property>
- <property name="type_hint">normal</property>
+ <property name="type_hint">dialog</property>
<signal name="response" handler="on_edit_groups_dialog_response"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox6">
diff --git a/data/gui/features_window.ui b/data/gui/features_window.ui
index 1625564f6bc2a04c2451e2e5becd40465ec8996b..e28309fdac379b5f0c9f534f1bd0810fa5490ef1 100644
--- a/data/gui/features_window.ui
+++ b/data/gui/features_window.ui
@@ -8,6 +8,7 @@
<property name="title" translatable="yes">Features</property>
<property name="default_width">300</property>
<property name="default_height">530</property>
+ <property name="type_hint">dialog</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
diff --git a/data/gui/filetransfers.ui b/data/gui/filetransfers.ui
index db2450cf28882f504c7b01fe1ef3c6a40584ffc3..52f40417920dcf4257d2c8ee4bf985ed647848f5 100644
--- a/data/gui/filetransfers.ui
+++ b/data/gui/filetransfers.ui
@@ -5,6 +5,7 @@
<object class="GtkWindow" id="file_transfers_window">
<property name="border_width">12</property>
<property name="title" translatable="yes">File Transfers</property>
+ <property name="type_hint">dialog</property>
<child internal-child="accessible">
<object class="AtkObject" id="file_transfers_window-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">File Transfers</property>
@@ -40,11 +41,11 @@
</object>
</child>
<signal name="button_press_event" handler="on_transfers_list_button_press_event"/>
- <signal name="motion_notify_event" handler="on_transfers_list_motion_notify_event"/>
+ <signal name="button_release_event" handler="on_transfers_list_button_release_event"/>
<signal name="key_press_event" handler="on_transfers_list_key_press_event"/>
<signal name="leave_notify_event" handler="on_transfers_list_leave_notify_event"/>
+ <signal name="motion_notify_event" handler="on_transfers_list_motion_notify_event"/>
<signal name="row_activated" handler="on_transfers_list_row_activated"/>
- <signal name="button_release_event" handler="on_transfers_list_button_release_event"/>
</object>
</child>
</object>
diff --git a/data/gui/gajim_themes_window.ui b/data/gui/gajim_themes_window.ui
index 82062ca332420585b7189da9f9f00a7b4d96078c..9b45b421ed689a0bbe8db389ab4dcdcb3ee67d3e 100644
--- a/data/gui/gajim_themes_window.ui
+++ b/data/gui/gajim_themes_window.ui
@@ -4,7 +4,7 @@
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkListStore" id="liststore1">
<columns>
- <!-- column-name item text -->
+ <!-- column-name item -->
<column type="gchararray"/>
</columns>
<data>
@@ -25,6 +25,7 @@
<object class="GtkWindow" id="gajim_themes_window">
<property name="border_width">12</property>
<property name="title" translatable="yes">Gajim Themes Customization</property>
+ <property name="type_hint">dialog</property>
<child>
<object class="GtkVBox" id="vbox97">
<property name="visible">True</property>
@@ -326,6 +327,7 @@
<property name="visible">True</property>
</object>
<packing>
+ <property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
diff --git a/data/gui/groups_post_window.ui b/data/gui/groups_post_window.ui
index ae4706854525b646e2692b7793e6b80d7e97160e..12188be807e43696f1a0b9fa8409f480ba7f6028 100644
--- a/data/gui/groups_post_window.ui
+++ b/data/gui/groups_post_window.ui
@@ -5,6 +5,7 @@
<object class="GtkWindow" id="groups_post_window">
<property name="visible">True</property>
<property name="title" translatable="yes">Create new post</property>
+ <property name="type_hint">dialog</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
diff --git a/data/gui/join_groupchat_window.ui b/data/gui/join_groupchat_window.ui
index 384b1ed9e23e9864df6fb85d4515a2f1a2b97169..f97c01daa95a9caac573a9eb7737e5559f37a6d5 100644
--- a/data/gui/join_groupchat_window.ui
+++ b/data/gui/join_groupchat_window.ui
@@ -5,6 +5,7 @@
<object class="GtkWindow" id="join_groupchat_window">
<property name="border_width">6</property>
<property name="title" translatable="yes">Join Group Chat</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_join_groupchat_window_destroy"/>
<signal name="key_press_event" handler="on_join_groupchat_window_key_press_event"/>
<child>
diff --git a/data/gui/manage_bookmarks_window.ui b/data/gui/manage_bookmarks_window.ui
index 300db9ef3942e4ff0a8cd0ca2de2cf67e127ad8b..a1557bebba7b3432030286f8fce1d8205aa9c402 100644
--- a/data/gui/manage_bookmarks_window.ui
+++ b/data/gui/manage_bookmarks_window.ui
@@ -13,6 +13,7 @@
<property name="title" translatable="yes">Manage Bookmarks</property>
<property name="default_width">550</property>
<property name="default_height">300</property>
+ <property name="type_hint">dialog</property>
<child>
<object class="GtkVBox" id="vbox86">
<property name="visible">True</property>
diff --git a/data/gui/manage_pep_services_window.ui b/data/gui/manage_pep_services_window.ui
index 34969b5d586df953df46eca7117a1a1d78a54023..e73aaea323db3f45a2479fa6d040de17ee62749b 100644
--- a/data/gui/manage_pep_services_window.ui
+++ b/data/gui/manage_pep_services_window.ui
@@ -7,6 +7,7 @@
<property name="title" translatable="yes">PEP Service Configuration</property>
<property name="default_width">350</property>
<property name="default_height">150</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_manage_pep_services_window_destroy"/>
<child>
<object class="GtkVBox" id="vbox1">
diff --git a/data/gui/manage_proxies_window.ui b/data/gui/manage_proxies_window.ui
index 9804cbd6e126cd756dae3d1ee26f34dc89f185bd..0fe8109e5b7e046ca59161755c89ce0f8b84f679 100644
--- a/data/gui/manage_proxies_window.ui
+++ b/data/gui/manage_proxies_window.ui
@@ -4,7 +4,7 @@
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkListStore" id="liststore1">
<columns>
- <!-- column-name item text -->
+ <!-- column-name item -->
<column type="gchararray"/>
</columns>
<data>
@@ -22,6 +22,7 @@
<object class="GtkWindow" id="manage_proxies_window">
<property name="border_width">12</property>
<property name="title" translatable="yes">Manage Proxy Profiles</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_manage_proxies_window_destroy"/>
<child>
<object class="GtkVBox" id="vbox87">
@@ -49,8 +50,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
- <signal name="key_press_event" handler="on_proxies_treeview_key_press_event"/>
<signal name="cursor_changed" handler="on_proxies_treeview_cursor_changed"/>
+ <signal name="key_press_event" handler="on_proxies_treeview_key_press_event"/>
</object>
</child>
</object>
diff --git a/data/gui/manage_sounds_window.ui b/data/gui/manage_sounds_window.ui
index 2fc3a4f6fa033e240ea4580e334601117ef58c29..710ac6606e67b0e0e7e2c166de2690338c8931d5 100644
--- a/data/gui/manage_sounds_window.ui
+++ b/data/gui/manage_sounds_window.ui
@@ -6,6 +6,7 @@
<property name="width_request">400</property>
<property name="height_request">350</property>
<property name="border_width">6</property>
+ <property name="type_hint">dialog</property>
<signal name="delete_event" handler="on_manage_sounds_window_delete_event"/>
<child>
<object class="GtkVBox" id="vbox1">
diff --git a/data/gui/preferences_window.ui b/data/gui/preferences_window.ui
index 1e796cb8671d1b479b0675423686a866181e1157..bb66cd4a54b201833a1ecbbb50c48c62b9082d1f 100644
--- a/data/gui/preferences_window.ui
+++ b/data/gui/preferences_window.ui
@@ -120,6 +120,7 @@
<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"/>
<child>
@@ -1356,8 +1357,8 @@ $T will be replaced by auto-not-available timeout</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
- <signal name="key_press_event" handler="on_msg_treeview_key_press_event"/>
<signal name="cursor_changed" handler="on_msg_treeview_cursor_changed"/>
+ <signal name="key_press_event" handler="on_msg_treeview_key_press_event"/>
</object>
</child>
</object>
diff --git a/data/gui/privacy_list_window.ui b/data/gui/privacy_list_window.ui
index 4160f7de10cdc2d1dc42c6e641119339f97866fa..12b9de0db5cf741b269f8c4c30a7c35094570cd2 100644
--- a/data/gui/privacy_list_window.ui
+++ b/data/gui/privacy_list_window.ui
@@ -6,6 +6,7 @@
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Privacy List</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_privacy_list_edit_window_destroy"/>
<child>
<object class="GtkVBox" id="main_vbox">
diff --git a/data/gui/privacy_lists_window.ui b/data/gui/privacy_lists_window.ui
index c1f9ba5e72575fe46354b18a7146cdd2ba20d45b..9d1d9927a2369b9df4944d1bfc699b0bade13a68 100644
--- a/data/gui/privacy_lists_window.ui
+++ b/data/gui/privacy_lists_window.ui
@@ -6,6 +6,7 @@
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">window1</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_privacy_lists_first_window_destroy"/>
<child>
<object class="GtkVBox" id="vbox1">
@@ -167,7 +168,7 @@
</object>
<object class="GtkListStore" id="liststore1">
<columns>
- <!-- column-name item text -->
+ <!-- column-name item -->
<column type="gchararray"/>
</columns>
</object>
diff --git a/data/gui/profile_window.ui b/data/gui/profile_window.ui
index c1e346b8c012e73fb91014524c1e6ec361856d0c..593e5cf8f231009c8f887729ddd5528602175c49 100644
--- a/data/gui/profile_window.ui
+++ b/data/gui/profile_window.ui
@@ -4,6 +4,7 @@
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkWindow" id="profile_window">
<property name="title" translatable="yes">Personal Information</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_profile_window_destroy"/>
<signal name="key_press_event" handler="on_profile_window_key_press_event"/>
<child>
diff --git a/data/gui/remove_account_window.ui b/data/gui/remove_account_window.ui
index f136c6b6dff6eaa73712b8669fe421dddc2cc490..a84a3012e3728774f74be16136f29aaf4f43541d 100644
--- a/data/gui/remove_account_window.ui
+++ b/data/gui/remove_account_window.ui
@@ -4,6 +4,7 @@
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkWindow" id="remove_account_window">
<property name="border_width">6</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_remove_account_window_destroy"/>
<child>
<object class="GtkVBox" id="vbox69">
diff --git a/data/gui/roster_item_exchange_window.ui b/data/gui/roster_item_exchange_window.ui
index 437ca3cab0509db0ad07ad4204bb800a935a380d..4c0b5eb0324a3248b45f7c7c3ee068319b7a2641 100644
--- a/data/gui/roster_item_exchange_window.ui
+++ b/data/gui/roster_item_exchange_window.ui
@@ -4,6 +4,7 @@
<!-- interface-naming-policy project-wide -->
<object class="GtkWindow" id="roster_item_exchange_window">
<property name="title" translatable="yes">Roster Item Exchange</property>
+ <property name="type_hint">dialog</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
diff --git a/data/gui/search_window.ui b/data/gui/search_window.ui
index 275d832c437a51a2611e37424770a22c22571d11..dc23bda21e4b46aabbfc8b08f1ff77883b9f9050 100644
--- a/data/gui/search_window.ui
+++ b/data/gui/search_window.ui
@@ -5,6 +5,7 @@
<object class="GtkWindow" id="search_window">
<property name="border_width">12</property>
<property name="title" translatable="yes">Search</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_search_window_destroy"/>
<signal name="key_press_event" handler="on_search_window_key_press_event"/>
<child>
diff --git a/data/gui/service_discovery_window.ui b/data/gui/service_discovery_window.ui
index e5ef4a2e4ca46e8d50477a6bd7452a223d27a0c4..46c83e4d048766eaec0a91190cd525446f6b833f 100644
--- a/data/gui/service_discovery_window.ui
+++ b/data/gui/service_discovery_window.ui
@@ -13,6 +13,7 @@
<property name="role">Service Discovery</property>
<property name="default_width">550</property>
<property name="default_height">420</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_service_discovery_window_destroy"/>
<child>
<object class="GtkVBox" id="vbox11">
diff --git a/data/gui/service_registration_window.ui b/data/gui/service_registration_window.ui
index fce939333a3f6d6fa8e566260db121270af4dacb..3c6d275dc0784b2a2418312f488d3287bc3b761c 100644
--- a/data/gui/service_registration_window.ui
+++ b/data/gui/service_registration_window.ui
@@ -5,6 +5,7 @@
<object class="GtkWindow" id="service_registration_window">
<property name="border_width">6</property>
<property name="title" translatable="yes">Register to</property>
+ <property name="type_hint">dialog</property>
<child>
<object class="GtkVBox" id="vbox12">
<property name="visible">True</property>
diff --git a/data/gui/subscription_request_window.ui b/data/gui/subscription_request_window.ui
index dfc9f400444fddeb9a2a703b611d53b1d3885172..05856dca8840b5de10446d6a354ef8d0b214fb16 100644
--- a/data/gui/subscription_request_window.ui
+++ b/data/gui/subscription_request_window.ui
@@ -5,6 +5,7 @@
<object class="GtkWindow" id="subscription_request_window">
<property name="border_width">12</property>
<property name="title" translatable="yes">Subscription Request</property>
+ <property name="type_hint">dialog</property>
<child>
<object class="GtkVBox" id="vbox10">
<property name="visible">True</property>
diff --git a/data/gui/synchronise_select_account_dialog.ui b/data/gui/synchronise_select_account_dialog.ui
index c94b724b9d3ec83e331a9e81c68390a022b693bc..d65e8b2d4dc2ba1ee3cdfe4a4d0ddc0ec9d33247 100644
--- a/data/gui/synchronise_select_account_dialog.ui
+++ b/data/gui/synchronise_select_account_dialog.ui
@@ -7,7 +7,7 @@
<property name="title" translatable="yes">Synchronise contacts</property>
<property name="default_width">350</property>
<property name="default_height">300</property>
- <property name="type_hint">normal</property>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox7">
<property name="visible">True</property>
diff --git a/data/gui/synchronise_select_contacts_dialog.ui b/data/gui/synchronise_select_contacts_dialog.ui
index 12bbd0af930de60b231b42d930e11e3a83e94562..22e194ea409eb88309cdc508cb262571b66a0456 100644
--- a/data/gui/synchronise_select_contacts_dialog.ui
+++ b/data/gui/synchronise_select_contacts_dialog.ui
@@ -7,7 +7,7 @@
<property name="title" translatable="yes">Synchronise : select contacts</property>
<property name="default_width">400</property>
<property name="default_height">300</property>
- <property name="type_hint">normal</property>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox7">
<property name="visible">True</property>
diff --git a/data/gui/vcard_information_window.ui b/data/gui/vcard_information_window.ui
index 942c1db74b83c24d6b4b79b871bbe061107d2d1f..3c9dfc9f713891b36d4aa404c8008445a4d3e2e4 100644
--- a/data/gui/vcard_information_window.ui
+++ b/data/gui/vcard_information_window.ui
@@ -5,6 +5,7 @@
<object class="GtkWindow" id="vcard_information_window">
<property name="border_width">12</property>
<property name="title" translatable="yes">Contact Information</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_vcard_information_window_destroy"/>
<signal name="key_press_event" handler="on_vcard_information_window_key_press_event"/>
<child>
diff --git a/data/gui/zeroconf_information_window.ui b/data/gui/zeroconf_information_window.ui
index 3996805a3da829103b5ab45dab4a830273df4d58..ac0927af285bfc7626ce8af3e15152f6c57d854e 100644
--- a/data/gui/zeroconf_information_window.ui
+++ b/data/gui/zeroconf_information_window.ui
@@ -6,6 +6,7 @@
<property name="border_width">12</property>
<property name="title">Contact Information</property>
<property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
<signal name="destroy" handler="on_zeroconf_information_window_destroy"/>
<signal name="key_press_event" handler="on_zeroconf_information_window_key_press_event"/>
<child>