diff --git a/plugins/channelrx/demodadsb/flags.qrc b/plugins/channelrx/demodadsb/flags.qrc
index 0dcf50d6f..dea5ac90c 100644
--- a/plugins/channelrx/demodadsb/flags.qrc
+++ b/plugins/channelrx/demodadsb/flags.qrc
@@ -53,6 +53,7 @@
flags/botswana_mil.bmp
flags/brazil.bmp
flags/brazil_mil.bmp
+ flags/british_virgin_islands.bmp
flags/brunei.bmp
flags/brunei_mil.bmp
flags/bulgaria.bmp
@@ -64,7 +65,7 @@
flags/cambodia.bmp
flags/cambodia_mil.bmp
flags/cameroon_mil.bmp
- flags/cameroun.bmp
+ flags/cameroon.bmp
flags/canada.bmp
flags/canada_mil.bmp
flags/cape_verde.bmp
@@ -86,8 +87,7 @@
flags/comoros.bmp
flags/comoros_mil.bmp
flags/congo_brazzaville.bmp
- flags/congodrc.bmp
- flags/congodrc_mil.bmp
+ flags/congo-drc.bmp
flags/congo-drc_mil.bmp
flags/congoroc.bmp
flags/congo-roc.bmp
@@ -98,11 +98,11 @@
flags/costa_rica_mil.bmp
flags/cote_d'ivoire.bmp
flags/cote_d'ivoire_mil.bmp
- flags/cote_d'ivorie.bmp
flags/croatia.bmp
flags/croatia_mil.bmp
flags/cuba.bmp
flags/cuba_mil.bmp
+ flags/curacao.bmp
flags/cyprus.bmp
flags/cyprus_mil.bmp
flags/czech_republic.bmp
@@ -203,6 +203,7 @@
flags/jordan.bmp
flags/jordan_mil.bmp
flags/kazakhstan_mil.bmp
+ flags/kampuchea.bmp
flags/kenya.bmp
flags/kenya_mil.bmp
flags/kazakhstan.bmp
@@ -213,7 +214,6 @@
flags/korea-north.bmp
flags/korea-north-mil.bmp
flags/korea-south.bmp
- flags/koreasouthmil.bmp
flags/korea-south-mil.bmp
flags/kuwait.bmp
flags/kuwait_mil.bmp
@@ -252,6 +252,7 @@
flags/malta_mil.bmp
flags/marshall islands.bmp
flags/marshall_islands.bmp
+ flags/martinique.bmp
flags/mauritania.bmp
flags/mauritania_mil.bmp
flags/mauritius.bmp
@@ -318,6 +319,7 @@
flags/poland_mil.bmp
flags/portugal.bmp
flags/portugal_mil.bmp
+ flags/puertorico.bmp
flags/qatar.bmp
flags/qatar_mil.bmp
flags/rep. congo.bmp
diff --git a/plugins/channelrx/demodadsb/flags/blank.bmp b/plugins/channelrx/demodadsb/flags/blank.bmp
index af2d89f60..83a04a23b 100644
Binary files a/plugins/channelrx/demodadsb/flags/blank.bmp and b/plugins/channelrx/demodadsb/flags/blank.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/british_virgin_islands.bmp b/plugins/channelrx/demodadsb/flags/british_virgin_islands.bmp
new file mode 100644
index 000000000..caebb7a4b
Binary files /dev/null and b/plugins/channelrx/demodadsb/flags/british_virgin_islands.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/burkinafaso.bmp b/plugins/channelrx/demodadsb/flags/burkinafaso.bmp
new file mode 100644
index 000000000..cb3e7ab34
Binary files /dev/null and b/plugins/channelrx/demodadsb/flags/burkinafaso.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/cameroun.bmp b/plugins/channelrx/demodadsb/flags/cameroon.bmp
similarity index 100%
rename from plugins/channelrx/demodadsb/flags/cameroun.bmp
rename to plugins/channelrx/demodadsb/flags/cameroon.bmp
diff --git a/plugins/channelrx/demodadsb/flags/chad.bmp b/plugins/channelrx/demodadsb/flags/chad.bmp
index f6d217038..3a1195f1e 100644
Binary files a/plugins/channelrx/demodadsb/flags/chad.bmp and b/plugins/channelrx/demodadsb/flags/chad.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/congo-drc.bmp b/plugins/channelrx/demodadsb/flags/congo-drc.bmp
new file mode 100644
index 000000000..d97a8cbb2
Binary files /dev/null and b/plugins/channelrx/demodadsb/flags/congo-drc.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/congodrc.bmp b/plugins/channelrx/demodadsb/flags/congodrc.bmp
deleted file mode 100644
index 9f110ae42..000000000
Binary files a/plugins/channelrx/demodadsb/flags/congodrc.bmp and /dev/null differ
diff --git a/plugins/channelrx/demodadsb/flags/congodrc_mil.bmp b/plugins/channelrx/demodadsb/flags/congodrc_mil.bmp
deleted file mode 100644
index b550d51a3..000000000
Binary files a/plugins/channelrx/demodadsb/flags/congodrc_mil.bmp and /dev/null differ
diff --git a/plugins/channelrx/demodadsb/flags/cote_d'ivoire.bmp b/plugins/channelrx/demodadsb/flags/cote_d'ivoire.bmp
index d364b290c..e5e143c3c 100644
Binary files a/plugins/channelrx/demodadsb/flags/cote_d'ivoire.bmp and b/plugins/channelrx/demodadsb/flags/cote_d'ivoire.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/cote_d'ivorie.bmp b/plugins/channelrx/demodadsb/flags/cote_d'ivorie.bmp
deleted file mode 100644
index e5e143c3c..000000000
Binary files a/plugins/channelrx/demodadsb/flags/cote_d'ivorie.bmp and /dev/null differ
diff --git a/plugins/channelrx/demodadsb/flags/curacao.bmp b/plugins/channelrx/demodadsb/flags/curacao.bmp
new file mode 100644
index 000000000..96273ba29
Binary files /dev/null and b/plugins/channelrx/demodadsb/flags/curacao.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/kampuchea.bmp b/plugins/channelrx/demodadsb/flags/kampuchea.bmp
new file mode 100644
index 000000000..d57abb81a
Binary files /dev/null and b/plugins/channelrx/demodadsb/flags/kampuchea.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/korea_south.bmp b/plugins/channelrx/demodadsb/flags/korea_south.bmp
index 7fad89114..680ed5fba 100644
Binary files a/plugins/channelrx/demodadsb/flags/korea_south.bmp and b/plugins/channelrx/demodadsb/flags/korea_south.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/koreasouthmil.bmp b/plugins/channelrx/demodadsb/flags/koreasouthmil.bmp
deleted file mode 100644
index f3c7e7ea3..000000000
Binary files a/plugins/channelrx/demodadsb/flags/koreasouthmil.bmp and /dev/null differ
diff --git a/plugins/channelrx/demodadsb/flags/martinique.bmp b/plugins/channelrx/demodadsb/flags/martinique.bmp
new file mode 100644
index 000000000..1d3920c97
Binary files /dev/null and b/plugins/channelrx/demodadsb/flags/martinique.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/militarymap.csv b/plugins/channelrx/demodadsb/flags/militarymap.csv
index e51417561..0030c898d 100644
--- a/plugins/channelrx/demodadsb/flags/militarymap.csv
+++ b/plugins/channelrx/demodadsb/flags/militarymap.csv
@@ -6,7 +6,9 @@ Bulgarian Air Force,bulgaria_mil
Bulgarian Air Force,bulgaria_mil
Chinese Air Force,china_mil
Colombian Air Force,colombia_mil
+Croatian Air Force,croatia_mil
Czech Air Force,czech_republic_mil
+Democratic Republic of Congo Air Force,congo-drc_mil
Ecuadorean Air Force,ecuador_mil
Egyptian Air Force,egypt_mil
Estonian Air Force,estonia_mil
@@ -16,6 +18,7 @@ Greek Air Force,greece_mil
Indian Air Force,india_mil
Israeli Air Force,israel_mil
Italian Air Force,italy_mil
+Ivory Coast Air Force,cote_d'ivoire_mil
Kuwait Air Force,kuwait_mil
Lithuanian Air Force,lithuania_mil
Mexican Air Force,mexico_mil
diff --git a/plugins/channelrx/demodadsb/flags/pakistan_mil.bmp b/plugins/channelrx/demodadsb/flags/pakistan_mil.bmp
index 414c6ec0f..3bb0de1ec 100644
Binary files a/plugins/channelrx/demodadsb/flags/pakistan_mil.bmp and b/plugins/channelrx/demodadsb/flags/pakistan_mil.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/palau.bmp b/plugins/channelrx/demodadsb/flags/palau.bmp
index 58b44ab15..d09bf054c 100644
Binary files a/plugins/channelrx/demodadsb/flags/palau.bmp and b/plugins/channelrx/demodadsb/flags/palau.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/paraguay.bmp b/plugins/channelrx/demodadsb/flags/paraguay.bmp
index 5307ded4b..4fcf50548 100644
Binary files a/plugins/channelrx/demodadsb/flags/paraguay.bmp and b/plugins/channelrx/demodadsb/flags/paraguay.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/puertorico.bmp b/plugins/channelrx/demodadsb/flags/puertorico.bmp
new file mode 100644
index 000000000..4dff2629c
Binary files /dev/null and b/plugins/channelrx/demodadsb/flags/puertorico.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/qatar.bmp b/plugins/channelrx/demodadsb/flags/qatar.bmp
index dcb4b7365..9c2334cde 100644
Binary files a/plugins/channelrx/demodadsb/flags/qatar.bmp and b/plugins/channelrx/demodadsb/flags/qatar.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/regprefixmap.csv b/plugins/channelrx/demodadsb/flags/regprefixmap.csv
index d86f9aa6b..fc00f7def 100644
--- a/plugins/channelrx/demodadsb/flags/regprefixmap.csv
+++ b/plugins/channelrx/demodadsb/flags/regprefixmap.csv
@@ -36,7 +36,7 @@ LZ,bulgaria
XT,burkina_faso
9U,burundi
XU,cambodia
-TJ,cameroun
+TJ,cameroon
C,canada
D4,cape_verde
VP-C,cayman_isles
@@ -48,7 +48,9 @@ B-M,china_macau
HJ,colombia
HK,colombia
D6,comoros
-9Q,congoroc
+TN,congoroc
+9S,congo-drc
+9T,congo-drc_mil
E5,cook_islands
TI,costa_rica
TU,cote_d'ivoire
@@ -222,3 +224,6 @@ VN,vietnam
7O,yemen
9J,zambia
Z,zimbabwe
+VP-L,british_virgin_islands
+XU,kampuchea
+F-O,martinique
diff --git a/plugins/channelrx/demodadsb/flags/samoa.bmp b/plugins/channelrx/demodadsb/flags/samoa.bmp
index 106c957f2..7b2a3da9f 100644
Binary files a/plugins/channelrx/demodadsb/flags/samoa.bmp and b/plugins/channelrx/demodadsb/flags/samoa.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/somalia.bmp b/plugins/channelrx/demodadsb/flags/somalia.bmp
index 4c252dede..9b7c2df4d 100644
Binary files a/plugins/channelrx/demodadsb/flags/somalia.bmp and b/plugins/channelrx/demodadsb/flags/somalia.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/south_sudan.bmp b/plugins/channelrx/demodadsb/flags/south_sudan.bmp
index 8b44d63df..786f900a8 100644
Binary files a/plugins/channelrx/demodadsb/flags/south_sudan.bmp and b/plugins/channelrx/demodadsb/flags/south_sudan.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/spain_mil.bmp b/plugins/channelrx/demodadsb/flags/spain_mil.bmp
index b6d56e45c..7de037d3f 100644
Binary files a/plugins/channelrx/demodadsb/flags/spain_mil.bmp and b/plugins/channelrx/demodadsb/flags/spain_mil.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/st_helena.bmp b/plugins/channelrx/demodadsb/flags/st_helena.bmp
index 7e54eb4de..db45e8ca4 100644
Binary files a/plugins/channelrx/demodadsb/flags/st_helena.bmp and b/plugins/channelrx/demodadsb/flags/st_helena.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/st_pierre_and_miquelon.bmp b/plugins/channelrx/demodadsb/flags/st_pierre_and_miquelon.bmp
index 0b8727713..c10c4826c 100644
Binary files a/plugins/channelrx/demodadsb/flags/st_pierre_and_miquelon.bmp and b/plugins/channelrx/demodadsb/flags/st_pierre_and_miquelon.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/tajikistan.bmp b/plugins/channelrx/demodadsb/flags/tajikistan.bmp
index 72fa2afab..0e70f4211 100644
Binary files a/plugins/channelrx/demodadsb/flags/tajikistan.bmp and b/plugins/channelrx/demodadsb/flags/tajikistan.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/turks_and_caicos.bmp b/plugins/channelrx/demodadsb/flags/turks_and_caicos.bmp
index 734b866af..4e65736e7 100644
Binary files a/plugins/channelrx/demodadsb/flags/turks_and_caicos.bmp and b/plugins/channelrx/demodadsb/flags/turks_and_caicos.bmp differ
diff --git a/plugins/channelrx/demodadsb/flags/tuvalu.bmp b/plugins/channelrx/demodadsb/flags/tuvalu.bmp
index 2030fd73d..f6e69e944 100644
Binary files a/plugins/channelrx/demodadsb/flags/tuvalu.bmp and b/plugins/channelrx/demodadsb/flags/tuvalu.bmp differ