diff --git a/configure.ac b/configure.ac
index a6aadddfc56aff15e7f74cd2772ed23519e033bf..abe3115e71af449ebfc4595cdf9a8704f2ee881f 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 8d9b13a95a7740e4d91a7399ba392f5cb7a37598..0000000000000000000000000000000000000000
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 d881baa4d4a43c8a74d66d879586252e9a467b57..0000000000000000000000000000000000000000
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 344eeea452943ee65d2afd60dec28754e88ca511..0000000000000000000000000000000000000000
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 bdd125ae38738a51a85c837ca6a27834a79758ea..0000000000000000000000000000000000000000
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 7b8298fdda5b1a4128517a4830ea5a3cce3b2012..0000000000000000000000000000000000000000
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 9152973b927f3e8be343880ae75bec01a106e6f8..0000000000000000000000000000000000000000
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 4a36aa2cee0bc1fd58ea6fbada4c4ea20066ab06..0000000000000000000000000000000000000000
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 ee0e93fa80fd54d933e4a622fd705d7c5dc8d01e..0000000000000000000000000000000000000000
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 efdd60f12db3c6759edfa3c91537e543e93a75e2..0000000000000000000000000000000000000000
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 0bf75af1545d44b59c015135083b058526cc0b7a..0000000000000000000000000000000000000000
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 9f90066057234a1b1cccd10f54a43c46528cbcc5..0000000000000000000000000000000000000000
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 26e69a71c2ae8af5691c1fc67b555d6767c96e62..0000000000000000000000000000000000000000
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 2dcabc4a170abe8ab160ce07a291ddc0f10f96d8..0000000000000000000000000000000000000000
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 de0a8c646529728ced8c63a8895b6776f30d7ae7..0000000000000000000000000000000000000000
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 067ff9546cdc18c43d692795a22ea56f88f2cdb7..0000000000000000000000000000000000000000
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 1171143612b72f998acec4861ef8d298cba18c89..0000000000000000000000000000000000000000
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 3c7474c826f1c6c7e056e8b02adddfc631e5b110..0000000000000000000000000000000000000000
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 279843fde50167d69c4bfb0d04e7986f55b81c74..0000000000000000000000000000000000000000
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 26e69a71c2ae8af5691c1fc67b555d6767c96e62..0000000000000000000000000000000000000000
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 2dcabc4a170abe8ab160ce07a291ddc0f10f96d8..0000000000000000000000000000000000000000
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 359993c9a78007cf9f519c367536cf94ab0022e5..0000000000000000000000000000000000000000
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 b7677906d2e7efa556f4a99ead824ddb28d75f21..0000000000000000000000000000000000000000
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 d89883096c9be2ab973cac56bd60764cb9ca73a8..0000000000000000000000000000000000000000
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 b8803e1644fe313e72aee286f5ef51255d0759d9..0000000000000000000000000000000000000000
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 190c5ae70709e2388a684508e0f82a151fef0ca0..0000000000000000000000000000000000000000
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 5658e072bbce220f6c6ff844415bfaa1798df226..0000000000000000000000000000000000000000
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 4c6bfc64d2bf8a7997758c2d305c16a3381d83de..0000000000000000000000000000000000000000
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 a2826337533b276ff548aea5beaedd2df5f18de4..0000000000000000000000000000000000000000
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 efdd60f12db3c6759edfa3c91537e543e93a75e2..0000000000000000000000000000000000000000
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 0bf75af1545d44b59c015135083b058526cc0b7a..0000000000000000000000000000000000000000
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 df8f0b2daafd6be4497497c446da5700564e9f3b..0000000000000000000000000000000000000000
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 df06e4b2b56dd3a180973b451327f03c4df55fc3..0000000000000000000000000000000000000000
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 be9cd475c448dc37f47ace86c276e56546258109..0000000000000000000000000000000000000000
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 198a2ed2f1b899637a2838db99692e3a7c357192..0000000000000000000000000000000000000000
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 495569e3231d603ed774779c4c7c98c1fcdef56d..0000000000000000000000000000000000000000
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 0e61eeb51db825af1fc3c0e49e579366233b8e1d..0000000000000000000000000000000000000000
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 3c7474c826f1c6c7e056e8b02adddfc631e5b110..0000000000000000000000000000000000000000
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 279843fde50167d69c4bfb0d04e7986f55b81c74..0000000000000000000000000000000000000000
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 df06e4b2b56dd3a180973b451327f03c4df55fc3..0000000000000000000000000000000000000000
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 be9cd475c448dc37f47ace86c276e56546258109..0000000000000000000000000000000000000000
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 606b1b0d81f3760dd758d901330fa3995dcbd53e..0000000000000000000000000000000000000000
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 3104ee23f5818aedb423b671663e4960345fd1f7..0000000000000000000000000000000000000000
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 83873d1dfeb7a22adfcbdceff07fc8a6be390387..0000000000000000000000000000000000000000
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 558aa72004d1264be0a648cb275fb59af4616df0..0000000000000000000000000000000000000000
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 bedf5eb58efea65254646d5037401d43c3472fe0..0000000000000000000000000000000000000000
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 0ecf3a82cb93ebda1bb780fc3004d5aa1155458e..0000000000000000000000000000000000000000
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 75530547cf20367c01c3f85abfcfeb7be1267d27..0000000000000000000000000000000000000000
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 9586cd5199de845a01b89eaf349368d925a0ac44..0000000000000000000000000000000000000000
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 efdd60f12db3c6759edfa3c91537e543e93a75e2..0000000000000000000000000000000000000000
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 0bf75af1545d44b59c015135083b058526cc0b7a..0000000000000000000000000000000000000000
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 dbd0e0c5049b28066ea42871ad8337b51ffdbcc6..0000000000000000000000000000000000000000
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 e8c7f9d1356693338422e10b52bdbc2ae5b674ed..0000000000000000000000000000000000000000
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 4dffc2f0c50d23b022827fcd39a6b10f64aab63c..0000000000000000000000000000000000000000
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 c5b830999cfc68403abcd24f2066458f6412ba4e..0000000000000000000000000000000000000000
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 dbd0e0c5049b28066ea42871ad8337b51ffdbcc6..0000000000000000000000000000000000000000
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 6849ec7d78c84865d8dfc062ee000392bf8b8a84..0000000000000000000000000000000000000000
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 3c7474c826f1c6c7e056e8b02adddfc631e5b110..0000000000000000000000000000000000000000
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 279843fde50167d69c4bfb0d04e7986f55b81c74..0000000000000000000000000000000000000000
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 e8c7f9d1356693338422e10b52bdbc2ae5b674ed..0000000000000000000000000000000000000000
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 4dffc2f0c50d23b022827fcd39a6b10f64aab63c..0000000000000000000000000000000000000000
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 96ad30cb89362a0946286643092d4b9c8c9d145c..0000000000000000000000000000000000000000
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 a6f90a2fbe22f22f914b90df7ef3987e4c0a3d16..0000000000000000000000000000000000000000
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 aed216df1be5fe6a0a298bc7a7b8eb2f3e7605a6..0000000000000000000000000000000000000000
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 e5d80c172f47400bf0074cbdf8e16c519d6fdda1..0000000000000000000000000000000000000000
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 e028df8f953f0a78690d1b66b2d525779185e162..0000000000000000000000000000000000000000
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 588511d43760c4417b1eca74c1ddae5082910756..0000000000000000000000000000000000000000
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 bb6bf86a1a3421d60f5e04f3ee644d700e429322..0000000000000000000000000000000000000000
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 18291f8b8ec9b79d15e583098b0daaca7ef2364a..0000000000000000000000000000000000000000
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 efdd60f12db3c6759edfa3c91537e543e93a75e2..0000000000000000000000000000000000000000
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 0bf75af1545d44b59c015135083b058526cc0b7a..0000000000000000000000000000000000000000
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 f8fc73dcfc7b6eb88d6d527b5a510cf6567e8eda..0000000000000000000000000000000000000000
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 3fa410da12b842665fcf5d05c414d2a24cdb158f..0000000000000000000000000000000000000000
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 c6ad0d5353e36046dbd87af2b7dbc991efd50469..0000000000000000000000000000000000000000
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 d688fb41ee86e8aae66fe4e6b90e86249d8e33a3..0000000000000000000000000000000000000000
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 40c8c952b42cdf3f82abff4298c381ba005dcd84..0000000000000000000000000000000000000000
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 9e1cae85ab41ac955485a0dc7f1bbc20576eddcd..0000000000000000000000000000000000000000
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 3c7474c826f1c6c7e056e8b02adddfc631e5b110..0000000000000000000000000000000000000000
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 279843fde50167d69c4bfb0d04e7986f55b81c74..0000000000000000000000000000000000000000
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 3fa410da12b842665fcf5d05c414d2a24cdb158f..0000000000000000000000000000000000000000
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 c6ad0d5353e36046dbd87af2b7dbc991efd50469..0000000000000000000000000000000000000000
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 58e55873dd5a14471c5390e4d33d075679419964..0000000000000000000000000000000000000000
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 0427ebc516283adfcce65d43eb6fe4fd2353a0b0..0000000000000000000000000000000000000000
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 d89883096c9be2ab973cac56bd60764cb9ca73a8..0000000000000000000000000000000000000000
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 5a67e74b1989ee5c6baf978e8b5005c413f68c9b..0000000000000000000000000000000000000000
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 6ea0b2dd724fe625f8711de5fb825047eae09111..0000000000000000000000000000000000000000
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 5658e072bbce220f6c6ff844415bfaa1798df226..0000000000000000000000000000000000000000
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 7e78a07c978708d358776dd21086b7bb0ef8d62f..0000000000000000000000000000000000000000
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 4d959d700344fa9f4fc560a792c9561ecf99369e..0000000000000000000000000000000000000000
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 efdd60f12db3c6759edfa3c91537e543e93a75e2..0000000000000000000000000000000000000000
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 0bf75af1545d44b59c015135083b058526cc0b7a..0000000000000000000000000000000000000000
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 e209800caf6353e6b787687305a713d1409a4435..0000000000000000000000000000000000000000
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 c591a69268fc40e69fc5b1f5452789423b99c02a..0000000000000000000000000000000000000000
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 575b73c929c08ad3553df5f58227edca3c71643a..0000000000000000000000000000000000000000
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 198a2ed2f1b899637a2838db99692e3a7c357192..0000000000000000000000000000000000000000
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 cc34197d449a25912a2d08ddf07214f53dea4126..0000000000000000000000000000000000000000
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 e1a917d240cf1f8b15abfd8e7459e66fd4b573f6..0000000000000000000000000000000000000000
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 3c7474c826f1c6c7e056e8b02adddfc631e5b110..0000000000000000000000000000000000000000
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 279843fde50167d69c4bfb0d04e7986f55b81c74..0000000000000000000000000000000000000000
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 c591a69268fc40e69fc5b1f5452789423b99c02a..0000000000000000000000000000000000000000
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 575b73c929c08ad3553df5f58227edca3c71643a..0000000000000000000000000000000000000000
Binary files a/data/iconsets/stellar/48x48/online.png and /dev/null differ
diff --git a/gajim.nsi b/gajim.nsi
index 9dca63a4b1fab777a80d2fc4e70c594d6f3c34d9..b4a87e1bf2d49ec9f680a506710a85ed7f075c47 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 92bcb527c68d7b69fa00060cd60b97df93f98699..0f3bd129639a0f1b3beba025778442d62a25b5be 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 d5a7211325fb768d40f558412db553cdfa5af566..c753197755d2c29101bbf2a85f42e5c8c85ca739 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: