diff --git a/interface/web/admin/templates/language_add.htm b/interface/web/admin/templates/language_add.htm
index a448d933f22f209d3d8fe671f3a14843688986c9..a140f75520e40766fb0819a763488ac32ff2ab6c 100644
--- a/interface/web/admin/templates/language_add.htm
+++ b/interface/web/admin/templates/language_add.htm
@@ -14,7 +14,7 @@
       <span class="wf_oneField">
         <span class="wf_oneField">
           <label for="lng_select" class="wf_preField">{tmpl_var name='language_select_txt'}</label>
-          <select name="lng_select" id="lng_select">{tmpl_var name='language_option'}</select>
+          <select name="lng_select" class="withicons" id="language">{tmpl_var name='language_option'}</select>
         </span>      
         <span class="wf_oneField">
           <label for="lng_new" class="wf_preField">{tmpl_var name='language_new_txt'}</label>
diff --git a/interface/web/admin/templates/language_complete.htm b/interface/web/admin/templates/language_complete.htm
index fd1b5b911bb451d96806d25c16ad02fef69c6740..9d97c9e929ee225ddb2d992cbb8dd0d972cb1e77 100644
--- a/interface/web/admin/templates/language_complete.htm
+++ b/interface/web/admin/templates/language_complete.htm
@@ -13,7 +13,7 @@
     <fieldset id="wf_area_language_complete"><legend>Language Complete</legend>
       <span class="wf_oneField">
         <label for="lng_select" class="wf_preField">{tmpl_var name='language_select_txt'}</label>
-        <select name="lng_select" id="lng_select">{tmpl_var name='language_option'}</select>
+        <select name="lng_select" class="withicons" id="language">{tmpl_var name='language_option'}</select>
       </span>
     </fieldset>
 
diff --git a/interface/web/admin/templates/language_export.htm b/interface/web/admin/templates/language_export.htm
index 84077d6cb665b3b56cb64dab923354268be820ef..4135445590de432c10d81eaf04bd2d46a23bb2c5 100644
--- a/interface/web/admin/templates/language_export.htm
+++ b/interface/web/admin/templates/language_export.htm
@@ -14,7 +14,7 @@
       <span class="wf_oneField">
         <span class="wf_oneField">
           <label for="lng_select" class="wf_preField">{tmpl_var name='language_select_txt'}</label>
-          <select name="lng_select" id="lng_select">{tmpl_var name='language_option'}</select>
+          <select name="lng_select" class="withicons" id="language">{tmpl_var name='language_option'}</select>
         </span>
       </span>
     </fieldset>
diff --git a/interface/web/admin/templates/language_list.htm b/interface/web/admin/templates/language_list.htm
index 77338afe89c920ccdd34f2b30d311958606b434f..37aba39d0ca9fa2893f1fcb4fa720acb0dbe726b 100644
--- a/interface/web/admin/templates/language_list.htm
+++ b/interface/web/admin/templates/language_list.htm
@@ -7,7 +7,7 @@
       <div class="buttons">
         <span class="wf_oneField">
           <label for="lng_select" class="wf_preField">{tmpl_var name='language_select_txt'}</label>
-          <select name="lng_select" id="lng_select" onChange="submitForm('pageForm','admin/language_list.php');">{tmpl_var name='language_option'}</select>
+          <select name="lng_select" class="withicons" id="language" onChange="submitForm('pageForm','admin/language_list.php');">{tmpl_var name='language_option'}</select>
         </span>
       </div>
     </fieldset>
diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm
index c497f441a6bc79ebff23e176f7ad34f4376aef2c..64671e3c25c63b32fb0828aadf657bc682ba9deb 100644
--- a/interface/web/admin/templates/users_user_edit.htm
+++ b/interface/web/admin/templates/users_user_edit.htm
@@ -38,7 +38,7 @@
       </span>
       <span class="wf_oneField">
         <label for="language" class="wf_preField">{tmpl_var name='language_txt'}</label>
-        <select id="language" name="language">{tmpl_var name='language'}</select>
+        <select id="language" class="withicons" name="language">{tmpl_var name='language'}</select>
       </span>
     </fieldset>
 
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
index e8c1194c7e65f2777f22e56a24d0368ea3b69b9e..8adaeb1dbdf65487c750828d9cca2e40efb735c3 100644
--- a/interface/web/client/templates/client_edit_address.htm
+++ b/interface/web/client/templates/client_edit_address.htm
@@ -27,7 +27,7 @@
       </span>
       <span class="wf_oneField">
         <label for="language" class="wf_preField">{tmpl_var name='language_txt'}</label>
-        <select id="language" name="language">{tmpl_var name='language'}</select>
+        <select id="language" class="withicons" name="language">{tmpl_var name='language'}</select>
       </span>
       <span class="wf_oneField">
         <label for="usertheme" class="wf_preField">{tmpl_var name='usertheme_txt'}</label>
diff --git a/interface/web/themes/default/css/screen/wforms.css b/interface/web/themes/default/css/screen/wforms.css
index aaf6893e71cb4b9aff2c8087cf00f3dbb605c0ad..06c9b61dc6e88aee2c0423d19291bf0870865d9c 100644
--- a/interface/web/themes/default/css/screen/wforms.css
+++ b/interface/web/themes/default/css/screen/wforms.css
@@ -245,13 +245,258 @@
     background-position: 1px;
     padding-left:24px;
   }
-  select#country option[value="US"] { background-image:url(../../icons/flags/us.png); }
-  select#country option[value="IN"] { background-image:url(../../icons/flags/in.png); }
-  select#country option[value="UK"] { background-image:url(../../icons/flags/uk.png); }
-  select#country option[value="FR"] { background-image:url(../../icons/flags/fr.png); }
-  select#country option[value="DE"] { background-image:url(../../icons/flags/de.png); }
-  select#country option[value="CA"] { background-image:url(../../icons/flags/ca.png); }
-  select#country option[value="RU"] { background-image:url(../../icons/flags/ru.png); }
+
+select#country option[value="AD"] { background-image:url(../../icons/flags/ad.png); }
+select#country option[value="AE"] { background-image:url(../../icons/flags/ae.png); }
+select#country option[value="AF"] { background-image:url(../../icons/flags/af.png); }
+select#country option[value="AG"] { background-image:url(../../icons/flags/ag.png); }
+select#country option[value="AI"] { background-image:url(../../icons/flags/ai.png); }
+select#country option[value="AL"] { background-image:url(../../icons/flags/al.png); }
+select#country option[value="AM"] { background-image:url(../../icons/flags/am.png); }
+select#country option[value="AN"] { background-image:url(../../icons/flags/an.png); }
+select#country option[value="AO"] { background-image:url(../../icons/flags/ao.png); }
+select#country option[value="AQ"] { background-image:url(../../icons/flags/aq.png); }
+select#country option[value="AR"] { background-image:url(../../icons/flags/ar.png); }
+select#country option[value="AS"] { background-image:url(../../icons/flags/as.png); }
+select#country option[value="AT"] { background-image:url(../../icons/flags/at.png); }
+select#country option[value="AU"] { background-image:url(../../icons/flags/au.png); }
+select#country option[value="AW"] { background-image:url(../../icons/flags/aw.png); }
+select#country option[value="AX"] { background-image:url(../../icons/flags/ax.png); }
+select#country option[value="AZ"] { background-image:url(../../icons/flags/az.png); }
+select#country option[value="BA"] { background-image:url(../../icons/flags/ba.png); }
+select#country option[value="BB"] { background-image:url(../../icons/flags/bb.png); }
+select#country option[value="BD"] { background-image:url(../../icons/flags/bd.png); }
+select#country option[value="BE"] { background-image:url(../../icons/flags/be.png); }
+select#country option[value="BF"] { background-image:url(../../icons/flags/bf.png); }
+select#country option[value="BG"] { background-image:url(../../icons/flags/bg.png); }
+select#country option[value="BH"] { background-image:url(../../icons/flags/bh.png); }
+select#country option[value="BI"] { background-image:url(../../icons/flags/bi.png); }
+select#country option[value="BJ"] { background-image:url(../../icons/flags/bj.png); }
+select#country option[value="BM"] { background-image:url(../../icons/flags/bm.png); }
+select#country option[value="BN"] { background-image:url(../../icons/flags/bn.png); }
+select#country option[value="BO"] { background-image:url(../../icons/flags/bo.png); }
+select#country option[value="BR"] { background-image:url(../../icons/flags/br.png); }
+select#country option[value="BS"] { background-image:url(../../icons/flags/bs.png); }
+select#country option[value="BT"] { background-image:url(../../icons/flags/bt.png); }
+select#country option[value="BV"] { background-image:url(../../icons/flags/bv.png); }
+select#country option[value="BW"] { background-image:url(../../icons/flags/bw.png); }
+select#country option[value="BY"] { background-image:url(../../icons/flags/by.png); }
+select#country option[value="BZ"] { background-image:url(../../icons/flags/bz.png); }
+select#country option[value="CA"] { background-image:url(../../icons/flags/ca.png); }
+select#country option[value="CC"] { background-image:url(../../icons/flags/cc.png); }
+select#country option[value="CD"] { background-image:url(../../icons/flags/cd.png); }
+select#country option[value="CF"] { background-image:url(../../icons/flags/cf.png); }
+select#country option[value="CG"] { background-image:url(../../icons/flags/cg.png); }
+select#country option[value="CH"] { background-image:url(../../icons/flags/ch.png); }
+select#country option[value="CI"] { background-image:url(../../icons/flags/ci.png); }
+select#country option[value="CK"] { background-image:url(../../icons/flags/ck.png); }
+select#country option[value="CL"] { background-image:url(../../icons/flags/cl.png); }
+select#country option[value="CM"] { background-image:url(../../icons/flags/cm.png); }
+select#country option[value="CN"] { background-image:url(../../icons/flags/cn.png); }
+select#country option[value="CO"] { background-image:url(../../icons/flags/co.png); }
+select#country option[value="CR"] { background-image:url(../../icons/flags/cr.png); }
+select#country option[value="CS"] { background-image:url(../../icons/flags/cs.png); }
+select#country option[value="CU"] { background-image:url(../../icons/flags/cu.png); }
+select#country option[value="CV"] { background-image:url(../../icons/flags/cv.png); }
+select#country option[value="CX"] { background-image:url(../../icons/flags/cx.png); }
+select#country option[value="CY"] { background-image:url(../../icons/flags/cy.png); }
+select#country option[value="CZ"] { background-image:url(../../icons/flags/cz.png); }
+select#country option[value="DE"] { background-image:url(../../icons/flags/de.png); }
+select#country option[value="DJ"] { background-image:url(../../icons/flags/dj.png); }
+select#country option[value="DK"] { background-image:url(../../icons/flags/dk.png); }
+select#country option[value="DM"] { background-image:url(../../icons/flags/dm.png); }
+select#country option[value="DO"] { background-image:url(../../icons/flags/do.png); }
+select#country option[value="DZ"] { background-image:url(../../icons/flags/dz.png); }
+select#country option[value="EC"] { background-image:url(../../icons/flags/ec.png); }
+select#country option[value="EE"] { background-image:url(../../icons/flags/ee.png); }
+select#country option[value="EG"] { background-image:url(../../icons/flags/eg.png); }
+select#country option[value="EH"] { background-image:url(../../icons/flags/eh.png); }
+select#country option[value="ER"] { background-image:url(../../icons/flags/er.png); }
+select#country option[value="ES"] { background-image:url(../../icons/flags/es.png); }
+select#country option[value="ET"] { background-image:url(../../icons/flags/et.png); }
+select#country option[value="FI"] { background-image:url(../../icons/flags/fi.png); }
+select#country option[value="FJ"] { background-image:url(../../icons/flags/fj.png); }
+select#country option[value="FK"] { background-image:url(../../icons/flags/fk.png); }
+select#country option[value="FM"] { background-image:url(../../icons/flags/fm.png); }
+select#country option[value="FO"] { background-image:url(../../icons/flags/fo.png); }
+select#country option[value="FR"] { background-image:url(../../icons/flags/fr.png); }
+select#country option[value="GA"] { background-image:url(../../icons/flags/ga.png); }
+select#country option[value="GB"] { background-image:url(../../icons/flags/gb.png); }
+select#country option[value="GD"] { background-image:url(../../icons/flags/gd.png); }
+select#country option[value="GE"] { background-image:url(../../icons/flags/ge.png); }
+select#country option[value="GF"] { background-image:url(../../icons/flags/gf.png); }
+select#country option[value="GH"] { background-image:url(../../icons/flags/gh.png); }
+select#country option[value="GI"] { background-image:url(../../icons/flags/gi.png); }
+select#country option[value="GL"] { background-image:url(../../icons/flags/gl.png); }
+select#country option[value="GM"] { background-image:url(../../icons/flags/gm.png); }
+select#country option[value="GN"] { background-image:url(../../icons/flags/gn.png); }
+select#country option[value="GP"] { background-image:url(../../icons/flags/gp.png); }
+select#country option[value="GQ"] { background-image:url(../../icons/flags/gq.png); }
+select#country option[value="GR"] { background-image:url(../../icons/flags/gr.png); }
+select#country option[value="GS"] { background-image:url(../../icons/flags/gs.png); }
+select#country option[value="GT"] { background-image:url(../../icons/flags/gt.png); }
+select#country option[value="GU"] { background-image:url(../../icons/flags/gu.png); }
+select#country option[value="GW"] { background-image:url(../../icons/flags/gw.png); }
+select#country option[value="GY"] { background-image:url(../../icons/flags/gy.png); }
+select#country option[value="HK"] { background-image:url(../../icons/flags/hk.png); }
+select#country option[value="HM"] { background-image:url(../../icons/flags/hm.png); }
+select#country option[value="HN"] { background-image:url(../../icons/flags/hn.png); }
+select#country option[value="HR"] { background-image:url(../../icons/flags/hr.png); }
+select#country option[value="HT"] { background-image:url(../../icons/flags/ht.png); }
+select#country option[value="HU"] { background-image:url(../../icons/flags/hu.png); }
+select#country option[value="ID"] { background-image:url(../../icons/flags/id.png); }
+select#country option[value="IE"] { background-image:url(../../icons/flags/ie.png); }
+select#country option[value="IL"] { background-image:url(../../icons/flags/il.png); }
+select#country option[value="IN"] { background-image:url(../../icons/flags/in.png); }
+select#country option[value="IO"] { background-image:url(../../icons/flags/io.png); }
+select#country option[value="IQ"] { background-image:url(../../icons/flags/iq.png); }
+select#country option[value="IR"] { background-image:url(../../icons/flags/ir.png); }
+select#country option[value="IS"] { background-image:url(../../icons/flags/is.png); }
+select#country option[value="IT"] { background-image:url(../../icons/flags/it.png); }
+select#country option[value="JM"] { background-image:url(../../icons/flags/jm.png); }
+select#country option[value="JO"] { background-image:url(../../icons/flags/jo.png); }
+select#country option[value="JP"] { background-image:url(../../icons/flags/jp.png); }
+select#country option[value="KE"] { background-image:url(../../icons/flags/ke.png); }
+select#country option[value="KG"] { background-image:url(../../icons/flags/kg.png); }
+select#country option[value="KH"] { background-image:url(../../icons/flags/kh.png); }
+select#country option[value="KI"] { background-image:url(../../icons/flags/ki.png); }
+select#country option[value="KM"] { background-image:url(../../icons/flags/km.png); }
+select#country option[value="KN"] { background-image:url(../../icons/flags/kn.png); }
+select#country option[value="KP"] { background-image:url(../../icons/flags/kp.png); }
+select#country option[value="KR"] { background-image:url(../../icons/flags/kr.png); }
+select#country option[value="KW"] { background-image:url(../../icons/flags/kw.png); }
+select#country option[value="KY"] { background-image:url(../../icons/flags/ky.png); }
+select#country option[value="KZ"] { background-image:url(../../icons/flags/kz.png); }
+select#country option[value="LA"] { background-image:url(../../icons/flags/la.png); }
+select#country option[value="LB"] { background-image:url(../../icons/flags/lb.png); }
+select#country option[value="LC"] { background-image:url(../../icons/flags/lc.png); }
+select#country option[value="LI"] { background-image:url(../../icons/flags/li.png); }
+select#country option[value="LK"] { background-image:url(../../icons/flags/lk.png); }
+select#country option[value="LR"] { background-image:url(../../icons/flags/lr.png); }
+select#country option[value="LS"] { background-image:url(../../icons/flags/ls.png); }
+select#country option[value="LT"] { background-image:url(../../icons/flags/lt.png); }
+select#country option[value="LU"] { background-image:url(../../icons/flags/lu.png); }
+select#country option[value="LV"] { background-image:url(../../icons/flags/lv.png); }
+select#country option[value="LY"] { background-image:url(../../icons/flags/ly.png); }
+select#country option[value="MA"] { background-image:url(../../icons/flags/ma.png); }
+select#country option[value="MC"] { background-image:url(../../icons/flags/mc.png); }
+select#country option[value="MD"] { background-image:url(../../icons/flags/md.png); }
+select#country option[value="ME"] { background-image:url(../../icons/flags/me.png); }
+select#country option[value="MG"] { background-image:url(../../icons/flags/mg.png); }
+select#country option[value="MH"] { background-image:url(../../icons/flags/mh.png); }
+select#country option[value="MK"] { background-image:url(../../icons/flags/mk.png); }
+select#country option[value="ML"] { background-image:url(../../icons/flags/ml.png); }
+select#country option[value="MM"] { background-image:url(../../icons/flags/mm.png); }
+select#country option[value="MN"] { background-image:url(../../icons/flags/mn.png); }
+select#country option[value="MO"] { background-image:url(../../icons/flags/mo.png); }
+select#country option[value="MP"] { background-image:url(../../icons/flags/mp.png); }
+select#country option[value="MQ"] { background-image:url(../../icons/flags/mq.png); }
+select#country option[value="MR"] { background-image:url(../../icons/flags/mr.png); }
+select#country option[value="MS"] { background-image:url(../../icons/flags/ms.png); }
+select#country option[value="MT"] { background-image:url(../../icons/flags/mt.png); }
+select#country option[value="MU"] { background-image:url(../../icons/flags/mu.png); }
+select#country option[value="MV"] { background-image:url(../../icons/flags/mv.png); }
+select#country option[value="MW"] { background-image:url(../../icons/flags/mw.png); }
+select#country option[value="MX"] { background-image:url(../../icons/flags/mx.png); }
+select#country option[value="MY"] { background-image:url(../../icons/flags/my.png); }
+select#country option[value="MZ"] { background-image:url(../../icons/flags/mz.png); }
+select#country option[value="NA"] { background-image:url(../../icons/flags/na.png); }
+select#country option[value="NC"] { background-image:url(../../icons/flags/nc.png); }
+select#country option[value="NE"] { background-image:url(../../icons/flags/ne.png); }
+select#country option[value="NF"] { background-image:url(../../icons/flags/nf.png); }
+select#country option[value="NG"] { background-image:url(../../icons/flags/ng.png); }
+select#country option[value="NI"] { background-image:url(../../icons/flags/ni.png); }
+select#country option[value="NL"] { background-image:url(../../icons/flags/nl.png); }
+select#country option[value="NO"] { background-image:url(../../icons/flags/no.png); }
+select#country option[value="NP"] { background-image:url(../../icons/flags/np.png); }
+select#country option[value="NR"] { background-image:url(../../icons/flags/nr.png); }
+select#country option[value="NU"] { background-image:url(../../icons/flags/nu.png); }
+select#country option[value="NZ"] { background-image:url(../../icons/flags/nz.png); }
+select#country option[value="OM"] { background-image:url(../../icons/flags/om.png); }
+select#country option[value="PA"] { background-image:url(../../icons/flags/pa.png); }
+select#country option[value="PE"] { background-image:url(../../icons/flags/pe.png); }
+select#country option[value="PF"] { background-image:url(../../icons/flags/pf.png); }
+select#country option[value="PG"] { background-image:url(../../icons/flags/pg.png); }
+select#country option[value="PH"] { background-image:url(../../icons/flags/ph.png); }
+select#country option[value="PK"] { background-image:url(../../icons/flags/pk.png); }
+select#country option[value="PL"] { background-image:url(../../icons/flags/pl.png); }
+select#country option[value="PM"] { background-image:url(../../icons/flags/pm.png); }
+select#country option[value="PN"] { background-image:url(../../icons/flags/pn.png); }
+select#country option[value="PR"] { background-image:url(../../icons/flags/pr.png); }
+select#country option[value="PS"] { background-image:url(../../icons/flags/ps.png); }
+select#country option[value="PT"] { background-image:url(../../icons/flags/pt.png); }
+select#country option[value="PW"] { background-image:url(../../icons/flags/pw.png); }
+select#country option[value="PY"] { background-image:url(../../icons/flags/py.png); }
+select#country option[value="QA"] { background-image:url(../../icons/flags/qa.png); }
+select#country option[value="RE"] { background-image:url(../../icons/flags/re.png); }
+select#country option[value="RO"] { background-image:url(../../icons/flags/ro.png); }
+select#country option[value="RS"] { background-image:url(../../icons/flags/rs.png); }
+select#country option[value="RU"] { background-image:url(../../icons/flags/ru.png); }
+select#country option[value="RW"] { background-image:url(../../icons/flags/rw.png); }
+select#country option[value="SA"] { background-image:url(../../icons/flags/sa.png); }
+select#country option[value="SB"] { background-image:url(../../icons/flags/sb.png); }
+select#country option[value="SC"] { background-image:url(../../icons/flags/sc.png); }
+select#country option[value="SD"] { background-image:url(../../icons/flags/sd.png); }
+select#country option[value="SE"] { background-image:url(../../icons/flags/se.png); }
+select#country option[value="SG"] { background-image:url(../../icons/flags/sg.png); }
+select#country option[value="SH"] { background-image:url(../../icons/flags/sh.png); }
+select#country option[value="SI"] { background-image:url(../../icons/flags/si.png); }
+select#country option[value="SJ"] { background-image:url(../../icons/flags/sj.png); }
+select#country option[value="SK"] { background-image:url(../../icons/flags/sk.png); }
+select#country option[value="SL"] { background-image:url(../../icons/flags/sl.png); }
+select#country option[value="SM"] { background-image:url(../../icons/flags/sm.png); }
+select#country option[value="SN"] { background-image:url(../../icons/flags/sn.png); }
+select#country option[value="SO"] { background-image:url(../../icons/flags/so.png); }
+select#country option[value="SR"] { background-image:url(../../icons/flags/sr.png); }
+select#country option[value="ST"] { background-image:url(../../icons/flags/st.png); }
+select#country option[value="SV"] { background-image:url(../../icons/flags/sv.png); }
+select#country option[value="SY"] { background-image:url(../../icons/flags/sy.png); }
+select#country option[value="SZ"] { background-image:url(../../icons/flags/sz.png); }
+select#country option[value="TC"] { background-image:url(../../icons/flags/tc.png); }
+select#country option[value="TD"] { background-image:url(../../icons/flags/td.png); }
+select#country option[value="TF"] { background-image:url(../../icons/flags/tf.png); }
+select#country option[value="TG"] { background-image:url(../../icons/flags/tg.png); }
+select#country option[value="TH"] { background-image:url(../../icons/flags/th.png); }
+select#country option[value="TJ"] { background-image:url(../../icons/flags/tj.png); }
+select#country option[value="TK"] { background-image:url(../../icons/flags/tk.png); }
+select#country option[value="TL"] { background-image:url(../../icons/flags/tl.png); }
+select#country option[value="TM"] { background-image:url(../../icons/flags/tm.png); }
+select#country option[value="TN"] { background-image:url(../../icons/flags/tn.png); }
+select#country option[value="TO"] { background-image:url(../../icons/flags/to.png); }
+select#country option[value="TR"] { background-image:url(../../icons/flags/tr.png); }
+select#country option[value="TT"] { background-image:url(../../icons/flags/tt.png); }
+select#country option[value="TV"] { background-image:url(../../icons/flags/tv.png); }
+select#country option[value="TW"] { background-image:url(../../icons/flags/tw.png); }
+select#country option[value="TZ"] { background-image:url(../../icons/flags/tz.png); }
+select#country option[value="UA"] { background-image:url(../../icons/flags/ua.png); }
+select#country option[value="UG"] { background-image:url(../../icons/flags/ug.png); }
+select#country option[value="UM"] { background-image:url(../../icons/flags/um.png); }
+select#country option[value="US"] { background-image:url(../../icons/flags/us.png); }
+select#country option[value="UY"] { background-image:url(../../icons/flags/uy.png); }
+select#country option[value="UZ"] { background-image:url(../../icons/flags/uz.png); }
+select#country option[value="VA"] { background-image:url(../../icons/flags/va.png); }
+select#country option[value="VC"] { background-image:url(../../icons/flags/vc.png); }
+select#country option[value="VE"] { background-image:url(../../icons/flags/ve.png); }
+select#country option[value="VG"] { background-image:url(../../icons/flags/vg.png); }
+select#country option[value="VI"] { background-image:url(../../icons/flags/vi.png); }
+select#country option[value="VN"] { background-image:url(../../icons/flags/vn.png); }
+select#country option[value="VU"] { background-image:url(../../icons/flags/vu.png); }
+select#country option[value="WF"] { background-image:url(../../icons/flags/wf.png); }
+select#country option[value="WS"] { background-image:url(../../icons/flags/ws.png); }
+select#country option[value="YE"] { background-image:url(../../icons/flags/ye.png); }
+select#country option[value="YT"] { background-image:url(../../icons/flags/yt.png); }
+select#country option[value="ZA"] { background-image:url(../../icons/flags/za.png); }
+select#country option[value="ZM"] { background-image:url(../../icons/flags/zm.png); }
+select#country option[value="ZW"] { background-image:url(../../icons/flags/zw.png); }
+
+select#language option[value="de"] { background-image:url(../../icons/flags/de.png); }
+select#language option[value="en"] { background-image:url(../../icons/flags/gb.png); }
+select#language option[value="fr"] { background-image:url(../../icons/flags/fr.png); }
+select#language option[value="it"] { background-image:url(../../icons/flags/it.png); }
+select#language option[value="bg"] { background-image:url(../../icons/flags/bg.png); }
+select#language option[value="ru"] { background-image:url(../../icons/flags/ru.png); }
+select#language option[value="nl"] { background-image:url(../../icons/flags/nl.png); }
+select#language option[value="se"] { background-image:url(../../icons/flags/se.png); }
 
 	 
 	 
@@ -300,4 +545,4 @@
 
 /* === */
 
-}
\ No newline at end of file
+}
diff --git a/interface/web/themes/default/icons/flags/aq.png b/interface/web/themes/default/icons/flags/aq.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c6602f263126bf6ebd695436cfeb9aa20b8cda4
Binary files /dev/null and b/interface/web/themes/default/icons/flags/aq.png differ
diff --git a/interface/web/tools/templates/user_settings.htm b/interface/web/tools/templates/user_settings.htm
index b82eb3038992d8b61a7d2de1e5e23c556663952a..cf9b5240a45618db51aefb17941631c12a6deb09 100644
--- a/interface/web/tools/templates/user_settings.htm
+++ b/interface/web/tools/templates/user_settings.htm
@@ -19,7 +19,7 @@
       </span>
       <span class="wf_oneField">
         <label for="language" class="wf_preField">{tmpl_var name='language_txt'}</label>
-        <select id="language" name="language">{tmpl_var name='language'}</select>
+        <select id="language" class="withicons" name="language">{tmpl_var name='language'}</select>
       </span>
     </fieldset>