diff --git a/sources.csv b/sources.csv
index dca61d21..d5fa7aff 100644
--- a/sources.csv
+++ b/sources.csv
@@ -4,7 +4,7 @@ ug-flag-afghanistan.png,https://commons.wikimedia.org/wiki/File:Flag_of_Afghanis
ug-flag-aland_islands.svg,,,
ug-flag-albania.svg,,,
ug-flag-algeria.svg,,,
-ug-flag-american_samoa.png,,,
+ug-flag-american_samoa.svg,https://commons.wikimedia.org/wiki/File:Flag_of_American_Samoa.svg,PD,optimised with svgo
ug-flag-andorra.png,,,
ug-flag-angola.svg,,,
ug-flag-anguilla.svg,,,
@@ -81,7 +81,7 @@ ug-flag-european_union.svg,,,
ug-flag-falkland_islands.svg,,,
ug-flag-faroe_islands.svg,,,
ug-flag-federated_states_of_micronesia.svg,,,
-ug-flag-fiji.png,,,
+ug-flag-fiji.svg,https://commons.wikimedia.org/wiki/File:Flag_of_Fiji.svg,PD,optimised with svgo
ug-flag-finland.svg,,,
ug-flag-france.svg,,,
ug-flag-french_polynesia.svg,,,
@@ -219,7 +219,7 @@ ug-flag-south_africa.svg,,,
ug-flag-south_korea.svg,,,
ug-flag-south_ossetia.svg,,,
ug-flag-south_sudan.svg,,,
-ug-flag-spain.png,,,
+ug-flag-spain.svg,https://commons.wikimedia.org/wiki/File:Flag_of_Spain.svg,PD,optimised with svgo
ug-flag-sri_lanka.svg,,,
ug-flag-sudan.svg,,,
ug-flag-suriname.svg,,,
diff --git a/src/data.csv b/src/data.csv
index 030794ea..4adda03b 100644
--- a/src/data.csv
+++ b/src/data.csv
@@ -46,7 +46,7 @@ his*oE$.bt,"San Marino","San Marino",,,"City of San Marino","San Marino",,,,,"",,,"","UG::Europe UG::Sovereign_State"
o_Qs1fsA*`,Slovakia,Slowakei,,,Bratislava,Bratislava,,,,,"",,,"","UG::Europe UG::European_Union UG::Sovereign_State"
etAIJgAn)8,Slovenia,Slowenien,,,Ljubljana,Ljubljana,,,,,"",,,"","UG::Europe UG::European_Union UG::Mediterranean UG::Sovereign_State"
-db{up5I>x|,Spain,Spanien,,,Madrid,Madrid,,,,,"",,,"","UG::Europe UG::European_Union UG::Mediterranean UG::Sovereign_State"
+db{up5I>x|,Spain,Spanien,,,Madrid,Madrid,,,,,"",,,"","UG::Europe UG::European_Union UG::Mediterranean UG::Sovereign_State"
q]au(Cz(^`,Sweden,Schweden,,,Stockholm,Stockholm,,,,,"",,,"","UG::Europe UG::European_Union UG::Sovereign_State"
j^y9}r#a`i,Switzerland,Schweiz,,,Bern,Bern,,,,,"",,,"","UG::Europe UG::Sovereign_State"
h(8o@usM_h,Turkey,Türkei,,,Ankara,Ankara,,,,,"",,,"","UG::Asia UG::Middle_East UG::Mediterranean UG::Sovereign_State"
@@ -149,7 +149,7 @@ stDJ0UMUpB,Turkmenistan,Turkmenistan,,,Ashgabat,Aschgabat,,,,,"","Egypt (with emblem), Iraq (with text) and Syria (with two stars)","Ägypten (mit Emblem), Irak (mit Text) und Syrien (mit zwei Sternen)","","UG::Asia UG::Middle_East UG::Sovereign_State"
n(u/Le9LCH,Vietnam,Vietnam,,,Hanoi,Hanoi,,,,,"",,,"","UG::Asia UG::Southeast_Asia UG::Sovereign_State"
kN&[K]7`>c,Uzbekistan,Usbekistan,,,Tashkent,Taschkent,,,,,"",,,"","UG::Asia UG::Sovereign_State"
-e%F*sk0uaT,Fiji,Fidschi,,,Suva,Suva,,,,,"",,,"","UG::Oceania UG::Sovereign_State"
+e%F*sk0uaT,Fiji,Fidschi,,,Suva,Suva,,,,,"",,,"","UG::Oceania UG::Sovereign_State"
jT[(te+7i%,"Papua New Guinea",Papua-Neuguinea,,,"Port Moresby","Port Moresby",,,,,"",,,"","UG::Oceania UG::Sovereign_State"
i~E.z}UxNF,Australia,Australien,,,Canberra,Canberra,,,,,"","New Zealand (red stars, two fewer stars)","Neuseeland (rote Sterne, zwei Sterne weniger)","","UG::Oceania UG::Sovereign_State"
pAOtFl&>U#,"Solomon Islands",Salomonen,,"Auch Salomoninseln.",Honiara,Honiara,,,,,"",,,"","UG::Oceania UG::Sovereign_State"
@@ -247,7 +247,7 @@ khTp#J9C!!,"Saint Helena","St. Helena","Part of Saint Helena, Ascension and Tris
r3?J{NB0J3,"Sint Eustatius","Sint Eustatius","Special municipality of the Netherlands.","Besondere Gemeinde der Niederlande.",Oranjestad,Oranjestad,,,"Special municipality","Besondere Gemeinde","",,,"","UG::America UG::Caribbean"
nE1cs;TFgo,"South Ossetia",Südossetien,"Independent state claimed by Georgia.","Unabhängiger Staat, von Georgien beansprucht.",Tskhinvali,Zchinwali,,,,,"",,,"","UG::Asia UG::Sovereign_State"
nN",,,"",UG::Oceania
-lU*>%[&e|.,"American Samoa",Amerikanisch-Samoa,"Unincorporated territory of the United States.","Nichtinkorporiertes US-amerikanisches Außengebiet.","Pago Pago","Pago Pago",,,,,"",,,"",UG::Oceania
+lU*>%[&e|.,"American Samoa",Amerikanisch-Samoa,"Unincorporated territory of the United States.","Nichtinkorporiertes US-amerikanisches Außengebiet.","Pago Pago","Pago Pago",,,,,"",,,"",UG::Oceania
nK;HFcd-1P,"Northern Mariana Islands","Nördliche Marianen","Unincorporated territory of the United States.","Nichtinkorporiertes US-amerikanisches Außengebiet.",Saipan,Saipan,,,,,"",,,"",UG::Oceania
s7{M&?)+C&,Aruba,Aruba,"Constituent country of the Kingdom of the Netherlands.","Autonomes Land innerhalb des Königreichs der Niederlande.",Oranjestad,Oranjestad,,,"Constituent country",,"",,,"","UG::America UG::Caribbean"
q@4oQPt%lt,Abkhazia,Abchasien,"Independent state claimed by Georgia.","Unabhängiger Staat, der von Georgien beansprucht wird.",Sukhumi,Sochumi,,,,,"",,,"","UG::Europe UG::Sovereign_State"
diff --git a/src/media/ug-flag-american_samoa.png b/src/media/ug-flag-american_samoa.png
deleted file mode 100644
index f9512c3d..00000000
Binary files a/src/media/ug-flag-american_samoa.png and /dev/null differ
diff --git a/src/media/ug-flag-american_samoa.svg b/src/media/ug-flag-american_samoa.svg
new file mode 100644
index 00000000..b9f5d5ba
--- /dev/null
+++ b/src/media/ug-flag-american_samoa.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/media/ug-flag-fiji.png b/src/media/ug-flag-fiji.png
deleted file mode 100644
index 97089ea2..00000000
Binary files a/src/media/ug-flag-fiji.png and /dev/null differ
diff --git a/src/media/ug-flag-fiji.svg b/src/media/ug-flag-fiji.svg
new file mode 100644
index 00000000..4d39f3ec
--- /dev/null
+++ b/src/media/ug-flag-fiji.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/media/ug-flag-spain.png b/src/media/ug-flag-spain.png
deleted file mode 100644
index d9f93a2d..00000000
Binary files a/src/media/ug-flag-spain.png and /dev/null differ
diff --git a/src/media/ug-flag-spain.svg b/src/media/ug-flag-spain.svg
new file mode 100644
index 00000000..4aac9402
--- /dev/null
+++ b/src/media/ug-flag-spain.svg
@@ -0,0 +1 @@
+
\ No newline at end of file