diff --git a/addons/l10n_ae/__manifest__.py b/addons/l10n_ae/__manifest__.py
index de854b6ebd1..c7fa563caa9 100644
--- a/addons/l10n_ae/__manifest__.py
+++ b/addons/l10n_ae/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     'name': 'U.A.E. - Accounting',
+    'icon': '/base/static/img/country_flags/ae.png',
     'author': 'Tech Receptives',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_ae/static/description/icon.png b/addons/l10n_ae/static/description/icon.png
deleted file mode 100644
index 51356fed87b..00000000000
Binary files a/addons/l10n_ae/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_ar/__manifest__.py b/addons/l10n_ar/__manifest__.py
index 3c7aa692f0e..a3c17d48cd4 100644
--- a/addons/l10n_ar/__manifest__.py
+++ b/addons/l10n_ar/__manifest__.py
@@ -2,6 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Argentina - Accounting',
+    'icon': '/base/static/img/country_flags/ar.png',
     'version': "3.0",
     'description': """
 Functional
diff --git a/addons/l10n_ar/static/description/icon.png b/addons/l10n_ar/static/description/icon.png
deleted file mode 100644
index bc3bad4fb1a..00000000000
Binary files a/addons/l10n_ar/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_at/__manifest__.py b/addons/l10n_at/__manifest__.py
index dfd0638984e..ebc54a21483 100644
--- a/addons/l10n_at/__manifest__.py
+++ b/addons/l10n_at/__manifest__.py
@@ -10,6 +10,7 @@
 
 {
     "name": "Austria - Accounting",
+    'icon': '/base/static/img/country_flags/at.png',
     "version": "3.0",
     "author": "WT-IO-IT GmbH, Wolfgang Taferner",
     "website": "https://www.wt-io-it.at",
diff --git a/addons/l10n_at/static/description/icon.png b/addons/l10n_at/static/description/icon.png
deleted file mode 100644
index b87bae1bca4..00000000000
Binary files a/addons/l10n_at/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_au/__manifest__.py b/addons/l10n_au/__manifest__.py
index 5cd7e769936..1c7242684ec 100644
--- a/addons/l10n_au/__manifest__.py
+++ b/addons/l10n_au/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     'name': 'Australian - Accounting',
+    'icon': '/base/static/img/country_flags/au.png',
     'version': '1.1',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_au/static/description/icon.png b/addons/l10n_au/static/description/icon.png
deleted file mode 100644
index 356eaf6eb1c..00000000000
Binary files a/addons/l10n_au/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_be/__manifest__.py b/addons/l10n_be/__manifest__.py
index 9dcbac60bfd..7468ee79e9b 100644
--- a/addons/l10n_be/__manifest__.py
+++ b/addons/l10n_be/__manifest__.py
@@ -4,6 +4,7 @@
 {
     'name': 'Belgium - Accounting',
     'version': '2.0',
+    'icon': '/base/static/img/country_flags/be.png',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Belgium in Odoo.
diff --git a/addons/l10n_be/static/description/icon.png b/addons/l10n_be/static/description/icon.png
deleted file mode 100644
index 8cc3cc68132..00000000000
Binary files a/addons/l10n_be/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_bo/__manifest__.py b/addons/l10n_bo/__manifest__.py
index 7397530c930..014facbabc2 100644
--- a/addons/l10n_bo/__manifest__.py
+++ b/addons/l10n_bo/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     "name": "Bolivia - Accounting",
+    'icon': '/base/static/img/country_flags/bo.png',
     "version": "2.0",
     "description": """
 Bolivian accounting chart and tax localization.
diff --git a/addons/l10n_bo/static/description/icon.png b/addons/l10n_bo/static/description/icon.png
deleted file mode 100644
index f31e7f3d427..00000000000
Binary files a/addons/l10n_bo/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_br/__manifest__.py b/addons/l10n_br/__manifest__.py
index 7baac561c8c..88ab588cc8a 100644
--- a/addons/l10n_br/__manifest__.py
+++ b/addons/l10n_br/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     'name': 'Brazilian - Accounting',
+    'icon': '/base/static/img/country_flags/br.png',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
 Base module for the Brazilian localization
diff --git a/addons/l10n_br/static/description/icon.png b/addons/l10n_br/static/description/icon.png
deleted file mode 100644
index 80212da3232..00000000000
Binary files a/addons/l10n_br/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_ca/__manifest__.py b/addons/l10n_ca/__manifest__.py
index c310e600fee..1b7809db1e3 100644
--- a/addons/l10n_ca/__manifest__.py
+++ b/addons/l10n_ca/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     'name': 'Canada - Accounting',
+    'icon': '/base/static/img/country_flags/ca.png',
     'author': 'Savoir-faire Linux',
     'website': 'https://www.savoirfairelinux.com',
     'category': 'Accounting/Localizations/Account Charts',
diff --git a/addons/l10n_ca/static/description/icon.png b/addons/l10n_ca/static/description/icon.png
deleted file mode 100644
index b3b6a9d23fa..00000000000
Binary files a/addons/l10n_ca/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_ch/__manifest__.py b/addons/l10n_ch/__manifest__.py
index 3e42fc67f54..48e3132359f 100644
--- a/addons/l10n_ch/__manifest__.py
+++ b/addons/l10n_ch/__manifest__.py
@@ -6,7 +6,7 @@
 # Translation contributors: brain-tec AG, Agile Business Group
 {
     'name': "Switzerland - Accounting",
-
+    'icon': '/base/static/img/country_flags/ch.png',
     'description': """
 Swiss localization
 ==================
diff --git a/addons/l10n_ch/static/description/icon.png b/addons/l10n_ch/static/description/icon.png
deleted file mode 100644
index ab9cbdf77a1..00000000000
Binary files a/addons/l10n_ch/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_cl/__manifest__.py b/addons/l10n_cl/__manifest__.py
index cbd1a22d88f..65d45a0b5a8 100644
--- a/addons/l10n_cl/__manifest__.py
+++ b/addons/l10n_cl/__manifest__.py
@@ -3,6 +3,7 @@
 # Copyright (c) 2019 - Blanco Martín & Asociados. https://www.bmya.cl
 {
     'name': 'Chile - Accounting',
+    'icon': '/base/static/img/country_flags/cl.png',
     'version': "3.0",
     'description': """
 Chilean accounting chart and tax localization.
diff --git a/addons/l10n_cl/static/description/icon.png b/addons/l10n_cl/static/description/icon.png
deleted file mode 100644
index aaaf873a6bc..00000000000
Binary files a/addons/l10n_cl/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_cn/__manifest__.py b/addons/l10n_cn/__manifest__.py
index 3e312776bd3..022963ca202 100644
--- a/addons/l10n_cn/__manifest__.py
+++ b/addons/l10n_cn/__manifest__.py
@@ -9,6 +9,7 @@
 
 {
     'name': 'China - Accounting',
+    'icon': '/base/static/img/country_flags/cn.png',
     'version': '1.8',
     'category': 'Accounting/Localizations/Account Charts',
     'author': 'www.openerp-china.org',
diff --git a/addons/l10n_cn/static/description/icon.png b/addons/l10n_cn/static/description/icon.png
deleted file mode 100644
index ce5e1e12f7c..00000000000
Binary files a/addons/l10n_cn/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_co/__manifest__.py b/addons/l10n_co/__manifest__.py
index 0fdcf97b925..fc376e71f6c 100644
--- a/addons/l10n_co/__manifest__.py
+++ b/addons/l10n_co/__manifest__.py
@@ -10,6 +10,7 @@
 
 {
     'name': 'Colombia - Accounting',
+    'icon': '/base/static/img/country_flags/co.png',
     'version': '0.8',
     'category': 'Accounting/Localizations/Account Charts',
     'description': 'Colombian Accounting and Tax Preconfiguration',
diff --git a/addons/l10n_co/static/description/icon.png b/addons/l10n_co/static/description/icon.png
deleted file mode 100644
index 62292783865..00000000000
Binary files a/addons/l10n_co/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_cr/__manifest__.py b/addons/l10n_cr/__manifest__.py
index 14cf758cb4e..8fb4d0ac84f 100644
--- a/addons/l10n_cr/__manifest__.py
+++ b/addons/l10n_cr/__manifest__.py
@@ -35,6 +35,7 @@
 
 {
     'name': 'Costa Rica - Accounting',
+    'icon': '/base/static/img/country_flags/cr.png',
     'url': 'https://github.com/CLEARCORP/odoo-costa-rica',
     'author': 'ClearCorp S.A.',
     'website': 'http://clearcorp.co.cr',
diff --git a/addons/l10n_cr/static/description/icon.png b/addons/l10n_cr/static/description/icon.png
deleted file mode 100644
index 16d8624acd3..00000000000
Binary files a/addons/l10n_cr/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_de/__manifest__.py b/addons/l10n_de/__manifest__.py
index 4f3a6110049..dcd7593a966 100644
--- a/addons/l10n_de/__manifest__.py
+++ b/addons/l10n_de/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     'name': 'Germany - Accounting',
+    'icon': '/base/static/img/country_flags/de.png',
     'author': 'openbig.org',
     'website': 'http://www.openbig.org',
     'category': 'Accounting/Localizations',
diff --git a/addons/l10n_de/static/description/icon.png b/addons/l10n_de/static/description/icon.png
deleted file mode 100644
index 5f378c4a317..00000000000
Binary files a/addons/l10n_de/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_de_skr03/__manifest__.py b/addons/l10n_de_skr03/__manifest__.py
index dfd79e09fe6..ef07e2ed0e7 100644
--- a/addons/l10n_de_skr03/__manifest__.py
+++ b/addons/l10n_de_skr03/__manifest__.py
@@ -33,6 +33,7 @@
 
 {
     'name': 'Germany SKR03 - Accounting',
+    'icon': '/base/static/img/country_flags/de.png',
     'version': '3.0',
     'author': 'openbig.org',
     'website': 'http://www.openbig.org',
diff --git a/addons/l10n_de_skr04/__manifest__.py b/addons/l10n_de_skr04/__manifest__.py
index 0da8e98f51e..2957bec9691 100644
--- a/addons/l10n_de_skr04/__manifest__.py
+++ b/addons/l10n_de_skr04/__manifest__.py
@@ -32,6 +32,7 @@
 
 {
     'name': 'Germany SKR04 - Accounting',
+    'icon': '/base/static/img/country_flags/de.png',
     'version': '3.0',
     'author': 'openbig.org',
     'website': 'http://www.openbig.org',
diff --git a/addons/l10n_dk/__manifest__.py b/addons/l10n_dk/__manifest__.py
index acf1f540b20..76bb1bbbf59 100644
--- a/addons/l10n_dk/__manifest__.py
+++ b/addons/l10n_dk/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     'name': 'Denmark - Accounting',
+    'icon': '/base/static/img/country_flags/dk.png',
     'version': '1.0',
     'author': 'Odoo House ApS',
     'website': 'https://odoohouse.dk',
diff --git a/addons/l10n_dk/static/description/icon.png b/addons/l10n_dk/static/description/icon.png
deleted file mode 100644
index 69f926ab5eb..00000000000
Binary files a/addons/l10n_dk/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_do/__manifest__.py b/addons/l10n_do/__manifest__.py
index 601b54a98bd..471afe67ff8 100644
--- a/addons/l10n_do/__manifest__.py
+++ b/addons/l10n_do/__manifest__.py
@@ -13,6 +13,7 @@
 
 {
     'name': 'Dominican Republic - Accounting',
+    'icon': '/base/static/img/country_flags/do.png',
     'version': '2.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_do/static/description/icon.png b/addons/l10n_do/static/description/icon.png
deleted file mode 100644
index 82baa854639..00000000000
Binary files a/addons/l10n_do/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_dz/__manifest__.py b/addons/l10n_dz/__manifest__.py
index 0aac2a314e6..763c94a8e82 100755
--- a/addons/l10n_dz/__manifest__.py
+++ b/addons/l10n_dz/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     'name': 'Algeria - Accounting',
+    'icon': '/base/static/img/country_flags/dz.png',
     'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_dz/static/description/icon.png b/addons/l10n_dz/static/description/icon.png
deleted file mode 100755
index 05ec75b85eb..00000000000
Binary files a/addons/l10n_dz/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_ec/__manifest__.py b/addons/l10n_ec/__manifest__.py
index 26b345fa2e3..e2ef89ff192 100644
--- a/addons/l10n_ec/__manifest__.py
+++ b/addons/l10n_ec/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     'name': 'Ecuador - Accounting',
+    'icon': '/base/static/img/country_flags/ec.png',
     'version': '1.1',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_ec/static/description/icon.png b/addons/l10n_ec/static/description/icon.png
deleted file mode 100644
index 1d10aa7c5c3..00000000000
Binary files a/addons/l10n_ec/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_es/__manifest__.py b/addons/l10n_es/__manifest__.py
index 17e2d02c167..ab6a3c516ef 100644
--- a/addons/l10n_es/__manifest__.py
+++ b/addons/l10n_es/__manifest__.py
@@ -14,6 +14,7 @@
 
 {
     "name" : "Spain - Accounting (PGCE 2008)",
+    'icon': '/base/static/img/country_flags/es.png',
     "version" : "4.0",
     "author" : "Spanish Localization Team",
     'category': 'Accounting/Localizations/Account Charts',
diff --git a/addons/l10n_es/static/description/icon.png b/addons/l10n_es/static/description/icon.png
deleted file mode 100644
index 0a36644a6c1..00000000000
Binary files a/addons/l10n_es/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_et/__manifest__.py b/addons/l10n_et/__manifest__.py
index b3d0b500ea1..efb6952b272 100644
--- a/addons/l10n_et/__manifest__.py
+++ b/addons/l10n_et/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     'name': 'Ethiopia - Accounting',
+    'icon': '/base/static/img/country_flags/et.png',
     'version': '2.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_et/static/description/icon.png b/addons/l10n_et/static/description/icon.png
deleted file mode 100644
index c068ef53004..00000000000
Binary files a/addons/l10n_et/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_fi/__manifest__.py b/addons/l10n_fi/__manifest__.py
index 94160c91bae..7906e8b2abc 100644
--- a/addons/l10n_fi/__manifest__.py
+++ b/addons/l10n_fi/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     "name": "Finnish Localization",
+    'icon': '/base/static/img/country_flags/fi.png',
     "version": "13.0.1",
     "author": "Avoin.Systems, "
               "Tawasta, "
diff --git a/addons/l10n_fi/static/description/icon.png b/addons/l10n_fi/static/description/icon.png
deleted file mode 100644
index 0d382126003..00000000000
Binary files a/addons/l10n_fi/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_fr/__manifest__.py b/addons/l10n_fr/__manifest__.py
index 5e0483f7961..d647ad5cce2 100644
--- a/addons/l10n_fr/__manifest__.py
+++ b/addons/l10n_fr/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     'name': 'France - Accounting',
+    'icon': '/base/static/img/country_flags/fr.png',
     'version': '2.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_fr/static/description/icon.png b/addons/l10n_fr/static/description/icon.png
deleted file mode 100644
index 920a473d570..00000000000
Binary files a/addons/l10n_fr/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_generic_coa/static/description/icon.png b/addons/l10n_generic_coa/static/description/icon.png
new file mode 100644
index 00000000000..f36382a997e
Binary files /dev/null and b/addons/l10n_generic_coa/static/description/icon.png differ
diff --git a/addons/l10n_gr/__manifest__.py b/addons/l10n_gr/__manifest__.py
index 12fb0082347..ab59cdc5816 100644
--- a/addons/l10n_gr/__manifest__.py
+++ b/addons/l10n_gr/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     'name': 'Greece - Accounting',
+    'icon': '/base/static/img/country_flags/gr.png',
     'author': 'P. Christeas, OpenERP SA.',
     'website': 'http://openerp.hellug.gr/',
     'category': 'Accounting/Localizations/Account Charts',
diff --git a/addons/l10n_gr/static/description/icon.png b/addons/l10n_gr/static/description/icon.png
deleted file mode 100644
index 971869740eb..00000000000
Binary files a/addons/l10n_gr/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_gt/__manifest__.py b/addons/l10n_gt/__manifest__.py
index 56779faa72d..f8833f03260 100644
--- a/addons/l10n_gt/__manifest__.py
+++ b/addons/l10n_gt/__manifest__.py
@@ -19,6 +19,7 @@
 
 {
     'name': 'Guatemala - Accounting',
+    'icon': '/base/static/img/country_flags/gt.png',
     'version': '3.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_gt/static/description/icon.png b/addons/l10n_gt/static/description/icon.png
deleted file mode 100644
index 5d238ebcf15..00000000000
Binary files a/addons/l10n_gt/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_hk/__manifest__.py b/addons/l10n_hk/__manifest__.py
index 9e567cba68d..45716b5fd5c 100644
--- a/addons/l10n_hk/__manifest__.py
+++ b/addons/l10n_hk/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     'name': 'Hong Kong - Accounting',
+    'icon': '/base/static/img/country_flags/hk.png',
     'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """ This is the base module to manage chart of accounting and localization for Hong Kong """,
diff --git a/addons/l10n_hk/static/description/icon.png b/addons/l10n_hk/static/description/icon.png
deleted file mode 100644
index 7d764ae0524..00000000000
Binary files a/addons/l10n_hk/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_hn/__manifest__.py b/addons/l10n_hn/__manifest__.py
index 7278e0784be..1127bcf202d 100644
--- a/addons/l10n_hn/__manifest__.py
+++ b/addons/l10n_hn/__manifest__.py
@@ -9,6 +9,7 @@
 
 {
     'name': 'Honduras - Accounting',
+    'icon': '/base/static/img/country_flags/hn.png',
     'version': '0.2',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_hn/static/description/icon.png b/addons/l10n_hn/static/description/icon.png
deleted file mode 100644
index 4a1cd3e1c8b..00000000000
Binary files a/addons/l10n_hn/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_hr/__manifest__.py b/addons/l10n_hr/__manifest__.py
index 200ed60e369..d6a02ada341 100644
--- a/addons/l10n_hr/__manifest__.py
+++ b/addons/l10n_hr/__manifest__.py
@@ -10,6 +10,7 @@
 
 {
     "name": "Croatia - Accounting (RRIF 2012)",
+    'icon': '/base/static/img/country_flags/hr.png',
     "description": """
 Croatian localisation.
 ======================
diff --git a/addons/l10n_hr/static/description/icon.png b/addons/l10n_hr/static/description/icon.png
deleted file mode 100644
index 4d4099497e9..00000000000
Binary files a/addons/l10n_hr/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_hu/__manifest__.py b/addons/l10n_hu/__manifest__.py
index 465f0d2a673..a235a9edfc5 100644
--- a/addons/l10n_hu/__manifest__.py
+++ b/addons/l10n_hu/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     'name': 'Hungarian - Accounting',
+    'icon': '/base/static/img/country_flags/hu.png',
     'version': '2.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_hu/static/description/icon.png b/addons/l10n_hu/static/description/icon.png
deleted file mode 100644
index 1c97c7af6f0..00000000000
Binary files a/addons/l10n_hu/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_id/__manifest__.py b/addons/l10n_id/__manifest__.py
index d1926df50c9..aefcfc1efca 100644
--- a/addons/l10n_id/__manifest__.py
+++ b/addons/l10n_id/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     'name': 'Indonesian - Accounting',
+    'icon': '/base/static/img/country_flags/id.png',
     'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_id/static/description/icon.png b/addons/l10n_id/static/description/icon.png
deleted file mode 100644
index dad4f46768f..00000000000
Binary files a/addons/l10n_id/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_ie/__manifest__.py b/addons/l10n_ie/__manifest__.py
index 698e4ec30a6..bf3da286058 100644
--- a/addons/l10n_ie/__manifest__.py
+++ b/addons/l10n_ie/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     'name': 'Ireland - Accounting',
+    'icon': '/base/static/img/country_flags/ie.png',
     'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_ie/static/description/icon.png b/addons/l10n_ie/static/description/icon.png
deleted file mode 100755
index 9c719b28504..00000000000
Binary files a/addons/l10n_ie/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_il/__manifest__.py b/addons/l10n_il/__manifest__.py
index e88daaec8b7..6c3072deed4 100644
--- a/addons/l10n_il/__manifest__.py
+++ b/addons/l10n_il/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     'name': 'Israel - Accounting',
+    'icon': '/base/static/img/country_flags/il.png',
     'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_in/__manifest__.py b/addons/l10n_in/__manifest__.py
index 5e1f18b5f48..60dbaccfb3c 100644
--- a/addons/l10n_in/__manifest__.py
+++ b/addons/l10n_in/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     'name': 'Indian - Accounting',
+    'icon': '/base/static/img/country_flags/in.png',
     'version': '2.0',
     'description': """
 Indian Accounting: Chart of Account.
diff --git a/addons/l10n_in/static/description/icon.png b/addons/l10n_in/static/description/icon.png
deleted file mode 100644
index d463901f569..00000000000
Binary files a/addons/l10n_in/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_it/__manifest__.py b/addons/l10n_it/__manifest__.py
index e4d23752d17..7f476c60fb9 100644
--- a/addons/l10n_it/__manifest__.py
+++ b/addons/l10n_it/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     'name': 'Italy - Accounting',
+    'icon': '/base/static/img/country_flags/it.png',
     'version': '0.2',
     'depends': [
         'account',
diff --git a/addons/l10n_it/static/description/icon.png b/addons/l10n_it/static/description/icon.png
deleted file mode 100644
index bb6a3cac55c..00000000000
Binary files a/addons/l10n_it/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_jp/__manifest__.py b/addons/l10n_jp/__manifest__.py
index 410e809c680..50d424583d6 100644
--- a/addons/l10n_jp/__manifest__.py
+++ b/addons/l10n_jp/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     'name': 'Japan - Accounting',
+    'icon': '/base/static/img/country_flags/jp.png',
     'version': '2.2',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_jp/static/description/icon.png b/addons/l10n_jp/static/description/icon.png
deleted file mode 100644
index cf0d49f9bac..00000000000
Binary files a/addons/l10n_jp/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_lt/__manifest__.py b/addons/l10n_lt/__manifest__.py
index 5354a62ddbf..95b897d87a7 100644
--- a/addons/l10n_lt/__manifest__.py
+++ b/addons/l10n_lt/__manifest__.py
@@ -3,6 +3,7 @@
 # See LICENSE file for full copyright and licensing details.
 {
     'name': "Lithuania - Accounting",
+    'icon': '/base/static/img/country_flags/lt.png',
     'version': '1.0.0',
     'description': """
         Chart of Accounts (COA) Template for Lithuania's Accounting.
diff --git a/addons/l10n_lt/static/description/icon.png b/addons/l10n_lt/static/description/icon.png
deleted file mode 100644
index af49ebb966b..00000000000
Binary files a/addons/l10n_lt/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_lu/__manifest__.py b/addons/l10n_lu/__manifest__.py
index feded1d500f..7cfeb46b4de 100644
--- a/addons/l10n_lu/__manifest__.py
+++ b/addons/l10n_lu/__manifest__.py
@@ -7,6 +7,7 @@
 
 {
     'name': 'Luxembourg - Accounting',
+    'icon': '/base/static/img/country_flags/lu.png',
     'version': '2.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_lu/static/description/icon.png b/addons/l10n_lu/static/description/icon.png
deleted file mode 100644
index de03ecfe43b..00000000000
Binary files a/addons/l10n_lu/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_ma/__manifest__.py b/addons/l10n_ma/__manifest__.py
index 942b2e845b4..07388a8be80 100644
--- a/addons/l10n_ma/__manifest__.py
+++ b/addons/l10n_ma/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     'name': 'Maroc - Accounting',
+    'icon': '/base/static/img/country_flags/ma.png',
     'author': 'kazacube',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_ma/static/description/icon.png b/addons/l10n_ma/static/description/icon.png
deleted file mode 100644
index 6e7079deffb..00000000000
Binary files a/addons/l10n_ma/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_mn/__manifest__.py b/addons/l10n_mn/__manifest__.py
index 80359e2057f..00e92119837 100644
--- a/addons/l10n_mn/__manifest__.py
+++ b/addons/l10n_mn/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     "name" : "Mongolia - Accounting",
+    'icon': '/base/static/img/country_flags/mn.png',
     "version" : "1.0",
     'category': 'Accounting/Localizations/Account Charts',
     "author" : "BumanIT LLC, Odoo S.A.",
diff --git a/addons/l10n_mn/static/description/icon.png b/addons/l10n_mn/static/description/icon.png
deleted file mode 100644
index dae4b68b81e..00000000000
Binary files a/addons/l10n_mn/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_mx/__manifest__.py b/addons/l10n_mx/__manifest__.py
index 630d85aef9c..07b990e8bab 100644
--- a/addons/l10n_mx/__manifest__.py
+++ b/addons/l10n_mx/__manifest__.py
@@ -8,6 +8,7 @@
 
 {
     "name": "Mexico - Accounting",
+    'icon': '/base/static/img/country_flags/mx.png',
     "version": "2.0",
     "author": "Vauxoo",
     'category': 'Accounting/Localizations/Account Charts',
diff --git a/addons/l10n_mx/static/description/icon.png b/addons/l10n_mx/static/description/icon.png
deleted file mode 100644
index 4da9a113254..00000000000
Binary files a/addons/l10n_mx/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_nl/__manifest__.py b/addons/l10n_nl/__manifest__.py
index 5da2d076acd..a633c12d35a 100644
--- a/addons/l10n_nl/__manifest__.py
+++ b/addons/l10n_nl/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     'name': 'Netherlands - Accounting',
+    'icon': '/base/static/img/country_flags/nl.png',
     'version': '3.0',
     'category': 'Accounting/Localizations/Account Charts',
     'author': 'Onestein',
diff --git a/addons/l10n_nl/static/description/icon.png b/addons/l10n_nl/static/description/icon.png
deleted file mode 100644
index 0e61cb9f4d7..00000000000
Binary files a/addons/l10n_nl/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_no/__manifest__.py b/addons/l10n_no/__manifest__.py
index ca1c4cf880f..cc8e7b677d4 100644
--- a/addons/l10n_no/__manifest__.py
+++ b/addons/l10n_no/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     "name" : "Norway - Accounting",
+    'icon': '/base/static/img/country_flags/no.png',
     "version" : "2.0",
     "author" : "Rolv Råen",
     'category': 'Accounting/Localizations/Account Charts',
diff --git a/addons/l10n_no/static/description/icon.png b/addons/l10n_no/static/description/icon.png
deleted file mode 100644
index e91d0de6141..00000000000
Binary files a/addons/l10n_no/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_nz/__manifest__.py b/addons/l10n_nz/__manifest__.py
index 0d46b74d436..2492d19ee90 100644
--- a/addons/l10n_nz/__manifest__.py
+++ b/addons/l10n_nz/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     'name': 'New Zealand - Accounting',
+    'icon': '/base/static/img/country_flags/nz.png',
     'version': '1.1',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_nz/static/description/icon.png b/addons/l10n_nz/static/description/icon.png
deleted file mode 100644
index 29b49b60918..00000000000
Binary files a/addons/l10n_nz/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_pa/__manifest__.py b/addons/l10n_pa/__manifest__.py
index 53cfd2f307d..0b47ba57103 100644
--- a/addons/l10n_pa/__manifest__.py
+++ b/addons/l10n_pa/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     "name": "Panama - Accounting",
+    'icon': '/base/static/img/country_flags/pa.png',
     "description": """
 Panamenian accounting chart and tax localization.
 
diff --git a/addons/l10n_pa/static/description/icon.png b/addons/l10n_pa/static/description/icon.png
deleted file mode 100644
index 4bca48b3ea3..00000000000
Binary files a/addons/l10n_pa/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_pe/__manifest__.py b/addons/l10n_pe/__manifest__.py
index 7165810e658..56549277e28 100644
--- a/addons/l10n_pe/__manifest__.py
+++ b/addons/l10n_pe/__manifest__.py
@@ -1,6 +1,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Peru - Accounting',
+    'icon': '/base/static/img/country_flags/pe.png',
     "version": "2.0",
     'summary': "PCGE Simplified",
     'category': 'Accounting/Localizations/Account Charts',
diff --git a/addons/l10n_pe/static/description/icon.png b/addons/l10n_pe/static/description/icon.png
deleted file mode 100644
index 0bd971ab896..00000000000
Binary files a/addons/l10n_pe/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_pl/__manifest__.py b/addons/l10n_pl/__manifest__.py
index 98c4f48d49f..83251d6a333 100644
--- a/addons/l10n_pl/__manifest__.py
+++ b/addons/l10n_pl/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     'name' : 'Poland - Accounting',
+    'icon': '/base/static/img/country_flags/pl.png',
     'version' : '2.0',
     'author' : 'Grzegorz Grzelak (OpenGLOBE)',
     'website': 'http://www.openglobe.pl',
diff --git a/addons/l10n_pl/static/description/icon.png b/addons/l10n_pl/static/description/icon.png
deleted file mode 100644
index 51c3402a7f9..00000000000
Binary files a/addons/l10n_pl/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_pt/__manifest__.py b/addons/l10n_pt/__manifest__.py
index acedf6a3e3a..55068dbe6c8 100644
--- a/addons/l10n_pt/__manifest__.py
+++ b/addons/l10n_pt/__manifest__.py
@@ -6,6 +6,7 @@
 
 {
     'name': 'Portugal - Accounting',
+    'icon': '/base/static/img/country_flags/pt.png',
     'version': '0.011',
     'author': 'ThinkOpen Solutions',
     'website': 'http://www.thinkopensolutions.com/',
diff --git a/addons/l10n_ro/__manifest__.py b/addons/l10n_ro/__manifest__.py
index af1da112c2d..b6f64e30cdf 100644
--- a/addons/l10n_ro/__manifest__.py
+++ b/addons/l10n_ro/__manifest__.py
@@ -10,6 +10,7 @@
 
 {
     "name": "Romania - Accounting",
+    'icon': '/base/static/img/country_flags/ro.png',
     "author": "Fekete Mihai (NextERP Romania SRL)",
     "website": "https://www.nexterp.ro",
     'category': 'Accounting/Localizations/Account Charts',
diff --git a/addons/l10n_ro/static/description/icon.png b/addons/l10n_ro/static/description/icon.png
deleted file mode 100644
index e3c0a0c9f6f..00000000000
Binary files a/addons/l10n_ro/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_sa/__manifest__.py b/addons/l10n_sa/__manifest__.py
index 1df17ae06f0..28296dad86f 100644
--- a/addons/l10n_sa/__manifest__.py
+++ b/addons/l10n_sa/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     'name': 'Saudi Arabia - Accounting',
+    'icon': '/base/static/img/country_flags/sa.png',
     'version': '1.1',
     'author': 'DVIT.ME',
     'category': 'Accounting/Localizations/Account Charts',
diff --git a/addons/l10n_sa/static/description/icon.png b/addons/l10n_sa/static/description/icon.png
deleted file mode 100644
index 05dda406617..00000000000
Binary files a/addons/l10n_sa/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_se/__manifest__.py b/addons/l10n_se/__manifest__.py
index 9d964152f10..7458e4e40b4 100644
--- a/addons/l10n_se/__manifest__.py
+++ b/addons/l10n_se/__manifest__.py
@@ -2,6 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     "name": "Swedish - Accounting",
+    'icon': '/base/static/img/country_flags/se.png',
     "version": "1.0",
     "author": "XCLUDE",
     "category": "Accounting/Localizations/Account Charts",
diff --git a/addons/l10n_se/static/description/icon.png b/addons/l10n_se/static/description/icon.png
deleted file mode 100644
index be4800025ba..00000000000
Binary files a/addons/l10n_se/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_sg/__manifest__.py b/addons/l10n_sg/__manifest__.py
index c1c15d14370..9d5d8243e61 100644
--- a/addons/l10n_sg/__manifest__.py
+++ b/addons/l10n_sg/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     'name': 'Singapore - Accounting',
+    'icon': '/base/static/img/country_flags/sg.png',
     'author': 'Tech Receptives',
     'version': '2.0',
     'category': 'Accounting/Localizations/Account Charts',
diff --git a/addons/l10n_sg/static/description/icon.png b/addons/l10n_sg/static/description/icon.png
deleted file mode 100644
index ea788dcb9ac..00000000000
Binary files a/addons/l10n_sg/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_si/__manifest__.py b/addons/l10n_si/__manifest__.py
index d9cd589c97e..5e23011a536 100644
--- a/addons/l10n_si/__manifest__.py
+++ b/addons/l10n_si/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     "name": "Slovenian - Accounting",
+    'icon': '/base/static/img/country_flags/si.png',
     "version": "1.1",
     "author": "Mentis d.o.o.",
     "website": "http://www.mentis.si",
diff --git a/addons/l10n_si/static/description/icon.png b/addons/l10n_si/static/description/icon.png
deleted file mode 100644
index c8aa81debf6..00000000000
Binary files a/addons/l10n_si/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_syscohada/__manifest__.py b/addons/l10n_syscohada/__manifest__.py
index 0da5e1cfb24..2d8452f68ec 100644
--- a/addons/l10n_syscohada/__manifest__.py
+++ b/addons/l10n_syscohada/__manifest__.py
@@ -8,6 +8,7 @@
     'name' : 'OHADA - Accounting',
     'author' : 'Baamtu Senegal',
     'category': 'Accounting/Localizations/Account Charts',
+    'icon': '/l10n_syscohada/static/description/icon.jpeg',
     'description': """
 This module implements the accounting chart for OHADA area.
 ===========================================================
diff --git a/addons/l10n_syscohada/static/description/icon.jpeg b/addons/l10n_syscohada/static/description/icon.jpeg
new file mode 100644
index 00000000000..2956667ae79
Binary files /dev/null and b/addons/l10n_syscohada/static/description/icon.jpeg differ
diff --git a/addons/l10n_th/__manifest__.py b/addons/l10n_th/__manifest__.py
index 8417cbaa0ae..d17b112157c 100644
--- a/addons/l10n_th/__manifest__.py
+++ b/addons/l10n_th/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     'name': 'Thailand - Accounting',
+    'icon': '/base/static/img/country_flags/th.png',
     'version': '2.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_th/static/description/icon.png b/addons/l10n_th/static/description/icon.png
deleted file mode 100644
index c7003b0d1a6..00000000000
Binary files a/addons/l10n_th/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_tr/__manifest__.py b/addons/l10n_tr/__manifest__.py
index eaa9f042ba4..244e3bcd56d 100644
--- a/addons/l10n_tr/__manifest__.py
+++ b/addons/l10n_tr/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     'name': 'Turkey - Accounting',
+    'icon': '/base/static/img/country_flags/tr.png',
     'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_tr/static/description/icon.png b/addons/l10n_tr/static/description/icon.png
deleted file mode 100644
index 04a0ab92f73..00000000000
Binary files a/addons/l10n_tr/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_ua/__manifest__.py b/addons/l10n_ua/__manifest__.py
index 47f6eb70d34..715be23629a 100644
--- a/addons/l10n_ua/__manifest__.py
+++ b/addons/l10n_ua/__manifest__.py
@@ -4,6 +4,7 @@
 
 {
     'name': 'Ukraine - Accounting',
+    'icon': '/base/static/img/country_flags/ua.png',
     'author': 'ERP Ukraine',
     'website': 'https://erp.co.ua',
     'version': '1.3',
diff --git a/addons/l10n_ua/static/description/icon.png b/addons/l10n_ua/static/description/icon.png
deleted file mode 100644
index 57cf957010d..00000000000
Binary files a/addons/l10n_ua/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_uk/__manifest__.py b/addons/l10n_uk/__manifest__.py
index 82a7dc806bf..283278711fe 100644
--- a/addons/l10n_uk/__manifest__.py
+++ b/addons/l10n_uk/__manifest__.py
@@ -5,6 +5,7 @@
 
 {
     'name': 'UK - Accounting',
+    'icon': '/base/static/img/country_flags/gb.png',
     'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_uk/static/description/icon.png b/addons/l10n_uk/static/description/icon.png
deleted file mode 100644
index ef34a80bbc8..00000000000
Binary files a/addons/l10n_uk/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_us/__manifest__.py b/addons/l10n_us/__manifest__.py
index 904dce68492..759ce6ec2bc 100644
--- a/addons/l10n_us/__manifest__.py
+++ b/addons/l10n_us/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     'name': 'United States - Accounting',
+    'icon': '/base/static/img/country_flags/us.png',
     'version': '1.1',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_us/static/description/icon.png b/addons/l10n_us/static/description/icon.png
deleted file mode 100644
index 281254425eb..00000000000
Binary files a/addons/l10n_us/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_uy/__manifest__.py b/addons/l10n_uy/__manifest__.py
index c973c14401e..25100ea32fe 100644
--- a/addons/l10n_uy/__manifest__.py
+++ b/addons/l10n_uy/__manifest__.py
@@ -3,6 +3,7 @@
 
 {
     'name': 'Uruguay - Accounting',
+    'icon': '/base/static/img/country_flags/uy.png',
     'version': '0.1',
     'author': 'Uruguay l10n Team, Guillem Barba',
     'category': 'Accounting/Localizations/Account Charts',
diff --git a/addons/l10n_uy/static/description/icon.png b/addons/l10n_uy/static/description/icon.png
deleted file mode 100644
index 10429e162a0..00000000000
Binary files a/addons/l10n_uy/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_ve/__manifest__.py b/addons/l10n_ve/__manifest__.py
index 4c29a0da1b6..29dc66588b6 100644
--- a/addons/l10n_ve/__manifest__.py
+++ b/addons/l10n_ve/__manifest__.py
@@ -8,6 +8,7 @@
 
 {
     'name' : 'Venezuela - Accounting',
+    'icon': '/base/static/img/country_flags/ve.png',
     'author': ['Odoo S.A.', 'Vauxoo'],
     'category': 'Accounting/Localizations/Account Charts',
     'description':
diff --git a/addons/l10n_ve/static/description/icon.png b/addons/l10n_ve/static/description/icon.png
deleted file mode 100644
index 19628533472..00000000000
Binary files a/addons/l10n_ve/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_vn/__manifest__.py b/addons/l10n_vn/__manifest__.py
index 4f64bb3607a..d6f495eb602 100644
--- a/addons/l10n_vn/__manifest__.py
+++ b/addons/l10n_vn/__manifest__.py
@@ -4,6 +4,7 @@
 
 {
     "name": "Vietnam - Accounting",
+    'icon': '/base/static/img/country_flags/vn.png',
     "version": "2.0",
     "author": "General Solutions",
     'website': 'http://gscom.vn',
diff --git a/addons/l10n_vn/static/description/icon.png b/addons/l10n_vn/static/description/icon.png
deleted file mode 100644
index 86c1352b579..00000000000
Binary files a/addons/l10n_vn/static/description/icon.png and /dev/null differ
diff --git a/addons/l10n_za/__manifest__.py b/addons/l10n_za/__manifest__.py
index 3dc4b85c597..09afc27a096 100644
--- a/addons/l10n_za/__manifest__.py
+++ b/addons/l10n_za/__manifest__.py
@@ -4,6 +4,7 @@
 
 {
     'name': 'South Africa - Accounting',
+    'icon': '/base/static/img/country_flags/za.png',
     'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_za/static/description/icon.png b/addons/l10n_za/static/description/icon.png
deleted file mode 100644
index 1f82ab5459c..00000000000
Binary files a/addons/l10n_za/static/description/icon.png and /dev/null differ