diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index f2df2d858..40f2bf423 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -267,7 +267,6 @@ class TorrentManager(component.Component):
         except RuntimeError, e:
             log.warning("Error adding torrent: %s", e)
         
-        log.debug("after torrent add")  
         if not handle or not handle.is_valid():
             log.debug("torrent handle is invalid!")
             # The torrent was not added to the session
@@ -286,6 +285,9 @@ class TorrentManager(component.Component):
             self.queue.insert(0, torrent.torrent_id)
         else:
             self.queue.insert(queue, torrent.torrent_id)
+        
+        # Set resolve_countries to True
+        handle.resolve_countries(True)
                             
         # Set per-torrent options
         torrent.set_max_connections(options["max_connections_per_torrent"])
diff --git a/deluge/data/pixmaps/flags/FLAGS_LICENCE b/deluge/data/pixmaps/flags/FLAGS_LICENCE
new file mode 100644
index 000000000..368a8fef8
--- /dev/null
+++ b/deluge/data/pixmaps/flags/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/deluge/data/pixmaps/flags/ad.png b/deluge/data/pixmaps/flags/ad.png
new file mode 100644
index 000000000..0d2b04c25
Binary files /dev/null and b/deluge/data/pixmaps/flags/ad.png differ
diff --git a/deluge/data/pixmaps/flags/ae.png b/deluge/data/pixmaps/flags/ae.png
new file mode 100644
index 000000000..885be201e
Binary files /dev/null and b/deluge/data/pixmaps/flags/ae.png differ
diff --git a/deluge/data/pixmaps/flags/af.png b/deluge/data/pixmaps/flags/af.png
new file mode 100644
index 000000000..d59b3a6dd
Binary files /dev/null and b/deluge/data/pixmaps/flags/af.png differ
diff --git a/deluge/data/pixmaps/flags/ag.png b/deluge/data/pixmaps/flags/ag.png
new file mode 100644
index 000000000..20440ba20
Binary files /dev/null and b/deluge/data/pixmaps/flags/ag.png differ
diff --git a/deluge/data/pixmaps/flags/ai.png b/deluge/data/pixmaps/flags/ai.png
new file mode 100644
index 000000000..c71ec8310
Binary files /dev/null and b/deluge/data/pixmaps/flags/ai.png differ
diff --git a/deluge/data/pixmaps/flags/al.png b/deluge/data/pixmaps/flags/al.png
new file mode 100644
index 000000000..d37e44ed0
Binary files /dev/null and b/deluge/data/pixmaps/flags/al.png differ
diff --git a/deluge/data/pixmaps/flags/am.png b/deluge/data/pixmaps/flags/am.png
new file mode 100644
index 000000000..043ec6728
Binary files /dev/null and b/deluge/data/pixmaps/flags/am.png differ
diff --git a/deluge/data/pixmaps/flags/an.png b/deluge/data/pixmaps/flags/an.png
new file mode 100644
index 000000000..9ede9b732
Binary files /dev/null and b/deluge/data/pixmaps/flags/an.png differ
diff --git a/deluge/data/pixmaps/flags/ao.png b/deluge/data/pixmaps/flags/ao.png
new file mode 100644
index 000000000..6b5e475c4
Binary files /dev/null and b/deluge/data/pixmaps/flags/ao.png differ
diff --git a/deluge/data/pixmaps/flags/aq.png b/deluge/data/pixmaps/flags/aq.png
new file mode 100644
index 000000000..f2144987b
Binary files /dev/null and b/deluge/data/pixmaps/flags/aq.png differ
diff --git a/deluge/data/pixmaps/flags/ar.png b/deluge/data/pixmaps/flags/ar.png
new file mode 100644
index 000000000..913bdb9fa
Binary files /dev/null and b/deluge/data/pixmaps/flags/ar.png differ
diff --git a/deluge/data/pixmaps/flags/as.png b/deluge/data/pixmaps/flags/as.png
new file mode 100644
index 000000000..5e6b4cdca
Binary files /dev/null and b/deluge/data/pixmaps/flags/as.png differ
diff --git a/deluge/data/pixmaps/flags/at.png b/deluge/data/pixmaps/flags/at.png
new file mode 100644
index 000000000..ee928f171
Binary files /dev/null and b/deluge/data/pixmaps/flags/at.png differ
diff --git a/deluge/data/pixmaps/flags/au.png b/deluge/data/pixmaps/flags/au.png
new file mode 100644
index 000000000..422598a68
Binary files /dev/null and b/deluge/data/pixmaps/flags/au.png differ
diff --git a/deluge/data/pixmaps/flags/aw.png b/deluge/data/pixmaps/flags/aw.png
new file mode 100644
index 000000000..68c9c9864
Binary files /dev/null and b/deluge/data/pixmaps/flags/aw.png differ
diff --git a/deluge/data/pixmaps/flags/ax.png b/deluge/data/pixmaps/flags/ax.png
new file mode 100644
index 000000000..6b834b442
Binary files /dev/null and b/deluge/data/pixmaps/flags/ax.png differ
diff --git a/deluge/data/pixmaps/flags/az.png b/deluge/data/pixmaps/flags/az.png
new file mode 100644
index 000000000..c1271f2ed
Binary files /dev/null and b/deluge/data/pixmaps/flags/az.png differ
diff --git a/deluge/data/pixmaps/flags/ba.png b/deluge/data/pixmaps/flags/ba.png
new file mode 100644
index 000000000..f4daa7b52
Binary files /dev/null and b/deluge/data/pixmaps/flags/ba.png differ
diff --git a/deluge/data/pixmaps/flags/bb.png b/deluge/data/pixmaps/flags/bb.png
new file mode 100644
index 000000000..bebfc7a66
Binary files /dev/null and b/deluge/data/pixmaps/flags/bb.png differ
diff --git a/deluge/data/pixmaps/flags/bd.png b/deluge/data/pixmaps/flags/bd.png
new file mode 100644
index 000000000..a72670a08
Binary files /dev/null and b/deluge/data/pixmaps/flags/bd.png differ
diff --git a/deluge/data/pixmaps/flags/be.png b/deluge/data/pixmaps/flags/be.png
new file mode 100644
index 000000000..e94e32cce
Binary files /dev/null and b/deluge/data/pixmaps/flags/be.png differ
diff --git a/deluge/data/pixmaps/flags/bf.png b/deluge/data/pixmaps/flags/bf.png
new file mode 100644
index 000000000..cd51c286f
Binary files /dev/null and b/deluge/data/pixmaps/flags/bf.png differ
diff --git a/deluge/data/pixmaps/flags/bg.png b/deluge/data/pixmaps/flags/bg.png
new file mode 100644
index 000000000..28544ef15
Binary files /dev/null and b/deluge/data/pixmaps/flags/bg.png differ
diff --git a/deluge/data/pixmaps/flags/bh.png b/deluge/data/pixmaps/flags/bh.png
new file mode 100644
index 000000000..5cee8eec3
Binary files /dev/null and b/deluge/data/pixmaps/flags/bh.png differ
diff --git a/deluge/data/pixmaps/flags/bi.png b/deluge/data/pixmaps/flags/bi.png
new file mode 100644
index 000000000..d3ff9476f
Binary files /dev/null and b/deluge/data/pixmaps/flags/bi.png differ
diff --git a/deluge/data/pixmaps/flags/bj.png b/deluge/data/pixmaps/flags/bj.png
new file mode 100644
index 000000000..010bc3579
Binary files /dev/null and b/deluge/data/pixmaps/flags/bj.png differ
diff --git a/deluge/data/pixmaps/flags/bm.png b/deluge/data/pixmaps/flags/bm.png
new file mode 100644
index 000000000..8f282aa27
Binary files /dev/null and b/deluge/data/pixmaps/flags/bm.png differ
diff --git a/deluge/data/pixmaps/flags/bn.png b/deluge/data/pixmaps/flags/bn.png
new file mode 100644
index 000000000..f1272b99d
Binary files /dev/null and b/deluge/data/pixmaps/flags/bn.png differ
diff --git a/deluge/data/pixmaps/flags/bo.png b/deluge/data/pixmaps/flags/bo.png
new file mode 100644
index 000000000..dcb2303aa
Binary files /dev/null and b/deluge/data/pixmaps/flags/bo.png differ
diff --git a/deluge/data/pixmaps/flags/br.png b/deluge/data/pixmaps/flags/br.png
new file mode 100644
index 000000000..38f81c4aa
Binary files /dev/null and b/deluge/data/pixmaps/flags/br.png differ
diff --git a/deluge/data/pixmaps/flags/bs.png b/deluge/data/pixmaps/flags/bs.png
new file mode 100644
index 000000000..d1708dda7
Binary files /dev/null and b/deluge/data/pixmaps/flags/bs.png differ
diff --git a/deluge/data/pixmaps/flags/bt.png b/deluge/data/pixmaps/flags/bt.png
new file mode 100644
index 000000000..d39c1fc06
Binary files /dev/null and b/deluge/data/pixmaps/flags/bt.png differ
diff --git a/deluge/data/pixmaps/flags/bv.png b/deluge/data/pixmaps/flags/bv.png
new file mode 100644
index 000000000..bac14bc40
Binary files /dev/null and b/deluge/data/pixmaps/flags/bv.png differ
diff --git a/deluge/data/pixmaps/flags/bw.png b/deluge/data/pixmaps/flags/bw.png
new file mode 100644
index 000000000..b372b23f8
Binary files /dev/null and b/deluge/data/pixmaps/flags/bw.png differ
diff --git a/deluge/data/pixmaps/flags/by.png b/deluge/data/pixmaps/flags/by.png
new file mode 100644
index 000000000..e217a8295
Binary files /dev/null and b/deluge/data/pixmaps/flags/by.png differ
diff --git a/deluge/data/pixmaps/flags/bz.png b/deluge/data/pixmaps/flags/bz.png
new file mode 100644
index 000000000..87e7e76f9
Binary files /dev/null and b/deluge/data/pixmaps/flags/bz.png differ
diff --git a/deluge/data/pixmaps/flags/ca.png b/deluge/data/pixmaps/flags/ca.png
new file mode 100644
index 000000000..182b51e3a
Binary files /dev/null and b/deluge/data/pixmaps/flags/ca.png differ
diff --git a/deluge/data/pixmaps/flags/cc.png b/deluge/data/pixmaps/flags/cc.png
new file mode 100644
index 000000000..82310fa87
Binary files /dev/null and b/deluge/data/pixmaps/flags/cc.png differ
diff --git a/deluge/data/pixmaps/flags/cd.png b/deluge/data/pixmaps/flags/cd.png
new file mode 100644
index 000000000..e555370eb
Binary files /dev/null and b/deluge/data/pixmaps/flags/cd.png differ
diff --git a/deluge/data/pixmaps/flags/cf.png b/deluge/data/pixmaps/flags/cf.png
new file mode 100644
index 000000000..0e797cc5c
Binary files /dev/null and b/deluge/data/pixmaps/flags/cf.png differ
diff --git a/deluge/data/pixmaps/flags/cg.png b/deluge/data/pixmaps/flags/cg.png
new file mode 100644
index 000000000..83ecf4aa0
Binary files /dev/null and b/deluge/data/pixmaps/flags/cg.png differ
diff --git a/deluge/data/pixmaps/flags/ch.png b/deluge/data/pixmaps/flags/ch.png
new file mode 100644
index 000000000..47af5323c
Binary files /dev/null and b/deluge/data/pixmaps/flags/ch.png differ
diff --git a/deluge/data/pixmaps/flags/ci.png b/deluge/data/pixmaps/flags/ci.png
new file mode 100644
index 000000000..c15d564bb
Binary files /dev/null and b/deluge/data/pixmaps/flags/ci.png differ
diff --git a/deluge/data/pixmaps/flags/ck.png b/deluge/data/pixmaps/flags/ck.png
new file mode 100644
index 000000000..9eaf66ceb
Binary files /dev/null and b/deluge/data/pixmaps/flags/ck.png differ
diff --git a/deluge/data/pixmaps/flags/cl.png b/deluge/data/pixmaps/flags/cl.png
new file mode 100644
index 000000000..a15e5a910
Binary files /dev/null and b/deluge/data/pixmaps/flags/cl.png differ
diff --git a/deluge/data/pixmaps/flags/cm.png b/deluge/data/pixmaps/flags/cm.png
new file mode 100644
index 000000000..633480892
Binary files /dev/null and b/deluge/data/pixmaps/flags/cm.png differ
diff --git a/deluge/data/pixmaps/flags/cn.png b/deluge/data/pixmaps/flags/cn.png
new file mode 100644
index 000000000..cfb61ee32
Binary files /dev/null and b/deluge/data/pixmaps/flags/cn.png differ
diff --git a/deluge/data/pixmaps/flags/co.png b/deluge/data/pixmaps/flags/co.png
new file mode 100644
index 000000000..c68ade012
Binary files /dev/null and b/deluge/data/pixmaps/flags/co.png differ
diff --git a/deluge/data/pixmaps/flags/cr.png b/deluge/data/pixmaps/flags/cr.png
new file mode 100644
index 000000000..b9c89a01c
Binary files /dev/null and b/deluge/data/pixmaps/flags/cr.png differ
diff --git a/deluge/data/pixmaps/flags/cs.png b/deluge/data/pixmaps/flags/cs.png
new file mode 100644
index 000000000..9355b9329
Binary files /dev/null and b/deluge/data/pixmaps/flags/cs.png differ
diff --git a/deluge/data/pixmaps/flags/cu.png b/deluge/data/pixmaps/flags/cu.png
new file mode 100644
index 000000000..f9abb7102
Binary files /dev/null and b/deluge/data/pixmaps/flags/cu.png differ
diff --git a/deluge/data/pixmaps/flags/cv.png b/deluge/data/pixmaps/flags/cv.png
new file mode 100644
index 000000000..df1d52588
Binary files /dev/null and b/deluge/data/pixmaps/flags/cv.png differ
diff --git a/deluge/data/pixmaps/flags/cx.png b/deluge/data/pixmaps/flags/cx.png
new file mode 100644
index 000000000..e1978521c
Binary files /dev/null and b/deluge/data/pixmaps/flags/cx.png differ
diff --git a/deluge/data/pixmaps/flags/cy.png b/deluge/data/pixmaps/flags/cy.png
new file mode 100644
index 000000000..564232b35
Binary files /dev/null and b/deluge/data/pixmaps/flags/cy.png differ
diff --git a/deluge/data/pixmaps/flags/cz.png b/deluge/data/pixmaps/flags/cz.png
new file mode 100644
index 000000000..dcc14c6c8
Binary files /dev/null and b/deluge/data/pixmaps/flags/cz.png differ
diff --git a/deluge/data/pixmaps/flags/de.png b/deluge/data/pixmaps/flags/de.png
new file mode 100644
index 000000000..8c688c9c2
Binary files /dev/null and b/deluge/data/pixmaps/flags/de.png differ
diff --git a/deluge/data/pixmaps/flags/dj.png b/deluge/data/pixmaps/flags/dj.png
new file mode 100644
index 000000000..a9b2adf70
Binary files /dev/null and b/deluge/data/pixmaps/flags/dj.png differ
diff --git a/deluge/data/pixmaps/flags/dk.png b/deluge/data/pixmaps/flags/dk.png
new file mode 100644
index 000000000..e73bcee24
Binary files /dev/null and b/deluge/data/pixmaps/flags/dk.png differ
diff --git a/deluge/data/pixmaps/flags/dm.png b/deluge/data/pixmaps/flags/dm.png
new file mode 100644
index 000000000..31fa4cd1d
Binary files /dev/null and b/deluge/data/pixmaps/flags/dm.png differ
diff --git a/deluge/data/pixmaps/flags/do.png b/deluge/data/pixmaps/flags/do.png
new file mode 100644
index 000000000..818b2ce30
Binary files /dev/null and b/deluge/data/pixmaps/flags/do.png differ
diff --git a/deluge/data/pixmaps/flags/dz.png b/deluge/data/pixmaps/flags/dz.png
new file mode 100644
index 000000000..246c73c3e
Binary files /dev/null and b/deluge/data/pixmaps/flags/dz.png differ
diff --git a/deluge/data/pixmaps/flags/ec.png b/deluge/data/pixmaps/flags/ec.png
new file mode 100644
index 000000000..febddf840
Binary files /dev/null and b/deluge/data/pixmaps/flags/ec.png differ
diff --git a/deluge/data/pixmaps/flags/ee.png b/deluge/data/pixmaps/flags/ee.png
new file mode 100644
index 000000000..f6e109f51
Binary files /dev/null and b/deluge/data/pixmaps/flags/ee.png differ
diff --git a/deluge/data/pixmaps/flags/eg.png b/deluge/data/pixmaps/flags/eg.png
new file mode 100644
index 000000000..6c32efbc6
Binary files /dev/null and b/deluge/data/pixmaps/flags/eg.png differ
diff --git a/deluge/data/pixmaps/flags/eh.png b/deluge/data/pixmaps/flags/eh.png
new file mode 100644
index 000000000..fe0918685
Binary files /dev/null and b/deluge/data/pixmaps/flags/eh.png differ
diff --git a/deluge/data/pixmaps/flags/er.png b/deluge/data/pixmaps/flags/er.png
new file mode 100644
index 000000000..a91ef3f8b
Binary files /dev/null and b/deluge/data/pixmaps/flags/er.png differ
diff --git a/deluge/data/pixmaps/flags/es.png b/deluge/data/pixmaps/flags/es.png
new file mode 100644
index 000000000..bfe7b69c4
Binary files /dev/null and b/deluge/data/pixmaps/flags/es.png differ
diff --git a/deluge/data/pixmaps/flags/et.png b/deluge/data/pixmaps/flags/et.png
new file mode 100644
index 000000000..0b642741d
Binary files /dev/null and b/deluge/data/pixmaps/flags/et.png differ
diff --git a/deluge/data/pixmaps/flags/fi.png b/deluge/data/pixmaps/flags/fi.png
new file mode 100644
index 000000000..8637023f8
Binary files /dev/null and b/deluge/data/pixmaps/flags/fi.png differ
diff --git a/deluge/data/pixmaps/flags/fj.png b/deluge/data/pixmaps/flags/fj.png
new file mode 100644
index 000000000..0aab514ab
Binary files /dev/null and b/deluge/data/pixmaps/flags/fj.png differ
diff --git a/deluge/data/pixmaps/flags/fk.png b/deluge/data/pixmaps/flags/fk.png
new file mode 100644
index 000000000..2b721f96d
Binary files /dev/null and b/deluge/data/pixmaps/flags/fk.png differ
diff --git a/deluge/data/pixmaps/flags/fm.png b/deluge/data/pixmaps/flags/fm.png
new file mode 100644
index 000000000..1a910645a
Binary files /dev/null and b/deluge/data/pixmaps/flags/fm.png differ
diff --git a/deluge/data/pixmaps/flags/fo.png b/deluge/data/pixmaps/flags/fo.png
new file mode 100644
index 000000000..4bf6eddfb
Binary files /dev/null and b/deluge/data/pixmaps/flags/fo.png differ
diff --git a/deluge/data/pixmaps/flags/fr.png b/deluge/data/pixmaps/flags/fr.png
new file mode 100644
index 000000000..d4616ed1f
Binary files /dev/null and b/deluge/data/pixmaps/flags/fr.png differ
diff --git a/deluge/data/pixmaps/flags/fx.png b/deluge/data/pixmaps/flags/fx.png
new file mode 100644
index 000000000..d4616ed1f
Binary files /dev/null and b/deluge/data/pixmaps/flags/fx.png differ
diff --git a/deluge/data/pixmaps/flags/ga.png b/deluge/data/pixmaps/flags/ga.png
new file mode 100644
index 000000000..1f1788cd3
Binary files /dev/null and b/deluge/data/pixmaps/flags/ga.png differ
diff --git a/deluge/data/pixmaps/flags/gb.png b/deluge/data/pixmaps/flags/gb.png
new file mode 100644
index 000000000..e0ce9a66a
Binary files /dev/null and b/deluge/data/pixmaps/flags/gb.png differ
diff --git a/deluge/data/pixmaps/flags/gd.png b/deluge/data/pixmaps/flags/gd.png
new file mode 100644
index 000000000..70467ac36
Binary files /dev/null and b/deluge/data/pixmaps/flags/gd.png differ
diff --git a/deluge/data/pixmaps/flags/ge.png b/deluge/data/pixmaps/flags/ge.png
new file mode 100644
index 000000000..11260b6bc
Binary files /dev/null and b/deluge/data/pixmaps/flags/ge.png differ
diff --git a/deluge/data/pixmaps/flags/gf.png b/deluge/data/pixmaps/flags/gf.png
new file mode 100644
index 000000000..d4616ed1f
Binary files /dev/null and b/deluge/data/pixmaps/flags/gf.png differ
diff --git a/deluge/data/pixmaps/flags/gg.png b/deluge/data/pixmaps/flags/gg.png
new file mode 100644
index 000000000..20252f2be
Binary files /dev/null and b/deluge/data/pixmaps/flags/gg.png differ
diff --git a/deluge/data/pixmaps/flags/gh.png b/deluge/data/pixmaps/flags/gh.png
new file mode 100644
index 000000000..3f3b980fb
Binary files /dev/null and b/deluge/data/pixmaps/flags/gh.png differ
diff --git a/deluge/data/pixmaps/flags/gi.png b/deluge/data/pixmaps/flags/gi.png
new file mode 100644
index 000000000..54d6eb103
Binary files /dev/null and b/deluge/data/pixmaps/flags/gi.png differ
diff --git a/deluge/data/pixmaps/flags/gl.png b/deluge/data/pixmaps/flags/gl.png
new file mode 100644
index 000000000..ef5ead591
Binary files /dev/null and b/deluge/data/pixmaps/flags/gl.png differ
diff --git a/deluge/data/pixmaps/flags/gm.png b/deluge/data/pixmaps/flags/gm.png
new file mode 100644
index 000000000..95cce12dd
Binary files /dev/null and b/deluge/data/pixmaps/flags/gm.png differ
diff --git a/deluge/data/pixmaps/flags/gn.png b/deluge/data/pixmaps/flags/gn.png
new file mode 100644
index 000000000..5f8bba11b
Binary files /dev/null and b/deluge/data/pixmaps/flags/gn.png differ
diff --git a/deluge/data/pixmaps/flags/gp.png b/deluge/data/pixmaps/flags/gp.png
new file mode 100644
index 000000000..d4616ed1f
Binary files /dev/null and b/deluge/data/pixmaps/flags/gp.png differ
diff --git a/deluge/data/pixmaps/flags/gq.png b/deluge/data/pixmaps/flags/gq.png
new file mode 100644
index 000000000..2cbd4a89a
Binary files /dev/null and b/deluge/data/pixmaps/flags/gq.png differ
diff --git a/deluge/data/pixmaps/flags/gr.png b/deluge/data/pixmaps/flags/gr.png
new file mode 100644
index 000000000..a5b70ad2d
Binary files /dev/null and b/deluge/data/pixmaps/flags/gr.png differ
diff --git a/deluge/data/pixmaps/flags/gs.png b/deluge/data/pixmaps/flags/gs.png
new file mode 100644
index 000000000..770617135
Binary files /dev/null and b/deluge/data/pixmaps/flags/gs.png differ
diff --git a/deluge/data/pixmaps/flags/gt.png b/deluge/data/pixmaps/flags/gt.png
new file mode 100644
index 000000000..ce82c343a
Binary files /dev/null and b/deluge/data/pixmaps/flags/gt.png differ
diff --git a/deluge/data/pixmaps/flags/gu.png b/deluge/data/pixmaps/flags/gu.png
new file mode 100644
index 000000000..1d2dc8731
Binary files /dev/null and b/deluge/data/pixmaps/flags/gu.png differ
diff --git a/deluge/data/pixmaps/flags/gw.png b/deluge/data/pixmaps/flags/gw.png
new file mode 100644
index 000000000..5e70972a4
Binary files /dev/null and b/deluge/data/pixmaps/flags/gw.png differ
diff --git a/deluge/data/pixmaps/flags/gy.png b/deluge/data/pixmaps/flags/gy.png
new file mode 100644
index 000000000..ae7c645dd
Binary files /dev/null and b/deluge/data/pixmaps/flags/gy.png differ
diff --git a/deluge/data/pixmaps/flags/hk.png b/deluge/data/pixmaps/flags/hk.png
new file mode 100644
index 000000000..0bc072052
Binary files /dev/null and b/deluge/data/pixmaps/flags/hk.png differ
diff --git a/deluge/data/pixmaps/flags/hm.png b/deluge/data/pixmaps/flags/hm.png
new file mode 100644
index 000000000..214924d27
Binary files /dev/null and b/deluge/data/pixmaps/flags/hm.png differ
diff --git a/deluge/data/pixmaps/flags/hn.png b/deluge/data/pixmaps/flags/hn.png
new file mode 100644
index 000000000..de08a367b
Binary files /dev/null and b/deluge/data/pixmaps/flags/hn.png differ
diff --git a/deluge/data/pixmaps/flags/hr.png b/deluge/data/pixmaps/flags/hr.png
new file mode 100644
index 000000000..69eeed334
Binary files /dev/null and b/deluge/data/pixmaps/flags/hr.png differ
diff --git a/deluge/data/pixmaps/flags/ht.png b/deluge/data/pixmaps/flags/ht.png
new file mode 100644
index 000000000..8369277b7
Binary files /dev/null and b/deluge/data/pixmaps/flags/ht.png differ
diff --git a/deluge/data/pixmaps/flags/hu.png b/deluge/data/pixmaps/flags/hu.png
new file mode 100644
index 000000000..0d492a04d
Binary files /dev/null and b/deluge/data/pixmaps/flags/hu.png differ
diff --git a/deluge/data/pixmaps/flags/id.png b/deluge/data/pixmaps/flags/id.png
new file mode 100644
index 000000000..14e91f92a
Binary files /dev/null and b/deluge/data/pixmaps/flags/id.png differ
diff --git a/deluge/data/pixmaps/flags/ie.png b/deluge/data/pixmaps/flags/ie.png
new file mode 100644
index 000000000..839c3106f
Binary files /dev/null and b/deluge/data/pixmaps/flags/ie.png differ
diff --git a/deluge/data/pixmaps/flags/il.png b/deluge/data/pixmaps/flags/il.png
new file mode 100644
index 000000000..31cf02dec
Binary files /dev/null and b/deluge/data/pixmaps/flags/il.png differ
diff --git a/deluge/data/pixmaps/flags/in.png b/deluge/data/pixmaps/flags/in.png
new file mode 100644
index 000000000..92737dbda
Binary files /dev/null and b/deluge/data/pixmaps/flags/in.png differ
diff --git a/deluge/data/pixmaps/flags/io.png b/deluge/data/pixmaps/flags/io.png
new file mode 100644
index 000000000..9ece8abe7
Binary files /dev/null and b/deluge/data/pixmaps/flags/io.png differ
diff --git a/deluge/data/pixmaps/flags/iq.png b/deluge/data/pixmaps/flags/iq.png
new file mode 100644
index 000000000..f73741913
Binary files /dev/null and b/deluge/data/pixmaps/flags/iq.png differ
diff --git a/deluge/data/pixmaps/flags/ir.png b/deluge/data/pixmaps/flags/ir.png
new file mode 100644
index 000000000..e81a0f677
Binary files /dev/null and b/deluge/data/pixmaps/flags/ir.png differ
diff --git a/deluge/data/pixmaps/flags/is.png b/deluge/data/pixmaps/flags/is.png
new file mode 100644
index 000000000..8bf828728
Binary files /dev/null and b/deluge/data/pixmaps/flags/is.png differ
diff --git a/deluge/data/pixmaps/flags/it.png b/deluge/data/pixmaps/flags/it.png
new file mode 100644
index 000000000..e0cab7297
Binary files /dev/null and b/deluge/data/pixmaps/flags/it.png differ
diff --git a/deluge/data/pixmaps/flags/je.png b/deluge/data/pixmaps/flags/je.png
new file mode 100644
index 000000000..a66213330
Binary files /dev/null and b/deluge/data/pixmaps/flags/je.png differ
diff --git a/deluge/data/pixmaps/flags/jm.png b/deluge/data/pixmaps/flags/jm.png
new file mode 100644
index 000000000..f3021b5f7
Binary files /dev/null and b/deluge/data/pixmaps/flags/jm.png differ
diff --git a/deluge/data/pixmaps/flags/jo.png b/deluge/data/pixmaps/flags/jo.png
new file mode 100644
index 000000000..e39b14e05
Binary files /dev/null and b/deluge/data/pixmaps/flags/jo.png differ
diff --git a/deluge/data/pixmaps/flags/jp.png b/deluge/data/pixmaps/flags/jp.png
new file mode 100644
index 000000000..506a5356e
Binary files /dev/null and b/deluge/data/pixmaps/flags/jp.png differ
diff --git a/deluge/data/pixmaps/flags/ke.png b/deluge/data/pixmaps/flags/ke.png
new file mode 100644
index 000000000..ffb150afd
Binary files /dev/null and b/deluge/data/pixmaps/flags/ke.png differ
diff --git a/deluge/data/pixmaps/flags/kg.png b/deluge/data/pixmaps/flags/kg.png
new file mode 100644
index 000000000..aceeb6c61
Binary files /dev/null and b/deluge/data/pixmaps/flags/kg.png differ
diff --git a/deluge/data/pixmaps/flags/kh.png b/deluge/data/pixmaps/flags/kh.png
new file mode 100644
index 000000000..c64d08aa9
Binary files /dev/null and b/deluge/data/pixmaps/flags/kh.png differ
diff --git a/deluge/data/pixmaps/flags/ki.png b/deluge/data/pixmaps/flags/ki.png
new file mode 100644
index 000000000..510e344bb
Binary files /dev/null and b/deluge/data/pixmaps/flags/ki.png differ
diff --git a/deluge/data/pixmaps/flags/km.png b/deluge/data/pixmaps/flags/km.png
new file mode 100644
index 000000000..f0aab2ea7
Binary files /dev/null and b/deluge/data/pixmaps/flags/km.png differ
diff --git a/deluge/data/pixmaps/flags/kn.png b/deluge/data/pixmaps/flags/kn.png
new file mode 100644
index 000000000..887c87cfd
Binary files /dev/null and b/deluge/data/pixmaps/flags/kn.png differ
diff --git a/deluge/data/pixmaps/flags/kp.png b/deluge/data/pixmaps/flags/kp.png
new file mode 100644
index 000000000..653e82f63
Binary files /dev/null and b/deluge/data/pixmaps/flags/kp.png differ
diff --git a/deluge/data/pixmaps/flags/kr.png b/deluge/data/pixmaps/flags/kr.png
new file mode 100644
index 000000000..ac8276643
Binary files /dev/null and b/deluge/data/pixmaps/flags/kr.png differ
diff --git a/deluge/data/pixmaps/flags/kw.png b/deluge/data/pixmaps/flags/kw.png
new file mode 100644
index 000000000..a4c27ffd5
Binary files /dev/null and b/deluge/data/pixmaps/flags/kw.png differ
diff --git a/deluge/data/pixmaps/flags/ky.png b/deluge/data/pixmaps/flags/ky.png
new file mode 100644
index 000000000..c7f14c4dd
Binary files /dev/null and b/deluge/data/pixmaps/flags/ky.png differ
diff --git a/deluge/data/pixmaps/flags/kz.png b/deluge/data/pixmaps/flags/kz.png
new file mode 100644
index 000000000..38f75b20a
Binary files /dev/null and b/deluge/data/pixmaps/flags/kz.png differ
diff --git a/deluge/data/pixmaps/flags/la.png b/deluge/data/pixmaps/flags/la.png
new file mode 100644
index 000000000..fd70e0475
Binary files /dev/null and b/deluge/data/pixmaps/flags/la.png differ
diff --git a/deluge/data/pixmaps/flags/lb.png b/deluge/data/pixmaps/flags/lb.png
new file mode 100644
index 000000000..48043644c
Binary files /dev/null and b/deluge/data/pixmaps/flags/lb.png differ
diff --git a/deluge/data/pixmaps/flags/lc.png b/deluge/data/pixmaps/flags/lc.png
new file mode 100644
index 000000000..971b03a70
Binary files /dev/null and b/deluge/data/pixmaps/flags/lc.png differ
diff --git a/deluge/data/pixmaps/flags/li.png b/deluge/data/pixmaps/flags/li.png
new file mode 100644
index 000000000..cd6eb0893
Binary files /dev/null and b/deluge/data/pixmaps/flags/li.png differ
diff --git a/deluge/data/pixmaps/flags/lk.png b/deluge/data/pixmaps/flags/lk.png
new file mode 100644
index 000000000..500c9355f
Binary files /dev/null and b/deluge/data/pixmaps/flags/lk.png differ
diff --git a/deluge/data/pixmaps/flags/lr.png b/deluge/data/pixmaps/flags/lr.png
new file mode 100644
index 000000000..a77998406
Binary files /dev/null and b/deluge/data/pixmaps/flags/lr.png differ
diff --git a/deluge/data/pixmaps/flags/ls.png b/deluge/data/pixmaps/flags/ls.png
new file mode 100644
index 000000000..892bc44df
Binary files /dev/null and b/deluge/data/pixmaps/flags/ls.png differ
diff --git a/deluge/data/pixmaps/flags/lt.png b/deluge/data/pixmaps/flags/lt.png
new file mode 100644
index 000000000..2bd0203a5
Binary files /dev/null and b/deluge/data/pixmaps/flags/lt.png differ
diff --git a/deluge/data/pixmaps/flags/lu.png b/deluge/data/pixmaps/flags/lu.png
new file mode 100644
index 000000000..dab8533cb
Binary files /dev/null and b/deluge/data/pixmaps/flags/lu.png differ
diff --git a/deluge/data/pixmaps/flags/lv.png b/deluge/data/pixmaps/flags/lv.png
new file mode 100644
index 000000000..abba0cd5c
Binary files /dev/null and b/deluge/data/pixmaps/flags/lv.png differ
diff --git a/deluge/data/pixmaps/flags/ly.png b/deluge/data/pixmaps/flags/ly.png
new file mode 100644
index 000000000..7bce7778a
Binary files /dev/null and b/deluge/data/pixmaps/flags/ly.png differ
diff --git a/deluge/data/pixmaps/flags/ma.png b/deluge/data/pixmaps/flags/ma.png
new file mode 100644
index 000000000..c21eef1cc
Binary files /dev/null and b/deluge/data/pixmaps/flags/ma.png differ
diff --git a/deluge/data/pixmaps/flags/mc.png b/deluge/data/pixmaps/flags/mc.png
new file mode 100644
index 000000000..b33762c50
Binary files /dev/null and b/deluge/data/pixmaps/flags/mc.png differ
diff --git a/deluge/data/pixmaps/flags/md.png b/deluge/data/pixmaps/flags/md.png
new file mode 100644
index 000000000..5441949d8
Binary files /dev/null and b/deluge/data/pixmaps/flags/md.png differ
diff --git a/deluge/data/pixmaps/flags/me.png b/deluge/data/pixmaps/flags/me.png
new file mode 100644
index 000000000..7f9ed152a
Binary files /dev/null and b/deluge/data/pixmaps/flags/me.png differ
diff --git a/deluge/data/pixmaps/flags/mg.png b/deluge/data/pixmaps/flags/mg.png
new file mode 100644
index 000000000..5a86b6107
Binary files /dev/null and b/deluge/data/pixmaps/flags/mg.png differ
diff --git a/deluge/data/pixmaps/flags/mh.png b/deluge/data/pixmaps/flags/mh.png
new file mode 100644
index 000000000..7463976dc
Binary files /dev/null and b/deluge/data/pixmaps/flags/mh.png differ
diff --git a/deluge/data/pixmaps/flags/mk.png b/deluge/data/pixmaps/flags/mk.png
new file mode 100644
index 000000000..a981b835a
Binary files /dev/null and b/deluge/data/pixmaps/flags/mk.png differ
diff --git a/deluge/data/pixmaps/flags/ml.png b/deluge/data/pixmaps/flags/ml.png
new file mode 100644
index 000000000..36a632ee0
Binary files /dev/null and b/deluge/data/pixmaps/flags/ml.png differ
diff --git a/deluge/data/pixmaps/flags/mm.png b/deluge/data/pixmaps/flags/mm.png
new file mode 100644
index 000000000..86ecd2c80
Binary files /dev/null and b/deluge/data/pixmaps/flags/mm.png differ
diff --git a/deluge/data/pixmaps/flags/mn.png b/deluge/data/pixmaps/flags/mn.png
new file mode 100644
index 000000000..4f7adc7c8
Binary files /dev/null and b/deluge/data/pixmaps/flags/mn.png differ
diff --git a/deluge/data/pixmaps/flags/mo.png b/deluge/data/pixmaps/flags/mo.png
new file mode 100644
index 000000000..4cba9b407
Binary files /dev/null and b/deluge/data/pixmaps/flags/mo.png differ
diff --git a/deluge/data/pixmaps/flags/mp.png b/deluge/data/pixmaps/flags/mp.png
new file mode 100644
index 000000000..6c782fcb1
Binary files /dev/null and b/deluge/data/pixmaps/flags/mp.png differ
diff --git a/deluge/data/pixmaps/flags/mq.png b/deluge/data/pixmaps/flags/mq.png
new file mode 100644
index 000000000..d4616ed1f
Binary files /dev/null and b/deluge/data/pixmaps/flags/mq.png differ
diff --git a/deluge/data/pixmaps/flags/mr.png b/deluge/data/pixmaps/flags/mr.png
new file mode 100644
index 000000000..1460ab7c4
Binary files /dev/null and b/deluge/data/pixmaps/flags/mr.png differ
diff --git a/deluge/data/pixmaps/flags/ms.png b/deluge/data/pixmaps/flags/ms.png
new file mode 100644
index 000000000..526f512e3
Binary files /dev/null and b/deluge/data/pixmaps/flags/ms.png differ
diff --git a/deluge/data/pixmaps/flags/mt.png b/deluge/data/pixmaps/flags/mt.png
new file mode 100644
index 000000000..611a45933
Binary files /dev/null and b/deluge/data/pixmaps/flags/mt.png differ
diff --git a/deluge/data/pixmaps/flags/mu.png b/deluge/data/pixmaps/flags/mu.png
new file mode 100644
index 000000000..d8b22ccf0
Binary files /dev/null and b/deluge/data/pixmaps/flags/mu.png differ
diff --git a/deluge/data/pixmaps/flags/mv.png b/deluge/data/pixmaps/flags/mv.png
new file mode 100644
index 000000000..0024b864a
Binary files /dev/null and b/deluge/data/pixmaps/flags/mv.png differ
diff --git a/deluge/data/pixmaps/flags/mw.png b/deluge/data/pixmaps/flags/mw.png
new file mode 100644
index 000000000..975fb0a50
Binary files /dev/null and b/deluge/data/pixmaps/flags/mw.png differ
diff --git a/deluge/data/pixmaps/flags/mx.png b/deluge/data/pixmaps/flags/mx.png
new file mode 100644
index 000000000..8b705e4b3
Binary files /dev/null and b/deluge/data/pixmaps/flags/mx.png differ
diff --git a/deluge/data/pixmaps/flags/my.png b/deluge/data/pixmaps/flags/my.png
new file mode 100644
index 000000000..45a827783
Binary files /dev/null and b/deluge/data/pixmaps/flags/my.png differ
diff --git a/deluge/data/pixmaps/flags/mz.png b/deluge/data/pixmaps/flags/mz.png
new file mode 100644
index 000000000..14c7e9c45
Binary files /dev/null and b/deluge/data/pixmaps/flags/mz.png differ
diff --git a/deluge/data/pixmaps/flags/na.png b/deluge/data/pixmaps/flags/na.png
new file mode 100644
index 000000000..64df913b8
Binary files /dev/null and b/deluge/data/pixmaps/flags/na.png differ
diff --git a/deluge/data/pixmaps/flags/nc.png b/deluge/data/pixmaps/flags/nc.png
new file mode 100644
index 000000000..d4616ed1f
Binary files /dev/null and b/deluge/data/pixmaps/flags/nc.png differ
diff --git a/deluge/data/pixmaps/flags/ne.png b/deluge/data/pixmaps/flags/ne.png
new file mode 100644
index 000000000..8e6eb323a
Binary files /dev/null and b/deluge/data/pixmaps/flags/ne.png differ
diff --git a/deluge/data/pixmaps/flags/nf.png b/deluge/data/pixmaps/flags/nf.png
new file mode 100644
index 000000000..1f6e81410
Binary files /dev/null and b/deluge/data/pixmaps/flags/nf.png differ
diff --git a/deluge/data/pixmaps/flags/ng.png b/deluge/data/pixmaps/flags/ng.png
new file mode 100644
index 000000000..46dceb270
Binary files /dev/null and b/deluge/data/pixmaps/flags/ng.png differ
diff --git a/deluge/data/pixmaps/flags/ni.png b/deluge/data/pixmaps/flags/ni.png
new file mode 100644
index 000000000..452706578
Binary files /dev/null and b/deluge/data/pixmaps/flags/ni.png differ
diff --git a/deluge/data/pixmaps/flags/nl.png b/deluge/data/pixmaps/flags/nl.png
new file mode 100644
index 000000000..9f5e06340
Binary files /dev/null and b/deluge/data/pixmaps/flags/nl.png differ
diff --git a/deluge/data/pixmaps/flags/no.png b/deluge/data/pixmaps/flags/no.png
new file mode 100644
index 000000000..bac14bc40
Binary files /dev/null and b/deluge/data/pixmaps/flags/no.png differ
diff --git a/deluge/data/pixmaps/flags/np.png b/deluge/data/pixmaps/flags/np.png
new file mode 100644
index 000000000..7d0261652
Binary files /dev/null and b/deluge/data/pixmaps/flags/np.png differ
diff --git a/deluge/data/pixmaps/flags/nr.png b/deluge/data/pixmaps/flags/nr.png
new file mode 100644
index 000000000..599353a79
Binary files /dev/null and b/deluge/data/pixmaps/flags/nr.png differ
diff --git a/deluge/data/pixmaps/flags/nu.png b/deluge/data/pixmaps/flags/nu.png
new file mode 100644
index 000000000..eafce7b27
Binary files /dev/null and b/deluge/data/pixmaps/flags/nu.png differ
diff --git a/deluge/data/pixmaps/flags/nz.png b/deluge/data/pixmaps/flags/nz.png
new file mode 100644
index 000000000..36a08b14d
Binary files /dev/null and b/deluge/data/pixmaps/flags/nz.png differ
diff --git a/deluge/data/pixmaps/flags/om.png b/deluge/data/pixmaps/flags/om.png
new file mode 100644
index 000000000..13f67d91e
Binary files /dev/null and b/deluge/data/pixmaps/flags/om.png differ
diff --git a/deluge/data/pixmaps/flags/pa.png b/deluge/data/pixmaps/flags/pa.png
new file mode 100644
index 000000000..5d7356cc7
Binary files /dev/null and b/deluge/data/pixmaps/flags/pa.png differ
diff --git a/deluge/data/pixmaps/flags/pe.png b/deluge/data/pixmaps/flags/pe.png
new file mode 100644
index 000000000..913b23a20
Binary files /dev/null and b/deluge/data/pixmaps/flags/pe.png differ
diff --git a/deluge/data/pixmaps/flags/pf.png b/deluge/data/pixmaps/flags/pf.png
new file mode 100644
index 000000000..049a2df3e
Binary files /dev/null and b/deluge/data/pixmaps/flags/pf.png differ
diff --git a/deluge/data/pixmaps/flags/pg.png b/deluge/data/pixmaps/flags/pg.png
new file mode 100644
index 000000000..d70415489
Binary files /dev/null and b/deluge/data/pixmaps/flags/pg.png differ
diff --git a/deluge/data/pixmaps/flags/ph.png b/deluge/data/pixmaps/flags/ph.png
new file mode 100644
index 000000000..f5427019b
Binary files /dev/null and b/deluge/data/pixmaps/flags/ph.png differ
diff --git a/deluge/data/pixmaps/flags/pk.png b/deluge/data/pixmaps/flags/pk.png
new file mode 100644
index 000000000..f644d24ac
Binary files /dev/null and b/deluge/data/pixmaps/flags/pk.png differ
diff --git a/deluge/data/pixmaps/flags/pl.png b/deluge/data/pixmaps/flags/pl.png
new file mode 100644
index 000000000..bacf1fac9
Binary files /dev/null and b/deluge/data/pixmaps/flags/pl.png differ
diff --git a/deluge/data/pixmaps/flags/pm.png b/deluge/data/pixmaps/flags/pm.png
new file mode 100644
index 000000000..d4616ed1f
Binary files /dev/null and b/deluge/data/pixmaps/flags/pm.png differ
diff --git a/deluge/data/pixmaps/flags/pn.png b/deluge/data/pixmaps/flags/pn.png
new file mode 100644
index 000000000..f5743c590
Binary files /dev/null and b/deluge/data/pixmaps/flags/pn.png differ
diff --git a/deluge/data/pixmaps/flags/pr.png b/deluge/data/pixmaps/flags/pr.png
new file mode 100644
index 000000000..88d368020
Binary files /dev/null and b/deluge/data/pixmaps/flags/pr.png differ
diff --git a/deluge/data/pixmaps/flags/ps.png b/deluge/data/pixmaps/flags/ps.png
new file mode 100644
index 000000000..94c651258
Binary files /dev/null and b/deluge/data/pixmaps/flags/ps.png differ
diff --git a/deluge/data/pixmaps/flags/pt.png b/deluge/data/pixmaps/flags/pt.png
new file mode 100644
index 000000000..bc8f3977f
Binary files /dev/null and b/deluge/data/pixmaps/flags/pt.png differ
diff --git a/deluge/data/pixmaps/flags/pw.png b/deluge/data/pixmaps/flags/pw.png
new file mode 100644
index 000000000..6ab9422e2
Binary files /dev/null and b/deluge/data/pixmaps/flags/pw.png differ
diff --git a/deluge/data/pixmaps/flags/py.png b/deluge/data/pixmaps/flags/py.png
new file mode 100644
index 000000000..5ebaaefbc
Binary files /dev/null and b/deluge/data/pixmaps/flags/py.png differ
diff --git a/deluge/data/pixmaps/flags/qa.png b/deluge/data/pixmaps/flags/qa.png
new file mode 100644
index 000000000..71f70e559
Binary files /dev/null and b/deluge/data/pixmaps/flags/qa.png differ
diff --git a/deluge/data/pixmaps/flags/re.png b/deluge/data/pixmaps/flags/re.png
new file mode 100644
index 000000000..d4616ed1f
Binary files /dev/null and b/deluge/data/pixmaps/flags/re.png differ
diff --git a/deluge/data/pixmaps/flags/ro.png b/deluge/data/pixmaps/flags/ro.png
new file mode 100644
index 000000000..cf8e057dd
Binary files /dev/null and b/deluge/data/pixmaps/flags/ro.png differ
diff --git a/deluge/data/pixmaps/flags/rs.png b/deluge/data/pixmaps/flags/rs.png
new file mode 100644
index 000000000..3da1f485a
Binary files /dev/null and b/deluge/data/pixmaps/flags/rs.png differ
diff --git a/deluge/data/pixmaps/flags/ru.png b/deluge/data/pixmaps/flags/ru.png
new file mode 100644
index 000000000..712abb308
Binary files /dev/null and b/deluge/data/pixmaps/flags/ru.png differ
diff --git a/deluge/data/pixmaps/flags/rw.png b/deluge/data/pixmaps/flags/rw.png
new file mode 100644
index 000000000..774d03594
Binary files /dev/null and b/deluge/data/pixmaps/flags/rw.png differ
diff --git a/deluge/data/pixmaps/flags/sa.png b/deluge/data/pixmaps/flags/sa.png
new file mode 100644
index 000000000..470c3eddc
Binary files /dev/null and b/deluge/data/pixmaps/flags/sa.png differ
diff --git a/deluge/data/pixmaps/flags/sb.png b/deluge/data/pixmaps/flags/sb.png
new file mode 100644
index 000000000..fdc0d4bba
Binary files /dev/null and b/deluge/data/pixmaps/flags/sb.png differ
diff --git a/deluge/data/pixmaps/flags/sc.png b/deluge/data/pixmaps/flags/sc.png
new file mode 100644
index 000000000..804ff9840
Binary files /dev/null and b/deluge/data/pixmaps/flags/sc.png differ
diff --git a/deluge/data/pixmaps/flags/sd.png b/deluge/data/pixmaps/flags/sd.png
new file mode 100644
index 000000000..46d235ebf
Binary files /dev/null and b/deluge/data/pixmaps/flags/sd.png differ
diff --git a/deluge/data/pixmaps/flags/se.png b/deluge/data/pixmaps/flags/se.png
new file mode 100644
index 000000000..1e13d4aee
Binary files /dev/null and b/deluge/data/pixmaps/flags/se.png differ
diff --git a/deluge/data/pixmaps/flags/sg.png b/deluge/data/pixmaps/flags/sg.png
new file mode 100644
index 000000000..e51d426c1
Binary files /dev/null and b/deluge/data/pixmaps/flags/sg.png differ
diff --git a/deluge/data/pixmaps/flags/sh.png b/deluge/data/pixmaps/flags/sh.png
new file mode 100644
index 000000000..c696327f6
Binary files /dev/null and b/deluge/data/pixmaps/flags/sh.png differ
diff --git a/deluge/data/pixmaps/flags/si.png b/deluge/data/pixmaps/flags/si.png
new file mode 100644
index 000000000..c278182d1
Binary files /dev/null and b/deluge/data/pixmaps/flags/si.png differ
diff --git a/deluge/data/pixmaps/flags/sj.png b/deluge/data/pixmaps/flags/sj.png
new file mode 100644
index 000000000..bac14bc40
Binary files /dev/null and b/deluge/data/pixmaps/flags/sj.png differ
diff --git a/deluge/data/pixmaps/flags/sk.png b/deluge/data/pixmaps/flags/sk.png
new file mode 100644
index 000000000..2ee304725
Binary files /dev/null and b/deluge/data/pixmaps/flags/sk.png differ
diff --git a/deluge/data/pixmaps/flags/sl.png b/deluge/data/pixmaps/flags/sl.png
new file mode 100644
index 000000000..40d2755de
Binary files /dev/null and b/deluge/data/pixmaps/flags/sl.png differ
diff --git a/deluge/data/pixmaps/flags/sm.png b/deluge/data/pixmaps/flags/sm.png
new file mode 100644
index 000000000..fe0cace00
Binary files /dev/null and b/deluge/data/pixmaps/flags/sm.png differ
diff --git a/deluge/data/pixmaps/flags/sn.png b/deluge/data/pixmaps/flags/sn.png
new file mode 100644
index 000000000..e3edef72c
Binary files /dev/null and b/deluge/data/pixmaps/flags/sn.png differ
diff --git a/deluge/data/pixmaps/flags/so.png b/deluge/data/pixmaps/flags/so.png
new file mode 100644
index 000000000..915c224d4
Binary files /dev/null and b/deluge/data/pixmaps/flags/so.png differ
diff --git a/deluge/data/pixmaps/flags/sr.png b/deluge/data/pixmaps/flags/sr.png
new file mode 100644
index 000000000..8ccf0c1c9
Binary files /dev/null and b/deluge/data/pixmaps/flags/sr.png differ
diff --git a/deluge/data/pixmaps/flags/st.png b/deluge/data/pixmaps/flags/st.png
new file mode 100644
index 000000000..c83b44c5f
Binary files /dev/null and b/deluge/data/pixmaps/flags/st.png differ
diff --git a/deluge/data/pixmaps/flags/sv.png b/deluge/data/pixmaps/flags/sv.png
new file mode 100644
index 000000000..f6e2c2fe5
Binary files /dev/null and b/deluge/data/pixmaps/flags/sv.png differ
diff --git a/deluge/data/pixmaps/flags/sy.png b/deluge/data/pixmaps/flags/sy.png
new file mode 100644
index 000000000..9f2dc3ecb
Binary files /dev/null and b/deluge/data/pixmaps/flags/sy.png differ
diff --git a/deluge/data/pixmaps/flags/sz.png b/deluge/data/pixmaps/flags/sz.png
new file mode 100644
index 000000000..c880f713e
Binary files /dev/null and b/deluge/data/pixmaps/flags/sz.png differ
diff --git a/deluge/data/pixmaps/flags/tc.png b/deluge/data/pixmaps/flags/tc.png
new file mode 100644
index 000000000..b7450dec7
Binary files /dev/null and b/deluge/data/pixmaps/flags/tc.png differ
diff --git a/deluge/data/pixmaps/flags/td.png b/deluge/data/pixmaps/flags/td.png
new file mode 100644
index 000000000..cf8e057dd
Binary files /dev/null and b/deluge/data/pixmaps/flags/td.png differ
diff --git a/deluge/data/pixmaps/flags/tf.png b/deluge/data/pixmaps/flags/tf.png
new file mode 100644
index 000000000..88d215861
Binary files /dev/null and b/deluge/data/pixmaps/flags/tf.png differ
diff --git a/deluge/data/pixmaps/flags/tg.png b/deluge/data/pixmaps/flags/tg.png
new file mode 100644
index 000000000..c9298dfa6
Binary files /dev/null and b/deluge/data/pixmaps/flags/tg.png differ
diff --git a/deluge/data/pixmaps/flags/th.png b/deluge/data/pixmaps/flags/th.png
new file mode 100644
index 000000000..e04583c32
Binary files /dev/null and b/deluge/data/pixmaps/flags/th.png differ
diff --git a/deluge/data/pixmaps/flags/tj.png b/deluge/data/pixmaps/flags/tj.png
new file mode 100644
index 000000000..efad9a5d2
Binary files /dev/null and b/deluge/data/pixmaps/flags/tj.png differ
diff --git a/deluge/data/pixmaps/flags/tk.png b/deluge/data/pixmaps/flags/tk.png
new file mode 100644
index 000000000..36a08b14d
Binary files /dev/null and b/deluge/data/pixmaps/flags/tk.png differ
diff --git a/deluge/data/pixmaps/flags/tl.png b/deluge/data/pixmaps/flags/tl.png
new file mode 100644
index 000000000..b5df531ad
Binary files /dev/null and b/deluge/data/pixmaps/flags/tl.png differ
diff --git a/deluge/data/pixmaps/flags/tm.png b/deluge/data/pixmaps/flags/tm.png
new file mode 100644
index 000000000..aff8f4ed4
Binary files /dev/null and b/deluge/data/pixmaps/flags/tm.png differ
diff --git a/deluge/data/pixmaps/flags/tn.png b/deluge/data/pixmaps/flags/tn.png
new file mode 100644
index 000000000..12e204509
Binary files /dev/null and b/deluge/data/pixmaps/flags/tn.png differ
diff --git a/deluge/data/pixmaps/flags/to.png b/deluge/data/pixmaps/flags/to.png
new file mode 100644
index 000000000..5398fab5f
Binary files /dev/null and b/deluge/data/pixmaps/flags/to.png differ
diff --git a/deluge/data/pixmaps/flags/tp.png b/deluge/data/pixmaps/flags/tp.png
new file mode 100644
index 000000000..b5df531ad
Binary files /dev/null and b/deluge/data/pixmaps/flags/tp.png differ
diff --git a/deluge/data/pixmaps/flags/tr.png b/deluge/data/pixmaps/flags/tr.png
new file mode 100644
index 000000000..66b0e45b5
Binary files /dev/null and b/deluge/data/pixmaps/flags/tr.png differ
diff --git a/deluge/data/pixmaps/flags/tt.png b/deluge/data/pixmaps/flags/tt.png
new file mode 100644
index 000000000..b3e16640e
Binary files /dev/null and b/deluge/data/pixmaps/flags/tt.png differ
diff --git a/deluge/data/pixmaps/flags/tv.png b/deluge/data/pixmaps/flags/tv.png
new file mode 100644
index 000000000..f78c0d9a1
Binary files /dev/null and b/deluge/data/pixmaps/flags/tv.png differ
diff --git a/deluge/data/pixmaps/flags/tw.png b/deluge/data/pixmaps/flags/tw.png
new file mode 100644
index 000000000..2bb14c468
Binary files /dev/null and b/deluge/data/pixmaps/flags/tw.png differ
diff --git a/deluge/data/pixmaps/flags/tz.png b/deluge/data/pixmaps/flags/tz.png
new file mode 100644
index 000000000..f3e8e121f
Binary files /dev/null and b/deluge/data/pixmaps/flags/tz.png differ
diff --git a/deluge/data/pixmaps/flags/ua.png b/deluge/data/pixmaps/flags/ua.png
new file mode 100644
index 000000000..86291367d
Binary files /dev/null and b/deluge/data/pixmaps/flags/ua.png differ
diff --git a/deluge/data/pixmaps/flags/ug.png b/deluge/data/pixmaps/flags/ug.png
new file mode 100644
index 000000000..d17a5d35a
Binary files /dev/null and b/deluge/data/pixmaps/flags/ug.png differ
diff --git a/deluge/data/pixmaps/flags/um.png b/deluge/data/pixmaps/flags/um.png
new file mode 100644
index 000000000..a21bdc56c
Binary files /dev/null and b/deluge/data/pixmaps/flags/um.png differ
diff --git a/deluge/data/pixmaps/flags/us.png b/deluge/data/pixmaps/flags/us.png
new file mode 100644
index 000000000..a21bdc56c
Binary files /dev/null and b/deluge/data/pixmaps/flags/us.png differ
diff --git a/deluge/data/pixmaps/flags/uy.png b/deluge/data/pixmaps/flags/uy.png
new file mode 100644
index 000000000..43a2372e2
Binary files /dev/null and b/deluge/data/pixmaps/flags/uy.png differ
diff --git a/deluge/data/pixmaps/flags/uz.png b/deluge/data/pixmaps/flags/uz.png
new file mode 100644
index 000000000..456d35927
Binary files /dev/null and b/deluge/data/pixmaps/flags/uz.png differ
diff --git a/deluge/data/pixmaps/flags/va.png b/deluge/data/pixmaps/flags/va.png
new file mode 100644
index 000000000..306dc1ef5
Binary files /dev/null and b/deluge/data/pixmaps/flags/va.png differ
diff --git a/deluge/data/pixmaps/flags/vc.png b/deluge/data/pixmaps/flags/vc.png
new file mode 100644
index 000000000..682471224
Binary files /dev/null and b/deluge/data/pixmaps/flags/vc.png differ
diff --git a/deluge/data/pixmaps/flags/ve.png b/deluge/data/pixmaps/flags/ve.png
new file mode 100644
index 000000000..c93b6fcdc
Binary files /dev/null and b/deluge/data/pixmaps/flags/ve.png differ
diff --git a/deluge/data/pixmaps/flags/vg.png b/deluge/data/pixmaps/flags/vg.png
new file mode 100644
index 000000000..96172adda
Binary files /dev/null and b/deluge/data/pixmaps/flags/vg.png differ
diff --git a/deluge/data/pixmaps/flags/vi.png b/deluge/data/pixmaps/flags/vi.png
new file mode 100644
index 000000000..ab242df15
Binary files /dev/null and b/deluge/data/pixmaps/flags/vi.png differ
diff --git a/deluge/data/pixmaps/flags/vn.png b/deluge/data/pixmaps/flags/vn.png
new file mode 100644
index 000000000..d346b244c
Binary files /dev/null and b/deluge/data/pixmaps/flags/vn.png differ
diff --git a/deluge/data/pixmaps/flags/vu.png b/deluge/data/pixmaps/flags/vu.png
new file mode 100644
index 000000000..4962e7bd2
Binary files /dev/null and b/deluge/data/pixmaps/flags/vu.png differ
diff --git a/deluge/data/pixmaps/flags/wf.png b/deluge/data/pixmaps/flags/wf.png
new file mode 100644
index 000000000..d4616ed1f
Binary files /dev/null and b/deluge/data/pixmaps/flags/wf.png differ
diff --git a/deluge/data/pixmaps/flags/ws.png b/deluge/data/pixmaps/flags/ws.png
new file mode 100644
index 000000000..90c97c47d
Binary files /dev/null and b/deluge/data/pixmaps/flags/ws.png differ
diff --git a/deluge/data/pixmaps/flags/ye.png b/deluge/data/pixmaps/flags/ye.png
new file mode 100644
index 000000000..8f3b8d22b
Binary files /dev/null and b/deluge/data/pixmaps/flags/ye.png differ
diff --git a/deluge/data/pixmaps/flags/yt.png b/deluge/data/pixmaps/flags/yt.png
new file mode 100644
index 000000000..d4616ed1f
Binary files /dev/null and b/deluge/data/pixmaps/flags/yt.png differ
diff --git a/deluge/data/pixmaps/flags/yu.png b/deluge/data/pixmaps/flags/yu.png
new file mode 100644
index 000000000..9355b9329
Binary files /dev/null and b/deluge/data/pixmaps/flags/yu.png differ
diff --git a/deluge/data/pixmaps/flags/za.png b/deluge/data/pixmaps/flags/za.png
new file mode 100644
index 000000000..490f2daec
Binary files /dev/null and b/deluge/data/pixmaps/flags/za.png differ
diff --git a/deluge/data/pixmaps/flags/zm.png b/deluge/data/pixmaps/flags/zm.png
new file mode 100644
index 000000000..4fe4cbe03
Binary files /dev/null and b/deluge/data/pixmaps/flags/zm.png differ
diff --git a/deluge/data/pixmaps/flags/zw.png b/deluge/data/pixmaps/flags/zw.png
new file mode 100644
index 000000000..e7754fa38
Binary files /dev/null and b/deluge/data/pixmaps/flags/zw.png differ
diff --git a/deluge/ui/gtkui/peers_tab.py b/deluge/ui/gtkui/peers_tab.py
index 370706ebe..6a18905b9 100644
--- a/deluge/ui/gtkui/peers_tab.py
+++ b/deluge/ui/gtkui/peers_tab.py
@@ -34,6 +34,7 @@
 import gtk, gtk.glade
 import os.path
 import cPickle
+import pkg_resources
 
 from deluge.ui.client import aclient as client
 from deluge.configmanager import ConfigManager
@@ -42,9 +43,6 @@ import deluge.common
 from deluge.ui.gtkui.listview import cell_data_speed as cell_data_speed
 from deluge.log import LOG as log
 
-def cell_data_country(column, cell, model, row, data):
-    pass
-
 class ColumnState:
     def __init__(self, name, position, width, sort, sort_order):
         self.name = name
@@ -57,15 +55,16 @@ class PeersTab:
     def __init__(self):
         glade = component.get("MainWindow").get_glade()
         self.listview = glade.get_widget("peers_listview")
-        # country, ip, client, progress, progress, downspeed, upspeed
-        self.liststore = gtk.ListStore(str, str, str, int, int)
-        
+        # country pixbuf, ip, client, progress, progress, downspeed, upspeed, country code
+        self.liststore = gtk.ListStore(gtk.gdk.Pixbuf, str, str, int, int, str)
+        self.cached_flag_pixbufs = {}
+
         # Country column        
         column = gtk.TreeViewColumn()
         render = gtk.CellRendererPixbuf()
         column.pack_start(render, False)
-        column.set_cell_data_func(render, cell_data_country, 0)
-        column.set_sort_column_id(0)
+        column.add_attribute(render, "pixbuf", 0)
+        column.set_sort_column_id(5)
         column.set_clickable(True)
         column.set_resizable(True)
         column.set_expand(False)
@@ -206,15 +205,33 @@ class PeersTab:
 
         client.get_torrent_status(self._on_get_torrent_status, torrent_id, ["peers"])
 
+    def get_flag_pixbuf(self, country):
+        country = str(country)
+        if not country.isalpha():
+            return None
+ 
+        if not self.cached_flag_pixbufs.has_key(country):
+            # We haven't created a pixbuf for this country yet
+            try:
+                self.cached_flag_pixbufs[country] = gtk.gdk.pixbuf_new_from_file(
+                    pkg_resources.resource_filename(
+                        "deluge", 
+                         os.path.join("data", "pixmaps", "flags", country.lower() + ".png")))
+            except Exception, e:
+                log.debug("Unable to load flag: %s", e)
+                return None
+            
+        return self.cached_flag_pixbufs[country]
     def _on_get_torrent_status(self, status):
         self.liststore.clear()
         for peer in status["peers"]:
             self.liststore.append([
-                peer["country"], 
+                self.get_flag_pixbuf(peer["country"]), 
                 peer["ip"],
                 peer["client"], 
                 peer["down_speed"], 
-                peer["up_speed"]])
+                peer["up_speed"],
+                peer["country"]])
             
     def clear(self):
         self.liststore.clear()
diff --git a/setup.py b/setup.py
index 7046c54ec..1b39b20d7 100644
--- a/setup.py
+++ b/setup.py
@@ -250,6 +250,7 @@ setup(
     package_data = {"deluge": ["ui/gtkui/glade/*.glade", 
                                 "data/pixmaps/*.png",
                                 "data/pixmaps/*.svg",
+                                "data/pixmaps/flags/*.png",
                                 "data/revision",
                                 "plugins/*.egg",
                                 "i18n/*.pot",