diff --git a/configure.ac b/configure.ac
index a6aadddfc..abe3115e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-		[0.12.5.6-dev],[http://trac.gajim.org/],[gajim])
+		[0.12.5.7-dev],[http://trac.gajim.org/],[gajim])
 AC_PREREQ([2.59])
 
 AC_CONFIG_HEADER(config.h)
diff --git a/data/iconsets/crystal/16x16/away.png b/data/iconsets/crystal/16x16/away.png
deleted file mode 100644
index 8d9b13a95..000000000
Binary files a/data/iconsets/crystal/16x16/away.png and /dev/null differ
diff --git a/data/iconsets/crystal/16x16/chat.png b/data/iconsets/crystal/16x16/chat.png
deleted file mode 100644
index d881baa4d..000000000
Binary files a/data/iconsets/crystal/16x16/chat.png and /dev/null differ
diff --git a/data/iconsets/crystal/16x16/closed.png b/data/iconsets/crystal/16x16/closed.png
deleted file mode 100644
index 344eeea45..000000000
Binary files a/data/iconsets/crystal/16x16/closed.png and /dev/null differ
diff --git a/data/iconsets/crystal/16x16/connecting.gif b/data/iconsets/crystal/16x16/connecting.gif
deleted file mode 100644
index bdd125ae3..000000000
Binary files a/data/iconsets/crystal/16x16/connecting.gif and /dev/null differ
diff --git a/data/iconsets/crystal/16x16/dnd.png b/data/iconsets/crystal/16x16/dnd.png
deleted file mode 100644
index 7b8298fdd..000000000
Binary files a/data/iconsets/crystal/16x16/dnd.png and /dev/null differ
diff --git a/data/iconsets/crystal/16x16/error.png b/data/iconsets/crystal/16x16/error.png
deleted file mode 100644
index 9152973b9..000000000
Binary files a/data/iconsets/crystal/16x16/error.png and /dev/null differ
diff --git a/data/iconsets/crystal/16x16/event.gif b/data/iconsets/crystal/16x16/event.gif
deleted file mode 100644
index 4a36aa2ce..000000000
Binary files a/data/iconsets/crystal/16x16/event.gif and /dev/null differ
diff --git a/data/iconsets/crystal/16x16/invisible.png b/data/iconsets/crystal/16x16/invisible.png
deleted file mode 100644
index ee0e93fa8..000000000
Binary files a/data/iconsets/crystal/16x16/invisible.png and /dev/null differ
diff --git a/data/iconsets/crystal/16x16/muc_active.png b/data/iconsets/crystal/16x16/muc_active.png
deleted file mode 100644
index efdd60f12..000000000
Binary files a/data/iconsets/crystal/16x16/muc_active.png and /dev/null differ
diff --git a/data/iconsets/crystal/16x16/muc_inactive.png b/data/iconsets/crystal/16x16/muc_inactive.png
deleted file mode 100644
index 0bf75af15..000000000
Binary files a/data/iconsets/crystal/16x16/muc_inactive.png and /dev/null differ
diff --git a/data/iconsets/crystal/16x16/not_in_roster.png b/data/iconsets/crystal/16x16/not_in_roster.png
deleted file mode 100644
index 9f9006605..000000000
Binary files a/data/iconsets/crystal/16x16/not_in_roster.png and /dev/null differ
diff --git a/data/iconsets/crystal/16x16/offline.png b/data/iconsets/crystal/16x16/offline.png
deleted file mode 100644
index 26e69a71c..000000000
Binary files a/data/iconsets/crystal/16x16/offline.png and /dev/null differ
diff --git a/data/iconsets/crystal/16x16/online.png b/data/iconsets/crystal/16x16/online.png
deleted file mode 100644
index 2dcabc4a1..000000000
Binary files a/data/iconsets/crystal/16x16/online.png and /dev/null differ
diff --git a/data/iconsets/crystal/16x16/opened.png b/data/iconsets/crystal/16x16/opened.png
deleted file mode 100644
index de0a8c646..000000000
Binary files a/data/iconsets/crystal/16x16/opened.png and /dev/null differ
diff --git a/data/iconsets/crystal/16x16/requested.png b/data/iconsets/crystal/16x16/requested.png
deleted file mode 100644
index 067ff9546..000000000
Binary files a/data/iconsets/crystal/16x16/requested.png and /dev/null differ
diff --git a/data/iconsets/crystal/16x16/xa.png b/data/iconsets/crystal/16x16/xa.png
deleted file mode 100644
index 117114361..000000000
Binary files a/data/iconsets/crystal/16x16/xa.png and /dev/null differ
diff --git a/data/iconsets/crystal/32x32/muc_active.png b/data/iconsets/crystal/32x32/muc_active.png
deleted file mode 100644
index 3c7474c82..000000000
Binary files a/data/iconsets/crystal/32x32/muc_active.png and /dev/null differ
diff --git a/data/iconsets/crystal/32x32/muc_inactive.png b/data/iconsets/crystal/32x32/muc_inactive.png
deleted file mode 100644
index 279843fde..000000000
Binary files a/data/iconsets/crystal/32x32/muc_inactive.png and /dev/null differ
diff --git a/data/iconsets/crystal/48x48/offline.png b/data/iconsets/crystal/48x48/offline.png
deleted file mode 100644
index 26e69a71c..000000000
Binary files a/data/iconsets/crystal/48x48/offline.png and /dev/null differ
diff --git a/data/iconsets/crystal/48x48/online.png b/data/iconsets/crystal/48x48/online.png
deleted file mode 100644
index 2dcabc4a1..000000000
Binary files a/data/iconsets/crystal/48x48/online.png and /dev/null differ
diff --git a/data/iconsets/gossip/16x16/away.png b/data/iconsets/gossip/16x16/away.png
deleted file mode 100644
index 359993c9a..000000000
Binary files a/data/iconsets/gossip/16x16/away.png and /dev/null differ
diff --git a/data/iconsets/gossip/16x16/chat.png b/data/iconsets/gossip/16x16/chat.png
deleted file mode 100644
index b7677906d..000000000
Binary files a/data/iconsets/gossip/16x16/chat.png and /dev/null differ
diff --git a/data/iconsets/gossip/16x16/closed.png b/data/iconsets/gossip/16x16/closed.png
deleted file mode 100644
index d89883096..000000000
Binary files a/data/iconsets/gossip/16x16/closed.png and /dev/null differ
diff --git a/data/iconsets/gossip/16x16/connecting.gif b/data/iconsets/gossip/16x16/connecting.gif
deleted file mode 100644
index b8803e164..000000000
Binary files a/data/iconsets/gossip/16x16/connecting.gif and /dev/null differ
diff --git a/data/iconsets/gossip/16x16/dnd.png b/data/iconsets/gossip/16x16/dnd.png
deleted file mode 100644
index 190c5ae70..000000000
Binary files a/data/iconsets/gossip/16x16/dnd.png and /dev/null differ
diff --git a/data/iconsets/gossip/16x16/error.png b/data/iconsets/gossip/16x16/error.png
deleted file mode 100644
index 5658e072b..000000000
Binary files a/data/iconsets/gossip/16x16/error.png and /dev/null differ
diff --git a/data/iconsets/gossip/16x16/event.png b/data/iconsets/gossip/16x16/event.png
deleted file mode 100644
index 4c6bfc64d..000000000
Binary files a/data/iconsets/gossip/16x16/event.png and /dev/null differ
diff --git a/data/iconsets/gossip/16x16/invisible.png b/data/iconsets/gossip/16x16/invisible.png
deleted file mode 100644
index a28263375..000000000
Binary files a/data/iconsets/gossip/16x16/invisible.png and /dev/null differ
diff --git a/data/iconsets/gossip/16x16/muc_active.png b/data/iconsets/gossip/16x16/muc_active.png
deleted file mode 100644
index efdd60f12..000000000
Binary files a/data/iconsets/gossip/16x16/muc_active.png and /dev/null differ
diff --git a/data/iconsets/gossip/16x16/muc_inactive.png b/data/iconsets/gossip/16x16/muc_inactive.png
deleted file mode 100644
index 0bf75af15..000000000
Binary files a/data/iconsets/gossip/16x16/muc_inactive.png and /dev/null differ
diff --git a/data/iconsets/gossip/16x16/not_in_roster.png b/data/iconsets/gossip/16x16/not_in_roster.png
deleted file mode 100644
index df8f0b2da..000000000
Binary files a/data/iconsets/gossip/16x16/not_in_roster.png and /dev/null differ
diff --git a/data/iconsets/gossip/16x16/offline.png b/data/iconsets/gossip/16x16/offline.png
deleted file mode 100644
index df06e4b2b..000000000
Binary files a/data/iconsets/gossip/16x16/offline.png and /dev/null differ
diff --git a/data/iconsets/gossip/16x16/online.png b/data/iconsets/gossip/16x16/online.png
deleted file mode 100644
index be9cd475c..000000000
Binary files a/data/iconsets/gossip/16x16/online.png and /dev/null differ
diff --git a/data/iconsets/gossip/16x16/opened.png b/data/iconsets/gossip/16x16/opened.png
deleted file mode 100644
index 198a2ed2f..000000000
Binary files a/data/iconsets/gossip/16x16/opened.png and /dev/null differ
diff --git a/data/iconsets/gossip/16x16/requested.png b/data/iconsets/gossip/16x16/requested.png
deleted file mode 100644
index 495569e32..000000000
Binary files a/data/iconsets/gossip/16x16/requested.png and /dev/null differ
diff --git a/data/iconsets/gossip/16x16/xa.png b/data/iconsets/gossip/16x16/xa.png
deleted file mode 100644
index 0e61eeb51..000000000
Binary files a/data/iconsets/gossip/16x16/xa.png and /dev/null differ
diff --git a/data/iconsets/gossip/32x32/muc_active.png b/data/iconsets/gossip/32x32/muc_active.png
deleted file mode 100644
index 3c7474c82..000000000
Binary files a/data/iconsets/gossip/32x32/muc_active.png and /dev/null differ
diff --git a/data/iconsets/gossip/32x32/muc_inactive.png b/data/iconsets/gossip/32x32/muc_inactive.png
deleted file mode 100644
index 279843fde..000000000
Binary files a/data/iconsets/gossip/32x32/muc_inactive.png and /dev/null differ
diff --git a/data/iconsets/gossip/48x48/offline.png b/data/iconsets/gossip/48x48/offline.png
deleted file mode 100644
index df06e4b2b..000000000
Binary files a/data/iconsets/gossip/48x48/offline.png and /dev/null differ
diff --git a/data/iconsets/gossip/48x48/online.png b/data/iconsets/gossip/48x48/online.png
deleted file mode 100644
index be9cd475c..000000000
Binary files a/data/iconsets/gossip/48x48/online.png and /dev/null differ
diff --git a/data/iconsets/nuvola/16x16/away.png b/data/iconsets/nuvola/16x16/away.png
deleted file mode 100644
index 606b1b0d8..000000000
Binary files a/data/iconsets/nuvola/16x16/away.png and /dev/null differ
diff --git a/data/iconsets/nuvola/16x16/chat.png b/data/iconsets/nuvola/16x16/chat.png
deleted file mode 100644
index 3104ee23f..000000000
Binary files a/data/iconsets/nuvola/16x16/chat.png and /dev/null differ
diff --git a/data/iconsets/nuvola/16x16/closed.png b/data/iconsets/nuvola/16x16/closed.png
deleted file mode 100644
index 83873d1df..000000000
Binary files a/data/iconsets/nuvola/16x16/closed.png and /dev/null differ
diff --git a/data/iconsets/nuvola/16x16/connecting.png b/data/iconsets/nuvola/16x16/connecting.png
deleted file mode 100644
index 558aa7200..000000000
Binary files a/data/iconsets/nuvola/16x16/connecting.png and /dev/null differ
diff --git a/data/iconsets/nuvola/16x16/dnd.png b/data/iconsets/nuvola/16x16/dnd.png
deleted file mode 100644
index bedf5eb58..000000000
Binary files a/data/iconsets/nuvola/16x16/dnd.png and /dev/null differ
diff --git a/data/iconsets/nuvola/16x16/error.png b/data/iconsets/nuvola/16x16/error.png
deleted file mode 100644
index 0ecf3a82c..000000000
Binary files a/data/iconsets/nuvola/16x16/error.png and /dev/null differ
diff --git a/data/iconsets/nuvola/16x16/event.gif b/data/iconsets/nuvola/16x16/event.gif
deleted file mode 100644
index 75530547c..000000000
Binary files a/data/iconsets/nuvola/16x16/event.gif and /dev/null differ
diff --git a/data/iconsets/nuvola/16x16/invisible.png b/data/iconsets/nuvola/16x16/invisible.png
deleted file mode 100644
index 9586cd519..000000000
Binary files a/data/iconsets/nuvola/16x16/invisible.png and /dev/null differ
diff --git a/data/iconsets/nuvola/16x16/muc_active.png b/data/iconsets/nuvola/16x16/muc_active.png
deleted file mode 100644
index efdd60f12..000000000
Binary files a/data/iconsets/nuvola/16x16/muc_active.png and /dev/null differ
diff --git a/data/iconsets/nuvola/16x16/muc_inactive.png b/data/iconsets/nuvola/16x16/muc_inactive.png
deleted file mode 100644
index 0bf75af15..000000000
Binary files a/data/iconsets/nuvola/16x16/muc_inactive.png and /dev/null differ
diff --git a/data/iconsets/nuvola/16x16/not_in_roster.png b/data/iconsets/nuvola/16x16/not_in_roster.png
deleted file mode 100644
index dbd0e0c50..000000000
Binary files a/data/iconsets/nuvola/16x16/not_in_roster.png and /dev/null differ
diff --git a/data/iconsets/nuvola/16x16/offline.png b/data/iconsets/nuvola/16x16/offline.png
deleted file mode 100644
index e8c7f9d13..000000000
Binary files a/data/iconsets/nuvola/16x16/offline.png and /dev/null differ
diff --git a/data/iconsets/nuvola/16x16/online.png b/data/iconsets/nuvola/16x16/online.png
deleted file mode 100644
index 4dffc2f0c..000000000
Binary files a/data/iconsets/nuvola/16x16/online.png and /dev/null differ
diff --git a/data/iconsets/nuvola/16x16/opened.png b/data/iconsets/nuvola/16x16/opened.png
deleted file mode 100644
index c5b830999..000000000
Binary files a/data/iconsets/nuvola/16x16/opened.png and /dev/null differ
diff --git a/data/iconsets/nuvola/16x16/requested.png b/data/iconsets/nuvola/16x16/requested.png
deleted file mode 100644
index dbd0e0c50..000000000
Binary files a/data/iconsets/nuvola/16x16/requested.png and /dev/null differ
diff --git a/data/iconsets/nuvola/16x16/xa.png b/data/iconsets/nuvola/16x16/xa.png
deleted file mode 100644
index 6849ec7d7..000000000
Binary files a/data/iconsets/nuvola/16x16/xa.png and /dev/null differ
diff --git a/data/iconsets/nuvola/32x32/muc_active.png b/data/iconsets/nuvola/32x32/muc_active.png
deleted file mode 100644
index 3c7474c82..000000000
Binary files a/data/iconsets/nuvola/32x32/muc_active.png and /dev/null differ
diff --git a/data/iconsets/nuvola/32x32/muc_inactive.png b/data/iconsets/nuvola/32x32/muc_inactive.png
deleted file mode 100644
index 279843fde..000000000
Binary files a/data/iconsets/nuvola/32x32/muc_inactive.png and /dev/null differ
diff --git a/data/iconsets/nuvola/48x48/offline.png b/data/iconsets/nuvola/48x48/offline.png
deleted file mode 100644
index e8c7f9d13..000000000
Binary files a/data/iconsets/nuvola/48x48/offline.png and /dev/null differ
diff --git a/data/iconsets/nuvola/48x48/online.png b/data/iconsets/nuvola/48x48/online.png
deleted file mode 100644
index 4dffc2f0c..000000000
Binary files a/data/iconsets/nuvola/48x48/online.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/16x16/away.png b/data/iconsets/simplebulb/16x16/away.png
deleted file mode 100644
index 96ad30cb8..000000000
Binary files a/data/iconsets/simplebulb/16x16/away.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/16x16/chat.png b/data/iconsets/simplebulb/16x16/chat.png
deleted file mode 100644
index a6f90a2fb..000000000
Binary files a/data/iconsets/simplebulb/16x16/chat.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/16x16/closed.png b/data/iconsets/simplebulb/16x16/closed.png
deleted file mode 100644
index aed216df1..000000000
Binary files a/data/iconsets/simplebulb/16x16/closed.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/16x16/connecting.png b/data/iconsets/simplebulb/16x16/connecting.png
deleted file mode 100644
index e5d80c172..000000000
Binary files a/data/iconsets/simplebulb/16x16/connecting.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/16x16/dnd.png b/data/iconsets/simplebulb/16x16/dnd.png
deleted file mode 100644
index e028df8f9..000000000
Binary files a/data/iconsets/simplebulb/16x16/dnd.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/16x16/error.png b/data/iconsets/simplebulb/16x16/error.png
deleted file mode 100644
index 588511d43..000000000
Binary files a/data/iconsets/simplebulb/16x16/error.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/16x16/event.png b/data/iconsets/simplebulb/16x16/event.png
deleted file mode 100644
index bb6bf86a1..000000000
Binary files a/data/iconsets/simplebulb/16x16/event.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/16x16/invisible.png b/data/iconsets/simplebulb/16x16/invisible.png
deleted file mode 100644
index 18291f8b8..000000000
Binary files a/data/iconsets/simplebulb/16x16/invisible.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/16x16/muc_active.png b/data/iconsets/simplebulb/16x16/muc_active.png
deleted file mode 100644
index efdd60f12..000000000
Binary files a/data/iconsets/simplebulb/16x16/muc_active.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/16x16/muc_inactive.png b/data/iconsets/simplebulb/16x16/muc_inactive.png
deleted file mode 100644
index 0bf75af15..000000000
Binary files a/data/iconsets/simplebulb/16x16/muc_inactive.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/16x16/not_in_roster.png b/data/iconsets/simplebulb/16x16/not_in_roster.png
deleted file mode 100644
index f8fc73dcf..000000000
Binary files a/data/iconsets/simplebulb/16x16/not_in_roster.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/16x16/offline.png b/data/iconsets/simplebulb/16x16/offline.png
deleted file mode 100644
index 3fa410da1..000000000
Binary files a/data/iconsets/simplebulb/16x16/offline.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/16x16/online.png b/data/iconsets/simplebulb/16x16/online.png
deleted file mode 100644
index c6ad0d535..000000000
Binary files a/data/iconsets/simplebulb/16x16/online.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/16x16/opened.png b/data/iconsets/simplebulb/16x16/opened.png
deleted file mode 100644
index d688fb41e..000000000
Binary files a/data/iconsets/simplebulb/16x16/opened.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/16x16/requested.png b/data/iconsets/simplebulb/16x16/requested.png
deleted file mode 100644
index 40c8c952b..000000000
Binary files a/data/iconsets/simplebulb/16x16/requested.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/16x16/xa.png b/data/iconsets/simplebulb/16x16/xa.png
deleted file mode 100644
index 9e1cae85a..000000000
Binary files a/data/iconsets/simplebulb/16x16/xa.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/32x32/muc_active.png b/data/iconsets/simplebulb/32x32/muc_active.png
deleted file mode 100644
index 3c7474c82..000000000
Binary files a/data/iconsets/simplebulb/32x32/muc_active.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/32x32/muc_inactive.png b/data/iconsets/simplebulb/32x32/muc_inactive.png
deleted file mode 100644
index 279843fde..000000000
Binary files a/data/iconsets/simplebulb/32x32/muc_inactive.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/48x48/offline.png b/data/iconsets/simplebulb/48x48/offline.png
deleted file mode 100644
index 3fa410da1..000000000
Binary files a/data/iconsets/simplebulb/48x48/offline.png and /dev/null differ
diff --git a/data/iconsets/simplebulb/48x48/online.png b/data/iconsets/simplebulb/48x48/online.png
deleted file mode 100644
index c6ad0d535..000000000
Binary files a/data/iconsets/simplebulb/48x48/online.png and /dev/null differ
diff --git a/data/iconsets/stellar/16x16/away.png b/data/iconsets/stellar/16x16/away.png
deleted file mode 100644
index 58e55873d..000000000
Binary files a/data/iconsets/stellar/16x16/away.png and /dev/null differ
diff --git a/data/iconsets/stellar/16x16/chat.png b/data/iconsets/stellar/16x16/chat.png
deleted file mode 100644
index 0427ebc51..000000000
Binary files a/data/iconsets/stellar/16x16/chat.png and /dev/null differ
diff --git a/data/iconsets/stellar/16x16/closed.png b/data/iconsets/stellar/16x16/closed.png
deleted file mode 100644
index d89883096..000000000
Binary files a/data/iconsets/stellar/16x16/closed.png and /dev/null differ
diff --git a/data/iconsets/stellar/16x16/connecting.gif b/data/iconsets/stellar/16x16/connecting.gif
deleted file mode 100644
index 5a67e74b1..000000000
Binary files a/data/iconsets/stellar/16x16/connecting.gif and /dev/null differ
diff --git a/data/iconsets/stellar/16x16/dnd.png b/data/iconsets/stellar/16x16/dnd.png
deleted file mode 100644
index 6ea0b2dd7..000000000
Binary files a/data/iconsets/stellar/16x16/dnd.png and /dev/null differ
diff --git a/data/iconsets/stellar/16x16/error.png b/data/iconsets/stellar/16x16/error.png
deleted file mode 100644
index 5658e072b..000000000
Binary files a/data/iconsets/stellar/16x16/error.png and /dev/null differ
diff --git a/data/iconsets/stellar/16x16/event.gif b/data/iconsets/stellar/16x16/event.gif
deleted file mode 100644
index 7e78a07c9..000000000
Binary files a/data/iconsets/stellar/16x16/event.gif and /dev/null differ
diff --git a/data/iconsets/stellar/16x16/invisible.png b/data/iconsets/stellar/16x16/invisible.png
deleted file mode 100644
index 4d959d700..000000000
Binary files a/data/iconsets/stellar/16x16/invisible.png and /dev/null differ
diff --git a/data/iconsets/stellar/16x16/muc_active.png b/data/iconsets/stellar/16x16/muc_active.png
deleted file mode 100644
index efdd60f12..000000000
Binary files a/data/iconsets/stellar/16x16/muc_active.png and /dev/null differ
diff --git a/data/iconsets/stellar/16x16/muc_inactive.png b/data/iconsets/stellar/16x16/muc_inactive.png
deleted file mode 100644
index 0bf75af15..000000000
Binary files a/data/iconsets/stellar/16x16/muc_inactive.png and /dev/null differ
diff --git a/data/iconsets/stellar/16x16/not_in_roster.png b/data/iconsets/stellar/16x16/not_in_roster.png
deleted file mode 100644
index e209800ca..000000000
Binary files a/data/iconsets/stellar/16x16/not_in_roster.png and /dev/null differ
diff --git a/data/iconsets/stellar/16x16/offline.png b/data/iconsets/stellar/16x16/offline.png
deleted file mode 100644
index c591a6926..000000000
Binary files a/data/iconsets/stellar/16x16/offline.png and /dev/null differ
diff --git a/data/iconsets/stellar/16x16/online.png b/data/iconsets/stellar/16x16/online.png
deleted file mode 100644
index 575b73c92..000000000
Binary files a/data/iconsets/stellar/16x16/online.png and /dev/null differ
diff --git a/data/iconsets/stellar/16x16/opened.png b/data/iconsets/stellar/16x16/opened.png
deleted file mode 100644
index 198a2ed2f..000000000
Binary files a/data/iconsets/stellar/16x16/opened.png and /dev/null differ
diff --git a/data/iconsets/stellar/16x16/requested.png b/data/iconsets/stellar/16x16/requested.png
deleted file mode 100644
index cc34197d4..000000000
Binary files a/data/iconsets/stellar/16x16/requested.png and /dev/null differ
diff --git a/data/iconsets/stellar/16x16/xa.png b/data/iconsets/stellar/16x16/xa.png
deleted file mode 100644
index e1a917d24..000000000
Binary files a/data/iconsets/stellar/16x16/xa.png and /dev/null differ
diff --git a/data/iconsets/stellar/32x32/muc_active.png b/data/iconsets/stellar/32x32/muc_active.png
deleted file mode 100644
index 3c7474c82..000000000
Binary files a/data/iconsets/stellar/32x32/muc_active.png and /dev/null differ
diff --git a/data/iconsets/stellar/32x32/muc_inactive.png b/data/iconsets/stellar/32x32/muc_inactive.png
deleted file mode 100644
index 279843fde..000000000
Binary files a/data/iconsets/stellar/32x32/muc_inactive.png and /dev/null differ
diff --git a/data/iconsets/stellar/48x48/offline.png b/data/iconsets/stellar/48x48/offline.png
deleted file mode 100644
index c591a6926..000000000
Binary files a/data/iconsets/stellar/48x48/offline.png and /dev/null differ
diff --git a/data/iconsets/stellar/48x48/online.png b/data/iconsets/stellar/48x48/online.png
deleted file mode 100644
index 575b73c92..000000000
Binary files a/data/iconsets/stellar/48x48/online.png and /dev/null differ
diff --git a/gajim.nsi b/gajim.nsi
index 9dca63a4b..b4a87e1bf 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -255,11 +255,6 @@ SectionGroupEnd
 
 SectionGroup $(NAME_Iconsets)
 
-Section "crystal" SecIconsetsCrystal
-	SetOutPath "$INSTDIR\data\iconsets"
-	File /r "data\iconsets\crystal"
-SectionEnd
-
 Section "dcraven" SecIconsetsDcraven
 	SectionIn RO
 	SetOutPath "$INSTDIR\data\iconsets"
@@ -276,11 +271,6 @@ Section "goojim" SecIconsetsGoojim
 	File /r "data\iconsets\goojim"
 SectionEnd
 
-Section "gossip" SecIconsetsGossip
-	SetOutPath "$INSTDIR\data\iconsets"
-	File /r "data\iconsets\gossip"
-SectionEnd
-
 Section "gota" SecIconsetsGota
 	SetOutPath "$INSTDIR\data\iconsets"
 	File /r "data\iconsets\gota"
@@ -291,21 +281,6 @@ Section "jabberbulb" SecIconsetsJabberbulb
 	File /r "data\iconsets\jabberbulb"
 SectionEnd
 
-Section "nuvola" SecIconsetsNuvola
-	SetOutPath "$INSTDIR\data\iconsets"
-	File /r "data\iconsets\nuvola"
-SectionEnd
-
-Section "simplebulb" SecIconsetsSimplebulb
-	SetOutPath "$INSTDIR\data\iconsets"
-	File /r "data\iconsets\simplebulb"
-SectionEnd
-
-Section "stellar" SecIconsetsStellar
-	SetOutPath "$INSTDIR\data\iconsets"
-	File /r "data\iconsets\stellar"
-SectionEnd
-
 Section "sun" SecIconsetsSun
 	SetOutPath "$INSTDIR\data\iconsets"
 	File /r "data\iconsets\sun"
@@ -711,16 +686,11 @@ Section "Uninstall"
 	RMDir /r "$INSTDIR\data\emoticons\static"
 	RMDir /r "$INSTDIR\data\emoticons\static-big"
 	RMDir "$INSTDIR\data\emoticons"
-	RMDir /r "$INSTDIR\data\iconsets\crystal"
 	RMDir /r "$INSTDIR\data\iconsets\dcraven"
 	RMDir /r "$INSTDIR\data\iconsets\gnome"
 	RMDir /r "$INSTDIR\data\iconsets\goojim"
-	RMDir /r "$INSTDIR\data\iconsets\gossip"
 	RMDir /r "$INSTDIR\data\iconsets\gota"
 	RMDir /r "$INSTDIR\data\iconsets\jabberbulb"
-	RMDir /r "$INSTDIR\data\iconsets\nuvola"
-	RMDir /r "$INSTDIR\data\iconsets\simplebulb"
-	RMDir /r "$INSTDIR\data\iconsets\stellar"
 	RMDir /r "$INSTDIR\data\iconsets\sun"
 	RMDir /r "$INSTDIR\data\iconsets\transports"
 	RMDir "$INSTDIR\data\iconsets"
diff --git a/src/common/defs.py b/src/common/defs.py
index 92bcb527c..0f3bd1296 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -27,7 +27,7 @@ docdir = '../'
 datadir = '../'
 localedir = '../po'
 
-version = '0.12.5.6-dev'
+version = '0.12.5.7-dev'
 
 import sys, os.path
 for base in ('.', 'common'):
diff --git a/src/common/optparser.py b/src/common/optparser.py
index d5a721132..c75319775 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -213,6 +213,8 @@ class OptionsParser:
 			self.update_config_to_01255()
 		if old < [0, 12, 5, 6] and new >= [0, 12, 5, 6]:
 			self.update_config_to_01256()
+		if old < [0, 12, 5, 7] and new >= [0, 12, 5, 7]:
+			self.update_config_to_01257()
 
 		gajim.logger.init_vars()
 		gajim.config.set('version', new_version)
@@ -802,4 +804,10 @@ class OptionsParser:
 				gajim.config.set(c, vals[c][1])
 		gajim.config.set('version', '0.12.5.6')
 
+	def update_config_to_01257(self):
+		if 'iconset' in self.old_values:
+			if self.old_values['iconset'] in ('nuvola', 'crystal', 'gossip',
+			'simplebulb', 'stellar'):
+				gajim.config.set('iconset', gajim.config.DEFAULT_ICONSET)
+		gajim.config.set('version', '0.12.5.7')
 # vim: se ts=3: