diff --git a/data/gui/accounts_window.ui b/data/gui/accounts_window.ui
index d5277748b..196e2cbaf 100644
--- a/data/gui/accounts_window.ui
+++ b/data/gui/accounts_window.ui
@@ -192,6 +192,7 @@
                           <object class="GtkGrid" id="grid1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="border_width">6</property>
                             <property name="row_spacing">6</property>
                             <property name="column_spacing">6</property>
                             <child>
@@ -586,9 +587,10 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_sync_logs_with_server_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_sync_logs_with_server_checkbutton_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
diff --git a/data/gui/change_status_message_dialog.ui b/data/gui/change_status_message_dialog.ui
index a71e85929..f8a5f8787 100644
--- a/data/gui/change_status_message_dialog.ui
+++ b/data/gui/change_status_message_dialog.ui
@@ -71,7 +71,6 @@
               <object class="GtkBox" id="vbox112">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">12</property>
                 <property name="border_width">6</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
diff --git a/src/gajim.py b/src/gajim.py
index 2b7a8792b..5c3400e8c 100644
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -459,7 +459,7 @@ if pid_alive():
             pixs.append(pix)
     if pixs:
         # set the icon to all windows
-        Gtk.Window.set_default_icon_list(*pixs)
+        Gtk.Window.set_default_icon_list(pixs)
     pritext = _('Gajim is already running')
     sectext = _('Another instance of Gajim seems to be running\nRun anyway?')
     dialog = dialogs.YesNoDialog(pritext, sectext)
diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py
index 81f77ac07..023bca4b4 100644
--- a/src/gtkgui_helpers.py
+++ b/src/gtkgui_helpers.py
@@ -139,7 +139,7 @@ def popup_emoticons_under_button(menu, button, parent_win):
         x = window_x + button_x
         y = window_y + button_y
 
-        menu_height = menu.size_request().height
+        menu_height = menu.get_preferred_size()[0].height
 
         ## should we pop down or up?
         if (y + alloc.height + menu_height < Gdk.Screen.height()):
diff --git a/src/history_manager.py b/src/history_manager.py
index aac6c65e7..6bee92053 100644
--- a/src/history_manager.py
+++ b/src/history_manager.py
@@ -121,7 +121,7 @@ class HistoryManager:
                 pixs.append(pix)
         if pixs:
             # set the icon to all windows
-            Gtk.Window.set_default_icon_list(*pixs)
+            Gtk.Window.set_default_icon_list(pixs)
 
         if not os.path.exists(LOG_DB_PATH):
             dialogs.ErrorDialog(_('Cannot find history logs database'),