diff --git a/installation/src/Model/LanguagesModel.php b/installation/src/Model/LanguagesModel.php
index 72c11d6d4b0ab..9d41ad36e63b2 100644
--- a/installation/src/Model/LanguagesModel.php
+++ b/installation/src/Model/LanguagesModel.php
@@ -786,8 +786,15 @@ public function addLanguage($itemLanguage, $sefLangString)
 	{
 		$tableLanguage = Table::getInstance('Language');
 
+		// Use language code (eg "en-gb") as the flag.
 		$flag = strtolower(str_replace('-', '_',  $itemLanguage->language));
 
+		if (!file_exists(JPATH_ROOT . '/media/mod_languages/images/' . $flag . '.gif'))
+		{
+			// Use country (eg "gb") as the flag.
+			$flag = strtolower(substr($itemLanguage->language, strpos($itemLanguage->language, '-') + 1));
+		}
+
 		// Load the native language name.
 		$installationLocalisedIni = new Language($itemLanguage->language, false);
 		$nativeLanguageName       = $installationLocalisedIni->_('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME');
diff --git a/media/mod_languages/images/README b/media/mod_languages/images/README
new file mode 100644
index 0000000000000..61adf39c8a0ee
--- /dev/null
+++ b/media/mod_languages/images/README
@@ -0,0 +1,104 @@
+## Reserved filenames
+This filenames were present in earlier Joomla versions and were removed with PR #12014
+Due to potential B/C issues we can't put a new file with the same name into this folder.
+
+af.gif     Afrikaans (not Afghanistan!)
+af_za.gif  Afrikaans (South Africa)
+ar.gif     Arabic (not Argentina!)
+ar_aa.gif  Arabic Unitag
+az_az.gif  Azeri (Azerbaijan)
+be.gif     Belarusian (not Belgium!)
+be_by.gif  Belarusian (Belarus)
+bg_bg.gif  Bulgarian (Bulgaria)
+bn.gif     Bangladesh
+bn_bd.gif  Bangladesh
+br.gif     Breton (not Brazil!)
+bs.gif     Bosnian (Bosnia and Herzegovina)
+bs_ba.gif  Bosnian (Bosnia and Herzegovina)
+ca.gif     Catalan (not Canada!)
+cbk_iq.gif Something Iraq
+cs.gif     Czech
+cs_cz.gif  Czech (Czech Republic)
+cy.gif     Welsh (not Cyprus!)
+cz_cz.gif  Something (Czech Republic)
+da.gif     Danish
+de_de.gif  German (Germany)
+dz_bt.gif  Dzongkha (Bhutan)
+el.gif     Greek
+el_gr.gif  Greek (Greece)
+en.gif     English
+en_au.gif  English (Australia)
+en_gb.gif  English (United Kingdom)
+en_us.gif  English (United States)
+eo.gif     Esperanto
+es_co.gif  Spanish (Colombia)
+es_es.gif  Spanish (Spain)
+et.gif     Estonian
+et_ee.gif  Estonian (Estonia)
+fa.gif     Farsi
+fa_ir.gif  Farsi (Iran)
+fi_fi.gif  Finnish (Finland)
+fr_fr.gif  French (France)
+ga_ie.gif  Irish (Ireland)
+gd.gif     Gaelic (not Grenada!)
+gl.gif     Galician (not Greenland!)
+he.gif     Hebrew
+he_il.gif  Hebrew (Israel)
+hi.gif     Hindi
+hi_in.gif  Hindi (India)
+hk_hk.gif  Something (Hong Kong)
+hr_hr.gif  Croatian (Croatia)
+hu_hu.gif  Hungarian (Hungary)
+hy.gif     Armenian
+hy_am.gif  Armenian (Armenia)
+id_id.gif  Indonesian (Indonesia)
+is_is.gif  Icelandic (Iceland)
+it_it.gif  Italian (Italy)
+ja.gif     Japanese
+ja_jp.gif  Japanese (Japan)
+ka.gif     Georgian
+ka_ge.gif  Georgian (Georgia)
+km.gif     Khmer (not Comoros!)
+km_kh.gif  Khmer (Cambodia)
+ko.gif     Korean
+ko_kr.gif  Korean (Korea)
+ku.gif     Kurdish (Iraq flag)
+lo.gif     Lao
+lo_la.gif  Lao (Laos)
+lt_lt.gif  Lithuanian (Lithuania)
+lv_lv.gif  Latvian (Latvia)
+mk_mk.gif  FYRO Macedonian
+mn_mn.gif  Mongolian (Mongolia)
+ms_my.gif  Malay (Malaysia)
+nb_no.gif  Bokmål (Norway)
+nl_nl.gif  Dutch (Netherlands)
+nn_no.gif  Nynorsk (Norway)
+pl_pl.gif  Polish (Poland)
+ps.gif     Pushto (not Palestine!)
+pt_pt.gif  Portuguese (Portugal)
+ro_ro.gif  Romanian (Romania)
+ru_ru.gif  Russian (Russia)
+si.gif     Sinhala (not Slovenia!)
+sk_sk.gif  Slovak (Slovakia)
+sl.gif     Slovenian (not Sierra Leone!)
+sq_al.gif  Albanian (Albania)
+sr.gif     Serbian (not Suriname!)
+srp_me.gif Montenegrin (Montenegro)
+sv.gif     Swedish (not El Salvador!)
+sv_se.gif  Swedish (Sweden)
+sw.gif     Swahili
+sy.gif     Syriac (was assyrian flag, not Syria!)
+ta.gif     Tamil
+th_th.gif  Thai (Thailand)
+tk_tm.gif  Turkmen (Turkmenistan)
+tr_tr.gif  Turkish (Turkey)
+uk.gif     Ukrainian
+uk_ua.gif  Ukrainian (Ukraine)
+ur.gif     Urdu
+ur_pk.gif  Urdu (Islamic Republic of Pakistan)
+uz_uz.gif  Uzbek (Uzbekistan)
+vi.gif     Vietnamese
+vi_vn.gif  Vietnamese (Viet Nam)
+zh.gif     Chinese
+zh_cn.gif  Chinese (China)
+zh_tw.gif  Chinese (Taiwan)
diff --git a/media/mod_languages/images/ar.gif b/media/mod_languages/images/aa.gif
similarity index 100%
rename from media/mod_languages/images/ar.gif
rename to media/mod_languages/images/aa.gif
diff --git a/media/mod_languages/images/af_za.gif b/media/mod_languages/images/af_za.gif
deleted file mode 100644
index 8b72382219386..0000000000000
Binary files a/media/mod_languages/images/af_za.gif and /dev/null differ
diff --git a/media/mod_languages/images/hy.gif b/media/mod_languages/images/am.gif
similarity index 100%
rename from media/mod_languages/images/hy.gif
rename to media/mod_languages/images/am.gif
diff --git a/media/mod_languages/images/ar_aa.gif b/media/mod_languages/images/ar_aa.gif
deleted file mode 100644
index b019eff5530aa..0000000000000
Binary files a/media/mod_languages/images/ar_aa.gif and /dev/null differ
diff --git a/media/mod_languages/images/at.gif b/media/mod_languages/images/at.gif
index b295f0b380b7c..fe117901e34ab 100644
Binary files a/media/mod_languages/images/at.gif and b/media/mod_languages/images/at.gif differ
diff --git a/media/mod_languages/images/en_au.gif b/media/mod_languages/images/au.gif
similarity index 100%
rename from media/mod_languages/images/en_au.gif
rename to media/mod_languages/images/au.gif
diff --git a/media/mod_languages/images/az_az.gif b/media/mod_languages/images/az_az.gif
deleted file mode 100644
index 6c6e73dfc572c..0000000000000
Binary files a/media/mod_languages/images/az_az.gif and /dev/null differ
diff --git a/media/mod_languages/images/bs.gif b/media/mod_languages/images/ba.gif
similarity index 100%
rename from media/mod_languages/images/bs.gif
rename to media/mod_languages/images/ba.gif
diff --git a/media/mod_languages/images/bn.gif b/media/mod_languages/images/bd.gif
similarity index 100%
rename from media/mod_languages/images/bn.gif
rename to media/mod_languages/images/bd.gif
diff --git a/media/mod_languages/images/be_by.gif b/media/mod_languages/images/be_by.gif
deleted file mode 100644
index a96f3d982e808..0000000000000
Binary files a/media/mod_languages/images/be_by.gif and /dev/null differ
diff --git a/media/mod_languages/images/bg_bg.gif b/media/mod_languages/images/bg_bg.gif
deleted file mode 100644
index 0f31277387aff..0000000000000
Binary files a/media/mod_languages/images/bg_bg.gif and /dev/null differ
diff --git a/media/mod_languages/images/bn_bd.gif b/media/mod_languages/images/bn_bd.gif
deleted file mode 100644
index dfd1794531b7d..0000000000000
Binary files a/media/mod_languages/images/bn_bd.gif and /dev/null differ
diff --git a/media/mod_languages/images/br.gif b/media/mod_languages/images/br.gif
deleted file mode 100644
index 3d004e5974055..0000000000000
Binary files a/media/mod_languages/images/br.gif and /dev/null differ
diff --git a/media/mod_languages/images/bs_ba.gif b/media/mod_languages/images/bs_ba.gif
deleted file mode 100644
index bbd23bc4fc594..0000000000000
Binary files a/media/mod_languages/images/bs_ba.gif and /dev/null differ
diff --git a/media/mod_languages/images/dz_bt.gif b/media/mod_languages/images/bt.gif
similarity index 100%
rename from media/mod_languages/images/dz_bt.gif
rename to media/mod_languages/images/bt.gif
diff --git a/media/mod_languages/images/be.gif b/media/mod_languages/images/by.gif
similarity index 100%
rename from media/mod_languages/images/be.gif
rename to media/mod_languages/images/by.gif
diff --git a/media/mod_languages/images/ca.gif b/media/mod_languages/images/ca.gif
deleted file mode 100644
index c5a06721276a5..0000000000000
Binary files a/media/mod_languages/images/ca.gif and /dev/null differ
diff --git a/media/mod_languages/images/zh.gif b/media/mod_languages/images/cn.gif
similarity index 100%
rename from media/mod_languages/images/zh.gif
rename to media/mod_languages/images/cn.gif
diff --git a/media/mod_languages/images/es_co.gif b/media/mod_languages/images/co.gif
similarity index 100%
rename from media/mod_languages/images/es_co.gif
rename to media/mod_languages/images/co.gif
diff --git a/media/mod_languages/images/cs.gif b/media/mod_languages/images/cs.gif
deleted file mode 100644
index 5df79bba7094c..0000000000000
Binary files a/media/mod_languages/images/cs.gif and /dev/null differ
diff --git a/media/mod_languages/images/cs_cz.gif b/media/mod_languages/images/cs_cz.gif
deleted file mode 100644
index 5df79bba7094c..0000000000000
Binary files a/media/mod_languages/images/cs_cz.gif and /dev/null differ
diff --git a/media/mod_languages/images/cy.gif b/media/mod_languages/images/cy.gif
deleted file mode 100644
index d58557ca13660..0000000000000
Binary files a/media/mod_languages/images/cy.gif and /dev/null differ
diff --git a/media/mod_languages/images/cz_cz.gif b/media/mod_languages/images/cz_cz.gif
deleted file mode 100644
index 5df79bba7094c..0000000000000
Binary files a/media/mod_languages/images/cz_cz.gif and /dev/null differ
diff --git a/media/mod_languages/images/da.gif b/media/mod_languages/images/da.gif
deleted file mode 100644
index 254395676daf4..0000000000000
Binary files a/media/mod_languages/images/da.gif and /dev/null differ
diff --git a/media/mod_languages/images/de_at.gif b/media/mod_languages/images/de_at.gif
deleted file mode 100644
index fe117901e34ab..0000000000000
Binary files a/media/mod_languages/images/de_at.gif and /dev/null differ
diff --git a/media/mod_languages/images/de_ch.gif b/media/mod_languages/images/de_ch.gif
deleted file mode 100644
index df7b40f6e57a4..0000000000000
Binary files a/media/mod_languages/images/de_ch.gif and /dev/null differ
diff --git a/media/mod_languages/images/de_de.gif b/media/mod_languages/images/de_de.gif
deleted file mode 100644
index 06f693e0e5eb8..0000000000000
Binary files a/media/mod_languages/images/de_de.gif and /dev/null differ
diff --git a/media/mod_languages/images/et.gif b/media/mod_languages/images/ee.gif
similarity index 100%
rename from media/mod_languages/images/et.gif
rename to media/mod_languages/images/ee.gif
diff --git a/media/mod_languages/images/el_gr.gif b/media/mod_languages/images/el_gr.gif
deleted file mode 100644
index b8879c2980917..0000000000000
Binary files a/media/mod_languages/images/el_gr.gif and /dev/null differ
diff --git a/media/mod_languages/images/en_gb.gif b/media/mod_languages/images/en_gb.gif
deleted file mode 100644
index 3b9b213eacddf..0000000000000
Binary files a/media/mod_languages/images/en_gb.gif and /dev/null differ
diff --git a/media/mod_languages/images/en_us.gif b/media/mod_languages/images/en_us.gif
deleted file mode 100644
index 970411fcae65d..0000000000000
Binary files a/media/mod_languages/images/en_us.gif and /dev/null differ
diff --git a/media/mod_languages/images/eo.gif b/media/mod_languages/images/eo.gif
deleted file mode 100644
index 09024ecac4256..0000000000000
Binary files a/media/mod_languages/images/eo.gif and /dev/null differ
diff --git a/media/mod_languages/images/es_es.gif b/media/mod_languages/images/es_es.gif
deleted file mode 100644
index 3e8d4fe2752ce..0000000000000
Binary files a/media/mod_languages/images/es_es.gif and /dev/null differ
diff --git a/media/mod_languages/images/et_ee.gif b/media/mod_languages/images/et_ee.gif
deleted file mode 100644
index 6764ec8bcac01..0000000000000
Binary files a/media/mod_languages/images/et_ee.gif and /dev/null differ
diff --git a/media/mod_languages/images/fa_ir.gif b/media/mod_languages/images/fa_ir.gif
deleted file mode 100644
index 4babb94d3b0e4..0000000000000
Binary files a/media/mod_languages/images/fa_ir.gif and /dev/null differ
diff --git a/media/mod_languages/images/fi_fi.gif b/media/mod_languages/images/fi_fi.gif
deleted file mode 100644
index 95e5c11fd2941..0000000000000
Binary files a/media/mod_languages/images/fi_fi.gif and /dev/null differ
diff --git a/media/mod_languages/images/fr_fr.gif b/media/mod_languages/images/fr_fr.gif
deleted file mode 100644
index 13328761d3b13..0000000000000
Binary files a/media/mod_languages/images/fr_fr.gif and /dev/null differ
diff --git a/media/mod_languages/images/en.gif b/media/mod_languages/images/gb.gif
similarity index 100%
rename from media/mod_languages/images/en.gif
rename to media/mod_languages/images/gb.gif
diff --git a/media/mod_languages/images/gd.gif b/media/mod_languages/images/gd.gif
deleted file mode 100644
index 470ee74734b5f..0000000000000
Binary files a/media/mod_languages/images/gd.gif and /dev/null differ
diff --git a/media/mod_languages/images/ka.gif b/media/mod_languages/images/ge.gif
similarity index 100%
rename from media/mod_languages/images/ka.gif
rename to media/mod_languages/images/ge.gif
diff --git a/media/mod_languages/images/gl.gif b/media/mod_languages/images/gl.gif
deleted file mode 100644
index 06a704b07fdef..0000000000000
Binary files a/media/mod_languages/images/gl.gif and /dev/null differ
diff --git a/media/mod_languages/images/el.gif b/media/mod_languages/images/gr.gif
similarity index 100%
rename from media/mod_languages/images/el.gif
rename to media/mod_languages/images/gr.gif
diff --git a/media/mod_languages/images/he_il.gif b/media/mod_languages/images/he_il.gif
deleted file mode 100644
index 7170ce2a6fd1d..0000000000000
Binary files a/media/mod_languages/images/he_il.gif and /dev/null differ
diff --git a/media/mod_languages/images/hi_in.gif b/media/mod_languages/images/hi_in.gif
deleted file mode 100644
index 20b44757d308e..0000000000000
Binary files a/media/mod_languages/images/hi_in.gif and /dev/null differ
diff --git a/media/mod_languages/images/hk_hk.gif b/media/mod_languages/images/hk_hk.gif
deleted file mode 100644
index d6904f7e2e7ad..0000000000000
Binary files a/media/mod_languages/images/hk_hk.gif and /dev/null differ
diff --git a/media/mod_languages/images/hr_hr.gif b/media/mod_languages/images/hr_hr.gif
deleted file mode 100644
index 85e9f55bff136..0000000000000
Binary files a/media/mod_languages/images/hr_hr.gif and /dev/null differ
diff --git a/media/mod_languages/images/hu_hu.gif b/media/mod_languages/images/hu_hu.gif
deleted file mode 100644
index da28a93e62b91..0000000000000
Binary files a/media/mod_languages/images/hu_hu.gif and /dev/null differ
diff --git a/media/mod_languages/images/hy_am.gif b/media/mod_languages/images/hy_am.gif
deleted file mode 100644
index 92e71189f5d0f..0000000000000
Binary files a/media/mod_languages/images/hy_am.gif and /dev/null differ
diff --git a/media/mod_languages/images/id_id.gif b/media/mod_languages/images/id_id.gif
deleted file mode 100644
index 9e4a11e296bca..0000000000000
Binary files a/media/mod_languages/images/id_id.gif and /dev/null differ
diff --git a/media/mod_languages/images/ga_ie.gif b/media/mod_languages/images/ie.gif
similarity index 100%
rename from media/mod_languages/images/ga_ie.gif
rename to media/mod_languages/images/ie.gif
diff --git a/media/mod_languages/images/he.gif b/media/mod_languages/images/il.gif
similarity index 100%
rename from media/mod_languages/images/he.gif
rename to media/mod_languages/images/il.gif
diff --git a/media/mod_languages/images/hi.gif b/media/mod_languages/images/in.gif
similarity index 100%
rename from media/mod_languages/images/hi.gif
rename to media/mod_languages/images/in.gif
diff --git a/media/mod_languages/images/cbk_iq.gif b/media/mod_languages/images/iq.gif
similarity index 100%
rename from media/mod_languages/images/cbk_iq.gif
rename to media/mod_languages/images/iq.gif
diff --git a/media/mod_languages/images/fa.gif b/media/mod_languages/images/ir.gif
similarity index 100%
rename from media/mod_languages/images/fa.gif
rename to media/mod_languages/images/ir.gif
diff --git a/media/mod_languages/images/is_is.gif b/media/mod_languages/images/is_is.gif
deleted file mode 100644
index 2a4ecfb9dca7e..0000000000000
Binary files a/media/mod_languages/images/is_is.gif and /dev/null differ
diff --git a/media/mod_languages/images/it_it.gif b/media/mod_languages/images/it_it.gif
deleted file mode 100644
index 4a5f6f81798d6..0000000000000
Binary files a/media/mod_languages/images/it_it.gif and /dev/null differ
diff --git a/media/mod_languages/images/ja_jp.gif b/media/mod_languages/images/ja_jp.gif
deleted file mode 100644
index 63e3b7aca072f..0000000000000
Binary files a/media/mod_languages/images/ja_jp.gif and /dev/null differ
diff --git a/media/mod_languages/images/ja.gif b/media/mod_languages/images/jp.gif
similarity index 100%
rename from media/mod_languages/images/ja.gif
rename to media/mod_languages/images/jp.gif
diff --git a/media/mod_languages/images/ka_ge.gif b/media/mod_languages/images/ka_ge.gif
deleted file mode 100644
index fae96f1bbd4ce..0000000000000
Binary files a/media/mod_languages/images/ka_ge.gif and /dev/null differ
diff --git a/media/mod_languages/images/km.gif b/media/mod_languages/images/kh.gif
similarity index 100%
rename from media/mod_languages/images/km.gif
rename to media/mod_languages/images/kh.gif
diff --git a/media/mod_languages/images/km_kh.gif b/media/mod_languages/images/km_kh.gif
deleted file mode 100644
index 5114a28465f15..0000000000000
Binary files a/media/mod_languages/images/km_kh.gif and /dev/null differ
diff --git a/media/mod_languages/images/ko_kr.gif b/media/mod_languages/images/ko_kr.gif
deleted file mode 100644
index f81e4ae0bbf02..0000000000000
Binary files a/media/mod_languages/images/ko_kr.gif and /dev/null differ
diff --git a/media/mod_languages/images/ko.gif b/media/mod_languages/images/kr.gif
similarity index 100%
rename from media/mod_languages/images/ko.gif
rename to media/mod_languages/images/kr.gif
diff --git a/media/mod_languages/images/lo.gif b/media/mod_languages/images/la.gif
similarity index 100%
rename from media/mod_languages/images/lo.gif
rename to media/mod_languages/images/la.gif
diff --git a/media/mod_languages/images/de_li.gif b/media/mod_languages/images/li.gif
similarity index 100%
rename from media/mod_languages/images/de_li.gif
rename to media/mod_languages/images/li.gif
diff --git a/media/mod_languages/images/lk.gif b/media/mod_languages/images/lk.gif
new file mode 100644
index 0000000000000..1e9a303070cd6
Binary files /dev/null and b/media/mod_languages/images/lk.gif differ
diff --git a/media/mod_languages/images/lo_la.gif b/media/mod_languages/images/lo_la.gif
deleted file mode 100644
index e5cd3ec37c571..0000000000000
Binary files a/media/mod_languages/images/lo_la.gif and /dev/null differ
diff --git a/media/mod_languages/images/lt_lt.gif b/media/mod_languages/images/lt_lt.gif
deleted file mode 100644
index 184ba87d71819..0000000000000
Binary files a/media/mod_languages/images/lt_lt.gif and /dev/null differ
diff --git a/media/mod_languages/images/de_lu.gif b/media/mod_languages/images/lu.gif
similarity index 100%
rename from media/mod_languages/images/de_lu.gif
rename to media/mod_languages/images/lu.gif
diff --git a/media/mod_languages/images/lv_lv.gif b/media/mod_languages/images/lv_lv.gif
deleted file mode 100644
index 161b9b738d665..0000000000000
Binary files a/media/mod_languages/images/lv_lv.gif and /dev/null differ
diff --git a/media/mod_languages/images/srp_me.gif b/media/mod_languages/images/me.gif
similarity index 100%
rename from media/mod_languages/images/srp_me.gif
rename to media/mod_languages/images/me.gif
diff --git a/media/mod_languages/images/mk_mk.gif b/media/mod_languages/images/mk_mk.gif
deleted file mode 100644
index 278f00ee89e59..0000000000000
Binary files a/media/mod_languages/images/mk_mk.gif and /dev/null differ
diff --git a/media/mod_languages/images/mn_mn.gif b/media/mod_languages/images/mn_mn.gif
deleted file mode 100644
index 4213d4c55138d..0000000000000
Binary files a/media/mod_languages/images/mn_mn.gif and /dev/null differ
diff --git a/media/mod_languages/images/ms_my.gif b/media/mod_languages/images/my.gif
similarity index 100%
rename from media/mod_languages/images/ms_my.gif
rename to media/mod_languages/images/my.gif
diff --git a/media/mod_languages/images/nb_no.gif b/media/mod_languages/images/nb_no.gif
deleted file mode 100644
index 51295cdf76540..0000000000000
Binary files a/media/mod_languages/images/nb_no.gif and /dev/null differ
diff --git a/media/mod_languages/images/nl_nl.gif b/media/mod_languages/images/nl_nl.gif
deleted file mode 100644
index f125a7cb615e2..0000000000000
Binary files a/media/mod_languages/images/nl_nl.gif and /dev/null differ
diff --git a/media/mod_languages/images/nn_no.gif b/media/mod_languages/images/nn_no.gif
deleted file mode 100644
index 51295cdf76540..0000000000000
Binary files a/media/mod_languages/images/nn_no.gif and /dev/null differ
diff --git a/media/mod_languages/images/ur.gif b/media/mod_languages/images/pk.gif
similarity index 100%
rename from media/mod_languages/images/ur.gif
rename to media/mod_languages/images/pk.gif
diff --git a/media/mod_languages/images/pl_pl.gif b/media/mod_languages/images/pl_pl.gif
deleted file mode 100644
index 9b1a5717129fd..0000000000000
Binary files a/media/mod_languages/images/pl_pl.gif and /dev/null differ
diff --git a/media/mod_languages/images/ps.gif b/media/mod_languages/images/ps.gif
deleted file mode 100644
index 498e0c6fa7bd8..0000000000000
Binary files a/media/mod_languages/images/ps.gif and /dev/null differ
diff --git a/media/mod_languages/images/pt_pt.gif b/media/mod_languages/images/pt_pt.gif
deleted file mode 100644
index 654365752509d..0000000000000
Binary files a/media/mod_languages/images/pt_pt.gif and /dev/null differ
diff --git a/media/mod_languages/images/ro_ro.gif b/media/mod_languages/images/ro_ro.gif
deleted file mode 100644
index aa7240537b600..0000000000000
Binary files a/media/mod_languages/images/ro_ro.gif and /dev/null differ
diff --git a/media/mod_languages/images/ru_ru.gif b/media/mod_languages/images/ru_ru.gif
deleted file mode 100644
index b27855dde1481..0000000000000
Binary files a/media/mod_languages/images/ru_ru.gif and /dev/null differ
diff --git a/media/mod_languages/images/sv.gif b/media/mod_languages/images/se.gif
similarity index 100%
rename from media/mod_languages/images/sv.gif
rename to media/mod_languages/images/se.gif
diff --git a/media/mod_languages/images/si.gif b/media/mod_languages/images/si.gif
deleted file mode 100644
index 31d6da7169cc8..0000000000000
Binary files a/media/mod_languages/images/si.gif and /dev/null differ
diff --git a/media/mod_languages/images/sk_sk.gif b/media/mod_languages/images/sk_sk.gif
deleted file mode 100644
index 2b1daeb206aea..0000000000000
Binary files a/media/mod_languages/images/sk_sk.gif and /dev/null differ
diff --git a/media/mod_languages/images/sl.gif b/media/mod_languages/images/sl.gif
deleted file mode 100644
index e153cc3d7c5e6..0000000000000
Binary files a/media/mod_languages/images/sl.gif and /dev/null differ
diff --git a/media/mod_languages/images/sq_al.gif b/media/mod_languages/images/sq_al.gif
deleted file mode 100644
index 966016652a712..0000000000000
Binary files a/media/mod_languages/images/sq_al.gif and /dev/null differ
diff --git a/media/mod_languages/images/sr.gif b/media/mod_languages/images/sr.gif
deleted file mode 100644
index 4c6ed0e581b65..0000000000000
Binary files a/media/mod_languages/images/sr.gif and /dev/null differ
diff --git a/media/mod_languages/images/sv_se.gif b/media/mod_languages/images/sv_se.gif
deleted file mode 100644
index ca46f02f60165..0000000000000
Binary files a/media/mod_languages/images/sv_se.gif and /dev/null differ
diff --git a/media/mod_languages/images/sw.gif b/media/mod_languages/images/sw.gif
deleted file mode 100644
index 36ad8b4855cf9..0000000000000
Binary files a/media/mod_languages/images/sw.gif and /dev/null differ
diff --git a/media/mod_languages/images/sy.gif b/media/mod_languages/images/sy.gif
deleted file mode 100644
index 5c453a4f800ec..0000000000000
Binary files a/media/mod_languages/images/sy.gif and /dev/null differ
diff --git a/media/mod_languages/images/ta.gif b/media/mod_languages/images/ta.gif
deleted file mode 100644
index 43ab7af47440e..0000000000000
Binary files a/media/mod_languages/images/ta.gif and /dev/null differ
diff --git a/media/mod_languages/images/th_th.gif b/media/mod_languages/images/th_th.gif
deleted file mode 100644
index d2de99f69ca77..0000000000000
Binary files a/media/mod_languages/images/th_th.gif and /dev/null differ
diff --git a/media/mod_languages/images/tk_tm.gif b/media/mod_languages/images/tm.gif
similarity index 100%
rename from media/mod_languages/images/tk_tm.gif
rename to media/mod_languages/images/tm.gif
diff --git a/media/mod_languages/images/tr_tr.gif b/media/mod_languages/images/tr_tr.gif
deleted file mode 100644
index 9a73f85da9923..0000000000000
Binary files a/media/mod_languages/images/tr_tr.gif and /dev/null differ
diff --git a/media/mod_languages/images/uk.gif b/media/mod_languages/images/ua.gif
similarity index 100%
rename from media/mod_languages/images/uk.gif
rename to media/mod_languages/images/ua.gif
diff --git a/media/mod_languages/images/uk_ua.gif b/media/mod_languages/images/uk_ua.gif
deleted file mode 100644
index 442af6c78d7d4..0000000000000
Binary files a/media/mod_languages/images/uk_ua.gif and /dev/null differ
diff --git a/media/mod_languages/images/ur_pk.gif b/media/mod_languages/images/ur_pk.gif
deleted file mode 100644
index 40e2f6614bb0d..0000000000000
Binary files a/media/mod_languages/images/ur_pk.gif and /dev/null differ
diff --git a/media/mod_languages/images/uz_uz.gif b/media/mod_languages/images/uz_uz.gif
deleted file mode 100644
index 14630eed749fe..0000000000000
Binary files a/media/mod_languages/images/uz_uz.gif and /dev/null differ
diff --git a/media/mod_languages/images/vi_vn.gif b/media/mod_languages/images/vi_vn.gif
deleted file mode 100644
index 4a881ea8dad99..0000000000000
Binary files a/media/mod_languages/images/vi_vn.gif and /dev/null differ
diff --git a/media/mod_languages/images/vi.gif b/media/mod_languages/images/vn.gif
similarity index 100%
rename from media/mod_languages/images/vi.gif
rename to media/mod_languages/images/vn.gif
diff --git a/media/mod_languages/images/af.gif b/media/mod_languages/images/za.gif
similarity index 100%
rename from media/mod_languages/images/af.gif
rename to media/mod_languages/images/za.gif
diff --git a/media/mod_languages/images/zh_cn.gif b/media/mod_languages/images/zh_cn.gif
deleted file mode 100644
index 384522b664c3e..0000000000000
Binary files a/media/mod_languages/images/zh_cn.gif and /dev/null differ
diff --git a/media/mod_languages/images/zh_tw.gif b/media/mod_languages/images/zh_tw.gif
deleted file mode 100644
index a4fbb172e0c98..0000000000000
Binary files a/media/mod_languages/images/zh_tw.gif and /dev/null differ