diff --git a/src/dialogs.py b/src/dialogs.py
index 04d0a3f1f..ac97eac04 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -1420,9 +1420,9 @@ class HigDialog(Gtk.MessageDialog):
     on_response_ok=None, on_response_cancel=None, on_response_yes=None,
     on_response_no=None):
         self.call_cancel_on_destroy = True
-        Gtk.MessageDialog.__init__(self, parent,
-           Gtk.DialogFlags.DESTROY_WITH_PARENT | Gtk.DialogFlags.MODAL,
-           type_, buttons, message_format = pritext)
+        Gtk.MessageDialog.__init__(self, parent=parent,
+           modal=True, destroy_with_parent=True,
+           message_type=type_, buttons=buttons, text=pritext)
 
         self.format_secondary_markup(sectext)
 
diff --git a/src/plugins/gui.py b/src/plugins/gui.py
index bc99e52cf..612704a40 100644
--- a/src/plugins/gui.py
+++ b/src/plugins/gui.py
@@ -92,9 +92,7 @@ class PluginsWindow(object):
             activatable=ACTIVATABLE)
         self.installed_plugins_treeview.append_column(col)
 
-        icon = Gtk.Image()
-        self.def_icon = icon.render_icon_pixbuf(Gtk.STOCK_PREFERENCES,
-            Gtk.IconSize.MENU)
+        self.def_icon = gtkgui_helpers.get_icon_pixmap('preferences-desktop')
 
         # connect signal for selection change
         selection = self.installed_plugins_treeview.get_selection()
@@ -312,8 +310,8 @@ class GajimPluginConfigDialog(Gtk.Dialog):
 
     @log_calls('GajimPluginConfigDialog')
     def __init__(self, plugin, **kwargs):
-        Gtk.Dialog.__init__(self, '%s %s'%(plugin.name, _('Configuration')),
-                                                                    **kwargs)
+        Gtk.Dialog.__init__(self, title='%s %s'%(plugin.name,
+            _('Configuration')), **kwargs)
         self.plugin = plugin
         button = self.add_button('gtk-close', Gtk.ResponseType.CLOSE)
         button.connect('clicked', self.on_close_button_clicked)
diff --git a/src/tooltips.py b/src/tooltips.py
index 3c5243d5b..baf806845 100644
--- a/src/tooltips.py
+++ b/src/tooltips.py
@@ -447,10 +447,6 @@ class RosterTooltip(NotificationAreaTooltip):
 
     def __init__(self):
         self.account = None
-        self.image = Gtk.Image()
-        self.image.set_alignment(0, 0)
-        # padding is independent of the total length and better than alignment
-        self.image.set_padding(1, 2)
         self.avatar_image = Gtk.Image()
         NotificationAreaTooltip.__init__(self)