diff --git a/glade/merge_dialog.glade b/glade/merge_dialog.glade
index e393791d3..fa7edd86a 100644
--- a/glade/merge_dialog.glade
+++ b/glade/merge_dialog.glade
@@ -9,6 +9,9 @@
     <property name="default_width">200</property>
     <property name="default_height">50</property>
     <property name="has_separator">False</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/pixmaps/flags/FLAGS_LICENCE b/pixmaps/flags18x12/FLAGS_LICENCE
similarity index 100%
rename from pixmaps/flags/FLAGS_LICENCE
rename to pixmaps/flags18x12/FLAGS_LICENCE
diff --git a/pixmaps/flags/ad.png b/pixmaps/flags18x12/ad.png
similarity index 100%
rename from pixmaps/flags/ad.png
rename to pixmaps/flags18x12/ad.png
diff --git a/pixmaps/flags/ae.png b/pixmaps/flags18x12/ae.png
similarity index 100%
rename from pixmaps/flags/ae.png
rename to pixmaps/flags18x12/ae.png
diff --git a/pixmaps/flags/af.png b/pixmaps/flags18x12/af.png
similarity index 100%
rename from pixmaps/flags/af.png
rename to pixmaps/flags18x12/af.png
diff --git a/pixmaps/flags/ag.png b/pixmaps/flags18x12/ag.png
similarity index 100%
rename from pixmaps/flags/ag.png
rename to pixmaps/flags18x12/ag.png
diff --git a/pixmaps/flags/ai.png b/pixmaps/flags18x12/ai.png
similarity index 100%
rename from pixmaps/flags/ai.png
rename to pixmaps/flags18x12/ai.png
diff --git a/pixmaps/flags/al.png b/pixmaps/flags18x12/al.png
similarity index 100%
rename from pixmaps/flags/al.png
rename to pixmaps/flags18x12/al.png
diff --git a/pixmaps/flags/am.png b/pixmaps/flags18x12/am.png
similarity index 100%
rename from pixmaps/flags/am.png
rename to pixmaps/flags18x12/am.png
diff --git a/pixmaps/flags/an.png b/pixmaps/flags18x12/an.png
similarity index 100%
rename from pixmaps/flags/an.png
rename to pixmaps/flags18x12/an.png
diff --git a/pixmaps/flags/ao.png b/pixmaps/flags18x12/ao.png
similarity index 100%
rename from pixmaps/flags/ao.png
rename to pixmaps/flags18x12/ao.png
diff --git a/pixmaps/flags/aq.png b/pixmaps/flags18x12/aq.png
similarity index 100%
rename from pixmaps/flags/aq.png
rename to pixmaps/flags18x12/aq.png
diff --git a/pixmaps/flags/ar.png b/pixmaps/flags18x12/ar.png
similarity index 100%
rename from pixmaps/flags/ar.png
rename to pixmaps/flags18x12/ar.png
diff --git a/pixmaps/flags/as.png b/pixmaps/flags18x12/as.png
similarity index 100%
rename from pixmaps/flags/as.png
rename to pixmaps/flags18x12/as.png
diff --git a/pixmaps/flags/at.png b/pixmaps/flags18x12/at.png
similarity index 100%
rename from pixmaps/flags/at.png
rename to pixmaps/flags18x12/at.png
diff --git a/pixmaps/flags/au.png b/pixmaps/flags18x12/au.png
similarity index 100%
rename from pixmaps/flags/au.png
rename to pixmaps/flags18x12/au.png
diff --git a/pixmaps/flags/aw.png b/pixmaps/flags18x12/aw.png
similarity index 100%
rename from pixmaps/flags/aw.png
rename to pixmaps/flags18x12/aw.png
diff --git a/pixmaps/flags/ax.png b/pixmaps/flags18x12/ax.png
similarity index 100%
rename from pixmaps/flags/ax.png
rename to pixmaps/flags18x12/ax.png
diff --git a/pixmaps/flags/az.png b/pixmaps/flags18x12/az.png
similarity index 100%
rename from pixmaps/flags/az.png
rename to pixmaps/flags18x12/az.png
diff --git a/pixmaps/flags/ba.png b/pixmaps/flags18x12/ba.png
similarity index 100%
rename from pixmaps/flags/ba.png
rename to pixmaps/flags18x12/ba.png
diff --git a/pixmaps/flags/bb.png b/pixmaps/flags18x12/bb.png
similarity index 100%
rename from pixmaps/flags/bb.png
rename to pixmaps/flags18x12/bb.png
diff --git a/pixmaps/flags/bd.png b/pixmaps/flags18x12/bd.png
similarity index 100%
rename from pixmaps/flags/bd.png
rename to pixmaps/flags18x12/bd.png
diff --git a/pixmaps/flags/be.png b/pixmaps/flags18x12/be.png
similarity index 100%
rename from pixmaps/flags/be.png
rename to pixmaps/flags18x12/be.png
diff --git a/pixmaps/flags/bf.png b/pixmaps/flags18x12/bf.png
similarity index 100%
rename from pixmaps/flags/bf.png
rename to pixmaps/flags18x12/bf.png
diff --git a/pixmaps/flags/bg.png b/pixmaps/flags18x12/bg.png
similarity index 100%
rename from pixmaps/flags/bg.png
rename to pixmaps/flags18x12/bg.png
diff --git a/pixmaps/flags/bh.png b/pixmaps/flags18x12/bh.png
similarity index 100%
rename from pixmaps/flags/bh.png
rename to pixmaps/flags18x12/bh.png
diff --git a/pixmaps/flags/bi.png b/pixmaps/flags18x12/bi.png
similarity index 100%
rename from pixmaps/flags/bi.png
rename to pixmaps/flags18x12/bi.png
diff --git a/pixmaps/flags/bj.png b/pixmaps/flags18x12/bj.png
similarity index 100%
rename from pixmaps/flags/bj.png
rename to pixmaps/flags18x12/bj.png
diff --git a/pixmaps/flags/bm.png b/pixmaps/flags18x12/bm.png
similarity index 100%
rename from pixmaps/flags/bm.png
rename to pixmaps/flags18x12/bm.png
diff --git a/pixmaps/flags/bn.png b/pixmaps/flags18x12/bn.png
similarity index 100%
rename from pixmaps/flags/bn.png
rename to pixmaps/flags18x12/bn.png
diff --git a/pixmaps/flags/bo.png b/pixmaps/flags18x12/bo.png
similarity index 100%
rename from pixmaps/flags/bo.png
rename to pixmaps/flags18x12/bo.png
diff --git a/pixmaps/flags/br.png b/pixmaps/flags18x12/br.png
similarity index 100%
rename from pixmaps/flags/br.png
rename to pixmaps/flags18x12/br.png
diff --git a/pixmaps/flags/bs.png b/pixmaps/flags18x12/bs.png
similarity index 100%
rename from pixmaps/flags/bs.png
rename to pixmaps/flags18x12/bs.png
diff --git a/pixmaps/flags/bt.png b/pixmaps/flags18x12/bt.png
similarity index 100%
rename from pixmaps/flags/bt.png
rename to pixmaps/flags18x12/bt.png
diff --git a/pixmaps/flags/bv.png b/pixmaps/flags18x12/bv.png
similarity index 100%
rename from pixmaps/flags/bv.png
rename to pixmaps/flags18x12/bv.png
diff --git a/pixmaps/flags/bw.png b/pixmaps/flags18x12/bw.png
similarity index 100%
rename from pixmaps/flags/bw.png
rename to pixmaps/flags18x12/bw.png
diff --git a/pixmaps/flags/by.png b/pixmaps/flags18x12/by.png
similarity index 100%
rename from pixmaps/flags/by.png
rename to pixmaps/flags18x12/by.png
diff --git a/pixmaps/flags/bz.png b/pixmaps/flags18x12/bz.png
similarity index 100%
rename from pixmaps/flags/bz.png
rename to pixmaps/flags18x12/bz.png
diff --git a/pixmaps/flags/ca.png b/pixmaps/flags18x12/ca.png
similarity index 100%
rename from pixmaps/flags/ca.png
rename to pixmaps/flags18x12/ca.png
diff --git a/pixmaps/flags/cc.png b/pixmaps/flags18x12/cc.png
similarity index 100%
rename from pixmaps/flags/cc.png
rename to pixmaps/flags18x12/cc.png
diff --git a/pixmaps/flags/cd.png b/pixmaps/flags18x12/cd.png
similarity index 100%
rename from pixmaps/flags/cd.png
rename to pixmaps/flags18x12/cd.png
diff --git a/pixmaps/flags/cf.png b/pixmaps/flags18x12/cf.png
similarity index 100%
rename from pixmaps/flags/cf.png
rename to pixmaps/flags18x12/cf.png
diff --git a/pixmaps/flags/cg.png b/pixmaps/flags18x12/cg.png
similarity index 100%
rename from pixmaps/flags/cg.png
rename to pixmaps/flags18x12/cg.png
diff --git a/pixmaps/flags/ch.png b/pixmaps/flags18x12/ch.png
similarity index 100%
rename from pixmaps/flags/ch.png
rename to pixmaps/flags18x12/ch.png
diff --git a/pixmaps/flags/ci.png b/pixmaps/flags18x12/ci.png
similarity index 100%
rename from pixmaps/flags/ci.png
rename to pixmaps/flags18x12/ci.png
diff --git a/pixmaps/flags/ck.png b/pixmaps/flags18x12/ck.png
similarity index 100%
rename from pixmaps/flags/ck.png
rename to pixmaps/flags18x12/ck.png
diff --git a/pixmaps/flags/cl.png b/pixmaps/flags18x12/cl.png
similarity index 100%
rename from pixmaps/flags/cl.png
rename to pixmaps/flags18x12/cl.png
diff --git a/pixmaps/flags/cm.png b/pixmaps/flags18x12/cm.png
similarity index 100%
rename from pixmaps/flags/cm.png
rename to pixmaps/flags18x12/cm.png
diff --git a/pixmaps/flags/cn.png b/pixmaps/flags18x12/cn.png
similarity index 100%
rename from pixmaps/flags/cn.png
rename to pixmaps/flags18x12/cn.png
diff --git a/pixmaps/flags/co.png b/pixmaps/flags18x12/co.png
similarity index 100%
rename from pixmaps/flags/co.png
rename to pixmaps/flags18x12/co.png
diff --git a/pixmaps/flags/cr.png b/pixmaps/flags18x12/cr.png
similarity index 100%
rename from pixmaps/flags/cr.png
rename to pixmaps/flags18x12/cr.png
diff --git a/pixmaps/flags/cs.png b/pixmaps/flags18x12/cs.png
similarity index 100%
rename from pixmaps/flags/cs.png
rename to pixmaps/flags18x12/cs.png
diff --git a/pixmaps/flags/cu.png b/pixmaps/flags18x12/cu.png
similarity index 100%
rename from pixmaps/flags/cu.png
rename to pixmaps/flags18x12/cu.png
diff --git a/pixmaps/flags/cv.png b/pixmaps/flags18x12/cv.png
similarity index 100%
rename from pixmaps/flags/cv.png
rename to pixmaps/flags18x12/cv.png
diff --git a/pixmaps/flags/cx.png b/pixmaps/flags18x12/cx.png
similarity index 100%
rename from pixmaps/flags/cx.png
rename to pixmaps/flags18x12/cx.png
diff --git a/pixmaps/flags/cy.png b/pixmaps/flags18x12/cy.png
similarity index 100%
rename from pixmaps/flags/cy.png
rename to pixmaps/flags18x12/cy.png
diff --git a/pixmaps/flags/cz.png b/pixmaps/flags18x12/cz.png
similarity index 100%
rename from pixmaps/flags/cz.png
rename to pixmaps/flags18x12/cz.png
diff --git a/pixmaps/flags/de.png b/pixmaps/flags18x12/de.png
similarity index 100%
rename from pixmaps/flags/de.png
rename to pixmaps/flags18x12/de.png
diff --git a/pixmaps/flags/dj.png b/pixmaps/flags18x12/dj.png
similarity index 100%
rename from pixmaps/flags/dj.png
rename to pixmaps/flags18x12/dj.png
diff --git a/pixmaps/flags/dk.png b/pixmaps/flags18x12/dk.png
similarity index 100%
rename from pixmaps/flags/dk.png
rename to pixmaps/flags18x12/dk.png
diff --git a/pixmaps/flags/dm.png b/pixmaps/flags18x12/dm.png
similarity index 100%
rename from pixmaps/flags/dm.png
rename to pixmaps/flags18x12/dm.png
diff --git a/pixmaps/flags/do.png b/pixmaps/flags18x12/do.png
similarity index 100%
rename from pixmaps/flags/do.png
rename to pixmaps/flags18x12/do.png
diff --git a/pixmaps/flags/dz.png b/pixmaps/flags18x12/dz.png
similarity index 100%
rename from pixmaps/flags/dz.png
rename to pixmaps/flags18x12/dz.png
diff --git a/pixmaps/flags/ec.png b/pixmaps/flags18x12/ec.png
similarity index 100%
rename from pixmaps/flags/ec.png
rename to pixmaps/flags18x12/ec.png
diff --git a/pixmaps/flags/ee.png b/pixmaps/flags18x12/ee.png
similarity index 100%
rename from pixmaps/flags/ee.png
rename to pixmaps/flags18x12/ee.png
diff --git a/pixmaps/flags/eg.png b/pixmaps/flags18x12/eg.png
similarity index 100%
rename from pixmaps/flags/eg.png
rename to pixmaps/flags18x12/eg.png
diff --git a/pixmaps/flags/eh.png b/pixmaps/flags18x12/eh.png
similarity index 100%
rename from pixmaps/flags/eh.png
rename to pixmaps/flags18x12/eh.png
diff --git a/pixmaps/flags/er.png b/pixmaps/flags18x12/er.png
similarity index 100%
rename from pixmaps/flags/er.png
rename to pixmaps/flags18x12/er.png
diff --git a/pixmaps/flags/es.png b/pixmaps/flags18x12/es.png
similarity index 100%
rename from pixmaps/flags/es.png
rename to pixmaps/flags18x12/es.png
diff --git a/pixmaps/flags/et.png b/pixmaps/flags18x12/et.png
similarity index 100%
rename from pixmaps/flags/et.png
rename to pixmaps/flags18x12/et.png
diff --git a/pixmaps/flags/fi.png b/pixmaps/flags18x12/fi.png
similarity index 100%
rename from pixmaps/flags/fi.png
rename to pixmaps/flags18x12/fi.png
diff --git a/pixmaps/flags/fj.png b/pixmaps/flags18x12/fj.png
similarity index 100%
rename from pixmaps/flags/fj.png
rename to pixmaps/flags18x12/fj.png
diff --git a/pixmaps/flags/fk.png b/pixmaps/flags18x12/fk.png
similarity index 100%
rename from pixmaps/flags/fk.png
rename to pixmaps/flags18x12/fk.png
diff --git a/pixmaps/flags/fm.png b/pixmaps/flags18x12/fm.png
similarity index 100%
rename from pixmaps/flags/fm.png
rename to pixmaps/flags18x12/fm.png
diff --git a/pixmaps/flags/fo.png b/pixmaps/flags18x12/fo.png
similarity index 100%
rename from pixmaps/flags/fo.png
rename to pixmaps/flags18x12/fo.png
diff --git a/pixmaps/flags/fr.png b/pixmaps/flags18x12/fr.png
similarity index 100%
rename from pixmaps/flags/fr.png
rename to pixmaps/flags18x12/fr.png
diff --git a/pixmaps/flags/fx.png b/pixmaps/flags18x12/fx.png
similarity index 100%
rename from pixmaps/flags/fx.png
rename to pixmaps/flags18x12/fx.png
diff --git a/pixmaps/flags/ga.png b/pixmaps/flags18x12/ga.png
similarity index 100%
rename from pixmaps/flags/ga.png
rename to pixmaps/flags18x12/ga.png
diff --git a/pixmaps/flags/gb.png b/pixmaps/flags18x12/gb.png
similarity index 100%
rename from pixmaps/flags/gb.png
rename to pixmaps/flags18x12/gb.png
diff --git a/pixmaps/flags/gd.png b/pixmaps/flags18x12/gd.png
similarity index 100%
rename from pixmaps/flags/gd.png
rename to pixmaps/flags18x12/gd.png
diff --git a/pixmaps/flags/ge.png b/pixmaps/flags18x12/ge.png
similarity index 100%
rename from pixmaps/flags/ge.png
rename to pixmaps/flags18x12/ge.png
diff --git a/pixmaps/flags/gf.png b/pixmaps/flags18x12/gf.png
similarity index 100%
rename from pixmaps/flags/gf.png
rename to pixmaps/flags18x12/gf.png
diff --git a/pixmaps/flags/gg.png b/pixmaps/flags18x12/gg.png
similarity index 100%
rename from pixmaps/flags/gg.png
rename to pixmaps/flags18x12/gg.png
diff --git a/pixmaps/flags/gh.png b/pixmaps/flags18x12/gh.png
similarity index 100%
rename from pixmaps/flags/gh.png
rename to pixmaps/flags18x12/gh.png
diff --git a/pixmaps/flags/gi.png b/pixmaps/flags18x12/gi.png
similarity index 100%
rename from pixmaps/flags/gi.png
rename to pixmaps/flags18x12/gi.png
diff --git a/pixmaps/flags/gl.png b/pixmaps/flags18x12/gl.png
similarity index 100%
rename from pixmaps/flags/gl.png
rename to pixmaps/flags18x12/gl.png
diff --git a/pixmaps/flags/gm.png b/pixmaps/flags18x12/gm.png
similarity index 100%
rename from pixmaps/flags/gm.png
rename to pixmaps/flags18x12/gm.png
diff --git a/pixmaps/flags/gn.png b/pixmaps/flags18x12/gn.png
similarity index 100%
rename from pixmaps/flags/gn.png
rename to pixmaps/flags18x12/gn.png
diff --git a/pixmaps/flags/gp.png b/pixmaps/flags18x12/gp.png
similarity index 100%
rename from pixmaps/flags/gp.png
rename to pixmaps/flags18x12/gp.png
diff --git a/pixmaps/flags/gq.png b/pixmaps/flags18x12/gq.png
similarity index 100%
rename from pixmaps/flags/gq.png
rename to pixmaps/flags18x12/gq.png
diff --git a/pixmaps/flags/gr.png b/pixmaps/flags18x12/gr.png
similarity index 100%
rename from pixmaps/flags/gr.png
rename to pixmaps/flags18x12/gr.png
diff --git a/pixmaps/flags/gs.png b/pixmaps/flags18x12/gs.png
similarity index 100%
rename from pixmaps/flags/gs.png
rename to pixmaps/flags18x12/gs.png
diff --git a/pixmaps/flags/gt.png b/pixmaps/flags18x12/gt.png
similarity index 100%
rename from pixmaps/flags/gt.png
rename to pixmaps/flags18x12/gt.png
diff --git a/pixmaps/flags/gu.png b/pixmaps/flags18x12/gu.png
similarity index 100%
rename from pixmaps/flags/gu.png
rename to pixmaps/flags18x12/gu.png
diff --git a/pixmaps/flags/gw.png b/pixmaps/flags18x12/gw.png
similarity index 100%
rename from pixmaps/flags/gw.png
rename to pixmaps/flags18x12/gw.png
diff --git a/pixmaps/flags/gy.png b/pixmaps/flags18x12/gy.png
similarity index 100%
rename from pixmaps/flags/gy.png
rename to pixmaps/flags18x12/gy.png
diff --git a/pixmaps/flags/hk.png b/pixmaps/flags18x12/hk.png
similarity index 100%
rename from pixmaps/flags/hk.png
rename to pixmaps/flags18x12/hk.png
diff --git a/pixmaps/flags/hm.png b/pixmaps/flags18x12/hm.png
similarity index 100%
rename from pixmaps/flags/hm.png
rename to pixmaps/flags18x12/hm.png
diff --git a/pixmaps/flags/hn.png b/pixmaps/flags18x12/hn.png
similarity index 100%
rename from pixmaps/flags/hn.png
rename to pixmaps/flags18x12/hn.png
diff --git a/pixmaps/flags/hr.png b/pixmaps/flags18x12/hr.png
similarity index 100%
rename from pixmaps/flags/hr.png
rename to pixmaps/flags18x12/hr.png
diff --git a/pixmaps/flags/ht.png b/pixmaps/flags18x12/ht.png
similarity index 100%
rename from pixmaps/flags/ht.png
rename to pixmaps/flags18x12/ht.png
diff --git a/pixmaps/flags/hu.png b/pixmaps/flags18x12/hu.png
similarity index 100%
rename from pixmaps/flags/hu.png
rename to pixmaps/flags18x12/hu.png
diff --git a/pixmaps/flags/id.png b/pixmaps/flags18x12/id.png
similarity index 100%
rename from pixmaps/flags/id.png
rename to pixmaps/flags18x12/id.png
diff --git a/pixmaps/flags/ie.png b/pixmaps/flags18x12/ie.png
similarity index 100%
rename from pixmaps/flags/ie.png
rename to pixmaps/flags18x12/ie.png
diff --git a/pixmaps/flags/il.png b/pixmaps/flags18x12/il.png
similarity index 100%
rename from pixmaps/flags/il.png
rename to pixmaps/flags18x12/il.png
diff --git a/pixmaps/flags/in.png b/pixmaps/flags18x12/in.png
similarity index 100%
rename from pixmaps/flags/in.png
rename to pixmaps/flags18x12/in.png
diff --git a/pixmaps/flags/io.png b/pixmaps/flags18x12/io.png
similarity index 100%
rename from pixmaps/flags/io.png
rename to pixmaps/flags18x12/io.png
diff --git a/pixmaps/flags/iq.png b/pixmaps/flags18x12/iq.png
similarity index 100%
rename from pixmaps/flags/iq.png
rename to pixmaps/flags18x12/iq.png
diff --git a/pixmaps/flags/ir.png b/pixmaps/flags18x12/ir.png
similarity index 100%
rename from pixmaps/flags/ir.png
rename to pixmaps/flags18x12/ir.png
diff --git a/pixmaps/flags/is.png b/pixmaps/flags18x12/is.png
similarity index 100%
rename from pixmaps/flags/is.png
rename to pixmaps/flags18x12/is.png
diff --git a/pixmaps/flags/it.png b/pixmaps/flags18x12/it.png
similarity index 100%
rename from pixmaps/flags/it.png
rename to pixmaps/flags18x12/it.png
diff --git a/pixmaps/flags/je.png b/pixmaps/flags18x12/je.png
similarity index 100%
rename from pixmaps/flags/je.png
rename to pixmaps/flags18x12/je.png
diff --git a/pixmaps/flags/jm.png b/pixmaps/flags18x12/jm.png
similarity index 100%
rename from pixmaps/flags/jm.png
rename to pixmaps/flags18x12/jm.png
diff --git a/pixmaps/flags/jo.png b/pixmaps/flags18x12/jo.png
similarity index 100%
rename from pixmaps/flags/jo.png
rename to pixmaps/flags18x12/jo.png
diff --git a/pixmaps/flags/jp.png b/pixmaps/flags18x12/jp.png
similarity index 100%
rename from pixmaps/flags/jp.png
rename to pixmaps/flags18x12/jp.png
diff --git a/pixmaps/flags/ke.png b/pixmaps/flags18x12/ke.png
similarity index 100%
rename from pixmaps/flags/ke.png
rename to pixmaps/flags18x12/ke.png
diff --git a/pixmaps/flags/kg.png b/pixmaps/flags18x12/kg.png
similarity index 100%
rename from pixmaps/flags/kg.png
rename to pixmaps/flags18x12/kg.png
diff --git a/pixmaps/flags/kh.png b/pixmaps/flags18x12/kh.png
similarity index 100%
rename from pixmaps/flags/kh.png
rename to pixmaps/flags18x12/kh.png
diff --git a/pixmaps/flags/ki.png b/pixmaps/flags18x12/ki.png
similarity index 100%
rename from pixmaps/flags/ki.png
rename to pixmaps/flags18x12/ki.png
diff --git a/pixmaps/flags/km.png b/pixmaps/flags18x12/km.png
similarity index 100%
rename from pixmaps/flags/km.png
rename to pixmaps/flags18x12/km.png
diff --git a/pixmaps/flags/kn.png b/pixmaps/flags18x12/kn.png
similarity index 100%
rename from pixmaps/flags/kn.png
rename to pixmaps/flags18x12/kn.png
diff --git a/pixmaps/flags/kp.png b/pixmaps/flags18x12/kp.png
similarity index 100%
rename from pixmaps/flags/kp.png
rename to pixmaps/flags18x12/kp.png
diff --git a/pixmaps/flags/kr.png b/pixmaps/flags18x12/kr.png
similarity index 100%
rename from pixmaps/flags/kr.png
rename to pixmaps/flags18x12/kr.png
diff --git a/pixmaps/flags/kw.png b/pixmaps/flags18x12/kw.png
similarity index 100%
rename from pixmaps/flags/kw.png
rename to pixmaps/flags18x12/kw.png
diff --git a/pixmaps/flags/ky.png b/pixmaps/flags18x12/ky.png
similarity index 100%
rename from pixmaps/flags/ky.png
rename to pixmaps/flags18x12/ky.png
diff --git a/pixmaps/flags/kz.png b/pixmaps/flags18x12/kz.png
similarity index 100%
rename from pixmaps/flags/kz.png
rename to pixmaps/flags18x12/kz.png
diff --git a/pixmaps/flags/la.png b/pixmaps/flags18x12/la.png
similarity index 100%
rename from pixmaps/flags/la.png
rename to pixmaps/flags18x12/la.png
diff --git a/pixmaps/flags/lb.png b/pixmaps/flags18x12/lb.png
similarity index 100%
rename from pixmaps/flags/lb.png
rename to pixmaps/flags18x12/lb.png
diff --git a/pixmaps/flags/lc.png b/pixmaps/flags18x12/lc.png
similarity index 100%
rename from pixmaps/flags/lc.png
rename to pixmaps/flags18x12/lc.png
diff --git a/pixmaps/flags/li.png b/pixmaps/flags18x12/li.png
similarity index 100%
rename from pixmaps/flags/li.png
rename to pixmaps/flags18x12/li.png
diff --git a/pixmaps/flags/lk.png b/pixmaps/flags18x12/lk.png
similarity index 100%
rename from pixmaps/flags/lk.png
rename to pixmaps/flags18x12/lk.png
diff --git a/pixmaps/flags/lr.png b/pixmaps/flags18x12/lr.png
similarity index 100%
rename from pixmaps/flags/lr.png
rename to pixmaps/flags18x12/lr.png
diff --git a/pixmaps/flags/ls.png b/pixmaps/flags18x12/ls.png
similarity index 100%
rename from pixmaps/flags/ls.png
rename to pixmaps/flags18x12/ls.png
diff --git a/pixmaps/flags/lt.png b/pixmaps/flags18x12/lt.png
similarity index 100%
rename from pixmaps/flags/lt.png
rename to pixmaps/flags18x12/lt.png
diff --git a/pixmaps/flags/lu.png b/pixmaps/flags18x12/lu.png
similarity index 100%
rename from pixmaps/flags/lu.png
rename to pixmaps/flags18x12/lu.png
diff --git a/pixmaps/flags/lv.png b/pixmaps/flags18x12/lv.png
similarity index 100%
rename from pixmaps/flags/lv.png
rename to pixmaps/flags18x12/lv.png
diff --git a/pixmaps/flags/ly.png b/pixmaps/flags18x12/ly.png
similarity index 100%
rename from pixmaps/flags/ly.png
rename to pixmaps/flags18x12/ly.png
diff --git a/pixmaps/flags/ma.png b/pixmaps/flags18x12/ma.png
similarity index 100%
rename from pixmaps/flags/ma.png
rename to pixmaps/flags18x12/ma.png
diff --git a/pixmaps/flags/mc.png b/pixmaps/flags18x12/mc.png
similarity index 100%
rename from pixmaps/flags/mc.png
rename to pixmaps/flags18x12/mc.png
diff --git a/pixmaps/flags/md.png b/pixmaps/flags18x12/md.png
similarity index 100%
rename from pixmaps/flags/md.png
rename to pixmaps/flags18x12/md.png
diff --git a/pixmaps/flags/me.png b/pixmaps/flags18x12/me.png
similarity index 100%
rename from pixmaps/flags/me.png
rename to pixmaps/flags18x12/me.png
diff --git a/pixmaps/flags/mg.png b/pixmaps/flags18x12/mg.png
similarity index 100%
rename from pixmaps/flags/mg.png
rename to pixmaps/flags18x12/mg.png
diff --git a/pixmaps/flags/mh.png b/pixmaps/flags18x12/mh.png
similarity index 100%
rename from pixmaps/flags/mh.png
rename to pixmaps/flags18x12/mh.png
diff --git a/pixmaps/flags/mk.png b/pixmaps/flags18x12/mk.png
similarity index 100%
rename from pixmaps/flags/mk.png
rename to pixmaps/flags18x12/mk.png
diff --git a/pixmaps/flags/ml.png b/pixmaps/flags18x12/ml.png
similarity index 100%
rename from pixmaps/flags/ml.png
rename to pixmaps/flags18x12/ml.png
diff --git a/pixmaps/flags/mm.png b/pixmaps/flags18x12/mm.png
similarity index 100%
rename from pixmaps/flags/mm.png
rename to pixmaps/flags18x12/mm.png
diff --git a/pixmaps/flags/mn.png b/pixmaps/flags18x12/mn.png
similarity index 100%
rename from pixmaps/flags/mn.png
rename to pixmaps/flags18x12/mn.png
diff --git a/pixmaps/flags/mo.png b/pixmaps/flags18x12/mo.png
similarity index 100%
rename from pixmaps/flags/mo.png
rename to pixmaps/flags18x12/mo.png
diff --git a/pixmaps/flags/mp.png b/pixmaps/flags18x12/mp.png
similarity index 100%
rename from pixmaps/flags/mp.png
rename to pixmaps/flags18x12/mp.png
diff --git a/pixmaps/flags/mq.png b/pixmaps/flags18x12/mq.png
similarity index 100%
rename from pixmaps/flags/mq.png
rename to pixmaps/flags18x12/mq.png
diff --git a/pixmaps/flags/mr.png b/pixmaps/flags18x12/mr.png
similarity index 100%
rename from pixmaps/flags/mr.png
rename to pixmaps/flags18x12/mr.png
diff --git a/pixmaps/flags/ms.png b/pixmaps/flags18x12/ms.png
similarity index 100%
rename from pixmaps/flags/ms.png
rename to pixmaps/flags18x12/ms.png
diff --git a/pixmaps/flags/mt.png b/pixmaps/flags18x12/mt.png
similarity index 100%
rename from pixmaps/flags/mt.png
rename to pixmaps/flags18x12/mt.png
diff --git a/pixmaps/flags/mu.png b/pixmaps/flags18x12/mu.png
similarity index 100%
rename from pixmaps/flags/mu.png
rename to pixmaps/flags18x12/mu.png
diff --git a/pixmaps/flags/mv.png b/pixmaps/flags18x12/mv.png
similarity index 100%
rename from pixmaps/flags/mv.png
rename to pixmaps/flags18x12/mv.png
diff --git a/pixmaps/flags/mw.png b/pixmaps/flags18x12/mw.png
similarity index 100%
rename from pixmaps/flags/mw.png
rename to pixmaps/flags18x12/mw.png
diff --git a/pixmaps/flags/mx.png b/pixmaps/flags18x12/mx.png
similarity index 100%
rename from pixmaps/flags/mx.png
rename to pixmaps/flags18x12/mx.png
diff --git a/pixmaps/flags/my.png b/pixmaps/flags18x12/my.png
similarity index 100%
rename from pixmaps/flags/my.png
rename to pixmaps/flags18x12/my.png
diff --git a/pixmaps/flags/mz.png b/pixmaps/flags18x12/mz.png
similarity index 100%
rename from pixmaps/flags/mz.png
rename to pixmaps/flags18x12/mz.png
diff --git a/pixmaps/flags/na.png b/pixmaps/flags18x12/na.png
similarity index 100%
rename from pixmaps/flags/na.png
rename to pixmaps/flags18x12/na.png
diff --git a/pixmaps/flags/nc.png b/pixmaps/flags18x12/nc.png
similarity index 100%
rename from pixmaps/flags/nc.png
rename to pixmaps/flags18x12/nc.png
diff --git a/pixmaps/flags/ne.png b/pixmaps/flags18x12/ne.png
similarity index 100%
rename from pixmaps/flags/ne.png
rename to pixmaps/flags18x12/ne.png
diff --git a/pixmaps/flags/nf.png b/pixmaps/flags18x12/nf.png
similarity index 100%
rename from pixmaps/flags/nf.png
rename to pixmaps/flags18x12/nf.png
diff --git a/pixmaps/flags/ng.png b/pixmaps/flags18x12/ng.png
similarity index 100%
rename from pixmaps/flags/ng.png
rename to pixmaps/flags18x12/ng.png
diff --git a/pixmaps/flags/ni.png b/pixmaps/flags18x12/ni.png
similarity index 100%
rename from pixmaps/flags/ni.png
rename to pixmaps/flags18x12/ni.png
diff --git a/pixmaps/flags/nl.png b/pixmaps/flags18x12/nl.png
similarity index 100%
rename from pixmaps/flags/nl.png
rename to pixmaps/flags18x12/nl.png
diff --git a/pixmaps/flags/no.png b/pixmaps/flags18x12/no.png
similarity index 100%
rename from pixmaps/flags/no.png
rename to pixmaps/flags18x12/no.png
diff --git a/pixmaps/flags/np.png b/pixmaps/flags18x12/np.png
similarity index 100%
rename from pixmaps/flags/np.png
rename to pixmaps/flags18x12/np.png
diff --git a/pixmaps/flags/nr.png b/pixmaps/flags18x12/nr.png
similarity index 100%
rename from pixmaps/flags/nr.png
rename to pixmaps/flags18x12/nr.png
diff --git a/pixmaps/flags/nu.png b/pixmaps/flags18x12/nu.png
similarity index 100%
rename from pixmaps/flags/nu.png
rename to pixmaps/flags18x12/nu.png
diff --git a/pixmaps/flags/nz.png b/pixmaps/flags18x12/nz.png
similarity index 100%
rename from pixmaps/flags/nz.png
rename to pixmaps/flags18x12/nz.png
diff --git a/pixmaps/flags/om.png b/pixmaps/flags18x12/om.png
similarity index 100%
rename from pixmaps/flags/om.png
rename to pixmaps/flags18x12/om.png
diff --git a/pixmaps/flags/pa.png b/pixmaps/flags18x12/pa.png
similarity index 100%
rename from pixmaps/flags/pa.png
rename to pixmaps/flags18x12/pa.png
diff --git a/pixmaps/flags/pe.png b/pixmaps/flags18x12/pe.png
similarity index 100%
rename from pixmaps/flags/pe.png
rename to pixmaps/flags18x12/pe.png
diff --git a/pixmaps/flags/pf.png b/pixmaps/flags18x12/pf.png
similarity index 100%
rename from pixmaps/flags/pf.png
rename to pixmaps/flags18x12/pf.png
diff --git a/pixmaps/flags/pg.png b/pixmaps/flags18x12/pg.png
similarity index 100%
rename from pixmaps/flags/pg.png
rename to pixmaps/flags18x12/pg.png
diff --git a/pixmaps/flags/ph.png b/pixmaps/flags18x12/ph.png
similarity index 100%
rename from pixmaps/flags/ph.png
rename to pixmaps/flags18x12/ph.png
diff --git a/pixmaps/flags/pk.png b/pixmaps/flags18x12/pk.png
similarity index 100%
rename from pixmaps/flags/pk.png
rename to pixmaps/flags18x12/pk.png
diff --git a/pixmaps/flags/pl.png b/pixmaps/flags18x12/pl.png
similarity index 100%
rename from pixmaps/flags/pl.png
rename to pixmaps/flags18x12/pl.png
diff --git a/pixmaps/flags/pm.png b/pixmaps/flags18x12/pm.png
similarity index 100%
rename from pixmaps/flags/pm.png
rename to pixmaps/flags18x12/pm.png
diff --git a/pixmaps/flags/pn.png b/pixmaps/flags18x12/pn.png
similarity index 100%
rename from pixmaps/flags/pn.png
rename to pixmaps/flags18x12/pn.png
diff --git a/pixmaps/flags/pr.png b/pixmaps/flags18x12/pr.png
similarity index 100%
rename from pixmaps/flags/pr.png
rename to pixmaps/flags18x12/pr.png
diff --git a/pixmaps/flags/ps.png b/pixmaps/flags18x12/ps.png
similarity index 100%
rename from pixmaps/flags/ps.png
rename to pixmaps/flags18x12/ps.png
diff --git a/pixmaps/flags/pt.png b/pixmaps/flags18x12/pt.png
similarity index 100%
rename from pixmaps/flags/pt.png
rename to pixmaps/flags18x12/pt.png
diff --git a/pixmaps/flags/pw.png b/pixmaps/flags18x12/pw.png
similarity index 100%
rename from pixmaps/flags/pw.png
rename to pixmaps/flags18x12/pw.png
diff --git a/pixmaps/flags/py.png b/pixmaps/flags18x12/py.png
similarity index 100%
rename from pixmaps/flags/py.png
rename to pixmaps/flags18x12/py.png
diff --git a/pixmaps/flags/qa.png b/pixmaps/flags18x12/qa.png
similarity index 100%
rename from pixmaps/flags/qa.png
rename to pixmaps/flags18x12/qa.png
diff --git a/pixmaps/flags/re.png b/pixmaps/flags18x12/re.png
similarity index 100%
rename from pixmaps/flags/re.png
rename to pixmaps/flags18x12/re.png
diff --git a/pixmaps/flags/ro.png b/pixmaps/flags18x12/ro.png
similarity index 100%
rename from pixmaps/flags/ro.png
rename to pixmaps/flags18x12/ro.png
diff --git a/pixmaps/flags/rs.png b/pixmaps/flags18x12/rs.png
similarity index 100%
rename from pixmaps/flags/rs.png
rename to pixmaps/flags18x12/rs.png
diff --git a/pixmaps/flags/ru.png b/pixmaps/flags18x12/ru.png
similarity index 100%
rename from pixmaps/flags/ru.png
rename to pixmaps/flags18x12/ru.png
diff --git a/pixmaps/flags/rw.png b/pixmaps/flags18x12/rw.png
similarity index 100%
rename from pixmaps/flags/rw.png
rename to pixmaps/flags18x12/rw.png
diff --git a/pixmaps/flags/sa.png b/pixmaps/flags18x12/sa.png
similarity index 100%
rename from pixmaps/flags/sa.png
rename to pixmaps/flags18x12/sa.png
diff --git a/pixmaps/flags/sb.png b/pixmaps/flags18x12/sb.png
similarity index 100%
rename from pixmaps/flags/sb.png
rename to pixmaps/flags18x12/sb.png
diff --git a/pixmaps/flags/sc.png b/pixmaps/flags18x12/sc.png
similarity index 100%
rename from pixmaps/flags/sc.png
rename to pixmaps/flags18x12/sc.png
diff --git a/pixmaps/flags/sd.png b/pixmaps/flags18x12/sd.png
similarity index 100%
rename from pixmaps/flags/sd.png
rename to pixmaps/flags18x12/sd.png
diff --git a/pixmaps/flags/se.png b/pixmaps/flags18x12/se.png
similarity index 100%
rename from pixmaps/flags/se.png
rename to pixmaps/flags18x12/se.png
diff --git a/pixmaps/flags/sg.png b/pixmaps/flags18x12/sg.png
similarity index 100%
rename from pixmaps/flags/sg.png
rename to pixmaps/flags18x12/sg.png
diff --git a/pixmaps/flags/sh.png b/pixmaps/flags18x12/sh.png
similarity index 100%
rename from pixmaps/flags/sh.png
rename to pixmaps/flags18x12/sh.png
diff --git a/pixmaps/flags/si.png b/pixmaps/flags18x12/si.png
similarity index 100%
rename from pixmaps/flags/si.png
rename to pixmaps/flags18x12/si.png
diff --git a/pixmaps/flags/sj.png b/pixmaps/flags18x12/sj.png
similarity index 100%
rename from pixmaps/flags/sj.png
rename to pixmaps/flags18x12/sj.png
diff --git a/pixmaps/flags/sk.png b/pixmaps/flags18x12/sk.png
similarity index 100%
rename from pixmaps/flags/sk.png
rename to pixmaps/flags18x12/sk.png
diff --git a/pixmaps/flags/sl.png b/pixmaps/flags18x12/sl.png
similarity index 100%
rename from pixmaps/flags/sl.png
rename to pixmaps/flags18x12/sl.png
diff --git a/pixmaps/flags/sm.png b/pixmaps/flags18x12/sm.png
similarity index 100%
rename from pixmaps/flags/sm.png
rename to pixmaps/flags18x12/sm.png
diff --git a/pixmaps/flags/sn.png b/pixmaps/flags18x12/sn.png
similarity index 100%
rename from pixmaps/flags/sn.png
rename to pixmaps/flags18x12/sn.png
diff --git a/pixmaps/flags/so.png b/pixmaps/flags18x12/so.png
similarity index 100%
rename from pixmaps/flags/so.png
rename to pixmaps/flags18x12/so.png
diff --git a/pixmaps/flags/sr.png b/pixmaps/flags18x12/sr.png
similarity index 100%
rename from pixmaps/flags/sr.png
rename to pixmaps/flags18x12/sr.png
diff --git a/pixmaps/flags/st.png b/pixmaps/flags18x12/st.png
similarity index 100%
rename from pixmaps/flags/st.png
rename to pixmaps/flags18x12/st.png
diff --git a/pixmaps/flags/sv.png b/pixmaps/flags18x12/sv.png
similarity index 100%
rename from pixmaps/flags/sv.png
rename to pixmaps/flags18x12/sv.png
diff --git a/pixmaps/flags/sy.png b/pixmaps/flags18x12/sy.png
similarity index 100%
rename from pixmaps/flags/sy.png
rename to pixmaps/flags18x12/sy.png
diff --git a/pixmaps/flags/sz.png b/pixmaps/flags18x12/sz.png
similarity index 100%
rename from pixmaps/flags/sz.png
rename to pixmaps/flags18x12/sz.png
diff --git a/pixmaps/flags/tc.png b/pixmaps/flags18x12/tc.png
similarity index 100%
rename from pixmaps/flags/tc.png
rename to pixmaps/flags18x12/tc.png
diff --git a/pixmaps/flags/td.png b/pixmaps/flags18x12/td.png
similarity index 100%
rename from pixmaps/flags/td.png
rename to pixmaps/flags18x12/td.png
diff --git a/pixmaps/flags/tf.png b/pixmaps/flags18x12/tf.png
similarity index 100%
rename from pixmaps/flags/tf.png
rename to pixmaps/flags18x12/tf.png
diff --git a/pixmaps/flags/tg.png b/pixmaps/flags18x12/tg.png
similarity index 100%
rename from pixmaps/flags/tg.png
rename to pixmaps/flags18x12/tg.png
diff --git a/pixmaps/flags/th.png b/pixmaps/flags18x12/th.png
similarity index 100%
rename from pixmaps/flags/th.png
rename to pixmaps/flags18x12/th.png
diff --git a/pixmaps/flags/tj.png b/pixmaps/flags18x12/tj.png
similarity index 100%
rename from pixmaps/flags/tj.png
rename to pixmaps/flags18x12/tj.png
diff --git a/pixmaps/flags/tk.png b/pixmaps/flags18x12/tk.png
similarity index 100%
rename from pixmaps/flags/tk.png
rename to pixmaps/flags18x12/tk.png
diff --git a/pixmaps/flags/tl.png b/pixmaps/flags18x12/tl.png
similarity index 100%
rename from pixmaps/flags/tl.png
rename to pixmaps/flags18x12/tl.png
diff --git a/pixmaps/flags/tm.png b/pixmaps/flags18x12/tm.png
similarity index 100%
rename from pixmaps/flags/tm.png
rename to pixmaps/flags18x12/tm.png
diff --git a/pixmaps/flags/tn.png b/pixmaps/flags18x12/tn.png
similarity index 100%
rename from pixmaps/flags/tn.png
rename to pixmaps/flags18x12/tn.png
diff --git a/pixmaps/flags/to.png b/pixmaps/flags18x12/to.png
similarity index 100%
rename from pixmaps/flags/to.png
rename to pixmaps/flags18x12/to.png
diff --git a/pixmaps/flags/tp.png b/pixmaps/flags18x12/tp.png
similarity index 100%
rename from pixmaps/flags/tp.png
rename to pixmaps/flags18x12/tp.png
diff --git a/pixmaps/flags/tr.png b/pixmaps/flags18x12/tr.png
similarity index 100%
rename from pixmaps/flags/tr.png
rename to pixmaps/flags18x12/tr.png
diff --git a/pixmaps/flags/tt.png b/pixmaps/flags18x12/tt.png
similarity index 100%
rename from pixmaps/flags/tt.png
rename to pixmaps/flags18x12/tt.png
diff --git a/pixmaps/flags/tv.png b/pixmaps/flags18x12/tv.png
similarity index 100%
rename from pixmaps/flags/tv.png
rename to pixmaps/flags18x12/tv.png
diff --git a/pixmaps/flags/tw.png b/pixmaps/flags18x12/tw.png
similarity index 100%
rename from pixmaps/flags/tw.png
rename to pixmaps/flags18x12/tw.png
diff --git a/pixmaps/flags/tz.png b/pixmaps/flags18x12/tz.png
similarity index 100%
rename from pixmaps/flags/tz.png
rename to pixmaps/flags18x12/tz.png
diff --git a/pixmaps/flags/ua.png b/pixmaps/flags18x12/ua.png
similarity index 100%
rename from pixmaps/flags/ua.png
rename to pixmaps/flags18x12/ua.png
diff --git a/pixmaps/flags/ug.png b/pixmaps/flags18x12/ug.png
similarity index 100%
rename from pixmaps/flags/ug.png
rename to pixmaps/flags18x12/ug.png
diff --git a/pixmaps/flags/um.png b/pixmaps/flags18x12/um.png
similarity index 100%
rename from pixmaps/flags/um.png
rename to pixmaps/flags18x12/um.png
diff --git a/pixmaps/flags/us.png b/pixmaps/flags18x12/us.png
similarity index 100%
rename from pixmaps/flags/us.png
rename to pixmaps/flags18x12/us.png
diff --git a/pixmaps/flags/uy.png b/pixmaps/flags18x12/uy.png
similarity index 100%
rename from pixmaps/flags/uy.png
rename to pixmaps/flags18x12/uy.png
diff --git a/pixmaps/flags/uz.png b/pixmaps/flags18x12/uz.png
similarity index 100%
rename from pixmaps/flags/uz.png
rename to pixmaps/flags18x12/uz.png
diff --git a/pixmaps/flags/va.png b/pixmaps/flags18x12/va.png
similarity index 100%
rename from pixmaps/flags/va.png
rename to pixmaps/flags18x12/va.png
diff --git a/pixmaps/flags/vc.png b/pixmaps/flags18x12/vc.png
similarity index 100%
rename from pixmaps/flags/vc.png
rename to pixmaps/flags18x12/vc.png
diff --git a/pixmaps/flags/ve.png b/pixmaps/flags18x12/ve.png
similarity index 100%
rename from pixmaps/flags/ve.png
rename to pixmaps/flags18x12/ve.png
diff --git a/pixmaps/flags/vg.png b/pixmaps/flags18x12/vg.png
similarity index 100%
rename from pixmaps/flags/vg.png
rename to pixmaps/flags18x12/vg.png
diff --git a/pixmaps/flags/vi.png b/pixmaps/flags18x12/vi.png
similarity index 100%
rename from pixmaps/flags/vi.png
rename to pixmaps/flags18x12/vi.png
diff --git a/pixmaps/flags/vn.png b/pixmaps/flags18x12/vn.png
similarity index 100%
rename from pixmaps/flags/vn.png
rename to pixmaps/flags18x12/vn.png
diff --git a/pixmaps/flags/vu.png b/pixmaps/flags18x12/vu.png
similarity index 100%
rename from pixmaps/flags/vu.png
rename to pixmaps/flags18x12/vu.png
diff --git a/pixmaps/flags/wf.png b/pixmaps/flags18x12/wf.png
similarity index 100%
rename from pixmaps/flags/wf.png
rename to pixmaps/flags18x12/wf.png
diff --git a/pixmaps/flags/ws.png b/pixmaps/flags18x12/ws.png
similarity index 100%
rename from pixmaps/flags/ws.png
rename to pixmaps/flags18x12/ws.png
diff --git a/pixmaps/flags/ye.png b/pixmaps/flags18x12/ye.png
similarity index 100%
rename from pixmaps/flags/ye.png
rename to pixmaps/flags18x12/ye.png
diff --git a/pixmaps/flags/yt.png b/pixmaps/flags18x12/yt.png
similarity index 100%
rename from pixmaps/flags/yt.png
rename to pixmaps/flags18x12/yt.png
diff --git a/pixmaps/flags/yu.png b/pixmaps/flags18x12/yu.png
similarity index 100%
rename from pixmaps/flags/yu.png
rename to pixmaps/flags18x12/yu.png
diff --git a/pixmaps/flags/za.png b/pixmaps/flags18x12/za.png
similarity index 100%
rename from pixmaps/flags/za.png
rename to pixmaps/flags18x12/za.png
diff --git a/pixmaps/flags/zm.png b/pixmaps/flags18x12/zm.png
similarity index 100%
rename from pixmaps/flags/zm.png
rename to pixmaps/flags18x12/zm.png
diff --git a/pixmaps/flags/zw.png b/pixmaps/flags18x12/zw.png
similarity index 100%
rename from pixmaps/flags/zw.png
rename to pixmaps/flags18x12/zw.png
diff --git a/pixmaps/flags25x15/FLAGS_LICENCE b/pixmaps/flags25x15/FLAGS_LICENCE
new file mode 100644
index 000000000..368a8fef8
--- /dev/null
+++ b/pixmaps/flags25x15/FLAGS_LICENCE
@@ -0,0 +1,2 @@
+Flag images found at http://www.hahn-hotel.com/flags/
+"All sets provided by us are free to use to anyone, for commercial or non-commercial websites."
\ No newline at end of file
diff --git a/pixmaps/flags25x15/ad.png b/pixmaps/flags25x15/ad.png
new file mode 100644
index 000000000..5d1720225
Binary files /dev/null and b/pixmaps/flags25x15/ad.png differ
diff --git a/pixmaps/flags25x15/ae.png b/pixmaps/flags25x15/ae.png
new file mode 100644
index 000000000..007dc36a7
Binary files /dev/null and b/pixmaps/flags25x15/ae.png differ
diff --git a/pixmaps/flags25x15/af.png b/pixmaps/flags25x15/af.png
new file mode 100644
index 000000000..9f9cd77e2
Binary files /dev/null and b/pixmaps/flags25x15/af.png differ
diff --git a/pixmaps/flags25x15/ag.png b/pixmaps/flags25x15/ag.png
new file mode 100644
index 000000000..de7b76c10
Binary files /dev/null and b/pixmaps/flags25x15/ag.png differ
diff --git a/pixmaps/flags25x15/ai.png b/pixmaps/flags25x15/ai.png
new file mode 100644
index 000000000..bbbd7b197
Binary files /dev/null and b/pixmaps/flags25x15/ai.png differ
diff --git a/pixmaps/flags25x15/al.png b/pixmaps/flags25x15/al.png
new file mode 100644
index 000000000..c5d218cfa
Binary files /dev/null and b/pixmaps/flags25x15/al.png differ
diff --git a/pixmaps/flags25x15/am.png b/pixmaps/flags25x15/am.png
new file mode 100644
index 000000000..515451682
Binary files /dev/null and b/pixmaps/flags25x15/am.png differ
diff --git a/pixmaps/flags25x15/an.png b/pixmaps/flags25x15/an.png
new file mode 100644
index 000000000..28d1f98b3
Binary files /dev/null and b/pixmaps/flags25x15/an.png differ
diff --git a/pixmaps/flags25x15/ao.png b/pixmaps/flags25x15/ao.png
new file mode 100644
index 000000000..9dc5ab7cd
Binary files /dev/null and b/pixmaps/flags25x15/ao.png differ
diff --git a/pixmaps/flags25x15/aq.png b/pixmaps/flags25x15/aq.png
new file mode 100644
index 000000000..7caeae0ac
Binary files /dev/null and b/pixmaps/flags25x15/aq.png differ
diff --git a/pixmaps/flags25x15/ar.png b/pixmaps/flags25x15/ar.png
new file mode 100644
index 000000000..dcabc83ce
Binary files /dev/null and b/pixmaps/flags25x15/ar.png differ
diff --git a/pixmaps/flags25x15/as.png b/pixmaps/flags25x15/as.png
new file mode 100644
index 000000000..d19870923
Binary files /dev/null and b/pixmaps/flags25x15/as.png differ
diff --git a/pixmaps/flags25x15/at.png b/pixmaps/flags25x15/at.png
new file mode 100644
index 000000000..fadb6a2e2
Binary files /dev/null and b/pixmaps/flags25x15/at.png differ
diff --git a/pixmaps/flags25x15/au.png b/pixmaps/flags25x15/au.png
new file mode 100644
index 000000000..c8b559976
Binary files /dev/null and b/pixmaps/flags25x15/au.png differ
diff --git a/pixmaps/flags25x15/aw.png b/pixmaps/flags25x15/aw.png
new file mode 100644
index 000000000..c66e1f1c4
Binary files /dev/null and b/pixmaps/flags25x15/aw.png differ
diff --git a/pixmaps/flags25x15/ax.png b/pixmaps/flags25x15/ax.png
new file mode 100644
index 000000000..917ff47db
Binary files /dev/null and b/pixmaps/flags25x15/ax.png differ
diff --git a/pixmaps/flags25x15/az.png b/pixmaps/flags25x15/az.png
new file mode 100644
index 000000000..381598aae
Binary files /dev/null and b/pixmaps/flags25x15/az.png differ
diff --git a/pixmaps/flags25x15/ba.png b/pixmaps/flags25x15/ba.png
new file mode 100644
index 000000000..6eff4f0dd
Binary files /dev/null and b/pixmaps/flags25x15/ba.png differ
diff --git a/pixmaps/flags25x15/bb.png b/pixmaps/flags25x15/bb.png
new file mode 100644
index 000000000..18a1e0ddc
Binary files /dev/null and b/pixmaps/flags25x15/bb.png differ
diff --git a/pixmaps/flags25x15/bd.png b/pixmaps/flags25x15/bd.png
new file mode 100644
index 000000000..00770ad1f
Binary files /dev/null and b/pixmaps/flags25x15/bd.png differ
diff --git a/pixmaps/flags25x15/be.png b/pixmaps/flags25x15/be.png
new file mode 100644
index 000000000..b09b3d6c6
Binary files /dev/null and b/pixmaps/flags25x15/be.png differ
diff --git a/pixmaps/flags25x15/bf.png b/pixmaps/flags25x15/bf.png
new file mode 100644
index 000000000..fc472787a
Binary files /dev/null and b/pixmaps/flags25x15/bf.png differ
diff --git a/pixmaps/flags25x15/bg.png b/pixmaps/flags25x15/bg.png
new file mode 100644
index 000000000..d92441bda
Binary files /dev/null and b/pixmaps/flags25x15/bg.png differ
diff --git a/pixmaps/flags25x15/bh.png b/pixmaps/flags25x15/bh.png
new file mode 100644
index 000000000..4f6d433ef
Binary files /dev/null and b/pixmaps/flags25x15/bh.png differ
diff --git a/pixmaps/flags25x15/bi.png b/pixmaps/flags25x15/bi.png
new file mode 100644
index 000000000..3832f22a1
Binary files /dev/null and b/pixmaps/flags25x15/bi.png differ
diff --git a/pixmaps/flags25x15/bj.png b/pixmaps/flags25x15/bj.png
new file mode 100644
index 000000000..dd3c6883e
Binary files /dev/null and b/pixmaps/flags25x15/bj.png differ
diff --git a/pixmaps/flags25x15/bm.png b/pixmaps/flags25x15/bm.png
new file mode 100644
index 000000000..1ec8e4383
Binary files /dev/null and b/pixmaps/flags25x15/bm.png differ
diff --git a/pixmaps/flags25x15/bn.png b/pixmaps/flags25x15/bn.png
new file mode 100644
index 000000000..d8a6875d4
Binary files /dev/null and b/pixmaps/flags25x15/bn.png differ
diff --git a/pixmaps/flags25x15/bo.png b/pixmaps/flags25x15/bo.png
new file mode 100644
index 000000000..c8686b529
Binary files /dev/null and b/pixmaps/flags25x15/bo.png differ
diff --git a/pixmaps/flags25x15/br.png b/pixmaps/flags25x15/br.png
new file mode 100644
index 000000000..22a98684c
Binary files /dev/null and b/pixmaps/flags25x15/br.png differ
diff --git a/pixmaps/flags25x15/bs.png b/pixmaps/flags25x15/bs.png
new file mode 100644
index 000000000..dce7bcfae
Binary files /dev/null and b/pixmaps/flags25x15/bs.png differ
diff --git a/pixmaps/flags25x15/bt.png b/pixmaps/flags25x15/bt.png
new file mode 100644
index 000000000..b87008a54
Binary files /dev/null and b/pixmaps/flags25x15/bt.png differ
diff --git a/pixmaps/flags25x15/bv.png b/pixmaps/flags25x15/bv.png
new file mode 100644
index 000000000..3f24fb54b
Binary files /dev/null and b/pixmaps/flags25x15/bv.png differ
diff --git a/pixmaps/flags25x15/bw.png b/pixmaps/flags25x15/bw.png
new file mode 100644
index 000000000..46a79b45c
Binary files /dev/null and b/pixmaps/flags25x15/bw.png differ
diff --git a/pixmaps/flags25x15/by.png b/pixmaps/flags25x15/by.png
new file mode 100644
index 000000000..030b0f6b9
Binary files /dev/null and b/pixmaps/flags25x15/by.png differ
diff --git a/pixmaps/flags25x15/bz.png b/pixmaps/flags25x15/bz.png
new file mode 100644
index 000000000..7ee942ea0
Binary files /dev/null and b/pixmaps/flags25x15/bz.png differ
diff --git a/pixmaps/flags25x15/ca.png b/pixmaps/flags25x15/ca.png
new file mode 100644
index 000000000..d08962de0
Binary files /dev/null and b/pixmaps/flags25x15/ca.png differ
diff --git a/pixmaps/flags25x15/cc.png b/pixmaps/flags25x15/cc.png
new file mode 100644
index 000000000..18f219429
Binary files /dev/null and b/pixmaps/flags25x15/cc.png differ
diff --git a/pixmaps/flags25x15/cd.png b/pixmaps/flags25x15/cd.png
new file mode 100644
index 000000000..4adc67899
Binary files /dev/null and b/pixmaps/flags25x15/cd.png differ
diff --git a/pixmaps/flags25x15/cf.png b/pixmaps/flags25x15/cf.png
new file mode 100644
index 000000000..f136158df
Binary files /dev/null and b/pixmaps/flags25x15/cf.png differ
diff --git a/pixmaps/flags25x15/cg.png b/pixmaps/flags25x15/cg.png
new file mode 100644
index 000000000..2ec7d0e8b
Binary files /dev/null and b/pixmaps/flags25x15/cg.png differ
diff --git a/pixmaps/flags25x15/ch.png b/pixmaps/flags25x15/ch.png
new file mode 100644
index 000000000..e8b1cfcf7
Binary files /dev/null and b/pixmaps/flags25x15/ch.png differ
diff --git a/pixmaps/flags25x15/ci.png b/pixmaps/flags25x15/ci.png
new file mode 100644
index 000000000..c7644cb76
Binary files /dev/null and b/pixmaps/flags25x15/ci.png differ
diff --git a/pixmaps/flags25x15/ck.png b/pixmaps/flags25x15/ck.png
new file mode 100644
index 000000000..a896cc24e
Binary files /dev/null and b/pixmaps/flags25x15/ck.png differ
diff --git a/pixmaps/flags25x15/cl.png b/pixmaps/flags25x15/cl.png
new file mode 100644
index 000000000..a113a2b3c
Binary files /dev/null and b/pixmaps/flags25x15/cl.png differ
diff --git a/pixmaps/flags25x15/cm.png b/pixmaps/flags25x15/cm.png
new file mode 100644
index 000000000..a5d828f1b
Binary files /dev/null and b/pixmaps/flags25x15/cm.png differ
diff --git a/pixmaps/flags25x15/cn.png b/pixmaps/flags25x15/cn.png
new file mode 100644
index 000000000..2ad03f6d4
Binary files /dev/null and b/pixmaps/flags25x15/cn.png differ
diff --git a/pixmaps/flags25x15/co.png b/pixmaps/flags25x15/co.png
new file mode 100644
index 000000000..362f006fb
Binary files /dev/null and b/pixmaps/flags25x15/co.png differ
diff --git a/pixmaps/flags25x15/cr.png b/pixmaps/flags25x15/cr.png
new file mode 100644
index 000000000..a184a8dc7
Binary files /dev/null and b/pixmaps/flags25x15/cr.png differ
diff --git a/pixmaps/flags25x15/cs.png b/pixmaps/flags25x15/cs.png
new file mode 100644
index 000000000..7a89a78c1
Binary files /dev/null and b/pixmaps/flags25x15/cs.png differ
diff --git a/pixmaps/flags25x15/cu.png b/pixmaps/flags25x15/cu.png
new file mode 100644
index 000000000..19c6f800d
Binary files /dev/null and b/pixmaps/flags25x15/cu.png differ
diff --git a/pixmaps/flags25x15/cv.png b/pixmaps/flags25x15/cv.png
new file mode 100644
index 000000000..4f6bf243c
Binary files /dev/null and b/pixmaps/flags25x15/cv.png differ
diff --git a/pixmaps/flags25x15/cx.png b/pixmaps/flags25x15/cx.png
new file mode 100644
index 000000000..5c858cac7
Binary files /dev/null and b/pixmaps/flags25x15/cx.png differ
diff --git a/pixmaps/flags25x15/cy.png b/pixmaps/flags25x15/cy.png
new file mode 100644
index 000000000..8b03f5181
Binary files /dev/null and b/pixmaps/flags25x15/cy.png differ
diff --git a/pixmaps/flags25x15/cz.png b/pixmaps/flags25x15/cz.png
new file mode 100644
index 000000000..97ed7e846
Binary files /dev/null and b/pixmaps/flags25x15/cz.png differ
diff --git a/pixmaps/flags25x15/de.png b/pixmaps/flags25x15/de.png
new file mode 100644
index 000000000..24b07b581
Binary files /dev/null and b/pixmaps/flags25x15/de.png differ
diff --git a/pixmaps/flags25x15/dj.png b/pixmaps/flags25x15/dj.png
new file mode 100644
index 000000000..791c251d5
Binary files /dev/null and b/pixmaps/flags25x15/dj.png differ
diff --git a/pixmaps/flags25x15/dk.png b/pixmaps/flags25x15/dk.png
new file mode 100644
index 000000000..2be6ab1b0
Binary files /dev/null and b/pixmaps/flags25x15/dk.png differ
diff --git a/pixmaps/flags25x15/dm.png b/pixmaps/flags25x15/dm.png
new file mode 100644
index 000000000..edd7fff0e
Binary files /dev/null and b/pixmaps/flags25x15/dm.png differ
diff --git a/pixmaps/flags25x15/do.png b/pixmaps/flags25x15/do.png
new file mode 100644
index 000000000..622276206
Binary files /dev/null and b/pixmaps/flags25x15/do.png differ
diff --git a/pixmaps/flags25x15/dz.png b/pixmaps/flags25x15/dz.png
new file mode 100644
index 000000000..743cb1f62
Binary files /dev/null and b/pixmaps/flags25x15/dz.png differ
diff --git a/pixmaps/flags25x15/ec.png b/pixmaps/flags25x15/ec.png
new file mode 100644
index 000000000..cb87ce832
Binary files /dev/null and b/pixmaps/flags25x15/ec.png differ
diff --git a/pixmaps/flags25x15/ee.png b/pixmaps/flags25x15/ee.png
new file mode 100644
index 000000000..94e5106ff
Binary files /dev/null and b/pixmaps/flags25x15/ee.png differ
diff --git a/pixmaps/flags25x15/eg.png b/pixmaps/flags25x15/eg.png
new file mode 100644
index 000000000..dba11a2a7
Binary files /dev/null and b/pixmaps/flags25x15/eg.png differ
diff --git a/pixmaps/flags25x15/eh.png b/pixmaps/flags25x15/eh.png
new file mode 100644
index 000000000..1512a322b
Binary files /dev/null and b/pixmaps/flags25x15/eh.png differ
diff --git a/pixmaps/flags25x15/er.png b/pixmaps/flags25x15/er.png
new file mode 100644
index 000000000..43225fa62
Binary files /dev/null and b/pixmaps/flags25x15/er.png differ
diff --git a/pixmaps/flags25x15/es.png b/pixmaps/flags25x15/es.png
new file mode 100644
index 000000000..4b30c49f2
Binary files /dev/null and b/pixmaps/flags25x15/es.png differ
diff --git a/pixmaps/flags25x15/et.png b/pixmaps/flags25x15/et.png
new file mode 100644
index 000000000..7275abf09
Binary files /dev/null and b/pixmaps/flags25x15/et.png differ
diff --git a/pixmaps/flags25x15/fi.png b/pixmaps/flags25x15/fi.png
new file mode 100644
index 000000000..8574dec77
Binary files /dev/null and b/pixmaps/flags25x15/fi.png differ
diff --git a/pixmaps/flags25x15/fj.png b/pixmaps/flags25x15/fj.png
new file mode 100644
index 000000000..dd021d5ae
Binary files /dev/null and b/pixmaps/flags25x15/fj.png differ
diff --git a/pixmaps/flags25x15/fk.png b/pixmaps/flags25x15/fk.png
new file mode 100644
index 000000000..7c277bc57
Binary files /dev/null and b/pixmaps/flags25x15/fk.png differ
diff --git a/pixmaps/flags25x15/fm.png b/pixmaps/flags25x15/fm.png
new file mode 100644
index 000000000..6c4e13794
Binary files /dev/null and b/pixmaps/flags25x15/fm.png differ
diff --git a/pixmaps/flags25x15/fo.png b/pixmaps/flags25x15/fo.png
new file mode 100644
index 000000000..8eeb7ccc7
Binary files /dev/null and b/pixmaps/flags25x15/fo.png differ
diff --git a/pixmaps/flags25x15/fr.png b/pixmaps/flags25x15/fr.png
new file mode 100644
index 000000000..c1a539549
Binary files /dev/null and b/pixmaps/flags25x15/fr.png differ
diff --git a/pixmaps/flags25x15/fx.png b/pixmaps/flags25x15/fx.png
new file mode 100644
index 000000000..c1a539549
Binary files /dev/null and b/pixmaps/flags25x15/fx.png differ
diff --git a/pixmaps/flags25x15/ga.png b/pixmaps/flags25x15/ga.png
new file mode 100644
index 000000000..9c72bec54
Binary files /dev/null and b/pixmaps/flags25x15/ga.png differ
diff --git a/pixmaps/flags25x15/gb.png b/pixmaps/flags25x15/gb.png
new file mode 100644
index 000000000..8558aa61b
Binary files /dev/null and b/pixmaps/flags25x15/gb.png differ
diff --git a/pixmaps/flags25x15/gd.png b/pixmaps/flags25x15/gd.png
new file mode 100644
index 000000000..753538162
Binary files /dev/null and b/pixmaps/flags25x15/gd.png differ
diff --git a/pixmaps/flags25x15/ge.png b/pixmaps/flags25x15/ge.png
new file mode 100644
index 000000000..847e89d52
Binary files /dev/null and b/pixmaps/flags25x15/ge.png differ
diff --git a/pixmaps/flags25x15/gf.png b/pixmaps/flags25x15/gf.png
new file mode 100644
index 000000000..c1a539549
Binary files /dev/null and b/pixmaps/flags25x15/gf.png differ
diff --git a/pixmaps/flags25x15/gg.png b/pixmaps/flags25x15/gg.png
new file mode 100644
index 000000000..cef5a7ee1
Binary files /dev/null and b/pixmaps/flags25x15/gg.png differ
diff --git a/pixmaps/flags25x15/gh.png b/pixmaps/flags25x15/gh.png
new file mode 100644
index 000000000..f9aa766f5
Binary files /dev/null and b/pixmaps/flags25x15/gh.png differ
diff --git a/pixmaps/flags25x15/gi.png b/pixmaps/flags25x15/gi.png
new file mode 100644
index 000000000..5de3e79f4
Binary files /dev/null and b/pixmaps/flags25x15/gi.png differ
diff --git a/pixmaps/flags25x15/gl.png b/pixmaps/flags25x15/gl.png
new file mode 100644
index 000000000..f10fc56b3
Binary files /dev/null and b/pixmaps/flags25x15/gl.png differ
diff --git a/pixmaps/flags25x15/gm.png b/pixmaps/flags25x15/gm.png
new file mode 100644
index 000000000..c09dc7978
Binary files /dev/null and b/pixmaps/flags25x15/gm.png differ
diff --git a/pixmaps/flags25x15/gn.png b/pixmaps/flags25x15/gn.png
new file mode 100644
index 000000000..99748b520
Binary files /dev/null and b/pixmaps/flags25x15/gn.png differ
diff --git a/pixmaps/flags25x15/gp.png b/pixmaps/flags25x15/gp.png
new file mode 100644
index 000000000..c1a539549
Binary files /dev/null and b/pixmaps/flags25x15/gp.png differ
diff --git a/pixmaps/flags25x15/gq.png b/pixmaps/flags25x15/gq.png
new file mode 100644
index 000000000..14c8b43c8
Binary files /dev/null and b/pixmaps/flags25x15/gq.png differ
diff --git a/pixmaps/flags25x15/gr.png b/pixmaps/flags25x15/gr.png
new file mode 100644
index 000000000..35871f058
Binary files /dev/null and b/pixmaps/flags25x15/gr.png differ
diff --git a/pixmaps/flags25x15/gs.png b/pixmaps/flags25x15/gs.png
new file mode 100644
index 000000000..700656b2c
Binary files /dev/null and b/pixmaps/flags25x15/gs.png differ
diff --git a/pixmaps/flags25x15/gt.png b/pixmaps/flags25x15/gt.png
new file mode 100644
index 000000000..e8cce5864
Binary files /dev/null and b/pixmaps/flags25x15/gt.png differ
diff --git a/pixmaps/flags25x15/gu.png b/pixmaps/flags25x15/gu.png
new file mode 100644
index 000000000..40ddc6840
Binary files /dev/null and b/pixmaps/flags25x15/gu.png differ
diff --git a/pixmaps/flags25x15/gw.png b/pixmaps/flags25x15/gw.png
new file mode 100644
index 000000000..ec220ce45
Binary files /dev/null and b/pixmaps/flags25x15/gw.png differ
diff --git a/pixmaps/flags25x15/gy.png b/pixmaps/flags25x15/gy.png
new file mode 100644
index 000000000..2daa0968f
Binary files /dev/null and b/pixmaps/flags25x15/gy.png differ
diff --git a/pixmaps/flags25x15/hk.png b/pixmaps/flags25x15/hk.png
new file mode 100644
index 000000000..a2eeca2eb
Binary files /dev/null and b/pixmaps/flags25x15/hk.png differ
diff --git a/pixmaps/flags25x15/hm.png b/pixmaps/flags25x15/hm.png
new file mode 100644
index 000000000..c8b559976
Binary files /dev/null and b/pixmaps/flags25x15/hm.png differ
diff --git a/pixmaps/flags25x15/hn.png b/pixmaps/flags25x15/hn.png
new file mode 100644
index 000000000..633abb16a
Binary files /dev/null and b/pixmaps/flags25x15/hn.png differ
diff --git a/pixmaps/flags25x15/hr.png b/pixmaps/flags25x15/hr.png
new file mode 100644
index 000000000..ba09f129b
Binary files /dev/null and b/pixmaps/flags25x15/hr.png differ
diff --git a/pixmaps/flags25x15/ht.png b/pixmaps/flags25x15/ht.png
new file mode 100644
index 000000000..cf97344e3
Binary files /dev/null and b/pixmaps/flags25x15/ht.png differ
diff --git a/pixmaps/flags25x15/hu.png b/pixmaps/flags25x15/hu.png
new file mode 100644
index 000000000..3345bde6a
Binary files /dev/null and b/pixmaps/flags25x15/hu.png differ
diff --git a/pixmaps/flags25x15/id.png b/pixmaps/flags25x15/id.png
new file mode 100644
index 000000000..6aa9fde89
Binary files /dev/null and b/pixmaps/flags25x15/id.png differ
diff --git a/pixmaps/flags25x15/ie.png b/pixmaps/flags25x15/ie.png
new file mode 100644
index 000000000..fe977c307
Binary files /dev/null and b/pixmaps/flags25x15/ie.png differ
diff --git a/pixmaps/flags25x15/il.png b/pixmaps/flags25x15/il.png
new file mode 100644
index 000000000..bc8523eee
Binary files /dev/null and b/pixmaps/flags25x15/il.png differ
diff --git a/pixmaps/flags25x15/in.png b/pixmaps/flags25x15/in.png
new file mode 100644
index 000000000..b7c54956c
Binary files /dev/null and b/pixmaps/flags25x15/in.png differ
diff --git a/pixmaps/flags25x15/io.png b/pixmaps/flags25x15/io.png
new file mode 100644
index 000000000..fd5fb1cf4
Binary files /dev/null and b/pixmaps/flags25x15/io.png differ
diff --git a/pixmaps/flags25x15/iq.png b/pixmaps/flags25x15/iq.png
new file mode 100644
index 000000000..14a254dbf
Binary files /dev/null and b/pixmaps/flags25x15/iq.png differ
diff --git a/pixmaps/flags25x15/ir.png b/pixmaps/flags25x15/ir.png
new file mode 100644
index 000000000..4d7cb1f54
Binary files /dev/null and b/pixmaps/flags25x15/ir.png differ
diff --git a/pixmaps/flags25x15/is.png b/pixmaps/flags25x15/is.png
new file mode 100644
index 000000000..aa9011425
Binary files /dev/null and b/pixmaps/flags25x15/is.png differ
diff --git a/pixmaps/flags25x15/it.png b/pixmaps/flags25x15/it.png
new file mode 100644
index 000000000..5212ade5f
Binary files /dev/null and b/pixmaps/flags25x15/it.png differ
diff --git a/pixmaps/flags25x15/je.png b/pixmaps/flags25x15/je.png
new file mode 100644
index 000000000..5930485ba
Binary files /dev/null and b/pixmaps/flags25x15/je.png differ
diff --git a/pixmaps/flags25x15/jm.png b/pixmaps/flags25x15/jm.png
new file mode 100644
index 000000000..ccedfcda3
Binary files /dev/null and b/pixmaps/flags25x15/jm.png differ
diff --git a/pixmaps/flags25x15/jo.png b/pixmaps/flags25x15/jo.png
new file mode 100644
index 000000000..f4332604b
Binary files /dev/null and b/pixmaps/flags25x15/jo.png differ
diff --git a/pixmaps/flags25x15/jp.png b/pixmaps/flags25x15/jp.png
new file mode 100644
index 000000000..fb4f7573a
Binary files /dev/null and b/pixmaps/flags25x15/jp.png differ
diff --git a/pixmaps/flags25x15/ke.png b/pixmaps/flags25x15/ke.png
new file mode 100644
index 000000000..3538e8d2e
Binary files /dev/null and b/pixmaps/flags25x15/ke.png differ
diff --git a/pixmaps/flags25x15/kg.png b/pixmaps/flags25x15/kg.png
new file mode 100644
index 000000000..889b612b9
Binary files /dev/null and b/pixmaps/flags25x15/kg.png differ
diff --git a/pixmaps/flags25x15/kh.png b/pixmaps/flags25x15/kh.png
new file mode 100644
index 000000000..772f5870b
Binary files /dev/null and b/pixmaps/flags25x15/kh.png differ
diff --git a/pixmaps/flags25x15/ki.png b/pixmaps/flags25x15/ki.png
new file mode 100644
index 000000000..4c8a67c9d
Binary files /dev/null and b/pixmaps/flags25x15/ki.png differ
diff --git a/pixmaps/flags25x15/km.png b/pixmaps/flags25x15/km.png
new file mode 100644
index 000000000..e704afb34
Binary files /dev/null and b/pixmaps/flags25x15/km.png differ
diff --git a/pixmaps/flags25x15/kn.png b/pixmaps/flags25x15/kn.png
new file mode 100644
index 000000000..042232c2d
Binary files /dev/null and b/pixmaps/flags25x15/kn.png differ
diff --git a/pixmaps/flags25x15/kp.png b/pixmaps/flags25x15/kp.png
new file mode 100644
index 000000000..f8fbd308f
Binary files /dev/null and b/pixmaps/flags25x15/kp.png differ
diff --git a/pixmaps/flags25x15/kr.png b/pixmaps/flags25x15/kr.png
new file mode 100644
index 000000000..f83ebb31e
Binary files /dev/null and b/pixmaps/flags25x15/kr.png differ
diff --git a/pixmaps/flags25x15/kw.png b/pixmaps/flags25x15/kw.png
new file mode 100644
index 000000000..24748c6c3
Binary files /dev/null and b/pixmaps/flags25x15/kw.png differ
diff --git a/pixmaps/flags25x15/ky.png b/pixmaps/flags25x15/ky.png
new file mode 100644
index 000000000..697377161
Binary files /dev/null and b/pixmaps/flags25x15/ky.png differ
diff --git a/pixmaps/flags25x15/kz.png b/pixmaps/flags25x15/kz.png
new file mode 100644
index 000000000..3e102a414
Binary files /dev/null and b/pixmaps/flags25x15/kz.png differ
diff --git a/pixmaps/flags25x15/la.png b/pixmaps/flags25x15/la.png
new file mode 100644
index 000000000..532e3b679
Binary files /dev/null and b/pixmaps/flags25x15/la.png differ
diff --git a/pixmaps/flags25x15/lb.png b/pixmaps/flags25x15/lb.png
new file mode 100644
index 000000000..4f94e9f95
Binary files /dev/null and b/pixmaps/flags25x15/lb.png differ
diff --git a/pixmaps/flags25x15/lc.png b/pixmaps/flags25x15/lc.png
new file mode 100644
index 000000000..a1205be94
Binary files /dev/null and b/pixmaps/flags25x15/lc.png differ
diff --git a/pixmaps/flags25x15/li.png b/pixmaps/flags25x15/li.png
new file mode 100644
index 000000000..adef5a82d
Binary files /dev/null and b/pixmaps/flags25x15/li.png differ
diff --git a/pixmaps/flags25x15/lk.png b/pixmaps/flags25x15/lk.png
new file mode 100644
index 000000000..9ff43b5eb
Binary files /dev/null and b/pixmaps/flags25x15/lk.png differ
diff --git a/pixmaps/flags25x15/lr.png b/pixmaps/flags25x15/lr.png
new file mode 100644
index 000000000..dc4c555b5
Binary files /dev/null and b/pixmaps/flags25x15/lr.png differ
diff --git a/pixmaps/flags25x15/ls.png b/pixmaps/flags25x15/ls.png
new file mode 100644
index 000000000..4e0a9b03d
Binary files /dev/null and b/pixmaps/flags25x15/ls.png differ
diff --git a/pixmaps/flags25x15/lt.png b/pixmaps/flags25x15/lt.png
new file mode 100644
index 000000000..e951f7d80
Binary files /dev/null and b/pixmaps/flags25x15/lt.png differ
diff --git a/pixmaps/flags25x15/lu.png b/pixmaps/flags25x15/lu.png
new file mode 100644
index 000000000..aba4a1073
Binary files /dev/null and b/pixmaps/flags25x15/lu.png differ
diff --git a/pixmaps/flags25x15/lv.png b/pixmaps/flags25x15/lv.png
new file mode 100644
index 000000000..992161558
Binary files /dev/null and b/pixmaps/flags25x15/lv.png differ
diff --git a/pixmaps/flags25x15/ly.png b/pixmaps/flags25x15/ly.png
new file mode 100644
index 000000000..55f5edd50
Binary files /dev/null and b/pixmaps/flags25x15/ly.png differ
diff --git a/pixmaps/flags25x15/ma.png b/pixmaps/flags25x15/ma.png
new file mode 100644
index 000000000..f6f9d1fef
Binary files /dev/null and b/pixmaps/flags25x15/ma.png differ
diff --git a/pixmaps/flags25x15/mc.png b/pixmaps/flags25x15/mc.png
new file mode 100644
index 000000000..05b3bb480
Binary files /dev/null and b/pixmaps/flags25x15/mc.png differ
diff --git a/pixmaps/flags25x15/md.png b/pixmaps/flags25x15/md.png
new file mode 100644
index 000000000..81c36fa1b
Binary files /dev/null and b/pixmaps/flags25x15/md.png differ
diff --git a/pixmaps/flags25x15/me.png b/pixmaps/flags25x15/me.png
new file mode 100644
index 000000000..5f5199ef4
Binary files /dev/null and b/pixmaps/flags25x15/me.png differ
diff --git a/pixmaps/flags25x15/mg.png b/pixmaps/flags25x15/mg.png
new file mode 100644
index 000000000..ee2a02461
Binary files /dev/null and b/pixmaps/flags25x15/mg.png differ
diff --git a/pixmaps/flags25x15/mh.png b/pixmaps/flags25x15/mh.png
new file mode 100644
index 000000000..00af51fb6
Binary files /dev/null and b/pixmaps/flags25x15/mh.png differ
diff --git a/pixmaps/flags25x15/mk.png b/pixmaps/flags25x15/mk.png
new file mode 100644
index 000000000..618475d22
Binary files /dev/null and b/pixmaps/flags25x15/mk.png differ
diff --git a/pixmaps/flags25x15/ml.png b/pixmaps/flags25x15/ml.png
new file mode 100644
index 000000000..b10bcac64
Binary files /dev/null and b/pixmaps/flags25x15/ml.png differ
diff --git a/pixmaps/flags25x15/mm.png b/pixmaps/flags25x15/mm.png
new file mode 100644
index 000000000..f96999501
Binary files /dev/null and b/pixmaps/flags25x15/mm.png differ
diff --git a/pixmaps/flags25x15/mn.png b/pixmaps/flags25x15/mn.png
new file mode 100644
index 000000000..2a824d55f
Binary files /dev/null and b/pixmaps/flags25x15/mn.png differ
diff --git a/pixmaps/flags25x15/mo.png b/pixmaps/flags25x15/mo.png
new file mode 100644
index 000000000..06a1ead9a
Binary files /dev/null and b/pixmaps/flags25x15/mo.png differ
diff --git a/pixmaps/flags25x15/mp.png b/pixmaps/flags25x15/mp.png
new file mode 100644
index 000000000..52625e3d4
Binary files /dev/null and b/pixmaps/flags25x15/mp.png differ
diff --git a/pixmaps/flags25x15/mq.png b/pixmaps/flags25x15/mq.png
new file mode 100644
index 000000000..c1a539549
Binary files /dev/null and b/pixmaps/flags25x15/mq.png differ
diff --git a/pixmaps/flags25x15/mr.png b/pixmaps/flags25x15/mr.png
new file mode 100644
index 000000000..52fcfc229
Binary files /dev/null and b/pixmaps/flags25x15/mr.png differ
diff --git a/pixmaps/flags25x15/ms.png b/pixmaps/flags25x15/ms.png
new file mode 100644
index 000000000..022ca1a1a
Binary files /dev/null and b/pixmaps/flags25x15/ms.png differ
diff --git a/pixmaps/flags25x15/mt.png b/pixmaps/flags25x15/mt.png
new file mode 100644
index 000000000..ada70c644
Binary files /dev/null and b/pixmaps/flags25x15/mt.png differ
diff --git a/pixmaps/flags25x15/mu.png b/pixmaps/flags25x15/mu.png
new file mode 100644
index 000000000..1126c7abb
Binary files /dev/null and b/pixmaps/flags25x15/mu.png differ
diff --git a/pixmaps/flags25x15/mv.png b/pixmaps/flags25x15/mv.png
new file mode 100644
index 000000000..8f12c5b36
Binary files /dev/null and b/pixmaps/flags25x15/mv.png differ
diff --git a/pixmaps/flags25x15/mw.png b/pixmaps/flags25x15/mw.png
new file mode 100644
index 000000000..1ff74952e
Binary files /dev/null and b/pixmaps/flags25x15/mw.png differ
diff --git a/pixmaps/flags25x15/mx.png b/pixmaps/flags25x15/mx.png
new file mode 100644
index 000000000..0d7c67142
Binary files /dev/null and b/pixmaps/flags25x15/mx.png differ
diff --git a/pixmaps/flags25x15/my.png b/pixmaps/flags25x15/my.png
new file mode 100644
index 000000000..4eead54bd
Binary files /dev/null and b/pixmaps/flags25x15/my.png differ
diff --git a/pixmaps/flags25x15/mz.png b/pixmaps/flags25x15/mz.png
new file mode 100644
index 000000000..10b4b8d2b
Binary files /dev/null and b/pixmaps/flags25x15/mz.png differ
diff --git a/pixmaps/flags25x15/na.png b/pixmaps/flags25x15/na.png
new file mode 100644
index 000000000..db2580e8e
Binary files /dev/null and b/pixmaps/flags25x15/na.png differ
diff --git a/pixmaps/flags25x15/nc.png b/pixmaps/flags25x15/nc.png
new file mode 100644
index 000000000..c1a539549
Binary files /dev/null and b/pixmaps/flags25x15/nc.png differ
diff --git a/pixmaps/flags25x15/ne.png b/pixmaps/flags25x15/ne.png
new file mode 100644
index 000000000..fd818af33
Binary files /dev/null and b/pixmaps/flags25x15/ne.png differ
diff --git a/pixmaps/flags25x15/nf.png b/pixmaps/flags25x15/nf.png
new file mode 100644
index 000000000..46f61f0ad
Binary files /dev/null and b/pixmaps/flags25x15/nf.png differ
diff --git a/pixmaps/flags25x15/ng.png b/pixmaps/flags25x15/ng.png
new file mode 100644
index 000000000..e61fcbb33
Binary files /dev/null and b/pixmaps/flags25x15/ng.png differ
diff --git a/pixmaps/flags25x15/ni.png b/pixmaps/flags25x15/ni.png
new file mode 100644
index 000000000..50bebdf15
Binary files /dev/null and b/pixmaps/flags25x15/ni.png differ
diff --git a/pixmaps/flags25x15/nl.png b/pixmaps/flags25x15/nl.png
new file mode 100644
index 000000000..08d2f2abb
Binary files /dev/null and b/pixmaps/flags25x15/nl.png differ
diff --git a/pixmaps/flags25x15/no.png b/pixmaps/flags25x15/no.png
new file mode 100644
index 000000000..3f24fb54b
Binary files /dev/null and b/pixmaps/flags25x15/no.png differ
diff --git a/pixmaps/flags25x15/np.png b/pixmaps/flags25x15/np.png
new file mode 100644
index 000000000..f561629df
Binary files /dev/null and b/pixmaps/flags25x15/np.png differ
diff --git a/pixmaps/flags25x15/nr.png b/pixmaps/flags25x15/nr.png
new file mode 100644
index 000000000..15474be90
Binary files /dev/null and b/pixmaps/flags25x15/nr.png differ
diff --git a/pixmaps/flags25x15/nu.png b/pixmaps/flags25x15/nu.png
new file mode 100644
index 000000000..fd9f9e032
Binary files /dev/null and b/pixmaps/flags25x15/nu.png differ
diff --git a/pixmaps/flags25x15/nz.png b/pixmaps/flags25x15/nz.png
new file mode 100644
index 000000000..5bcbefd91
Binary files /dev/null and b/pixmaps/flags25x15/nz.png differ
diff --git a/pixmaps/flags25x15/om.png b/pixmaps/flags25x15/om.png
new file mode 100644
index 000000000..01a3db1b1
Binary files /dev/null and b/pixmaps/flags25x15/om.png differ
diff --git a/pixmaps/flags25x15/pa.png b/pixmaps/flags25x15/pa.png
new file mode 100644
index 000000000..632bd8e6e
Binary files /dev/null and b/pixmaps/flags25x15/pa.png differ
diff --git a/pixmaps/flags25x15/pe.png b/pixmaps/flags25x15/pe.png
new file mode 100644
index 000000000..c3b68310b
Binary files /dev/null and b/pixmaps/flags25x15/pe.png differ
diff --git a/pixmaps/flags25x15/pf.png b/pixmaps/flags25x15/pf.png
new file mode 100644
index 000000000..c9eaf6d42
Binary files /dev/null and b/pixmaps/flags25x15/pf.png differ
diff --git a/pixmaps/flags25x15/pg.png b/pixmaps/flags25x15/pg.png
new file mode 100644
index 000000000..1aa244ebe
Binary files /dev/null and b/pixmaps/flags25x15/pg.png differ
diff --git a/pixmaps/flags25x15/ph.png b/pixmaps/flags25x15/ph.png
new file mode 100644
index 000000000..bac753b58
Binary files /dev/null and b/pixmaps/flags25x15/ph.png differ
diff --git a/pixmaps/flags25x15/pk.png b/pixmaps/flags25x15/pk.png
new file mode 100644
index 000000000..c77f3fd24
Binary files /dev/null and b/pixmaps/flags25x15/pk.png differ
diff --git a/pixmaps/flags25x15/pl.png b/pixmaps/flags25x15/pl.png
new file mode 100644
index 000000000..6c83c264a
Binary files /dev/null and b/pixmaps/flags25x15/pl.png differ
diff --git a/pixmaps/flags25x15/pm.png b/pixmaps/flags25x15/pm.png
new file mode 100644
index 000000000..c1a539549
Binary files /dev/null and b/pixmaps/flags25x15/pm.png differ
diff --git a/pixmaps/flags25x15/pn.png b/pixmaps/flags25x15/pn.png
new file mode 100644
index 000000000..55f7b9150
Binary files /dev/null and b/pixmaps/flags25x15/pn.png differ
diff --git a/pixmaps/flags25x15/pr.png b/pixmaps/flags25x15/pr.png
new file mode 100644
index 000000000..e12c95831
Binary files /dev/null and b/pixmaps/flags25x15/pr.png differ
diff --git a/pixmaps/flags25x15/ps.png b/pixmaps/flags25x15/ps.png
new file mode 100644
index 000000000..fe3a67686
Binary files /dev/null and b/pixmaps/flags25x15/ps.png differ
diff --git a/pixmaps/flags25x15/pt.png b/pixmaps/flags25x15/pt.png
new file mode 100644
index 000000000..0911015a0
Binary files /dev/null and b/pixmaps/flags25x15/pt.png differ
diff --git a/pixmaps/flags25x15/pw.png b/pixmaps/flags25x15/pw.png
new file mode 100644
index 000000000..89e957275
Binary files /dev/null and b/pixmaps/flags25x15/pw.png differ
diff --git a/pixmaps/flags25x15/py.png b/pixmaps/flags25x15/py.png
new file mode 100644
index 000000000..78e16f1ad
Binary files /dev/null and b/pixmaps/flags25x15/py.png differ
diff --git a/pixmaps/flags25x15/qa.png b/pixmaps/flags25x15/qa.png
new file mode 100644
index 000000000..1e63f0482
Binary files /dev/null and b/pixmaps/flags25x15/qa.png differ
diff --git a/pixmaps/flags25x15/re.png b/pixmaps/flags25x15/re.png
new file mode 100644
index 000000000..c1a539549
Binary files /dev/null and b/pixmaps/flags25x15/re.png differ
diff --git a/pixmaps/flags25x15/ro.png b/pixmaps/flags25x15/ro.png
new file mode 100644
index 000000000..4a4f7b589
Binary files /dev/null and b/pixmaps/flags25x15/ro.png differ
diff --git a/pixmaps/flags25x15/rs.png b/pixmaps/flags25x15/rs.png
new file mode 100644
index 000000000..28afdd597
Binary files /dev/null and b/pixmaps/flags25x15/rs.png differ
diff --git a/pixmaps/flags25x15/ru.png b/pixmaps/flags25x15/ru.png
new file mode 100644
index 000000000..e6f8bb0eb
Binary files /dev/null and b/pixmaps/flags25x15/ru.png differ
diff --git a/pixmaps/flags25x15/rw.png b/pixmaps/flags25x15/rw.png
new file mode 100644
index 000000000..05543ea12
Binary files /dev/null and b/pixmaps/flags25x15/rw.png differ
diff --git a/pixmaps/flags25x15/sa.png b/pixmaps/flags25x15/sa.png
new file mode 100644
index 000000000..a38fc791a
Binary files /dev/null and b/pixmaps/flags25x15/sa.png differ
diff --git a/pixmaps/flags25x15/sb.png b/pixmaps/flags25x15/sb.png
new file mode 100644
index 000000000..f2748306a
Binary files /dev/null and b/pixmaps/flags25x15/sb.png differ
diff --git a/pixmaps/flags25x15/sc.png b/pixmaps/flags25x15/sc.png
new file mode 100644
index 000000000..369368ba6
Binary files /dev/null and b/pixmaps/flags25x15/sc.png differ
diff --git a/pixmaps/flags25x15/sd.png b/pixmaps/flags25x15/sd.png
new file mode 100644
index 000000000..54c57bf80
Binary files /dev/null and b/pixmaps/flags25x15/sd.png differ
diff --git a/pixmaps/flags25x15/se.png b/pixmaps/flags25x15/se.png
new file mode 100644
index 000000000..0b7156f70
Binary files /dev/null and b/pixmaps/flags25x15/se.png differ
diff --git a/pixmaps/flags25x15/sg.png b/pixmaps/flags25x15/sg.png
new file mode 100644
index 000000000..51647797f
Binary files /dev/null and b/pixmaps/flags25x15/sg.png differ
diff --git a/pixmaps/flags25x15/sh.png b/pixmaps/flags25x15/sh.png
new file mode 100644
index 000000000..243cae2da
Binary files /dev/null and b/pixmaps/flags25x15/sh.png differ
diff --git a/pixmaps/flags25x15/si.png b/pixmaps/flags25x15/si.png
new file mode 100644
index 000000000..5c8e9a992
Binary files /dev/null and b/pixmaps/flags25x15/si.png differ
diff --git a/pixmaps/flags25x15/sj.png b/pixmaps/flags25x15/sj.png
new file mode 100644
index 000000000..3f24fb54b
Binary files /dev/null and b/pixmaps/flags25x15/sj.png differ
diff --git a/pixmaps/flags25x15/sk.png b/pixmaps/flags25x15/sk.png
new file mode 100644
index 000000000..ee88a0736
Binary files /dev/null and b/pixmaps/flags25x15/sk.png differ
diff --git a/pixmaps/flags25x15/sl.png b/pixmaps/flags25x15/sl.png
new file mode 100644
index 000000000..608e0fe0d
Binary files /dev/null and b/pixmaps/flags25x15/sl.png differ
diff --git a/pixmaps/flags25x15/sm.png b/pixmaps/flags25x15/sm.png
new file mode 100644
index 000000000..e38069d9b
Binary files /dev/null and b/pixmaps/flags25x15/sm.png differ
diff --git a/pixmaps/flags25x15/sn.png b/pixmaps/flags25x15/sn.png
new file mode 100644
index 000000000..4b99a6657
Binary files /dev/null and b/pixmaps/flags25x15/sn.png differ
diff --git a/pixmaps/flags25x15/so.png b/pixmaps/flags25x15/so.png
new file mode 100644
index 000000000..53db90314
Binary files /dev/null and b/pixmaps/flags25x15/so.png differ
diff --git a/pixmaps/flags25x15/sr.png b/pixmaps/flags25x15/sr.png
new file mode 100644
index 000000000..8643fae87
Binary files /dev/null and b/pixmaps/flags25x15/sr.png differ
diff --git a/pixmaps/flags25x15/st.png b/pixmaps/flags25x15/st.png
new file mode 100644
index 000000000..27041497a
Binary files /dev/null and b/pixmaps/flags25x15/st.png differ
diff --git a/pixmaps/flags25x15/sv.png b/pixmaps/flags25x15/sv.png
new file mode 100644
index 000000000..f27b9be69
Binary files /dev/null and b/pixmaps/flags25x15/sv.png differ
diff --git a/pixmaps/flags25x15/sy.png b/pixmaps/flags25x15/sy.png
new file mode 100644
index 000000000..8816583f1
Binary files /dev/null and b/pixmaps/flags25x15/sy.png differ
diff --git a/pixmaps/flags25x15/sz.png b/pixmaps/flags25x15/sz.png
new file mode 100644
index 000000000..fc4bb0232
Binary files /dev/null and b/pixmaps/flags25x15/sz.png differ
diff --git a/pixmaps/flags25x15/tc.png b/pixmaps/flags25x15/tc.png
new file mode 100644
index 000000000..162ed8ab1
Binary files /dev/null and b/pixmaps/flags25x15/tc.png differ
diff --git a/pixmaps/flags25x15/td.png b/pixmaps/flags25x15/td.png
new file mode 100644
index 000000000..3801b2f1f
Binary files /dev/null and b/pixmaps/flags25x15/td.png differ
diff --git a/pixmaps/flags25x15/tf.png b/pixmaps/flags25x15/tf.png
new file mode 100644
index 000000000..c1a539549
Binary files /dev/null and b/pixmaps/flags25x15/tf.png differ
diff --git a/pixmaps/flags25x15/tg.png b/pixmaps/flags25x15/tg.png
new file mode 100644
index 000000000..2f80fe077
Binary files /dev/null and b/pixmaps/flags25x15/tg.png differ
diff --git a/pixmaps/flags25x15/th.png b/pixmaps/flags25x15/th.png
new file mode 100644
index 000000000..bbe147583
Binary files /dev/null and b/pixmaps/flags25x15/th.png differ
diff --git a/pixmaps/flags25x15/tj.png b/pixmaps/flags25x15/tj.png
new file mode 100644
index 000000000..1f1b0dae4
Binary files /dev/null and b/pixmaps/flags25x15/tj.png differ
diff --git a/pixmaps/flags25x15/tk.png b/pixmaps/flags25x15/tk.png
new file mode 100644
index 000000000..5bcbefd91
Binary files /dev/null and b/pixmaps/flags25x15/tk.png differ
diff --git a/pixmaps/flags25x15/tl.png b/pixmaps/flags25x15/tl.png
new file mode 100644
index 000000000..1babb2b83
Binary files /dev/null and b/pixmaps/flags25x15/tl.png differ
diff --git a/pixmaps/flags25x15/tm.png b/pixmaps/flags25x15/tm.png
new file mode 100644
index 000000000..5b75e7ad0
Binary files /dev/null and b/pixmaps/flags25x15/tm.png differ
diff --git a/pixmaps/flags25x15/tn.png b/pixmaps/flags25x15/tn.png
new file mode 100644
index 000000000..9d7f7e32f
Binary files /dev/null and b/pixmaps/flags25x15/tn.png differ
diff --git a/pixmaps/flags25x15/to.png b/pixmaps/flags25x15/to.png
new file mode 100644
index 000000000..bc2d04373
Binary files /dev/null and b/pixmaps/flags25x15/to.png differ
diff --git a/pixmaps/flags25x15/tp.png b/pixmaps/flags25x15/tp.png
new file mode 100644
index 000000000..1babb2b83
Binary files /dev/null and b/pixmaps/flags25x15/tp.png differ
diff --git a/pixmaps/flags25x15/tr.png b/pixmaps/flags25x15/tr.png
new file mode 100644
index 000000000..a7d155845
Binary files /dev/null and b/pixmaps/flags25x15/tr.png differ
diff --git a/pixmaps/flags25x15/tt.png b/pixmaps/flags25x15/tt.png
new file mode 100644
index 000000000..4d18c0371
Binary files /dev/null and b/pixmaps/flags25x15/tt.png differ
diff --git a/pixmaps/flags25x15/tv.png b/pixmaps/flags25x15/tv.png
new file mode 100644
index 000000000..d423b048e
Binary files /dev/null and b/pixmaps/flags25x15/tv.png differ
diff --git a/pixmaps/flags25x15/tw.png b/pixmaps/flags25x15/tw.png
new file mode 100644
index 000000000..f233d0a89
Binary files /dev/null and b/pixmaps/flags25x15/tw.png differ
diff --git a/pixmaps/flags25x15/tz.png b/pixmaps/flags25x15/tz.png
new file mode 100644
index 000000000..8816583f1
Binary files /dev/null and b/pixmaps/flags25x15/tz.png differ
diff --git a/pixmaps/flags25x15/ua.png b/pixmaps/flags25x15/ua.png
new file mode 100644
index 000000000..1ff1a18b5
Binary files /dev/null and b/pixmaps/flags25x15/ua.png differ
diff --git a/pixmaps/flags25x15/ug.png b/pixmaps/flags25x15/ug.png
new file mode 100644
index 000000000..69c83f81d
Binary files /dev/null and b/pixmaps/flags25x15/ug.png differ
diff --git a/pixmaps/flags25x15/um.png b/pixmaps/flags25x15/um.png
new file mode 100644
index 000000000..ac54a983f
Binary files /dev/null and b/pixmaps/flags25x15/um.png differ
diff --git a/pixmaps/flags25x15/us.png b/pixmaps/flags25x15/us.png
new file mode 100644
index 000000000..ac54a983f
Binary files /dev/null and b/pixmaps/flags25x15/us.png differ
diff --git a/pixmaps/flags25x15/uy.png b/pixmaps/flags25x15/uy.png
new file mode 100644
index 000000000..7e58ac4e2
Binary files /dev/null and b/pixmaps/flags25x15/uy.png differ
diff --git a/pixmaps/flags25x15/uz.png b/pixmaps/flags25x15/uz.png
new file mode 100644
index 000000000..76707c52a
Binary files /dev/null and b/pixmaps/flags25x15/uz.png differ
diff --git a/pixmaps/flags25x15/va.png b/pixmaps/flags25x15/va.png
new file mode 100644
index 000000000..29692363a
Binary files /dev/null and b/pixmaps/flags25x15/va.png differ
diff --git a/pixmaps/flags25x15/vc.png b/pixmaps/flags25x15/vc.png
new file mode 100644
index 000000000..93164d109
Binary files /dev/null and b/pixmaps/flags25x15/vc.png differ
diff --git a/pixmaps/flags25x15/ve.png b/pixmaps/flags25x15/ve.png
new file mode 100644
index 000000000..92844bbec
Binary files /dev/null and b/pixmaps/flags25x15/ve.png differ
diff --git a/pixmaps/flags25x15/vg.png b/pixmaps/flags25x15/vg.png
new file mode 100644
index 000000000..8d226efe5
Binary files /dev/null and b/pixmaps/flags25x15/vg.png differ
diff --git a/pixmaps/flags25x15/vi.png b/pixmaps/flags25x15/vi.png
new file mode 100644
index 000000000..7916f3aaa
Binary files /dev/null and b/pixmaps/flags25x15/vi.png differ
diff --git a/pixmaps/flags25x15/vn.png b/pixmaps/flags25x15/vn.png
new file mode 100644
index 000000000..538b0810d
Binary files /dev/null and b/pixmaps/flags25x15/vn.png differ
diff --git a/pixmaps/flags25x15/vu.png b/pixmaps/flags25x15/vu.png
new file mode 100644
index 000000000..e514f7b52
Binary files /dev/null and b/pixmaps/flags25x15/vu.png differ
diff --git a/pixmaps/flags25x15/wf.png b/pixmaps/flags25x15/wf.png
new file mode 100644
index 000000000..c1a539549
Binary files /dev/null and b/pixmaps/flags25x15/wf.png differ
diff --git a/pixmaps/flags25x15/ws.png b/pixmaps/flags25x15/ws.png
new file mode 100644
index 000000000..8a26405b7
Binary files /dev/null and b/pixmaps/flags25x15/ws.png differ
diff --git a/pixmaps/flags25x15/ye.png b/pixmaps/flags25x15/ye.png
new file mode 100644
index 000000000..5b4520ff1
Binary files /dev/null and b/pixmaps/flags25x15/ye.png differ
diff --git a/pixmaps/flags25x15/yt.png b/pixmaps/flags25x15/yt.png
new file mode 100644
index 000000000..c1a539549
Binary files /dev/null and b/pixmaps/flags25x15/yt.png differ
diff --git a/pixmaps/flags25x15/yu.png b/pixmaps/flags25x15/yu.png
new file mode 100644
index 000000000..7a89a78c1
Binary files /dev/null and b/pixmaps/flags25x15/yu.png differ
diff --git a/pixmaps/flags25x15/za.png b/pixmaps/flags25x15/za.png
new file mode 100644
index 000000000..38a122ce0
Binary files /dev/null and b/pixmaps/flags25x15/za.png differ
diff --git a/pixmaps/flags25x15/zm.png b/pixmaps/flags25x15/zm.png
new file mode 100644
index 000000000..7503819b9
Binary files /dev/null and b/pixmaps/flags25x15/zm.png differ
diff --git a/pixmaps/flags25x15/zw.png b/pixmaps/flags25x15/zw.png
new file mode 100644
index 000000000..0ccea687d
Binary files /dev/null and b/pixmaps/flags25x15/zw.png differ
diff --git a/plugins/BlocklistImport/__init__.py b/plugins/BlocklistImport/__init__.py
index 595a36350..5b2e8f9a7 100644
--- a/plugins/BlocklistImport/__init__.py
+++ b/plugins/BlocklistImport/__init__.py
@@ -132,10 +132,11 @@ class BlocklistImport:
         self.gtkprog.stop()
         self.cancelled = False
 
-    def configure(self):
+    def configure(self, window):
         self.gtkconf.start(self.config.get('listtype'),
                            self.config.get('url'),
-                           self.config.get('load_on_start'))
+                           self.config.get('load_on_start'),
+                           window)
 
     def setconfig(self, url, load_on_start, listtype):
         self.config.set('url', url)
diff --git a/plugins/BlocklistImport/ui.py b/plugins/BlocklistImport/ui.py
index 6998d08d8..e506a40d4 100644
--- a/plugins/BlocklistImport/ui.py
+++ b/plugins/BlocklistImport/ui.py
@@ -9,12 +9,13 @@ import BlocklistImport
 class GTKConfig(gtk.Dialog):
     def __init__(self, plugin):
         gtk.Dialog.__init__(self, title="Blocklist Config",
-                            flags=gtk.DIALOG_MODAL,
+                            flags=gtk.DIALOG_DESTROY_WITH_PARENT,
                             buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
                                      gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
+        self.set_property("skip-taskbar-hint", True)
+        self.set_property("skip-pager-hint", True)
 
         self.plugin = plugin
-
         # Setup
         self.set_border_width(12)
         self.vbox.set_spacing(6)
@@ -73,7 +74,8 @@ class GTKConfig(gtk.Dialog):
     def cancel(self, dialog):
         self.hide_all()
 
-    def start(self, ltype, url, load):
+    def start(self, ltype, url, load, window):
+        self.set_transient_for(window)
         if ltype:
             path = BlocklistImport.readers[ltype][2]
             i = self.listtype.get_model().get_iter(path)
diff --git a/plugins/EventLogging/__init__.py b/plugins/EventLogging/__init__.py
index 2413538d5..133b4bbd8 100644
--- a/plugins/EventLogging/__init__.py
+++ b/plugins/EventLogging/__init__.py
@@ -73,7 +73,6 @@ class EventLogging:
         self.dialog = self.glade.get_widget("dialog")
         self.dialog.set_position(gtk.WIN_POS_CENTER)
         self.glade.signal_autoconnect({
-                                        'toggle_ui': self.toggle_ui,
                                         'on_button_cancel_pressed': self.cancel_pressed,
                                         'on_button_ok_pressed': self.ok_pressed
                                       })
@@ -174,101 +173,7 @@ class EventLogging:
     def update(self):
         pass
 
-    def toggle_ui(self, widget):
-        if not self.dialog_initialize:
-            value = widget.get_active()
-            if widget == self.glade.get_widget("chk_finished"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_FINISHED'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_FINISHED'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_peer_error"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_PEER_ERROR'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_PEER_ERROR'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_invalid_request"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_INVALID_REQUEST'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_INVALID_REQUEST'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_file_error"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_FILE_ERROR'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_FILE_ERROR'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_hash_failed_error"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_HASH_FAILED_ERROR'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_HASH_FAILED_ERROR'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_peer_ban_error"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_PEER_BAN_ERROR'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_PEER_BAN_ERROR'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_fastresume_rejected_error"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_FASTRESUME_REJECTED_ERROR'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_FASTRESUME_REJECTED_ERROR'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_tracker_announce"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_TRACKER_ANNOUNCE'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_TRACKER_ANNOUNCE'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_tracker_reply"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_TRACKER_REPLY'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_TRACKER_REPLY'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_tracker_alert"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_TRACKER_ALERT'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_TRACKER_ALERT'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_tracker_warning"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_TRACKER_WARNING'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_TRACKER_WARNING'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_storage_moved"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_STORAGE_MOVED'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_STORAGE_MOVED'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_piece_finished"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_PIECE_FINISHED'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_PIECE_FINISHED'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_block_downloading"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_BLOCK_DOWNLOADING'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_BLOCK_DOWNLOADING'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_block_finished"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_BLOCK_FINISHED'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_BLOCK_FINISHED'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_peer_blocked"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_PEER_BLOCKED'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_PEER_BLOCKED'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_other"):
-                if value:
-                    self.manager.connect_event(self.manager.constants['EVENT_OTHER'], self.tab_log.handle_event)
-                else:
-                    self.manager.disconnect_event(self.manager.constants['EVENT_OTHER'], self.tab_log.handle_event)
-            if widget == self.glade.get_widget("chk_log_files"):
-                if value:
-                    self.tab_log.enable_log_files()
-                else:
-                    self.tab_log.disable_log_files()
-
-    def configure(self):
+    def configure(self, window):
         self.dialog_initialize = True
         try:
             self.glade.get_widget("chk_finished").set_active(self.config.get("enable_finished"))
@@ -343,27 +248,55 @@ class EventLogging:
         except:
             self.glade.get_widget("chk_log_files").set_active(False)
         self.dialog_initialize = False
+        self.dialog.set_transient_for(window)
         self.dialog.show()
 
+    def update_config(self, event_id, value):
+        if value:
+            self.manager.connect_event(event_id, self.tab_log.handle_event)
+        else:
+            self.manager.disconnect_event(event_id, self.tab_log.handle_event)
+
     def ok_pressed(self, src):
         self.dialog.hide()
+        self.update_config(self.manager.constants['EVENT_FINISHED'], self.glade.get_widget("chk_finished").get_active())
         self.config.set("enable_finished", self.glade.get_widget("chk_finished").get_active())
+        self.update_config(self.manager.constants['EVENT_PEER_ERROR'], self.glade.get_widget("chk_peer_error").get_active())
         self.config.set("enable_peer_error", self.glade.get_widget("chk_peer_error").get_active())
+        self.update_config(self.manager.constants['EVENT_INVALID_REQUEST'], self.glade.get_widget("chk_invalid_request").get_active())
         self.config.set("enable_invalid_request", self.glade.get_widget("chk_invalid_request").get_active())
+        self.update_config(self.manager.constants['EVENT_FILE_ERROR'], self.glade.get_widget("chk_file_error").get_active())
         self.config.set("enable_file_error", self.glade.get_widget("chk_file_error").get_active())
+        self.update_config(self.manager.constants['EVENT_HASH_FAILED_ERROR'], self.glade.get_widget("chk_hash_failed_error").get_active())
         self.config.set("enable_hash_failed_error", self.glade.get_widget("chk_hash_failed_error").get_active())
+        self.update_config(self.manager.constants['EVENT_PEER_BAN_ERROR'], self.glade.get_widget("chk_peer_ban_error").get_active())
         self.config.set("enable_peer_ban_error", self.glade.get_widget("chk_peer_ban_error").get_active())
+        self.update_config(self.manager.constants['EVENT_FASTRESUME_REJECTED_ERROR'], self.glade.get_widget("chk_fastresume_rejected_error").get_active())
         self.config.set("enable_fastresume_rejected_error", self.glade.get_widget("chk_fastresume_rejected_error").get_active())
+        self.update_config(self.manager.constants['EVENT_TRACKER_ANNOUNCE'], self.glade.get_widget("chk_tracker_announce").get_active())
         self.config.set("enable_tracker_announce", self.glade.get_widget("chk_tracker_announce").get_active())
+        self.update_config(self.manager.constants['EVENT_TRACKER_REPLY'], self.glade.get_widget("chk_tracker_reply").get_active())
         self.config.set("enable_tracker_reply", self.glade.get_widget("chk_tracker_reply").get_active())
+        self.update_config(self.manager.constants['EVENT_TRACKER_ALERT'], self.glade.get_widget("chk_tracker_alert").get_active())
         self.config.set("enable_tracker_alert", self.glade.get_widget("chk_tracker_alert").get_active())
+        self.update_config(self.manager.constants['EVENT_TRACKER_WARNING'], self.glade.get_widget("chk_tracker_warning").get_active())
         self.config.set("enable_tracker_warning", self.glade.get_widget("chk_tracker_warning").get_active())
+        self.update_config(self.manager.constants['EVENT_STORAGE_MOVED'], self.glade.get_widget("chk_storage_moved").get_active())
         self.config.set("enable_storage_moved", self.glade.get_widget("chk_storage_moved").get_active())
+        self.update_config(self.manager.constants['EVENT_PIECE_FINISHED'], self.glade.get_widget("chk_piece_finished").get_active())
         self.config.set("enable_piece_finished", self.glade.get_widget("chk_piece_finished").get_active())
+        self.update_config(self.manager.constants['EVENT_BLOCK_DOWNLOADING'], self.glade.get_widget("chk_block_downloading").get_active())
         self.config.set("enable_block_downloading", self.glade.get_widget("chk_block_downloading").get_active())
+        self.update_config(self.manager.constants['EVENT_BLOCK_FINISHED'], self.glade.get_widget("chk_block_finished").get_active())
         self.config.set("enable_block_finished", self.glade.get_widget("chk_block_finished").get_active())
+        self.update_config(self.manager.constants['EVENT_PEER_BLOCKED'], self.glade.get_widget("chk_peer_blocked").get_active())
         self.config.set("enable_peer_blocked", self.glade.get_widget("chk_peer_blocked").get_active())
+        self.update_config(self.manager.constants['EVENT_OTHER'], self.glade.get_widget("chk_other").get_active())
         self.config.set("enable_other", self.glade.get_widget("chk_other").get_active())
+        if self.glade.get_widget("chk_log_files").get_active():
+            self.tab_log.enable_log_files()
+        else:
+            self.tab_log.disable_log_files()
         self.config.set("enable_log_files", self.glade.get_widget("chk_log_files").get_active())
 
     def cancel_pressed(self, src):
diff --git a/plugins/EventLogging/event_logging_preferences.glade b/plugins/EventLogging/event_logging_preferences.glade
index 4720b6b86..fc6a96d4e 100644
--- a/plugins/EventLogging/event_logging_preferences.glade
+++ b/plugins/EventLogging/event_logging_preferences.glade
@@ -8,6 +8,9 @@
     <property name="default_width">400</property>
     <property name="default_height">150</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
@@ -26,7 +29,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">19</property>
@@ -51,7 +53,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">17</property>
@@ -66,7 +67,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">16</property>
@@ -81,7 +81,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">15</property>
@@ -96,7 +95,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">14</property>
@@ -111,7 +109,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">13</property>
@@ -126,7 +123,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">12</property>
@@ -141,7 +137,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">11</property>
@@ -156,7 +151,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">10</property>
@@ -171,7 +165,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">9</property>
@@ -186,7 +179,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">8</property>
@@ -201,7 +193,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">7</property>
@@ -216,7 +207,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">6</property>
@@ -231,7 +221,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">5</property>
@@ -246,7 +235,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">4</property>
@@ -261,7 +249,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">3</property>
@@ -276,7 +263,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">2</property>
@@ -291,7 +277,6 @@
                 <property name="use_underline">True</property>
                 <property name="response_id">0</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_ui"/>
               </widget>
               <packing>
                 <property name="top_attach">1</property>
diff --git a/plugins/TorrentNotification/__init__.py b/plugins/TorrentNotification/__init__.py
index 68ee00597..ccb58a233 100644
--- a/plugins/TorrentNotification/__init__.py
+++ b/plugins/TorrentNotification/__init__.py
@@ -99,7 +99,7 @@ class TorrentNotification:
         else:
             print "there was a problem initializing the pynotify module"
 
-    def configure(self):
+    def configure(self, window):
         import os.path
         try:
             self.glade.get_widget("chk_tray_blink").set_active(self.config.get("enable_tray_blink"))
@@ -113,6 +113,7 @@ class TorrentNotification:
             self.glade.get_widget("chk_sound").set_active(False)
             self.glade.get_widget("sound_path_button").set_filename(os.path.expanduser("~/"))
             self.glade.get_widget("sound_path_button").set_sensitive(False)
+        self.dialog.set_transient_for(window)
         self.dialog.show()
 
     def dialog_ok(self, source):
diff --git a/plugins/TorrentNotification/notification_preferences.glade b/plugins/TorrentNotification/notification_preferences.glade
index 7e9070282..5432e039c 100644
--- a/plugins/TorrentNotification/notification_preferences.glade
+++ b/plugins/TorrentNotification/notification_preferences.glade
@@ -8,6 +8,9 @@
     <property name="default_width">400</property>
     <property name="default_height">150</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
diff --git a/plugins/TorrentPeers/__init__.py b/plugins/TorrentPeers/__init__.py
index 75bd3fae0..365f5eced 100644
--- a/plugins/TorrentPeers/__init__.py
+++ b/plugins/TorrentPeers/__init__.py
@@ -42,6 +42,21 @@ class TorrentPeers:
         print "Loading TorrentPeers plugin..."
         self.manager = core
         self.parent = interface
+        self.config_file = deluge.common.CONFIG_DIR + "/peers.conf"
+        self.config = deluge.pref.Preferences(self.config_file)
+        try:
+            self.config.load()
+        except IOError:
+            # File does not exist
+            pass
+        self.dialog_initialize = True
+        self.glade = gtk.glade.XML(path + "/peers_preferences.glade")
+        self.dialog = self.glade.get_widget("dialog")
+        self.glade.signal_autoconnect({
+                                        'toggle_ui': self.toggle_ui,
+                                        'on_button_cancel_pressed': self.cancel_pressed,
+                                        'on_button_ok_pressed': self.ok_pressed
+                                      })
         treeView = gtk.TreeView()
         scrolledWindow = gtk.ScrolledWindow()
         scrolledWindow.add(treeView)
@@ -55,6 +70,8 @@ class TorrentPeers:
         treeView.show()
         scrolledWindow.show()
         self.tab_peers = PeersTabManager(treeView, self.manager)
+        self.rebuild_view = False
+        self.update_config()
         self.tab_peers.build_peers_view()
 
     def unload(self):
@@ -64,6 +81,59 @@ class TorrentPeers:
             if self.parentNotebook.get_nth_page(page) == self.topWidget:
                 self.parentNotebook.remove_page(page)
                 break
+        self.config.save(self.config_file)
+
+    def configure(self, window):
+        self.dialog_initialize = True
+        try:
+            if self.config.get("enable_flags"):
+                self.glade.get_widget("chk_flags").set_active(True)
+                self.glade.get_widget("radio_18").set_sensitive(True)
+                self.glade.get_widget("radio_25").set_sensitive(True)
+                if self.config.get("size_18"):
+                    self.glade.get_widget("radio_18").set_active(True)
+                    self.glade.get_widget("radio_25").set_active(False)
+                else:
+                    self.glade.get_widget("radio_18").set_active(False)
+                    self.glade.get_widget("radio_25").set_active(True)
+            else:
+                self.glade.get_widget("chk_flags").set_active(False)
+                self.glade.get_widget("radio_18").set_sensitive(False)
+                self.glade.get_widget("radio_25").set_sensitive(False)
+        except:
+            self.glade.get_widget("chk_finished").set_active(False)
+            self.glade.get_widget("radio_18").set_sensitive(False)
+            self.glade.get_widget("radio_25").set_sensitive(False)
+        self.dialog_initialize = False
+        self.dialog.set_transient_for(window)
+        self.dialog.show()
+
+    def update_config(self, rebuild_view=False):
+        if self.config.get("enable_flags"):
+            self.tab_peers.enable_flags()
+            if self.config.get("size_18"):
+                if self.tab_peers.flag_size == "25x15":
+                    self.tab_peers.clear_flag_cache()
+                self.tab_peers.set_flag_size("18x12")
+            else:
+                if self.tab_peers.flag_size == "18x12":
+                    self.tab_peers.clear_flag_cache()
+                self.tab_peers.set_flag_size("25x15")
+        else:
+            self.tab_peers.disable_flags()
+            self.rebuild_view = rebuild_view
+            
+
+    def toggle_ui(self, widget):
+        if not self.dialog_initialize:
+            value = widget.get_active()
+            if widget == self.glade.get_widget("chk_flags"):
+                if value:
+                    self.glade.get_widget("radio_18").set_sensitive(True)
+                    self.glade.get_widget("radio_25").set_sensitive(True)
+                else:
+                    self.glade.get_widget("radio_18").set_sensitive(False)
+                    self.glade.get_widget("radio_25").set_sensitive(False)
 
     def update(self):
         if not self.parent.update_interface:
@@ -81,5 +151,24 @@ class TorrentPeers:
                     self.tab_peers.set_unique_id(unique_id)
                     self.tab_peers.update_peer_store()
                 else:
+                    if self.rebuild_view:
+                        self.tab_peers.clear_peer_store()
+                        self.tab_peers.set_unique_id(unique_id)
+                        self.tab_peers.rebuild_peer_view(self.topWidget)
+                        self.tab_peers.update_peer_store()
+                        self.rebuild_view = False
                     self.tab_peers.update_peer_store()
                 break
+
+    def ok_pressed(self, src):
+        self.dialog.hide()
+        if self.config.get("enable_flags") and not self.glade.get_widget("chk_flags").get_active():
+            rebuild_view = True
+        else:
+            rebuild_view = False
+        self.config.set("enable_flags", self.glade.get_widget("chk_flags").get_active())
+        self.config.set("size_18", self.glade.get_widget("radio_18").get_active())
+        self.update_config(rebuild_view)
+
+    def cancel_pressed(self, src):
+        self.dialog.hide()
diff --git a/plugins/TorrentPeers/tab_peers.py b/plugins/TorrentPeers/tab_peers.py
index 08e225c70..f0b9d5ae1 100644
--- a/plugins/TorrentPeers/tab_peers.py
+++ b/plugins/TorrentPeers/tab_peers.py
@@ -16,6 +16,8 @@ class PeersTabManager(object):
         # in update_torrent_info_widget
         self.peer_store_dict = {}       
         self._cached_flags = {}
+        self.show_flags = None
+        self.flag_size = ""
 
     def clear_peer_store(self):
         self.peer_store.clear()
@@ -25,6 +27,11 @@ class PeersTabManager(object):
     def set_unique_id(self, unique_id):
         self.peer_unique_id = unique_id
 
+    def rebuild_peers_view(self, scrolledWindow):
+        self.peer_view.destroy()
+        self.peer_view = gtk.TreeView()
+        scrolledWindow.add(self.peer_view)
+
     def build_peers_view(self):
         def percent(column, cell, model, iter, data):
             percent = float(model.get_value(iter, data))
@@ -44,16 +51,28 @@ class PeersTabManager(object):
         dgtk.add_func_column(self.peer_view, _("Up Speed"), 
                              dgtk.cell_data_speed, 6)
 
+    def enable_flags(self):
+        self.show_flags = True
+
+    def disable_flags(self):
+        self.show_flags = False
+
+    def clear_flag_cache(self):
+        self._cached_flags = {}
+
+    def set_flag_size(self, size):
+        self.flag_size = size
+
     def get_country_flag_image(self, country):
         flag_image = None
-        if country.isalpha():
+        if country.isalpha() and self.show_flags:
             if country in self._cached_flags:
                 flag_image = self._cached_flags[country]
             else:
                 try:
+                    flag_path = "flags" + self.flag_size + '/' + str(country.lower()) + '.png'
                     flag_image = gtk.gdk.pixbuf_new_from_file(
-                                        common.get_pixmap('flags/%s.png' % 
-                                                          country.lower()))
+                                        common.get_pixmap(flag_path))
                 except gobject.GError:
                     pass
                     
diff --git a/setup.py b/setup.py
index 942abd3ff..9d55ffc39 100644
--- a/setup.py
+++ b/setup.py
@@ -282,7 +282,8 @@ cmdclass = {
 
 data = [('share/deluge/glade',  glob.glob('glade/*.glade')),
         ('share/deluge/pixmaps', glob.glob('pixmaps/*.png')),
-        ('share/deluge/pixmaps/flags', glob.glob('pixmaps/flags/*.png')),
+        ('share/deluge/pixmaps/flags18x12', glob.glob('pixmaps/flags18x12/*.png')),
+        ('share/deluge/pixmaps/flags25x15', glob.glob('pixmaps/flags25x15/*.png')),
         ('share/applications' , ['deluge.desktop']),
         ('share/pixmaps' , ['deluge.png'])]
 
diff --git a/src/dialogs.py b/src/dialogs.py
index a7fdac8b8..58b22e3ef 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -53,7 +53,7 @@ class PreferencesDlg:
         self.preferences = preferences
         self.active_port = str(active_port)
         
-    def show(self, interface):
+    def show(self, interface, window):
         # Load settings into dialog
         try:
             self.glade.get_widget("combo_encin").set_active(self.preferences.get("encin_state"))
@@ -146,6 +146,7 @@ class PreferencesDlg:
         except KeyError:
             pass
         # Now, show the dialog
+        self.dialog.set_transient_for(window)
         self.dialog.show()
 
     def ok_pressed(self, source, interface):
@@ -278,7 +279,8 @@ class MergeDlg:
         self.dialog.set_position(gtk.WIN_POS_CENTER)
         self.dialog.set_icon_from_file(common.get_pixmap("deluge32.png"))
     
-    def show(self):
+    def show(self, window):
+        self.dialog.set_transient_for(window)
         self.dialog.show()
         r = self.dialog.run()
         self.dialog.hide()
@@ -299,10 +301,10 @@ class FilesDlg:
         self.files_manager.build_file_view()
         self.files_manager.prepare_file_store()
     
-    def show(self):
+    def show(self, window):
         #clear private setting
         self.glade.get_widget("chk_setpriv").set_active(False)
-        
+        self.dialog.set_transient_for(window)
         self.dialog.show()
         r = self.dialog.run()
         self.dialog.hide()
@@ -337,7 +339,7 @@ class PluginDlg:
         self.glade.signal_autoconnect(signals)
         self.plugins = plugins
 
-    def show(self):
+    def show(self, window):
         self.store.clear()
         for plugin in self.plugins.get_available_plugins():
             #print plugin
@@ -347,6 +349,7 @@ class PluginDlg:
                 self.store.append( (plugin, False) )
         self.glade.get_widget("plugin_text").get_buffer().set_text("")
         self.glade.get_widget("plugin_conf").set_sensitive(False)
+        self.dialog.set_transient_for(window)
         self.dialog.show()
 
     def close_pressed(self, source):
@@ -389,7 +392,7 @@ class PluginDlg:
     def plugin_pref(self, widget=None):
         (model, plugin_iter) = self.view.get_selection().get_selected()
         plugin_name = self.store.get_value(plugin_iter, 0)
-        self.plugins.configure_plugin(plugin_name)
+        self.plugins.configure_plugin(plugin_name, self.dialog)
 
 
 def show_about_dialog(parent=None):
diff --git a/src/interface.py b/src/interface.py
index daf7bbb6d..ec241dde2 100644
--- a/src/interface.py
+++ b/src/interface.py
@@ -574,7 +574,7 @@ class DelugeGTK:
         
         unique_id = model.get_value(model.get_iter(path), 0)
         self.update_torrent_info_widget(unique_id)
-        
+        self.plugins.update_active_plugins()
         return True
     
     def torrent_view_clicked(self, widget, event):
@@ -639,7 +639,7 @@ class DelugeGTK:
         active_port = self.manager.get_state()['port']
         preferences_dialog = dialogs.PreferencesDlg(self.config, active_port)
         # Only apply the prefs if the user pressed OK in the prefs dialog
-        preferences_dialog.show(self)
+        preferences_dialog.show(self, self.window)
 
     def show_preferences_dialog_clicked(self, arg=None):
         if self.config.get("lock_tray") == True:
@@ -649,7 +649,7 @@ class DelugeGTK:
     
     def show_plugin_dialog_clicked(self, arg=None):
         plugin_dialog = dialogs.PluginDlg(self.plugins)
-        plugin_dialog.show()
+        plugin_dialog.show(self.window)
     
     def apply_prefs(self):
         # Show tray icon if necessary
@@ -1032,7 +1032,7 @@ class DelugeGTK:
             dumped_torrent = self.manager.dump_torrent_file_info(torrent)
             if self.config.get('enable_files_dialog'):
                 files_dialog = dialogs.FilesDlg(dumped_torrent)
-                if files_dialog.show() == 1:
+                if files_dialog.show(self.window) == 1:
                     unique_id = self.manager.add_torrent(torrent, path, 
                                     self.config.get('use_compact_storage'))
                     self.manager.prioritize_files(unique_id, 
@@ -1054,7 +1054,7 @@ class DelugeGTK:
                     break
             if is_duplicate:
                 merge_dialog = dialogs.MergeDlg()
-                if merge_dialog.show() == 1:
+                if merge_dialog.show(self.window) == 1:
                     new_trackers_as_list = self.manager.dump_trackers(torrent).replace(' ','').splitlines(True)
                     original_trackers_as_list = self.manager.get_trackers(unique_id).replace(' ','').splitlines(True)
                     for index in xrange(len(new_trackers_as_list)):
diff --git a/src/plugins.py b/src/plugins.py
index 9c8610901..25cf2b80f 100644
--- a/src/plugins.py
+++ b/src/plugins.py
@@ -90,8 +90,8 @@ class PluginManager:
         else:
             return False
 
-    def configure_plugin(self, name):
-        self.enabled_plugins[name].configure()
+    def configure_plugin(self, name, window):
+        self.enabled_plugins[name].configure(window)
     
     def update_active_plugins(self):
         for name in self.enabled_plugins.keys():