diff --git a/icons/hicolor/128x128/apps/gajim-about.png b/icons/hicolor/128x128/apps/gajim.png
similarity index 100%
rename from icons/hicolor/128x128/apps/gajim-about.png
rename to icons/hicolor/128x128/apps/gajim.png
diff --git a/icons/hicolor/16x16/actions/gajim-message_corrected.png b/icons/hicolor/16x16/actions/gajim-message_corrected.png
deleted file mode 100644
index c0b39d791..000000000
Binary files a/icons/hicolor/16x16/actions/gajim-message_corrected.png and /dev/null differ
diff --git a/icons/hicolor/16x16/actions/gajim-receipt_missing.png b/icons/hicolor/16x16/actions/gajim-receipt_missing.png
deleted file mode 100644
index 4332bc44e..000000000
Binary files a/icons/hicolor/16x16/actions/gajim-receipt_missing.png and /dev/null differ
diff --git a/icons/hicolor/16x16/actions/gajim-receipt_received.png b/icons/hicolor/16x16/actions/gajim-receipt_received.png
deleted file mode 100644
index a6910ddfc..000000000
Binary files a/icons/hicolor/16x16/actions/gajim-receipt_received.png and /dev/null differ
diff --git a/icons/hicolor/16x16/actions/gajim-earth.png b/icons/hicolor/16x16/status/gajim-earth.png
similarity index 100%
rename from icons/hicolor/16x16/actions/gajim-earth.png
rename to icons/hicolor/16x16/status/gajim-earth.png
diff --git a/icons/hicolor/16x16/actions/gajim-muc_separator.png b/icons/hicolor/16x16/status/gajim-muc_separator.png
similarity index 100%
rename from icons/hicolor/16x16/actions/gajim-muc_separator.png
rename to icons/hicolor/16x16/status/gajim-muc_separator.png
diff --git a/icons/hicolor/16x16/status/gajim-plugins.png b/icons/hicolor/16x16/status/gajim-plugins.png
new file mode 100644
index 000000000..096e098b4
Binary files /dev/null and b/icons/hicolor/16x16/status/gajim-plugins.png differ
diff --git a/icons/hicolor/16x16/actions/gajim-security_high.png b/icons/hicolor/16x16/status/gajim-security_high.png
similarity index 100%
rename from icons/hicolor/16x16/actions/gajim-security_high.png
rename to icons/hicolor/16x16/status/gajim-security_high.png
diff --git a/icons/hicolor/16x16/actions/gajim-security_low.png b/icons/hicolor/16x16/status/gajim-security_low.png
similarity index 100%
rename from icons/hicolor/16x16/actions/gajim-security_low.png
rename to icons/hicolor/16x16/status/gajim-security_low.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-error.png b/icons/hicolor/32x32/categories/gajim-agent-error.png
deleted file mode 100644
index 62714e189..000000000
Binary files a/icons/hicolor/32x32/categories/gajim-agent-error.png and /dev/null differ
diff --git a/icons/hicolor/48x48/actions/gajim-warning.png b/icons/hicolor/48x48/actions/gajim-warning.png
deleted file mode 100644
index dd1979512..000000000
Binary files a/icons/hicolor/48x48/actions/gajim-warning.png and /dev/null differ
diff --git a/icons/hicolor/48x48/actions/gajim-chat_msg_recv.png b/icons/hicolor/48x48/status/gajim-chat_msg_recv.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-chat_msg_recv.png
rename to icons/hicolor/48x48/status/gajim-chat_msg_recv.png
diff --git a/icons/hicolor/48x48/actions/gajim-connection_lost.png b/icons/hicolor/48x48/status/gajim-connection_lost.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-connection_lost.png
rename to icons/hicolor/48x48/status/gajim-connection_lost.png
diff --git a/icons/hicolor/48x48/actions/gajim-ft_done.png b/icons/hicolor/48x48/status/gajim-ft_done.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-ft_done.png
rename to icons/hicolor/48x48/status/gajim-ft_done.png
diff --git a/icons/hicolor/48x48/actions/gajim-ft_error.png b/icons/hicolor/48x48/status/gajim-ft_error.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-ft_error.png
rename to icons/hicolor/48x48/status/gajim-ft_error.png
diff --git a/icons/hicolor/48x48/actions/gajim-ft_request.png b/icons/hicolor/48x48/status/gajim-ft_request.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-ft_request.png
rename to icons/hicolor/48x48/status/gajim-ft_request.png
diff --git a/icons/hicolor/48x48/actions/gajim-ft_stopped.png b/icons/hicolor/48x48/status/gajim-ft_stopped.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-ft_stopped.png
rename to icons/hicolor/48x48/status/gajim-ft_stopped.png
diff --git a/icons/hicolor/48x48/actions/gajim-gc_invitation.png b/icons/hicolor/48x48/status/gajim-gc_invitation.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-gc_invitation.png
rename to icons/hicolor/48x48/status/gajim-gc_invitation.png
diff --git a/icons/hicolor/48x48/actions/gajim-new_email_recv.png b/icons/hicolor/48x48/status/gajim-new_email_recv.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-new_email_recv.png
rename to icons/hicolor/48x48/status/gajim-new_email_recv.png
diff --git a/icons/hicolor/48x48/actions/gajim-priv_msg_recv.png b/icons/hicolor/48x48/status/gajim-priv_msg_recv.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-priv_msg_recv.png
rename to icons/hicolor/48x48/status/gajim-priv_msg_recv.png
diff --git a/icons/hicolor/48x48/actions/gajim-single_msg_recv.png b/icons/hicolor/48x48/status/gajim-single_msg_recv.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-single_msg_recv.png
rename to icons/hicolor/48x48/status/gajim-single_msg_recv.png
diff --git a/icons/hicolor/48x48/actions/gajim-subscription_request.png b/icons/hicolor/48x48/status/gajim-subscription_request.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-subscription_request.png
rename to icons/hicolor/48x48/status/gajim-subscription_request.png
diff --git a/icons/hicolor/48x48/actions/gajim-unsubscribed.png b/icons/hicolor/48x48/status/gajim-unsubscribed.png
similarity index 100%
rename from icons/hicolor/48x48/actions/gajim-unsubscribed.png
rename to icons/hicolor/48x48/status/gajim-unsubscribed.png
diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index 6229426e1..20543f46c 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -171,21 +171,9 @@ class ConversationTextview(gobject.GObject):
 
     FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap(
         'gajim-muc_separator')
-    XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-no',
-        quiet=True)
-    if not XEP0184_WARNING_PIXBUF:
-        MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap(
-            'gajim-receipt_missing')
-    XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-yes',
-        quiet=True)
-    if not XEP0184_RECEIVED_PIXBUF:
-        MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap(
-            'gajim-receipt_received')
-    MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap(
-        'gtk-spell-check', quiet=True)
-    if not MESSAGE_CORRECTED_PIXBUF:
-        MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap(
-            'gajim-message_corrected')
+    XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-no')
+    XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-yes')
+    MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-spell-check')
 
     # smooth scroll constants
     MAX_SCROLL_TIME = 0.4 # seconds
diff --git a/src/dialogs.py b/src/dialogs.py
index c7db7ab00..0aab9be66 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -1311,7 +1311,7 @@ class AboutDialog:
 
         dlg.props.wrap_license = True
 
-        pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-about', 128)
+        pixbuf = gtkgui_helpers.get_icon_pixmap('gajim', 128)
 
         dlg.set_logo(pixbuf)
         #here you write your name in the form Name FamilyName <someone@somewhere>
diff --git a/src/gui_interface.py b/src/gui_interface.py
index 81e4e4007..ef50cd5d6 100644
--- a/src/gui_interface.py
+++ b/src/gui_interface.py
@@ -662,7 +662,7 @@ class Interface:
                 'key.')
             dialogs.WarningDialog(_('Your passphrase is incorrect'), sectext)
         else:
-            path = gtkgui_helpers.get_icon_path('gajim-warning', 48)
+            path = gtkgui_helpers.get_icon_path('gtk-dialog-warning', 48)
             account = obj.conn.name
             notify.popup('warning', account, account, 'warning', path,
                 _('OpenPGP Passphrase Incorrect'),
diff --git a/src/htmltextview.py b/src/htmltextview.py
index 25ecf1261..fbb24ee65 100644
--- a/src/htmltextview.py
+++ b/src/htmltextview.py
@@ -521,7 +521,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
                     if alt:
                         alt += '\n'
                     alt += _('Loading')
-                    pixbuf = get_icon_pixmap('gajim-receipt_missing')
+                    pixbuf = get_icon_pixmap('gtk-no')
             if mem:
                 # Caveat: GdkPixbuf is known not to be safe to load
                 # images from network... this program is now potentially
diff --git a/src/roster_window.py b/src/roster_window.py
index 61c57a4c5..14dccd875 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -6474,6 +6474,11 @@ class RosterWindow:
         # Add a Separator (self._iter_is_separator() checks on string SEPARATOR)
         liststore.append(['SEPARATOR', None, '', True])
 
+        path = gtkgui_helpers.get_icon_path('gajim-plugins')
+        img = gtk.Image()
+        img.set_from_file(path)
+        self.xml.get_object('plugins_menuitem').set_image(img)
+
         path = gtkgui_helpers.get_icon_path('gajim-kbd_input')
         img = gtk.Image()
         img.set_from_file(path)