diff --git a/icons/hicolor/16x16/actions/document-send.png b/gajim/data/icons/hicolor/16x16/actions/document-send.png
similarity index 100%
rename from icons/hicolor/16x16/actions/document-send.png
rename to gajim/data/icons/hicolor/16x16/actions/document-send.png
diff --git a/icons/hicolor/16x16/actions/gajim-cam_active.png b/gajim/data/icons/hicolor/16x16/actions/gajim-cam_active.png
similarity index 100%
rename from icons/hicolor/16x16/actions/gajim-cam_active.png
rename to gajim/data/icons/hicolor/16x16/actions/gajim-cam_active.png
diff --git a/icons/hicolor/16x16/actions/gajim-cam_inactive.png b/gajim/data/icons/hicolor/16x16/actions/gajim-cam_inactive.png
similarity index 100%
rename from icons/hicolor/16x16/actions/gajim-cam_inactive.png
rename to gajim/data/icons/hicolor/16x16/actions/gajim-cam_inactive.png
diff --git a/icons/hicolor/16x16/actions/gajim-kbd_input.png b/gajim/data/icons/hicolor/16x16/actions/gajim-kbd_input.png
similarity index 100%
rename from icons/hicolor/16x16/actions/gajim-kbd_input.png
rename to gajim/data/icons/hicolor/16x16/actions/gajim-kbd_input.png
diff --git a/icons/hicolor/16x16/actions/gajim-mic_active.png b/gajim/data/icons/hicolor/16x16/actions/gajim-mic_active.png
similarity index 100%
rename from icons/hicolor/16x16/actions/gajim-mic_active.png
rename to gajim/data/icons/hicolor/16x16/actions/gajim-mic_active.png
diff --git a/icons/hicolor/16x16/actions/gajim-mic_inactive.png b/gajim/data/icons/hicolor/16x16/actions/gajim-mic_inactive.png
similarity index 100%
rename from icons/hicolor/16x16/actions/gajim-mic_inactive.png
rename to gajim/data/icons/hicolor/16x16/actions/gajim-mic_inactive.png
diff --git a/icons/hicolor/16x16/status/applications-internet.png b/gajim/data/icons/hicolor/16x16/status/applications-internet.png
similarity index 100%
rename from icons/hicolor/16x16/status/applications-internet.png
rename to gajim/data/icons/hicolor/16x16/status/applications-internet.png
diff --git a/icons/hicolor/16x16/status/audio-mic-volume-high.png b/gajim/data/icons/hicolor/16x16/status/audio-mic-volume-high.png
similarity index 100%
rename from icons/hicolor/16x16/status/audio-mic-volume-high.png
rename to gajim/data/icons/hicolor/16x16/status/audio-mic-volume-high.png
diff --git a/icons/hicolor/16x16/status/audio-mic-volume-low.png b/gajim/data/icons/hicolor/16x16/status/audio-mic-volume-low.png
similarity index 100%
rename from icons/hicolor/16x16/status/audio-mic-volume-low.png
rename to gajim/data/icons/hicolor/16x16/status/audio-mic-volume-low.png
diff --git a/icons/hicolor/16x16/status/audio-mic-volume-medium.png b/gajim/data/icons/hicolor/16x16/status/audio-mic-volume-medium.png
similarity index 100%
rename from icons/hicolor/16x16/status/audio-mic-volume-medium.png
rename to gajim/data/icons/hicolor/16x16/status/audio-mic-volume-medium.png
diff --git a/icons/hicolor/16x16/status/audio-mic-volume-muted.png b/gajim/data/icons/hicolor/16x16/status/audio-mic-volume-muted.png
similarity index 100%
rename from icons/hicolor/16x16/status/audio-mic-volume-muted.png
rename to gajim/data/icons/hicolor/16x16/status/audio-mic-volume-muted.png
diff --git a/icons/hicolor/16x16/status/channel-secure-croped-symbolic.symbolic.png b/gajim/data/icons/hicolor/16x16/status/channel-secure-croped-symbolic.symbolic.png
similarity index 100%
rename from icons/hicolor/16x16/status/channel-secure-croped-symbolic.symbolic.png
rename to gajim/data/icons/hicolor/16x16/status/channel-secure-croped-symbolic.symbolic.png
diff --git a/icons/hicolor/16x16/status/gajim-plugins.png b/gajim/data/icons/hicolor/16x16/status/gajim-plugins.png
similarity index 100%
rename from icons/hicolor/16x16/status/gajim-plugins.png
rename to gajim/data/icons/hicolor/16x16/status/gajim-plugins.png
diff --git a/icons/hicolor/16x16/status/security-high.png b/gajim/data/icons/hicolor/16x16/status/security-high.png
similarity index 100%
rename from icons/hicolor/16x16/status/security-high.png
rename to gajim/data/icons/hicolor/16x16/status/security-high.png
diff --git a/icons/hicolor/16x16/status/security-low.png b/gajim/data/icons/hicolor/16x16/status/security-low.png
similarity index 100%
rename from icons/hicolor/16x16/status/security-low.png
rename to gajim/data/icons/hicolor/16x16/status/security-low.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-aim.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-aim.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-aim.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-aim.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-bytestreams.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-bytestreams.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-bytestreams.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-bytestreams.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-conference.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-conference.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-conference.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-conference.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-disc.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-disc.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-disc.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-disc.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-facebook.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-facebook.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-facebook.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-facebook.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-gadu-gadu.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-gadu-gadu.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-gadu-gadu.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-gadu-gadu.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-http-ws.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-http-ws.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-http-ws.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-http-ws.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-icq.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-icq.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-icq.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-icq.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-irc.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-irc.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-irc.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-irc.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-jabber.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-jabber.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-jabber.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-jabber.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-jud.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-jud.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-jud.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-jud.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-mail.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-mail.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-mail.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-mail.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-mrim.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-mrim.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-mrim.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-mrim.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-msn.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-msn.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-msn.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-msn.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-pubsub.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-pubsub.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-pubsub.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-pubsub.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-rss.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-rss.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-rss.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-rss.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-sip.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-sip.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-sip.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-sip.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-sms.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-sms.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-sms.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-sms.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-tv.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-tv.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-tv.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-tv.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-twitter.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-twitter.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-twitter.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-twitter.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-weather.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-weather.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-weather.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-weather.png
diff --git a/icons/hicolor/32x32/categories/gajim-agent-yahoo.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-yahoo.png
similarity index 100%
rename from icons/hicolor/32x32/categories/gajim-agent-yahoo.png
rename to gajim/data/icons/hicolor/32x32/categories/gajim-agent-yahoo.png
diff --git a/icons/hicolor/32x32/mimetypes/application-certificate.png b/gajim/data/icons/hicolor/32x32/mimetypes/application-certificate.png
similarity index 100%
rename from icons/hicolor/32x32/mimetypes/application-certificate.png
rename to gajim/data/icons/hicolor/32x32/mimetypes/application-certificate.png
diff --git a/icons/hicolor/32x32/status/security-high.png b/gajim/data/icons/hicolor/32x32/status/security-high.png
similarity index 100%
rename from icons/hicolor/32x32/status/security-high.png
rename to gajim/data/icons/hicolor/32x32/status/security-high.png
diff --git a/icons/hicolor/32x32/status/security-low.png b/gajim/data/icons/hicolor/32x32/status/security-low.png
similarity index 100%
rename from icons/hicolor/32x32/status/security-low.png
rename to gajim/data/icons/hicolor/32x32/status/security-low.png
diff --git a/icons/hicolor/48x48/status/gajim-chat_msg_recv.png b/gajim/data/icons/hicolor/48x48/status/gajim-chat_msg_recv.png
similarity index 100%
rename from icons/hicolor/48x48/status/gajim-chat_msg_recv.png
rename to gajim/data/icons/hicolor/48x48/status/gajim-chat_msg_recv.png
diff --git a/icons/hicolor/48x48/status/gajim-connection_lost.png b/gajim/data/icons/hicolor/48x48/status/gajim-connection_lost.png
similarity index 100%
rename from icons/hicolor/48x48/status/gajim-connection_lost.png
rename to gajim/data/icons/hicolor/48x48/status/gajim-connection_lost.png
diff --git a/icons/hicolor/48x48/status/gajim-ft_done.png b/gajim/data/icons/hicolor/48x48/status/gajim-ft_done.png
similarity index 100%
rename from icons/hicolor/48x48/status/gajim-ft_done.png
rename to gajim/data/icons/hicolor/48x48/status/gajim-ft_done.png
diff --git a/icons/hicolor/48x48/status/gajim-ft_error.png b/gajim/data/icons/hicolor/48x48/status/gajim-ft_error.png
similarity index 100%
rename from icons/hicolor/48x48/status/gajim-ft_error.png
rename to gajim/data/icons/hicolor/48x48/status/gajim-ft_error.png
diff --git a/icons/hicolor/48x48/status/gajim-ft_request.png b/gajim/data/icons/hicolor/48x48/status/gajim-ft_request.png
similarity index 100%
rename from icons/hicolor/48x48/status/gajim-ft_request.png
rename to gajim/data/icons/hicolor/48x48/status/gajim-ft_request.png
diff --git a/icons/hicolor/48x48/status/gajim-ft_stopped.png b/gajim/data/icons/hicolor/48x48/status/gajim-ft_stopped.png
similarity index 100%
rename from icons/hicolor/48x48/status/gajim-ft_stopped.png
rename to gajim/data/icons/hicolor/48x48/status/gajim-ft_stopped.png
diff --git a/icons/hicolor/48x48/status/gajim-gc_invitation.png b/gajim/data/icons/hicolor/48x48/status/gajim-gc_invitation.png
similarity index 100%
rename from icons/hicolor/48x48/status/gajim-gc_invitation.png
rename to gajim/data/icons/hicolor/48x48/status/gajim-gc_invitation.png
diff --git a/icons/hicolor/48x48/status/gajim-new_email_recv.png b/gajim/data/icons/hicolor/48x48/status/gajim-new_email_recv.png
similarity index 100%
rename from icons/hicolor/48x48/status/gajim-new_email_recv.png
rename to gajim/data/icons/hicolor/48x48/status/gajim-new_email_recv.png
diff --git a/icons/hicolor/48x48/status/gajim-priv_msg_recv.png b/gajim/data/icons/hicolor/48x48/status/gajim-priv_msg_recv.png
similarity index 100%
rename from icons/hicolor/48x48/status/gajim-priv_msg_recv.png
rename to gajim/data/icons/hicolor/48x48/status/gajim-priv_msg_recv.png
diff --git a/icons/hicolor/48x48/status/gajim-single_msg_recv.png b/gajim/data/icons/hicolor/48x48/status/gajim-single_msg_recv.png
similarity index 100%
rename from icons/hicolor/48x48/status/gajim-single_msg_recv.png
rename to gajim/data/icons/hicolor/48x48/status/gajim-single_msg_recv.png
diff --git a/icons/hicolor/48x48/status/gajim-subscription_request.png b/gajim/data/icons/hicolor/48x48/status/gajim-subscription_request.png
similarity index 100%
rename from icons/hicolor/48x48/status/gajim-subscription_request.png
rename to gajim/data/icons/hicolor/48x48/status/gajim-subscription_request.png
diff --git a/icons/hicolor/48x48/status/gajim-unsubscribed.png b/gajim/data/icons/hicolor/48x48/status/gajim-unsubscribed.png
similarity index 100%
rename from icons/hicolor/48x48/status/gajim-unsubscribed.png
rename to gajim/data/icons/hicolor/48x48/status/gajim-unsubscribed.png