diff --git a/sources.csv b/sources.csv
index d5fa7aff..3f37c533 100644
--- a/sources.csv
+++ b/sources.csv
@@ -22,7 +22,7 @@ ug-flag-bali.png,,,
 ug-flag-bangladesh.svg,,,
 ug-flag-barbados.svg,,,
 ug-flag-belarus.svg,,,
-ug-flag-belgium.svg,,,
+ug-flag-belgium.svg,https://commons.wikimedia.org/wiki/File:Flag_of_Belgium.svg,PD,resized
 ug-flag-belize.png,,,
 ug-flag-benin.svg,,,
 ug-flag-bermuda.svg,,,
@@ -55,7 +55,7 @@ ug-flag-colombia.svg,,,
 ug-flag-comoros.svg,,,
 ug-flag-cook_islands.svg,,,
 ug-flag-corsica.svg,,,
-ug-flag-costa_rica.svg,,,
+ug-flag-costa_rica.png,https://commons.wikimedia.org/wiki/File:Flag_of_Costa_Rica_(state).svg,PD,"converted to PNG, optimised with optipng"
 ug-flag-croatia.png,,,
 ug-flag-cuba.svg,,,
 ug-flag-curacao.svg,,,
@@ -179,7 +179,7 @@ ug-flag-palestine.svg,,,
 ug-flag-panama.svg,,,
 ug-flag-papua_new_guinea.svg,,,
 ug-flag-paraguay.svg,,,
-ug-flag-peru.svg,,,
+ug-flag-peru.png,https://commons.wikimedia.org/wiki/File:Flag_of_Peru_(state).svg,PD,"converted to PNG, optimised with optipng"
 ug-flag-philippines.svg,,,
 ug-flag-pitcairn_islands.svg,,,
 ug-flag-poland.svg,,,
@@ -252,7 +252,7 @@ ug-flag-uruguay.svg,,,
 ug-flag-uzbekistan.svg,,,
 ug-flag-vanuatu.svg,,,
 ug-flag-vatican_city.svg,,,
-ug-flag-venezuela.svg,,,
+ug-flag-venezuela.png,https://en.wikipedia.org/wiki/File:Flag_of_Venezuela_(state).svg,PD,converted to PNG
 ug-flag-vietnam.svg,,,
 ug-flag-wales.svg,,,
 ug-flag-yemen.svg,,,
diff --git a/src/data.csv b/src/data.csv
index 4adda03b..1ff32fb0 100644
--- a/src/data.csv
+++ b/src/data.csv
@@ -142,7 +142,7 @@ czq?(.f9rK,Syria,Syrien,,,Damascus,Damaskus,,,,,"<img src=""ug-flag-syria.svg""
 kDeaNFo$(Q,Taiwan,Taiwan,"Partially recognised state claimed by China.","Völkerrechtliche Stellung umstritten, von China beansprucht.",Taipei,Taipeh,,,,,"<img src=""ug-flag-taiwan.svg"" />",,,"<img src=""ug-map-taiwan.png"" />","UG::Asia UG::Sovereign_State"
 ei3G6ous#%,"Sri Lanka","Sri Lanka",,,"Sri Jayawardenepura Kotte","Sri Jayawardenepura Kotte","Colombo is often referred to as the capital but Sri Jayawardenepura Kotte, a suburb of Colombo, is the official, legislative capital.","Colombo wird oft als die Hauptstadt bezeichnet, aber Sri Jayawardenepura Kotte, ein Vorort von Colombo, ist die offizielle, legislative Hauptstadt.",,,"<img src=""ug-flag-sri_lanka.svg"" />",,,"<img src=""ug-map-sri_lanka.png"" />","UG::Asia UG::Sovereign_State"
 eLiW%Al2Is,Tajikistan,Tadschikistan,,,Dushanbe,Duschanbe,,,,,"<img src=""ug-flag-tajikistan.svg"" />",,,"<img src=""ug-map-tajikistan.png"" />","UG::Asia UG::Sovereign_State"
-f)aQmJp.B?,Thailand,Thailand,,,Bangkok,Bangkok,,,,,"<img src=""ug-flag-thailand.svg"" />","Costa Rica (blue and red&nbsp;inverted)","Costa Rica (Blau und Rot vertauscht)","<img src=""ug-map-thailand.png"" />","UG::Asia UG::Southeast_Asia UG::Sovereign_State"
+f)aQmJp.B?,Thailand,Thailand,,,Bangkok,Bangkok,,,,,"<img src=""ug-flag-thailand.svg"" />","Costa Rica (blue and red&nbsp;inverted, with coat of arms)","Costa Rica (Blau und Rot vertauscht, mit Wappen)","<img src=""ug-map-thailand.png"" />","UG::Asia UG::Southeast_Asia UG::Sovereign_State"
 "d@=,E(oqDu","East Timor",Osttimor,"Also known as&nbsp;Timor-Leste.","Auch Timor-Leste.",Dili,Dili,,,,,"<img src=""ug-flag-east_timor.svg"" />",,,"<img src=""ug-map-east_timor.png"" />","UG::Asia UG::Southeast_Asia UG::Sovereign_State"
 mLG*@5t=NG,"United Arab Emirates","Vereinigte Arabische Emirate",,,"Abu Dhabi","Abu Dhabi",,,,,"<img src=""ug-flag-united_arab_emirates.svg"" />",,,"<img src=""ug-map-united_arab_emirates.png"" />","UG::Asia UG::Middle_East UG::Sovereign_State"
 stDJ0UMUpB,Turkmenistan,Turkmenistan,,,Ashgabat,Aschgabat,,,,,"<img src=""ug-flag-turkmenistan.svg"" />",,,"<img src=""ug-map-turkmenistan.png"" />","UG::Asia UG::Sovereign_State"
@@ -161,10 +161,10 @@ f0(HVIK@$w,Colombia,Kolumbien,,,Bogotá,Bogotá,,,,,"<img src=""ug-flag-colombia
 jY<1R8gh$5,Ecuador,Ecuador,,,Quito,Quito,,,,,"<img src=""ug-flag-ecuador.png"" />","Colombia (no coat of arms)","Kolumbien (kein Wappen)","<img src=""ug-map-ecuador.png"" />","UG::America UG::South_America UG::Sovereign_State"
 ow]5&Kht`e,Guyana,Guyana,,,Georgetown,Georgetown,,,"One-word country name",Ein-Wort-Ländername,"<img src=""ug-flag-guyana.svg"" />",,,"<img src=""ug-map-guyana.png"" />","UG::America UG::South_America UG::Sovereign_State"
 qksH)(ibFv,Paraguay,Paraguay,,,Asunción,Asunción,,,,,"<img src=""ug-flag-paraguay.svg"" />",,,"<img src=""ug-map-paraguay.png"" />","UG::America UG::South_America UG::Sovereign_State"
-h%Lx8uxLJ{,Peru,Peru,,,Lima,Lima,,,,,"<img src=""ug-flag-peru.svg"" />",,,"<img src=""ug-map-peru.png"" />","UG::America UG::South_America UG::Sovereign_State"
+h%Lx8uxLJ{,Peru,Peru,,,Lima,Lima,,,,,"<img src=""ug-flag-peru.png"" />",,,"<img src=""ug-map-peru.png"" />","UG::America UG::South_America UG::Sovereign_State"
 "i0)jG,7&w>",Suriname,Suriname,,"Auch Surinam.",Paramaribo,Paramaribo,,,,,"<img src=""ug-flag-suriname.svg"" />",,,"<img src=""ug-map-suriname.png"" />","UG::America UG::South_America UG::Sovereign_State"
 cBO(I-Le=v,Uruguay,Uruguay,,,Montevideo,Montevideo,,,,,"<img src=""ug-flag-uruguay.svg"" />",,,"<img src=""ug-map-uruguay.png"" />","UG::America UG::South_America UG::Sovereign_State"
-mkj;-5D/)m,Venezuela,Venezuela,,,Caracas,Caracas,,,,,"<img src=""ug-flag-venezuela.svg"" />",,,"<img src=""ug-map-venezuela.png"" />","UG::America UG::South_America UG::Sovereign_State"
+mkj;-5D/)m,Venezuela,Venezuela,,,Caracas,Caracas,,,,,"<img src=""ug-flag-venezuela.png"" />",,,"<img src=""ug-map-venezuela.png"" />","UG::America UG::South_America UG::Sovereign_State"
 qd$w_!A9y<,"Cook Islands",Cookinseln,,,Avarua,Avarua,,,,,"<img src=""ug-flag-cook_islands.svg"" />",,,"<img src=""ug-map-cook_islands.png"" />","UG::Oceania UG::Sovereign_State"
 iaA$(k1aV>,"Federated States of Micronesia","Föderierte Staaten von Mikronesien",,,Palikir,Palikir,,,,,"<img src=""ug-flag-federated_states_of_micronesia.svg"" />",,,"<img src=""ug-map-federated_states_of_micronesia.png"" />","UG::Oceania UG::Sovereign_State"
 b`8}eUH!Ii,Guam,Guam,"Unincorporated territory of the United States.","Nichtinkorporiertes US-amerikanisches Außengebiet.",Hagåtña,Hagåtña,,,,,"<img src=""ug-flag-guam.svg"" />",,,"<img src=""ug-map-guam.png"" />",UG::Oceania
@@ -183,7 +183,7 @@ e%!;xc:jxC,Bermuda,Bermuda,"Overseas territory of the United Kingdom.","Britisch
 >e=4!;^#_,"The Bahamas",Bahamas,,,Nassau,Nassau,,,,,"<img src=""ug-flag-the_bahamas.svg"" />",,,"<img src=""ug-map-the_bahamas.png"" />","UG::America UG::Caribbean UG::Sovereign_State"
 cIMc3Nzy>W,Barbados,Barbados,,,Bridgetown,Bridgetown,,,,,"<img src=""ug-flag-barbados.svg"" />",,,"<img src=""ug-map-barbados.png"" />","UG::America UG::Caribbean UG::Sovereign_State"
 rOVL2(d0m^,Belize,Belize,,,Belmopan,Belmopan,,,,,"<img src=""ug-flag-belize.png"" />",,,"<img src=""ug-map-belize.png"" />","UG::America UG::North+Central_America UG::Sovereign_State"
-"s,m:kRL/53","Costa Rica","Costa Rica",,,"San José","San José",,,,,"<img src=""ug-flag-costa_rica.svg"" />","Thailand (red and blue inverted)","Thailand (Rot und Blau vertauscht)","<img src=""ug-map-costa_rica.png"" />","UG::America UG::North+Central_America UG::Sovereign_State"
+"s,m:kRL/53","Costa Rica","Costa Rica",,,"San José","San José",,,,,"<img src=""ug-flag-costa_rica.png"" />","Thailand (red and blue inverted, no coat of arms)","Thailand (Rot und Blau vertauscht, kein Wappen)","<img src=""ug-map-costa_rica.png"" />","UG::America UG::North+Central_America UG::Sovereign_State"
 il{B6F&ui9,"El Salvador","El Salvador",,,"San Salvador","San Salvador",,,,,"<img src=""ug-flag-el_salvador.png"" />","Nicaragua (different coat of arms)","Nicaragua (anderes Wappen)","<img src=""ug-map-el_salvador.png"" />","UG::America UG::North+Central_America UG::Sovereign_State"
 b^_Av:%|%E,Guatemala,Guatemala,,,"Guatemala City",Guatemala-Stadt,,,,,"<img src=""ug-flag-guatemala.png"" />",,,"<img src=""ug-map-guatemala.png"" />","UG::America UG::North+Central_America UG::Sovereign_State"
 rGPlNG/dw%,Honduras,Honduras,,,Tegucigalpa,Tegucigalpa,,,,,"<img src=""ug-flag-honduras.svg"" />",,,"<img src=""ug-map-honduras.png"" />","UG::America UG::North+Central_America UG::Sovereign_State"
diff --git a/src/media/ug-flag-belgium.svg b/src/media/ug-flag-belgium.svg
index fdea6137..349a7411 100644
--- a/src/media/ug-flag-belgium.svg
+++ b/src/media/ug-flag-belgium.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="375" height="250" viewBox="0 0 450 300"><path fill="#ed2939" d="M0 0h450v300H0z"/><path fill="#fae042" d="M0 0h300v300H0z"/><path d="M0 0h150v300H0z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="288" height="250" viewBox="0 0 288 250" version="1.1"><g id="surface1"><rect x="0" y="0" width="288" height="250" style="fill:rgb(92.941176%,16.078431%,22.352941%);fill-opacity:1;stroke:none;"/><path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.039216%,87.843137%,25.882353%);fill-opacity:1;" d="M 0 0 L 192 0 L 192 250 L 0 250 Z M 0 0 "/><path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 0 0 L 96 0 L 96 250 L 0 250 Z M 0 0 "/></g></svg>
\ No newline at end of file
diff --git a/src/media/ug-flag-costa_rica.png b/src/media/ug-flag-costa_rica.png
new file mode 100644
index 00000000..37085c46
Binary files /dev/null and b/src/media/ug-flag-costa_rica.png differ
diff --git a/src/media/ug-flag-costa_rica.svg b/src/media/ug-flag-costa_rica.svg
deleted file mode 100644
index 526643a9..00000000
--- a/src/media/ug-flag-costa_rica.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="417" height="250" viewBox="0 0 10 6"><path d="M0 0h10v6H0z" fill="#002b7f"/><path d="M0 1h10v4H0z" fill="#fff"/><path d="M0 2h10v2H0z" fill="#ce1126"/></svg>
\ No newline at end of file
diff --git a/src/media/ug-flag-peru.png b/src/media/ug-flag-peru.png
new file mode 100644
index 00000000..3d47a391
Binary files /dev/null and b/src/media/ug-flag-peru.png differ
diff --git a/src/media/ug-flag-peru.svg b/src/media/ug-flag-peru.svg
deleted file mode 100644
index 70bea263..00000000
--- a/src/media/ug-flag-peru.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="375" height="250" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 900 600"><path fill="#D91023" d="M0 0h900v600H0z"/><path fill="#fff" d="M300 0h300v600H300z"/></svg>
\ No newline at end of file
diff --git a/src/media/ug-flag-venezuela.png b/src/media/ug-flag-venezuela.png
new file mode 100644
index 00000000..07b5b032
Binary files /dev/null and b/src/media/ug-flag-venezuela.png differ
diff --git a/src/media/ug-flag-venezuela.svg b/src/media/ug-flag-venezuela.svg
deleted file mode 100644
index f381e5be..00000000
--- a/src/media/ug-flag-venezuela.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="375" height="250" viewBox="0 0 180 120"><defs><g id="d" transform="translate(0 -36)"><g id="c"><g id="b"><path d="M0-5v5h3z" fill="#fff" transform="rotate(18 0 -5)" id="a"/><use xlink:href="#a" transform="scale(-1 1)"/></g><use xlink:href="#b" transform="rotate(72)"/></g><use xlink:href="#b" transform="rotate(-72)"/><use xlink:href="#c" transform="rotate(144)"/></g></defs><path d="M0 0h180v120H0z" fill="#cf142b"/><path d="M0 0h180v80H0z" fill="#00247d"/><path d="M0 0h180v40H0z" fill="#fc0"/><g transform="translate(90 84)"><g id="f"><g id="e"><use xlink:href="#d" transform="rotate(10)"/><use xlink:href="#d" transform="rotate(30)"/></g><use xlink:href="#e" transform="rotate(40)"/></g><use xlink:href="#f" transform="rotate(-80)"/></g></svg>
\ No newline at end of file