diff --git a/addons/l10n_tw/__manifest__.py b/addons/l10n_tw/__manifest__.py
index 8717103e25a..bf7cc57540b 100644
--- a/addons/l10n_tw/__manifest__.py
+++ b/addons/l10n_tw/__manifest__.py
@@ -24,6 +24,10 @@ This is the base module to manage the accounting chart for Taiwan in Odoo.
         "data/res_country_data.xml",
         "data/res.city.csv",
     ],
+    'demo': [
+        'demo/demo_company.xml',
+    ],
+    "icon": "/base/static/img/country_flags/tw.png",
     "post_init_hook": "load_translations",
     "license": "LGPL-3",
 }
diff --git a/addons/l10n_tw/data/l10n_tw_chart_data.xml b/addons/l10n_tw/data/l10n_tw_chart_data.xml
index 4c61b5ea894..da2913ff0d7 100644
--- a/addons/l10n_tw/data/l10n_tw_chart_data.xml
+++ b/addons/l10n_tw/data/l10n_tw_chart_data.xml
@@ -7,6 +7,7 @@
         <field name="cash_account_code_prefix">1111</field>
         <field name="transfer_account_code_prefix">1114</field>
         <field name="currency_id" ref="base.TWD" />
+        <field name="spoken_languages" eval="'zh_TW'"/>
         <field name="country_id" ref="base.tw" />
     </record>
 </odoo>
diff --git a/addons/l10n_tw/demo/demo_company.xml b/addons/l10n_tw/demo/demo_company.xml
new file mode 100644
index 00000000000..dabecef6e8f
--- /dev/null
+++ b/addons/l10n_tw/demo/demo_company.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="partner_demo_company_tw" model="res.partner">
+        <field name="name">TW Company</field>
+        <field name="vat"></field>
+        <field name="street">信義路</field>
+        <field name="city_id" ref="l10n_tw.city_tw_110" />
+        <field name="country_id" ref="base.tw"/>
+        <field name="state_id" ref="l10n_tw.state_tw_tpc"/>
+        <field name="zip">110</field>
+        <field name="phone">+886 2 1234 5678</field>
+        <field name="email">info@company.twexample.com</field>
+        <field name="website">www.twexample.com</field>
+    </record>
+
+    <record id="demo_company_tw" model="res.company">
+        <field name="name">TW Company</field>
+        <field name="partner_id" ref="partner_demo_company_tw"/>
+    </record>
+
+    <function model="res.company" name="_onchange_country_id">
+        <value eval="[ref('demo_company_tw')]"/>
+    </function>
+
+    <function model="res.users" name="write">
+        <value eval="[ref('base.user_root'), ref('base.user_admin'), ref('base.user_demo')]"/>
+        <value eval="{'company_ids': [(4, ref('l10n_tw.demo_company_tw'))]}"/>
+    </function>
+
+    <function model="account.chart.template" name="try_loading">
+        <value eval="[ref('l10n_tw.l10n_tw_chart_template')]"/>
+        <value model="res.company" eval="obj().env.ref('l10n_tw.demo_company_tw')"/>
+    </function>
+</odoo>
diff --git a/addons/l10n_tw/static/description/icon.png b/addons/l10n_tw/static/description/icon.png
deleted file mode 100644
index d5fd8853bf5..00000000000
Binary files a/addons/l10n_tw/static/description/icon.png and /dev/null differ