From 03641610c2b4a6b832ea87795fd21e1d7af10b59 Mon Sep 17 00:00:00 2001
From: Julien Mougenot <jum@odoo.com>
Date: Tue, 30 Mar 2021 18:24:56 +0200
Subject: [PATCH] [REF] *: convert all modules to new asset system

Conversion of all modules to the new manifest assets declaration.

Part of task: 2352566

Co-authored-by: Julien Mougenot <jum@odoo.com>
Co-authored-by: Simon Genin <ges@odoo.com>
---
 addons/account/__manifest__.py                |  47 +-
 addons/account/views/account.xml              |  54 --
 addons/adyen_platforms/__manifest__.py        |  15 +-
 addons/adyen_platforms/views/assets.xml       |  10 -
 addons/auth_oauth/__manifest__.py             |   5 +
 .../auth_oauth/views/auth_oauth_templates.xml |   6 -
 addons/auth_password_policy/__manifest__.py   |  13 +-
 addons/auth_password_policy/views/assets.xml  |  16 -
 .../__manifest__.py                           |   7 +-
 .../views/templates.xml                       |   5 -
 .../__manifest__.py                           |   8 +-
 .../views/assets.xml                          |   9 -
 addons/auth_signup/__manifest__.py            |   8 +-
 .../auth_signup/views/auth_signup_assets.xml  |   8 -
 addons/auth_totp/__manifest__.py              |   5 +
 addons/auth_totp/views/templates.xml          |   5 -
 addons/auth_totp_portal/__manifest__.py       |   8 +
 addons/auth_totp_portal/views/templates.xml   |  12 -
 addons/barcodes/__manifest__.py               |  15 +-
 addons/barcodes/views/barcodes_templates.xml  |  26 -
 .../barcodes_gs1_nomenclature/__manifest__.py |   9 +-
 .../views/barcodes_gs1_templates.xml          |  14 -
 addons/base_automation/__manifest__.py        |   8 +
 .../views/base_automation_view.xml            |  14 +-
 addons/base_iban/__manifest__.py              |  10 +-
 addons/base_iban/views/templates.xml          |  17 -
 addons/base_import/__manifest__.py            |  16 +-
 .../views/base_import_templates.xml           |  19 -
 addons/base_setup/__manifest__.py             |  21 +-
 addons/base_setup/views/assets.xml            |  11 -
 addons/board/__manifest__.py                  |  18 +-
 addons/board/views/board_templates.xml        |  17 -
 addons/bus/__manifest__.py                    |  17 +-
 addons/bus/views/bus.xml                      |  30 -
 addons/calendar/__manifest__.py               |  19 +-
 addons/calendar/views/calendar_templates.xml  |  20 -
 addons/coupon/__manifest__.py                 |   6 +-
 addons/coupon/views/assets.xml                |  10 -
 addons/crm/__manifest__.py                    |  20 +-
 addons/crm/views/assets.xml                   |  27 -
 addons/crm_iap_lead/__manifest__.py           |  12 +-
 addons/crm_iap_lead/views/assets.xml          |   9 -
 addons/event/__manifest__.py                  |  15 +-
 addons/event/views/event_templates.xml        |  14 +-
 addons/event_sale/__manifest__.py             |  14 +-
 addons/event_sale/views/assets.xml            |  20 -
 addons/fleet/__manifest__.py                  |   7 +-
 addons/fleet/views/assets.xml                 |   9 -
 addons/gamification/__manifest__.py           |   6 +-
 addons/gamification/views/gamification.xml    |   7 -
 addons/google_calendar/__manifest__.py        |  20 +-
 .../views/google_calendar_templates.xml       |  25 -
 addons/google_drive/__manifest__.py           |  16 +-
 .../views/google_drive_templates.xml          |  17 -
 addons/google_recaptcha/__manifest__.py       |   7 +-
 addons/google_recaptcha/views/assets.xml      |  13 -
 addons/google_spreadsheet/__manifest__.py     |  10 +-
 .../views/google_spreadsheet_templates.xml    |  10 -
 addons/hr/__manifest__.py                     |  30 +-
 addons/hr/views/hr_templates.xml              |  29 -
 addons/hr_attendance/__manifest__.py          |  21 +-
 .../views/web_asset_backend_template.xml      |  20 -
 addons/hr_contract/__manifest__.py            |   6 +-
 addons/hr_contract/views/assets.xml           |   8 -
 addons/hr_expense/__manifest__.py             |  22 +-
 addons/hr_expense/views/assets.xml            |  22 -
 addons/hr_gamification/__manifest__.py        |   8 +-
 .../views/gamification_templates.xml          |  10 -
 addons/hr_holidays/__manifest__.py            |  37 +-
 .../hr_holidays/views/hr_leave_template.xml   |  32 -
 addons/hr_org_chart/__manifest__.py           |  19 +-
 addons/hr_org_chart/views/hr_templates.xml    |  21 -
 addons/hr_recruitment/__manifest__.py         |   8 +-
 .../views/hr_recruitment_templates.xml        |  16 -
 addons/hr_skills/__manifest__.py              |  17 +-
 addons/hr_skills/views/hr_templates.xml       |  14 -
 addons/hr_skills_slides/__manifest__.py       |  11 +-
 .../hr_skills_slides/views/hr_templates.xml   |   6 -
 addons/hr_skills_survey/__manifest__.py       |  11 +-
 .../hr_skills_survey/views/hr_templates.xml   |   6 -
 addons/hr_timesheet/__manifest__.py           |  21 +-
 addons/hr_timesheet/views/assets.xml          |  21 -
 addons/hr_work_entry/__manifest__.py          |   8 +-
 addons/hr_work_entry_contract/__manifest__.py |   7 +-
 .../views/hr_work_entry_template.xml          |  11 -
 addons/iap/__manifest__.py                    |  15 +-
 addons/iap/views/assets.xml                   |  16 -
 addons/im_livechat/__manifest__.py            |  45 +-
 .../views/im_livechat_channel_templates.xml   |  38 --
 addons/l10n_ar/__manifest__.py                |   6 +-
 addons/l10n_ar/views/l10n_ar.xml              |   8 -
 addons/l10n_ch/__manifest__.py                |   6 +-
 addons/l10n_ch/report/isr_report.xml          |   6 -
 addons/l10n_ch/report/swissqr_report.xml      |   6 -
 addons/l10n_co_pos/__manifest__.py            |  12 +-
 addons/l10n_co_pos/views/templates.xml        |  11 -
 addons/l10n_de/__manifest__.py                |   5 +
 addons/l10n_de/report/din5008_report.xml      |   6 -
 addons/l10n_fr_pos_cert/__manifest__.py       |  10 +-
 .../views/l10n_fr_pos_cert_templates.xml      |  12 -
 addons/l10n_in_pos/__manifest__.py            |  14 +-
 addons/l10n_in_pos/views/point_of_sale.xml    |   8 -
 addons/lunch/__manifest__.py                  |  32 +-
 addons/lunch/views/lunch_templates.xml        |  36 -
 addons/mail/__manifest__.py                   | 446 ++++++++++---
 addons/mail/views/assets.xml                  | 338 ----------
 addons/mail_bot/__manifest__.py               |  22 +-
 addons/mail_bot/views/assets.xml              |  28 -
 addons/maintenance/__manifest__.py            |   6 +-
 .../views/maintenance_templates.xml           |   8 -
 addons/mass_mailing/__manifest__.py           |  33 +-
 addons/mass_mailing/views/assets.xml          |  49 +-
 addons/microsoft_calendar/__manifest__.py     |  14 +-
 .../views/microsoft_calendar_templates.xml    |  12 -
 addons/mrp/__manifest__.py                    |  29 +-
 addons/mrp/views/assets.xml                   |  34 -
 addons/note/__manifest__.py                   |  18 +-
 addons/note/views/note_templates.xml          |  17 -
 addons/pad/__manifest__.py                    |  14 +-
 addons/pad/views/pad.xml                      |  15 -
 addons/pad_project/__manifest__.py            |   8 +-
 .../views/project_portal_assets.xml           |   8 -
 addons/partner_autocomplete/__manifest__.py   |  22 +-
 .../views/partner_autocomplete_assets.xml     |  24 -
 addons/payment/__manifest__.py                |  15 +-
 addons/payment/views/assets.xml               |  26 -
 addons/payment_adyen/__manifest__.py          |   8 +-
 addons/payment_adyen/views/assets.xml         |  20 -
 addons/payment_authorize/__manifest__.py      |   7 +-
 addons/payment_authorize/views/assets.xml     |  13 -
 addons/payment_stripe/__manifest__.py         |   7 +-
 addons/payment_stripe/views/assets.xml        |  11 -
 addons/payment_test/__manifest__.py           |   6 +-
 addons/payment_test/views/assets.xml          |  10 -
 addons/point_of_sale/__manifest__.py          | 196 +++---
 .../point_of_sale/views/pos_assets_common.xml | 118 ----
 .../point_of_sale/views/pos_assets_index.xml  |  27 -
 .../point_of_sale/views/pos_assets_qunit.xml  |   1 -
 addons/portal/__manifest__.py                 |  29 +-
 addons/portal/views/assets.xml                |  33 -
 addons/portal_rating/__manifest__.py          |   9 +-
 addons/portal_rating/views/assets.xml         |  13 -
 addons/pos_adyen/__manifest__.py              |   7 +-
 .../pos_adyen/views/point_of_sale_assets.xml  |   9 -
 addons/pos_cache/__manifest__.py              |   8 +-
 .../pos_cache/views/pos_cache_templates.xml   |  10 -
 addons/pos_coupon/__manifest__.py             |  28 +-
 addons/pos_coupon/views/assets_common.xml     |  22 -
 addons/pos_discount/__manifest__.py           |  14 +-
 .../views/pos_discount_templates.xml          |  10 -
 addons/pos_epson_printer/__manifest__.py      |  12 +-
 .../views/point_of_sale_assets.xml            |   9 -
 .../__manifest__.py                           |   6 +-
 .../views/point_of_sale_assets.xml            |   8 -
 addons/pos_hr/__manifest__.py                 |  24 +-
 addons/pos_hr/views/point_of_sale.xml         |  23 -
 addons/pos_mercury/__manifest__.py            |  20 +-
 .../views/pos_mercury_templates.xml           |  18 -
 addons/pos_restaurant/__manifest__.py         |  71 +-
 .../views/pos_restaurant_templates.xml        |  63 --
 addons/pos_restaurant_adyen/__manifest__.py   |   8 +-
 .../views/point_of_sale_assets.xml            |   9 -
 addons/pos_six/__manifest__.py                |  19 +-
 addons/pos_six/views/point_of_sale_assets.xml |  12 -
 addons/product/__manifest__.py                |  13 +-
 addons/product/views/product_templates.xml    |  15 -
 addons/product_matrix/__manifest__.py         |  15 +-
 addons/product_matrix/views/assets.xml        |   9 -
 addons/project/__manifest__.py                |  24 +-
 addons/project/views/project_assets.xml       |  25 -
 addons/purchase/__manifest__.py               |  19 +-
 addons/purchase/views/assets.xml              |  19 -
 .../purchase_product_matrix/__manifest__.py   |  12 +-
 .../purchase_product_matrix/views/assets.xml  |  21 -
 addons/purchase_stock/__manifest__.py         |   6 +-
 addons/purchase_stock/views/assets.xml        |   8 -
 addons/rating/__manifest__.py                 |   6 +-
 addons/rating/views/assets.xml                |  10 -
 addons/resource/__manifest__.py               |   8 +-
 addons/resource/views/resource.xml            |   9 -
 addons/sale/__manifest__.py                   |  29 +-
 addons/sale/views/assets.xml                  |  41 --
 addons/sale_expense/__manifest__.py           |   9 +-
 addons/sale_expense/views/assets.xml          |  14 -
 addons/sale_management/__manifest__.py        |   5 +
 .../views/sale_portal_templates.xml           |   6 -
 .../sale_product_configurator/__manifest__.py |  17 +-
 .../views/assets.xml                          |  28 -
 addons/sale_product_matrix/__manifest__.py    |  14 +-
 addons/sale_product_matrix/views/assets.xml   |  20 -
 addons/sale_stock/__manifest__.py             |   9 +-
 addons/sale_stock/views/sale_order_views.xml  |   7 +-
 addons/sale_timesheet/__manifest__.py         |  19 +-
 .../views/hr_timesheet_templates.xml          |  14 -
 .../views/sale_timesheet_portal_templates.xml |   6 -
 addons/sales_team/__manifest__.py             |   6 +-
 addons/sales_team/views/assets.xml            |   8 -
 addons/sms/__manifest__.py                    |  28 +-
 addons/sms/views/assets.xml                   |  28 -
 addons/snailmail/__manifest__.py              |  43 +-
 addons/snailmail/views/assets.xml             |  33 -
 addons/snailmail/views/report_assets.xml      |   6 -
 addons/snailmail_account/__manifest__.py      |   6 +-
 addons/snailmail_account/views/assets.xml     |   8 -
 addons/stock/__manifest__.py                  |  56 +-
 .../stock/report/report_stock_forecasted.xml  |   8 -
 addons/stock/report/report_stock_rule.xml     |   6 -
 .../stock/views/report_stock_traceability.xml |   6 -
 addons/stock/views/stock_template.xml         |  35 +-
 addons/survey/__manifest__.py                 |  39 +-
 addons/survey/views/assets.xml                |  69 --
 addons/test_event_full/__manifest__.py        |  10 +-
 addons/test_event_full/views/assets.xml       |   8 -
 addons/test_website/__manifest__.py           |   8 +
 addons/test_website/views/templates.xml       |  15 -
 .../test_website_slides_full/__manifest__.py  |   8 +-
 .../test_website_slides_full/views/assets.xml |   8 -
 addons/utm/__manifest__.py                    |   6 +-
 addons/utm/views/assets.xml                   |  11 -
 addons/web/__manifest__.py                    | 522 ++++++++++++++-
 addons/web/views/report_templates.xml         |  33 -
 addons/web/views/webclient_templates.xml      | 619 +-----------------
 addons/web_editor/__manifest__.py             | 140 +++-
 addons/web_editor/data/editor_assets.xml      |  11 +
 addons/web_editor/views/editor.xml            | 169 -----
 addons/web_kanban_gauge/__manifest__.py       |  13 +-
 .../views/web_kanban_gauge_templates.xml      |  14 -
 addons/web_tour/__manifest__.py               |  30 +-
 addons/web_tour/views/tour_templates.xml      |  34 -
 addons/web_unsplash/__manifest__.py           |  12 +-
 .../views/web_unsplash_templates.xml          |  14 -
 addons/website/__manifest__.py                | 126 +++-
 addons/website/data/ir_asset.xml              |  28 +
 addons/website/tests/template_qweb_test.xml   |  12 -
 addons/website/views/assets.xml               | 172 -----
 addons/website/views/snippets/s_alert.xml     |  10 +-
 addons/website/views/snippets/s_badge.xml     |  21 +-
 .../website/views/snippets/s_blockquote.xml   |  12 +-
 addons/website/views/snippets/s_btn.xml       |  10 +-
 addons/website/views/snippets/s_card.xml      |  11 +-
 addons/website/views/snippets/s_chart.xml     |  16 +-
 .../views/snippets/s_color_blocks_2.xml       |  10 +-
 .../website/views/snippets/s_company_team.xml |  10 +-
 .../website/views/snippets/s_comparisons.xml  |  10 +-
 addons/website/views/snippets/s_countdown.xml |  19 +-
 .../views/snippets/s_dynamic_snippet.xml      |  23 +-
 .../snippets/s_dynamic_snippet_carousel.xml   |  25 +-
 .../views/snippets/s_facebook_page.xml        |  10 +-
 .../website/views/snippets/s_faq_collapse.xml |  10 +-
 .../views/snippets/s_features_grid.xml        |  10 +-
 .../website/views/snippets/s_google_map.xml   |  60 +-
 addons/website/views/snippets/s_hr.xml        |  10 +-
 .../views/snippets/s_image_gallery.xml        |  47 +-
 addons/website/views/snippets/s_map.xml       |  10 +-
 .../views/snippets/s_masonry_block.xml        |  36 +-
 .../website/views/snippets/s_media_list.xml   |  86 +--
 addons/website/views/snippets/s_numbers.xml   |   3 -
 addons/website/views/snippets/s_popup.xml     |  72 +-
 .../views/snippets/s_process_steps.xml        |  10 +-
 .../views/snippets/s_product_catalog.xml      |  19 +-
 .../website/views/snippets/s_product_list.xml |  23 +-
 .../website/views/snippets/s_progress_bar.xml |   3 -
 .../views/snippets/s_quotes_carousel.xml      |  34 +-
 addons/website/views/snippets/s_rating.xml    |  49 +-
 .../website/views/snippets/s_references.xml   |  10 +-
 addons/website/views/snippets/s_share.xml     |  20 +-
 addons/website/views/snippets/s_showcase.xml  |  36 +-
 .../views/snippets/s_table_of_content.xml     |  24 +-
 addons/website/views/snippets/s_tabs.xml      |  69 +-
 .../views/snippets/s_text_highlight.xml       |  10 +-
 .../views/snippets/s_three_columns.xml        |  11 +-
 addons/website/views/snippets/s_timeline.xml  |  10 +-
 addons/website/views/snippets/s_title.xml     |  11 +-
 addons/website/views/website_templates.xml    |  21 +-
 addons/website_blog/__manifest__.py           |  16 +-
 addons/website_blog/data/ir_asset.xml         |  13 +
 .../views/snippets/s_blog_posts.xml           |  20 +-
 .../views/website_blog_templates.xml          |  22 -
 addons/website_crm/__manifest__.py            |   9 +-
 .../views/website_crm_templates.xml           |  14 +-
 .../__manifest__.py                           |   6 +-
 .../website_crm_partner_assign_templates.xml  |   5 -
 addons/website_event/__manifest__.py          |  23 +-
 addons/website_event/views/assets.xml         |  38 --
 .../website_event_exhibitor/__manifest__.py   |   8 +-
 .../website_event_exhibitor/views/assets.xml  |  14 -
 addons/website_event_meet/__manifest__.py     |   9 +-
 addons/website_event_meet/views/assets.xml    |  11 -
 .../website_event_questions/__manifest__.py   |   6 +-
 .../website_event_questions/views/assets.xml  |  10 -
 addons/website_event_sale/__manifest__.py     |   8 +-
 addons/website_event_sale/views/assets.xml    |  10 -
 addons/website_event_track/__manifest__.py    |  12 +-
 addons/website_event_track/views/assets.xml   |  18 -
 .../website_event_track_live/__manifest__.py  |  14 +-
 .../website_event_track_live/views/assets.xml |  14 -
 .../__manifest__.py                           |  13 +-
 .../views/assets.xml                          |  11 -
 .../website_event_track_quiz/__manifest__.py  |   8 +-
 .../website_event_track_quiz/views/assets.xml |  12 -
 addons/website_form/__manifest__.py           |  11 +-
 addons/website_form/data/ir_asset.xml         |  13 +
 addons/website_form/views/assets.xml          |  17 -
 .../views/snippets/s_website_form.xml         |  33 +-
 addons/website_form_project/__manifest__.py   |   8 +-
 .../views/website_form_project_assets.xml     |  10 -
 addons/website_forum/__manifest__.py          |  20 +-
 addons/website_forum/views/website_forum.xml  |  23 -
 addons/website_hr_recruitment/__manifest__.py |  11 +
 .../website_hr_recruitment_templates.xml      |  18 -
 addons/website_jitsi/__manifest__.py          |   7 +-
 addons/website_jitsi/views/assets.xml         |  11 -
 addons/website_links/__manifest__.py          |  18 +-
 .../views/website_links_template.xml          |  21 -
 addons/website_livechat/__manifest__.py       |  46 +-
 addons/website_livechat/views/assets.xml      |  38 --
 .../views/website_livechat.xml                |  19 -
 addons/website_mail/__manifest__.py           |   7 +-
 addons/website_mail/views/assets.xml          |   9 -
 addons/website_mail_channel/__manifest__.py   |  10 +-
 addons/website_mail_channel/views/assets.xml  |  19 -
 .../views/snippets/s_channel.xml              |  10 +-
 addons/website_mass_mailing/__manifest__.py   |  19 +-
 .../views/website_mass_mailing_templates.xml  |  25 -
 addons/website_membership/__manifest__.py     |   1 -
 addons/website_profile/__manifest__.py        |   6 +
 .../website_profile/views/website_profile.xml |   9 -
 addons/website_sale/__manifest__.py           |  47 +-
 .../snippets/s_dynamic_snippet_products.xml   |  12 +-
 .../views/snippets/s_products_searchbar.xml   |  10 +-
 addons/website_sale/views/templates.xml       |  74 ---
 .../website_sale_comparison/__manifest__.py   |   9 +
 .../website_sale_comparison_template.xml      |  13 -
 addons/website_sale_coupon/__manifest__.py    |   5 +
 .../views/website_sale_templates.xml          |   5 -
 .../__manifest__.py                           |   8 +-
 ...website_sale_coupon_delivery_templates.xml |  10 -
 addons/website_sale_delivery/__manifest__.py  |   9 +-
 .../views/website_sale_delivery_templates.xml |  13 -
 addons/website_sale_gift_card/__manifest__.py |   8 +-
 .../website_sale_gift_card/views/assets.xml   |   8 -
 .../website_sale_management/__manifest__.py   |   6 +-
 .../__manifest__.py                           |  13 +-
 .../views/assets.xml                          |  22 -
 addons/website_sale_slides/__manifest__.py    |   6 +-
 addons/website_sale_slides/views/assets.xml   |  12 -
 addons/website_sale_stock/__manifest__.py     |   5 +
 .../views/website_sale_stock_templates.xml    |   6 -
 addons/website_sale_wishlist/__manifest__.py  |   8 +
 .../views/website_sale_wishlist_template.xml  |  13 -
 addons/website_slides/__manifest__.py         |  58 +-
 addons/website_slides/views/assets.xml        |  77 ---
 addons/website_slides_forum/__manifest__.py   |   6 +-
 addons/website_slides_forum/views/assets.xml  |   8 -
 addons/website_slides_survey/__manifest__.py  |  12 +-
 addons/website_slides_survey/views/assets.xml |  20 -
 addons/website_twitter/__manifest__.py        |   9 +
 .../website_twitter_snippet_templates.xml     |  15 +-
 odoo/addons/test_apikeys/__manifest__.py      |   7 +-
 odoo/addons/test_apikeys/views/assets.xml     |   7 -
 .../test_assetsbundle/data/ir_asset.xml       |   4 +-
 odoo/addons/test_main_flows/__manifest__.py   |   9 +-
 odoo/addons/test_main_flows/views/assets.xml  |   8 -
 odoo/addons/test_new_api/__manifest__.py      |   9 +-
 .../views/test_new_api_templates.xml          |  10 -
 .../test_translation_import/__manifest__.py   |   8 +-
 366 files changed, 3601 insertions(+), 5201 deletions(-)
 delete mode 100644 addons/account/views/account.xml
 delete mode 100644 addons/adyen_platforms/views/assets.xml
 delete mode 100644 addons/auth_password_policy/views/assets.xml
 delete mode 100644 addons/auth_password_policy_signup/views/assets.xml
 delete mode 100644 addons/auth_signup/views/auth_signup_assets.xml
 delete mode 100644 addons/barcodes/views/barcodes_templates.xml
 delete mode 100644 addons/barcodes_gs1_nomenclature/views/barcodes_gs1_templates.xml
 delete mode 100644 addons/base_iban/views/templates.xml
 delete mode 100644 addons/base_import/views/base_import_templates.xml
 delete mode 100644 addons/base_setup/views/assets.xml
 delete mode 100644 addons/board/views/board_templates.xml
 delete mode 100644 addons/bus/views/bus.xml
 delete mode 100644 addons/coupon/views/assets.xml
 delete mode 100644 addons/crm/views/assets.xml
 delete mode 100644 addons/crm_iap_lead/views/assets.xml
 delete mode 100644 addons/event_sale/views/assets.xml
 delete mode 100644 addons/fleet/views/assets.xml
 delete mode 100644 addons/gamification/views/gamification.xml
 delete mode 100644 addons/google_calendar/views/google_calendar_templates.xml
 delete mode 100644 addons/google_drive/views/google_drive_templates.xml
 delete mode 100644 addons/google_recaptcha/views/assets.xml
 delete mode 100644 addons/google_spreadsheet/views/google_spreadsheet_templates.xml
 delete mode 100644 addons/hr/views/hr_templates.xml
 delete mode 100644 addons/hr_attendance/views/web_asset_backend_template.xml
 delete mode 100644 addons/hr_contract/views/assets.xml
 delete mode 100644 addons/hr_expense/views/assets.xml
 delete mode 100644 addons/hr_gamification/views/gamification_templates.xml
 delete mode 100644 addons/hr_holidays/views/hr_leave_template.xml
 delete mode 100644 addons/hr_org_chart/views/hr_templates.xml
 delete mode 100644 addons/hr_recruitment/views/hr_recruitment_templates.xml
 delete mode 100644 addons/hr_skills/views/hr_templates.xml
 delete mode 100644 addons/hr_timesheet/views/assets.xml
 delete mode 100644 addons/hr_work_entry_contract/views/hr_work_entry_template.xml
 delete mode 100644 addons/iap/views/assets.xml
 delete mode 100644 addons/l10n_ar/views/l10n_ar.xml
 delete mode 100644 addons/l10n_co_pos/views/templates.xml
 delete mode 100644 addons/l10n_fr_pos_cert/views/l10n_fr_pos_cert_templates.xml
 delete mode 100644 addons/l10n_in_pos/views/point_of_sale.xml
 delete mode 100644 addons/mail/views/assets.xml
 delete mode 100644 addons/mail_bot/views/assets.xml
 delete mode 100644 addons/maintenance/views/maintenance_templates.xml
 delete mode 100644 addons/microsoft_calendar/views/microsoft_calendar_templates.xml
 delete mode 100644 addons/mrp/views/assets.xml
 delete mode 100644 addons/note/views/note_templates.xml
 delete mode 100644 addons/pad/views/pad.xml
 delete mode 100644 addons/pad_project/views/project_portal_assets.xml
 delete mode 100644 addons/partner_autocomplete/views/partner_autocomplete_assets.xml
 delete mode 100644 addons/payment/views/assets.xml
 delete mode 100644 addons/payment_adyen/views/assets.xml
 delete mode 100644 addons/payment_authorize/views/assets.xml
 delete mode 100644 addons/payment_stripe/views/assets.xml
 delete mode 100644 addons/payment_test/views/assets.xml
 delete mode 100644 addons/portal/views/assets.xml
 delete mode 100644 addons/portal_rating/views/assets.xml
 delete mode 100644 addons/pos_adyen/views/point_of_sale_assets.xml
 delete mode 100644 addons/pos_cache/views/pos_cache_templates.xml
 delete mode 100644 addons/pos_coupon/views/assets_common.xml
 delete mode 100644 addons/pos_discount/views/pos_discount_templates.xml
 delete mode 100644 addons/pos_epson_printer/views/point_of_sale_assets.xml
 delete mode 100644 addons/pos_epson_printer_restaurant/views/point_of_sale_assets.xml
 delete mode 100644 addons/pos_hr/views/point_of_sale.xml
 delete mode 100644 addons/pos_mercury/views/pos_mercury_templates.xml
 delete mode 100644 addons/pos_restaurant_adyen/views/point_of_sale_assets.xml
 delete mode 100644 addons/pos_six/views/point_of_sale_assets.xml
 delete mode 100644 addons/product/views/product_templates.xml
 delete mode 100644 addons/product_matrix/views/assets.xml
 delete mode 100644 addons/project/views/project_assets.xml
 delete mode 100644 addons/purchase/views/assets.xml
 delete mode 100644 addons/purchase_product_matrix/views/assets.xml
 delete mode 100644 addons/purchase_stock/views/assets.xml
 delete mode 100644 addons/rating/views/assets.xml
 delete mode 100644 addons/resource/views/resource.xml
 delete mode 100644 addons/sale/views/assets.xml
 delete mode 100644 addons/sale_expense/views/assets.xml
 delete mode 100644 addons/sale_product_configurator/views/assets.xml
 delete mode 100644 addons/sale_product_matrix/views/assets.xml
 delete mode 100644 addons/sales_team/views/assets.xml
 delete mode 100644 addons/sms/views/assets.xml
 delete mode 100644 addons/snailmail/views/assets.xml
 delete mode 100644 addons/snailmail_account/views/assets.xml
 delete mode 100644 addons/survey/views/assets.xml
 delete mode 100644 addons/test_event_full/views/assets.xml
 delete mode 100644 addons/test_website_slides_full/views/assets.xml
 delete mode 100644 addons/utm/views/assets.xml
 create mode 100644 addons/web_editor/data/editor_assets.xml
 delete mode 100644 addons/web_kanban_gauge/views/web_kanban_gauge_templates.xml
 delete mode 100644 addons/web_tour/views/tour_templates.xml
 delete mode 100644 addons/web_unsplash/views/web_unsplash_templates.xml
 create mode 100644 addons/website/data/ir_asset.xml
 create mode 100644 addons/website_blog/data/ir_asset.xml
 delete mode 100644 addons/website_event/views/assets.xml
 delete mode 100644 addons/website_event_exhibitor/views/assets.xml
 delete mode 100644 addons/website_event_meet/views/assets.xml
 delete mode 100644 addons/website_event_questions/views/assets.xml
 delete mode 100644 addons/website_event_sale/views/assets.xml
 delete mode 100644 addons/website_event_track/views/assets.xml
 delete mode 100644 addons/website_event_track_live/views/assets.xml
 delete mode 100644 addons/website_event_track_live_quiz/views/assets.xml
 delete mode 100644 addons/website_event_track_quiz/views/assets.xml
 create mode 100644 addons/website_form/data/ir_asset.xml
 delete mode 100644 addons/website_form/views/assets.xml
 delete mode 100644 addons/website_form_project/views/website_form_project_assets.xml
 delete mode 100644 addons/website_jitsi/views/assets.xml
 delete mode 100644 addons/website_livechat/views/assets.xml
 delete mode 100644 addons/website_mail/views/assets.xml
 delete mode 100644 addons/website_mail_channel/views/assets.xml
 delete mode 100644 addons/website_mass_mailing/views/website_mass_mailing_templates.xml
 delete mode 100644 addons/website_sale_coupon_delivery/views/website_sale_coupon_delivery_templates.xml
 delete mode 100644 addons/website_sale_gift_card/views/assets.xml
 delete mode 100644 addons/website_sale_product_configurator/views/assets.xml
 delete mode 100644 addons/website_sale_slides/views/assets.xml
 delete mode 100644 addons/website_slides/views/assets.xml
 delete mode 100644 addons/website_slides_forum/views/assets.xml
 delete mode 100644 addons/website_slides_survey/views/assets.xml
 delete mode 100644 odoo/addons/test_apikeys/views/assets.xml
 delete mode 100644 odoo/addons/test_main_flows/views/assets.xml
 delete mode 100644 odoo/addons/test_new_api/views/test_new_api_templates.xml

diff --git a/addons/account/__manifest__.py b/addons/account/__manifest__.py
index 93e8bb8958c..e64b6f69656 100644
--- a/addons/account/__manifest__.py
+++ b/addons/account/__manifest__.py
@@ -52,7 +52,6 @@ You could use this simplified accounting in case you work with an (external) acc
         'views/res_company_views.xml',
         'views/product_view.xml',
         'views/account_analytic_view.xml',
-        'views/account.xml',
         'views/report_invoice.xml',
         'report/account_invoice_report_view.xml',
         'views/account_cash_rounding_view.xml',
@@ -81,16 +80,46 @@ You could use this simplified accounting in case you work with an (external) acc
     'demo': [
         'demo/account_demo.xml',
     ],
-    'qweb': [
-        "static/src/xml/account_payment.xml",
-        'static/src/xml/account_resequence.xml',
-        "static/src/xml/bills_upload_views.xml",
-        'static/src/xml/account_journal_activity.xml',
-        'static/src/xml/grouped_view_widget.xml',
-        'static/src/xml/tax_group.xml',
-    ],
     'installable': True,
     'application': True,
     'auto_install': False,
     'post_init_hook': '_account_post_init',
+    'assets': {
+        'web._assets_primary_variables': [
+            'account/static/src/scss/variables.scss',
+        ],
+        'web.assets_backend': [
+            'account/static/src/css/account_bank_and_cash.css',
+            'account/static/src/css/account.css',
+            'account/static/src/css/tax_group.css',
+            'account/static/src/scss/account_reconciliation.scss',
+            'account/static/src/scss/account_journal_dashboard.scss',
+            'account/static/src/scss/account_dashboard.scss',
+            'account/static/src/scss/account_searchpanel.scss',
+            'account/static/src/scss/section_and_note_backend.scss',
+            'account/static/src/scss/account_activity.scss',
+            'account/static/src/js/account_payment_field.js',
+            'account/static/src/js/account_resequence_field.js',
+            'account/static/src/js/grouped_view_widget.js',
+            'account/static/src/js/mail_activity.js',
+            'account/static/src/js/tax_group.js',
+            'account/static/src/js/section_and_note_fields_backend.js',
+            'account/static/src/js/tours/account.js',
+            'account/static/src/js/bills_upload.js',
+            'account/static/src/js/account_selection.js',
+        ],
+        'web.assets_frontend': [
+            'account/static/src/js/account_portal_sidebar.js',
+        ],
+        'web.assets_tests': [
+            'account/static/tests/tours/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            ('after', 'web/static/tests/views/kanban_tests.js', 'account/static/tests/account_payment_field_tests.js'),
+            ('after', 'web/static/tests/views/kanban_tests.js', 'account/static/tests/section_and_note_tests.js'),
+        ],
+        'web.assets_qweb': [
+            'account/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/account/views/account.xml b/addons/account/views/account.xml
deleted file mode 100644
index 3013dc8881e..00000000000
--- a/addons/account/views/account.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="web._assets_primary_variables">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/account/static/src/scss/variables.scss"/>
-        </xpath>
-    </template>
-
-    <template id="assets_backend" name="account assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" href="/account/static/src/css/account_bank_and_cash.css"/>
-            <link rel="stylesheet" href="/account/static/src/css/account.css"/>
-            <link rel="stylesheet" href="/account/static/src/css/tax_group.css"/>
-            <link rel="stylesheet" type="text/scss" href="/account/static/src/scss/account_reconciliation.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/account/static/src/scss/account_journal_dashboard.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/account/static/src/scss/account_dashboard.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/account/static/src/scss/account_searchpanel.scss"/>
-
-            <link rel="stylesheet" href="/account/static/src/scss/section_and_note_backend.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/account/static/src/scss/account_activity.scss"/>
-
-            <script type="text/javascript" src="/account/static/src/js/account_payment_field.js"></script>
-            <script type="text/javascript" src="/account/static/src/js/account_resequence_field.js"></script>
-            <script type="text/javascript" src="/account/static/src/js/grouped_view_widget.js"></script>
-            <script type="text/javascript" src="/account/static/src/js/mail_activity.js"></script>
-            <script type="text/javascript" src="/account/static/src/js/tax_group.js"></script>
-
-            <script type="text/javascript" src="/account/static/src/js/section_and_note_fields_backend.js"></script>
-            <script type="text/javascript" src="/account/static/src/js/tours/account.js"></script>
-            <script type="text/javascript" src="/account/static/src/js/bills_upload.js"/>
-            <script type="text/javascript" src="/account/static/src/js/account_selection.js"/>
-        </xpath>
-    </template>
-
-    <template id="assets_frontend" name="account assets" inherit_id="web.assets_frontend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/account/static/src/js/account_portal_sidebar.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_tests" name="Account Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/account/static/tests/tours/account_dashboard_setup_bar_tests.js"></script>
-            <script type="text/javascript" src="/account/static/tests/tours/tax_group_tests.js"></script>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" name="account tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="//script[contains(@src, '/web/static/tests/views/kanban_tests.js')]" position="after">
-            <script type="text/javascript" src="/account/static/tests/account_payment_field_tests.js"></script>
-            <script type="text/javascript" src="/account/static/tests/section_and_note_tests.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/adyen_platforms/__manifest__.py b/addons/adyen_platforms/__manifest__.py
index 189ff6b8204..91eabb20da2 100644
--- a/addons/adyen_platforms/__manifest__.py
+++ b/addons/adyen_platforms/__manifest__.py
@@ -14,11 +14,14 @@
         'views/adyen_account_templates.xml',
         'views/adyen_account_views.xml',
         'views/adyen_transaction_views.xml',
-        'views/assets.xml',
-    ],
-    'qweb': [
-        "static/src/xml/adyen_account_templates.xml",
-        "static/src/xml/adyen_transactions_templates.xml",
-    ],
+        ],
     'installable': True,
+    'assets': {
+        'web.assets_backend': [
+            'adyen_platforms/static/src/js/**/*',
+        ],
+        'web.assets_qweb': [
+            'adyen_platforms/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/adyen_platforms/views/assets.xml b/addons/adyen_platforms/views/assets.xml
deleted file mode 100644
index e1d29146b66..00000000000
--- a/addons/adyen_platforms/views/assets.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" inherit_id="web.assets_backend" name="Adyen for Platforms Backend Assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/adyen_platforms/static/src/js/adyen_account_fields.js"></script>
-            <script type="text/javascript" src="/adyen_platforms/static/src/js/adyen_account_views.js"></script>
-            <script type="text/javascript" src="/adyen_platforms/static/src/js/adyen_transactions.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/auth_oauth/__manifest__.py b/addons/auth_oauth/__manifest__.py
index cd226fcdff9..93715883c78 100644
--- a/addons/auth_oauth/__manifest__.py
+++ b/addons/auth_oauth/__manifest__.py
@@ -18,4 +18,9 @@ Allow users to login through OAuth2 Provider.
         'views/auth_oauth_templates.xml',
         'security/ir.model.access.csv',
     ],
+    'assets': {
+        'web.assets_frontend': [
+            'auth_oauth/static/**/*',
+        ],
+    }
 }
diff --git a/addons/auth_oauth/views/auth_oauth_templates.xml b/addons/auth_oauth/views/auth_oauth_templates.xml
index 529bd8f27ce..390a787cf7d 100644
--- a/addons/auth_oauth/views/auth_oauth_templates.xml
+++ b/addons/auth_oauth/views/auth_oauth_templates.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-        <template id="assets_frontend" inherit_id="web.assets_frontend" name="OAuth Providers Assets">
-            <xpath expr="//link[last()]" position="after">
-                <link rel="stylesheet" type="text/scss" href="/auth_oauth/static/src/scss/auth_oauth.scss"/>
-            </xpath>
-        </template>
-
         <template id="providers" name="OAuth Providers">
             <t t-if="len(providers) &gt; 0">
                 <em t-attf-class="d-block text-center text-muted small my-#{len(providers) if len(providers) &lt; 3 else 3}">- or -</em>
diff --git a/addons/auth_password_policy/__manifest__.py b/addons/auth_password_policy/__manifest__.py
index aad5aa0d62f..2443302fef2 100644
--- a/addons/auth_password_policy/__manifest__.py
+++ b/addons/auth_password_policy/__manifest__.py
@@ -5,8 +5,17 @@
     'depends': ['base_setup', 'web'],
     'data': [
         'data/defaults.xml',
-        'views/assets.xml',
         'views/res_users.xml',
         'views/res_config_settings_views.xml',
-    ]
+    ],
+    'assets': {
+        'web.assets_backend': [
+            'auth_password_policy/static/src/js/password_field.js',
+            'auth_password_policy/static/src/js/change_password.js',
+        ],
+        'web.assets_common': [
+            'auth_password_policy/static/src/js/password_gauge.js',
+            'auth_password_policy/static/src/css/password_field.css',
+        ],
+    }
 }
diff --git a/addons/auth_password_policy/views/assets.xml b/addons/auth_password_policy/views/assets.xml
deleted file mode 100644
index 67bcc7196e8..00000000000
--- a/addons/auth_password_policy/views/assets.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<odoo>
-    <template id="assets_backend" inherit_id="web.assets_backend"
-              name="Password Policy Backend Assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/auth_password_policy/static/src/js/password_field.js"></script>
-            <script type="text/javascript" src="/auth_password_policy/static/src/js/change_password.js"></script>
-        </xpath>
-    </template>
-    <template id="assets_common" inherit_id="web.assets_common"
-              name="Password Policy Common Assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/auth_password_policy/static/src/js/password_gauge.js"></script>
-            <link rel="stylesheet" type="text/css" href="/auth_password_policy/static/src/css/password_field.css"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/auth_password_policy_portal/__manifest__.py b/addons/auth_password_policy_portal/__manifest__.py
index 8241c90a670..706d68f7666 100644
--- a/addons/auth_password_policy_portal/__manifest__.py
+++ b/addons/auth_password_policy_portal/__manifest__.py
@@ -3,5 +3,10 @@
     'depends': ['auth_password_policy', 'portal'],
     'category': 'Tools',
     'auto_install': True,
-    'data': ['views/templates.xml']
+    'data': ['views/templates.xml'],
+    'assets': {
+        'web.assets_frontend': [
+            'auth_password_policy_portal/static/**/*',
+        ],
+    }
 }
diff --git a/addons/auth_password_policy_portal/views/templates.xml b/addons/auth_password_policy_portal/views/templates.xml
index 427ee055e51..e7d188053e3 100644
--- a/addons/auth_password_policy_portal/views/templates.xml
+++ b/addons/auth_password_policy_portal/views/templates.xml
@@ -1,9 +1,4 @@
 <odoo>
-    <template id="assets_frontend" inherit_id="web.assets_frontend" name="Portal Password Policy Assets">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/auth_password_policy_portal/static/src/scss/portal_policy.scss"/>
-        </xpath>
-    </template>
     <template id="portal_my_security" inherit_id="portal.portal_my_security"
               name="Password policy data for portal">
         <xpath expr="//div[hasclass('form-group')][input[@name='new1']]" position="attributes">
diff --git a/addons/auth_password_policy_signup/__manifest__.py b/addons/auth_password_policy_signup/__manifest__.py
index ebf6f71933f..be10ef38f99 100644
--- a/addons/auth_password_policy_signup/__manifest__.py
+++ b/addons/auth_password_policy_signup/__manifest__.py
@@ -4,7 +4,11 @@
     'category': 'Hidden/Tools',
     'auto_install': True,
     'data': [
-        'views/assets.xml',
         'views/signup_templates.xml',
-    ]
+    ],
+    'assets': {
+        'web.assets_frontend': [
+            'auth_password_policy_signup/static/**/*',
+        ],
+    }
 }
diff --git a/addons/auth_password_policy_signup/views/assets.xml b/addons/auth_password_policy_signup/views/assets.xml
deleted file mode 100644
index 1f6f37147e0..00000000000
--- a/addons/auth_password_policy_signup/views/assets.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<odoo>
-    <template id="assets_frontend" inherit_id="web.assets_frontend" name="Auth Signup Password Policy Assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/auth_password_policy_signup/static/src/js/signup_policy.js"></script>
-            <link rel="stylesheet" type="text/scss" href="/auth_password_policy_signup/static/src/scss/signup_policy.scss"/>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/addons/auth_signup/__manifest__.py b/addons/auth_signup/__manifest__.py
index dcd77bb03e4..085616beb9b 100644
--- a/addons/auth_signup/__manifest__.py
+++ b/addons/auth_signup/__manifest__.py
@@ -22,7 +22,11 @@ Allow users to sign up and reset their password
         'views/res_config_settings_views.xml',
         'views/res_users_views.xml',
         'views/auth_signup_login_templates.xml',
-        'views/auth_signup_assets.xml',
-    ],
+        ],
     'bootstrap': True,
+    'assets': {
+        'web.assets_frontend': [
+            'auth_signup/static/**/*',
+        ],
+    }
 }
diff --git a/addons/auth_signup/views/auth_signup_assets.xml b/addons/auth_signup/views/auth_signup_assets.xml
deleted file mode 100644
index 23a1e01cf17..00000000000
--- a/addons/auth_signup/views/auth_signup_assets.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_frontend" inherit_id="web.assets_frontend" name="Auth Assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/auth_signup/static/src/js/signup.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/auth_totp/__manifest__.py b/addons/auth_totp/__manifest__.py
index f98675c5252..89288442952 100644
--- a/addons/auth_totp/__manifest__.py
+++ b/addons/auth_totp/__manifest__.py
@@ -22,4 +22,9 @@ can setup API keys to replace their main password.
         'views/user_preferences.xml',
         'views/templates.xml',
     ],
+    'assets': {
+        'web.assets_tests': [
+            'auth_totp/static/**/*',
+        ],
+    },
 }
diff --git a/addons/auth_totp/views/templates.xml b/addons/auth_totp/views/templates.xml
index 100dbbc4452..cd6c90cad38 100644
--- a/addons/auth_totp/views/templates.xml
+++ b/addons/auth_totp/views/templates.xml
@@ -1,9 +1,4 @@
 <odoo>
-    <template id="assets_tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/auth_totp/static/tests/totp_flow.js"></script>
-        </xpath>
-    </template>
     <template id="auth_totp_form">
         <t t-call="web.login_layout">
             <t t-set="disable_footer">1</t>
diff --git a/addons/auth_totp_portal/__manifest__.py b/addons/auth_totp_portal/__manifest__.py
index c316c51feb9..8d7b5b949c5 100644
--- a/addons/auth_totp_portal/__manifest__.py
+++ b/addons/auth_totp_portal/__manifest__.py
@@ -7,4 +7,12 @@
         'security/security.xml',
         'views/templates.xml',
     ],
+    'assets': {
+        'web.assets_frontend': [
+            'auth_totp_portal/static/src/**/*',
+        ],
+        'web.assets_tests': [
+            'auth_totp_portal/static/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/auth_totp_portal/views/templates.xml b/addons/auth_totp_portal/views/templates.xml
index 48120eb7f52..a3e8291519e 100644
--- a/addons/auth_totp_portal/views/templates.xml
+++ b/addons/auth_totp_portal/views/templates.xml
@@ -1,16 +1,4 @@
 <odoo>
-    <template id="auth_totp_frontend" name="TOTP frontend (portal)" inherit_id="portal.assets_frontend">
-        <xpath expr="." position="inside">
-            <script type="application/javascript"
-                    src="/auth_totp_portal/static/src/js/totp_frontend.js"/>
-        </xpath>
-    </template>
-    <template id="assets_tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/auth_totp_portal/static/tests/totp_portal.js"></script>
-        </xpath>
-    </template>
-
     <template id="totp_portal_hook" name="TOTP Portal hook" inherit_id="portal.portal_my_security">
         <xpath expr="//div[hasclass('o_portal_security_body')]">
             <!--
diff --git a/addons/barcodes/__manifest__.py b/addons/barcodes/__manifest__.py
index f1a8756184a..c89e24a7596 100644
--- a/addons/barcodes/__manifest__.py
+++ b/addons/barcodes/__manifest__.py
@@ -8,9 +8,20 @@
         'data/barcodes_data.xml',
         'views/barcodes_view.xml',
         'security/ir.model.access.csv',
-        'views/barcodes_templates.xml',
-    ],
+        ],
     'installable': True,
     'auto_install': False,
     'post_init_hook': '_assign_default_nomeclature_id',
+    'assets': {
+        'web.assets_backend': [
+            'barcodes/static/src/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'barcodes/static/tests/barcode_tests.js',
+            'barcodes/static/tests/barcode_parser_tests.js',
+        ],
+        'web.qunit_mobile_suite_tests': [
+            'barcodes/static/tests/barcode_mobile_tests.js',
+        ],
+    }
 }
diff --git a/addons/barcodes/views/barcodes_templates.xml b/addons/barcodes/views/barcodes_templates.xml
deleted file mode 100644
index fc9db84c5e0..00000000000
--- a/addons/barcodes/views/barcodes_templates.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-       <template id="assets_backend" name="barcodes assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/barcodes/static/src/js/barcode_parser.js"></script>
-                <script type="text/javascript" src="/barcodes/static/src/js/barcode_events.js"></script>
-                <script type="text/javascript" src="/barcodes/static/src/js/barcode_form_view.js"></script>
-                <script type="text/javascript" src="/barcodes/static/src/js/barcode_field.js"></script>
-            </xpath>
-        </template>
-
-        <template id="qunit_suite" name="barcode_tests" inherit_id="web.qunit_suite_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/barcodes/static/tests/barcode_tests.js"/>
-                <script type="text/javascript" src="/barcodes/static/tests/barcode_parser_tests.js"/>
-            </xpath>
-        </template>
-
-        <template id="qunit_mobile_suite" name="barcode_mobile_tests" inherit_id="web.qunit_mobile_suite_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/barcodes/static/tests/barcode_mobile_tests.js"></script>
-            </xpath>
-        </template>
-
-</odoo>
diff --git a/addons/barcodes_gs1_nomenclature/__manifest__.py b/addons/barcodes_gs1_nomenclature/__manifest__.py
index 8ea27725ec7..63350aded0a 100644
--- a/addons/barcodes_gs1_nomenclature/__manifest__.py
+++ b/addons/barcodes_gs1_nomenclature/__manifest__.py
@@ -8,9 +8,16 @@
     'depends': ['barcodes', 'uom'],
     'data': [
         'data/barcodes_gs1_rules.xml',
-        'views/barcodes_gs1_templates.xml',
         'views/barcodes_view.xml',
     ],
     'installable': True,
     'auto_install': False,
+    'assets': {
+        'web.assets_backend': [
+            'barcodes_gs1_nomenclature/static/src/js/barcode_parser.js',
+        ],
+        'web.qunit_suite_tests': [
+            'barcodes_gs1_nomenclature/static/src/js/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/barcodes_gs1_nomenclature/views/barcodes_gs1_templates.xml b/addons/barcodes_gs1_nomenclature/views/barcodes_gs1_templates.xml
deleted file mode 100644
index 47c6567e12d..00000000000
--- a/addons/barcodes_gs1_nomenclature/views/barcodes_gs1_templates.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="barcodes assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/barcodes_gs1_nomenclature/static/src/js/barcode_parser.js"></script>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" name="barcode_tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/barcodes_gs1_nomenclature/static/src/js/tests/barcode_parser_tests.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/base_automation/__manifest__.py b/addons/base_automation/__manifest__.py
index 8d263a11383..4122299bea1 100644
--- a/addons/base_automation/__manifest__.py
+++ b/addons/base_automation/__manifest__.py
@@ -21,4 +21,12 @@ trigger an automatic reminder email.
         'data/base_automation_data.xml',
         'views/base_automation_view.xml',
     ],
+    'assets': {
+        'web.assets_backend': [
+            'base_automation/static/src/js/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'base_automation/static/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/base_automation/views/base_automation_view.xml b/addons/base_automation/views/base_automation_view.xml
index fdaaec3d3aa..f27814bb4c1 100644
--- a/addons/base_automation/views/base_automation_view.xml
+++ b/addons/base_automation/views/base_automation_view.xml
@@ -101,16 +101,4 @@
         <menuitem id="menu_base_automation_form"
             parent="base.menu_automation" action="base_automation_act" sequence="1"/>
 
-        <template id="assets_backend" name="base_automation assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/base_automation/static/src/js/base_automation_error_dialog.js"/>
-            </xpath>
-        </template>
-
-        <template id="qunit_suite" name="base_automation_tests" inherit_id="web.qunit_suite_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/base_automation/static/tests/base_automation_error_dialog.js"/>
-            </xpath>
-        </template>
-
-</odoo>
+        </odoo>
diff --git a/addons/base_iban/__manifest__.py b/addons/base_iban/__manifest__.py
index c18f7b94894..b149e54a554 100644
--- a/addons/base_iban/__manifest__.py
+++ b/addons/base_iban/__manifest__.py
@@ -12,9 +12,17 @@ with a single statement.
     """,
     'depends': ['account', 'web'],
     'data': [
-        'views/templates.xml',
         'views/partner_view.xml',
         'views/setup_wizards_view.xml'
     ],
     'demo': ['data/res_partner_bank_demo.xml'],
+    'assets': {
+        'web.assets_backend': [
+            'base_iban/static/src/js/iban_widget.js',
+            'base_iban/static/src/scss/iban_widget_view.scss',
+        ],
+        'web.qunit_suite_tests': [
+            'base_iban/static/src/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/base_iban/views/templates.xml b/addons/base_iban/views/templates.xml
deleted file mode 100644
index b25dc9e1cab..00000000000
--- a/addons/base_iban/views/templates.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <template id="assets_backend" name="base_iban_assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/base_iban/static/src/js/iban_widget.js"></script>
-                <link rel="stylesheet" type="text/scss" href="/base_iban/static/src/scss/iban_widget_view.scss"/>
-            </xpath>
-        </template>
-
-        <template id="qunit_suite" name="base_iban_widget_tests" inherit_id="web.qunit_suite_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/base_iban/static/src/tests/iban_widget_test.js"></script>
-            </xpath>
-        </template>
-    </data>
-</odoo>
diff --git a/addons/base_import/__manifest__.py b/addons/base_import/__manifest__.py
index 24992defce3..3e67f593910 100644
--- a/addons/base_import/__manifest__.py
+++ b/addons/base_import/__manifest__.py
@@ -27,7 +27,19 @@ Re-implement Odoo's file import system:
     'auto_install': True,
     'data': [
         'security/ir.model.access.csv',
-        'views/base_import_templates.xml',
     ],
-    'qweb': ['static/src/xml/base_import.xml'],
+    'assets': {
+        'web.assets_qweb': [
+            'base_import/static/src/xml/**/*',
+        ],
+        'web.assets_backend': [
+            'base_import/static/src/scss/base_import.scss',
+            'base_import/static/lib/javascript-state-machine/state-machine.js',
+            'base_import/static/src/js/import_action.js',
+            'base_import/static/src/js/import_menu.js',
+        ],
+        'web.qunit_suite_tests': [
+            'base_import/static/tests/**/*',
+        ],
+    },
 }
diff --git a/addons/base_import/views/base_import_templates.xml b/addons/base_import/views/base_import_templates.xml
deleted file mode 100644
index 092cdc4ef15..00000000000
--- a/addons/base_import/views/base_import_templates.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <template id="assets_backend" name="base_import assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" type="text/scss" href="/base_import/static/src/scss/base_import.scss"/>
-                <script type="text/javascript" src="/base_import/static/lib/javascript-state-machine/state-machine.js"></script>
-                <script type="text/javascript" src="/base_import/static/src/js/import_action.js"></script>
-                <script type="text/javascript" src="/base_import/static/src/js/import_menu.js"></script>
-            </xpath>
-        </template>
-
-        <template id="qunit_suite" name="base_import_tests" inherit_id="web.qunit_suite_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/base_import/static/tests/import_buttons_tests.js"></script>
-            </xpath>
-        </template>
-    </data>
-</odoo>
diff --git a/addons/base_setup/__manifest__.py b/addons/base_setup/__manifest__.py
index 1afdc984581..e0c6189b237 100644
--- a/addons/base_setup/__manifest__.py
+++ b/addons/base_setup/__manifest__.py
@@ -16,17 +16,20 @@ Shows you a list of applications features to install from.
         'data/base_setup_data.xml',
         'views/res_config_settings_views.xml',
         'views/res_partner_views.xml',
-        'views/assets.xml',
-    ],
+        ],
     'demo': [],
     'installable': True,
     'auto_install': False,
 
-    'qweb': [
-        'static/src/xml/res_config_dev_tool.xml',
-        'static/src/xml/res_config_edition.xml',
-        'static/src/xml/res_config_invite_users.xml',
-    ],
-
-    
+    'assets': {
+        'web.assets_backend': [
+            'base_setup/static/src/scss/settings.scss',
+            'base_setup/static/src/js/res_config_dev_tool.js',
+            'base_setup/static/src/js/res_config_edition.js',
+            'base_setup/static/src/js/res_config_invite_users.js',
+        ],
+        'web.assets_qweb': [
+            'base_setup/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/base_setup/views/assets.xml b/addons/base_setup/views/assets.xml
deleted file mode 100644
index cd0cb0efc85..00000000000
--- a/addons/base_setup/views/assets.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="dev tool assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/base_setup/static/src/scss/settings.scss"/>
-            <script type="text/javascript" src="/base_setup/static/src/js/res_config_dev_tool.js"></script>
-            <script type="text/javascript" src="/base_setup/static/src/js/res_config_edition.js"></script>
-            <script type="text/javascript" src="/base_setup/static/src/js/res_config_invite_users.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/board/__manifest__.py b/addons/board/__manifest__.py
index 82d69eaeda5..b504003488d 100644
--- a/addons/board/__manifest__.py
+++ b/addons/board/__manifest__.py
@@ -17,8 +17,20 @@ Allows users to create custom dashboard.
     'data': [
         'security/ir.model.access.csv',
         'views/board_views.xml',
-        'views/board_templates.xml',
-    ],
-    'qweb': ['static/src/xml/board.xml'],
+        ],
     'application': True,
+    'assets': {
+        'web.assets_backend': [
+            'board/static/src/scss/dashboard.scss',
+            'board/static/src/js/action_manager_board_action.js',
+            'board/static/src/js/board_view.js',
+            'board/static/src/js/add_to_board_menu.js',
+        ],
+        'web.qunit_suite_tests': [
+            'board/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'board/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/board/views/board_templates.xml b/addons/board/views/board_templates.xml
deleted file mode 100644
index bfd6695a847..00000000000
--- a/addons/board/views/board_templates.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-        <template id="assets_backend" name="board assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" type="text/scss" href="/board/static/src/scss/dashboard.scss"/>
-                <script type="text/javascript" src="/board/static/src/js/action_manager_board_action.js"></script>
-                <script type="text/javascript" src="/board/static/src/js/board_view.js"></script>
-                <script type="text/javascript" src="/board/static/src/js/add_to_board_menu.js"></script>
-            </xpath>
-        </template>
-
-         <template id="qunit_suite" name="dashboard_tests" inherit_id="web.qunit_suite_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/board/static/tests/dashboard_tests.js"></script>
-            </xpath>
-        </template>
-</odoo>
diff --git a/addons/bus/__manifest__.py b/addons/bus/__manifest__.py
index 2489f6a38f9..9dd82600664 100644
--- a/addons/bus/__manifest__.py
+++ b/addons/bus/__manifest__.py
@@ -6,8 +6,23 @@
     'description': "Instant Messaging Bus allow you to send messages to users, in live.",
     'depends': ['base', 'web'],
     'data': [
-        'views/bus.xml',
         'security/ir.model.access.csv',
     ],
     'installable': True,
+    'assets': {
+        'web.assets_backend': [
+            'bus/static/src/**/*',
+        ],
+        'web.assets_frontend': [
+            'bus/static/src/js/longpolling_bus.js',
+            'bus/static/src/js/crosstab_bus.js',
+            'bus/static/src/js/services/bus_service.js',
+        ],
+        'web.qunit_suite_tests': [
+            'bus/static/tests/bus_tests.js',
+        ],
+        'web.assets_tests': [
+            'bus/static/tests/bus_tests_tour.js',
+        ],
+    }
 }
diff --git a/addons/bus/views/bus.xml b/addons/bus/views/bus.xml
deleted file mode 100644
index 24a83d4241b..00000000000
--- a/addons/bus/views/bus.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="im assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/bus/static/src/js/longpolling_bus.js"></script>
-            <script type="text/javascript" src="/bus/static/src/js/crosstab_bus.js"></script>
-            <script type="text/javascript" src="/bus/static/src/js/services/bus_service.js"></script>
-            <script type="text/javascript" src="/bus/static/src/js/web_client_bus.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_frontend" name="im assets" inherit_id="web.assets_frontend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/bus/static/src/js/longpolling_bus.js"></script>
-            <script type="text/javascript" src="/bus/static/src/js/crosstab_bus.js"></script>
-            <script type="text/javascript" src="/bus/static/src/js/services/bus_service.js"></script>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" name="bus tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/bus/static/tests/bus_tests.js"/>
-        </xpath>
-    </template>
-    <template id="assets_tests" name="Bus Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/bus/static/tests/bus_tests_tour.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/calendar/__manifest__.py b/addons/calendar/__manifest__.py
index 20466920cd4..8e068662534 100644
--- a/addons/calendar/__manifest__.py
+++ b/addons/calendar/__manifest__.py
@@ -33,8 +33,25 @@ If you need to manage your meetings, you should install the CRM module.
         'views/calendar_templates.xml',
         'views/calendar_views.xml',
     ],
-    'qweb': ['static/src/xml/base_calendar.xml'],
     'installable': True,
     'application': True,
     'auto_install': False,
+    'assets': {
+        'web.assets_backend': [
+            'calendar/static/src/scss/calendar.scss',
+            'calendar/static/src/js/base_calendar.js',
+            'calendar/static/src/js/calendar_renderer.js',
+            'calendar/static/src/js/calendar_controller.js',
+            'calendar/static/src/js/calendar_model.js',
+            'calendar/static/src/js/calendar_view.js',
+            'calendar/static/src/js/mail_activity.js',
+            'calendar/static/src/js/systray_activity_menu.js',
+        ],
+        'web.qunit_suite_tests': [
+            'calendar/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'calendar/static/src/xml/base_calendar.xml',
+        ],
+    }
 }
diff --git a/addons/calendar/views/calendar_templates.xml b/addons/calendar/views/calendar_templates.xml
index 581b201c01b..7bf940a5285 100644
--- a/addons/calendar/views/calendar_templates.xml
+++ b/addons/calendar/views/calendar_templates.xml
@@ -1,25 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="assets_backend" name="calendar assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/calendar/static/src/scss/calendar.scss"/>
-            <script type="text/javascript" src="/calendar/static/src/js/base_calendar.js"></script>
-            <script type="text/javascript" src="/calendar/static/src/js/calendar_renderer.js"></script>
-            <script type="text/javascript" src="/calendar/static/src/js/calendar_controller.js"></script>
-            <script type="text/javascript" src="/calendar/static/src/js/calendar_model.js"></script>
-            <script type="text/javascript" src="/calendar/static/src/js/calendar_view.js"></script>
-            <script type="text/javascript" src="/calendar/static/src/js/mail_activity.js"></script>
-            <script type="text/javascript" src="/calendar/static/src/js/systray_activity_menu.js"></script>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" inherit_id="web.qunit_suite_tests">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/calendar/static/tests/calendar_tests.js"/>
-            <script type="text/javascript" src="/calendar/static/tests/systray_activity_menu_tests.js"/>
-        </xpath>
-    </template>
-
     <!-- Template rendered in route auth=None, for anonymous user. This allow them to see meeting details -->
     <template id="invitation_page_anonymous" name="Calendar Invitation Page for anonymous users">
         <t t-call="web.layout">
diff --git a/addons/coupon/__manifest__.py b/addons/coupon/__manifest__.py
index 1081b202f39..84798bd6969 100644
--- a/addons/coupon/__manifest__.py
+++ b/addons/coupon/__manifest__.py
@@ -11,7 +11,6 @@
         'wizard/coupon_generate_views.xml',
         'security/ir.model.access.csv',
         'security/coupon_security.xml',
-        'views/assets.xml',
         'views/coupon_views.xml',
         'views/coupon_program_views.xml',
         'report/coupon_report.xml',
@@ -22,4 +21,9 @@
         'demo/coupon_demo.xml',
     ],
     'installable': True,
+    'assets': {
+        'web.assets_backend': [
+            'coupon/static/**/*',
+        ],
+    }
 }
diff --git a/addons/coupon/views/assets.xml b/addons/coupon/views/assets.xml
deleted file mode 100644
index 510589e1985..00000000000
--- a/addons/coupon/views/assets.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets_backend" name="coupen assets backend" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/coupon/static/src/js/coupon.js"/>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/addons/crm/__manifest__.py b/addons/crm/__manifest__.py
index 8c09d4f750c..75b071d3ee4 100644
--- a/addons/crm/__manifest__.py
+++ b/addons/crm/__manifest__.py
@@ -43,7 +43,6 @@
         'wizard/crm_merge_opportunities_views.xml',
         'wizard/crm_lead_pls_update_views.xml',
 
-        'views/assets.xml',
         'views/calendar_views.xml',
         'views/crm_recurring_plan_views.xml',
         'views/crm_menu_views.xml',
@@ -70,5 +69,22 @@
     'css': ['static/src/css/crm.css'],
     'installable': True,
     'application': True,
-    'auto_install': False
+    'auto_install': False,
+    'assets': {
+        'web.assets_backend': [
+            'crm/static/src/js/crm_form.js',
+            'crm/static/src/js/crm_kanban.js',
+            'crm/static/src/js/systray_activity_menu.js',
+            'crm/static/src/js/tours/crm.js',
+            'crm/static/src/scss/crm.scss',
+            'crm/static/src/scss/crm_team_member_views.scss',
+        ],
+        'web.assets_tests': [
+            'crm/static/tests/tours/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'crm/static/tests/mock_server.js',
+            'crm/static/tests/crm_rainbowman_tests.js',
+        ],
+    }
 }
diff --git a/addons/crm/views/assets.xml b/addons/crm/views/assets.xml
deleted file mode 100644
index e1111a4affa..00000000000
--- a/addons/crm/views/assets.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="CRM assets backend" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/crm/static/src/js/crm_form.js"/>
-            <script type="text/javascript" src="/crm/static/src/js/crm_kanban.js"/>
-            <script type="text/javascript" src="/crm/static/src/js/systray_activity_menu.js"/>
-            <script type="text/javascript" src="/crm/static/src/js/tours/crm.js"></script>
-        </xpath>
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/crm/static/src/scss/crm.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/crm/static/src/scss/crm_team_member_views.scss"></link>
-        </xpath>
-    </template>
-
-    <template id="assets_tests" name="CRM Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/crm/static/tests/tours/crm_rainbowman.js"></script>
-        </xpath>
-    </template>
-    <template id="qunit_suite" name="crm tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/crm/static/tests/mock_server.js"></script>
-            <script type="text/javascript" src="/crm/static/tests/crm_rainbowman_tests.js"></script>
-        </xpath>
-    </template>         
-</odoo>
diff --git a/addons/crm_iap_lead/__manifest__.py b/addons/crm_iap_lead/__manifest__.py
index 7707b845f47..b749f31b812 100644
--- a/addons/crm_iap_lead/__manifest__.py
+++ b/addons/crm_iap_lead/__manifest__.py
@@ -18,14 +18,18 @@
         'data/mail_template_data.xml',
         'data/ir_sequence_data.xml',
         'security/ir.model.access.csv',
-        'views/assets.xml',
         'views/crm_lead_view.xml',
         'views/crm_iap_lead_views.xml',
         'views/res_config_settings_views.xml',
         'views/mail_templates.xml',
     ],
-    'qweb': [
-        'static/src/xml/leads_tree_generate_leads_views.xml',
-    ],
     'auto_install': True,
+    'assets': {
+        'web.assets_backend': [
+            'crm_iap_lead/static/src/js/**/*',
+        ],
+        'web.assets_qweb': [
+            'crm_iap_lead/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/crm_iap_lead/views/assets.xml b/addons/crm_iap_lead/views/assets.xml
deleted file mode 100644
index 107a1140026..00000000000
--- a/addons/crm_iap_lead/views/assets.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="crm_iap_lead assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/crm_iap_lead/static/src/js/leads_tree_generate_leads.js"/>
-            <script type="text/javascript" src="/crm_iap_lead/static/src/js/tours/crm_iap_lead.js"></script>
-        </xpath>
-    </template>
-</odoo>
\ No newline at end of file
diff --git a/addons/event/__manifest__.py b/addons/event/__manifest__.py
index bd221a9962d..62cca453bed 100644
--- a/addons/event/__manifest__.py
+++ b/addons/event/__manifest__.py
@@ -44,7 +44,16 @@ Key Features
     ],
     'installable': True,
     'auto_install': False,
-    'qweb': [
-        'static/src/xml/field_icon_selection.xml',
-    ],
+    'assets': {
+        'web.assets_backend': [
+            'event/static/src/scss/event.scss',
+            'event/static/src/js/field_icon_selection.js',
+        ],
+        'web.assets_common': [
+            'event/static/src/js/tours/**/*',
+        ],
+        'web.assets_qweb': [
+            'event/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/event/views/event_templates.xml b/addons/event/views/event_templates.xml
index 54cbdb0b684..5765d3baba4 100644
--- a/addons/event/views/event_templates.xml
+++ b/addons/event/views/event_templates.xml
@@ -1,19 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <template id="assets_backend" name="event assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" type="text/scss" href="/event/static/src/scss/event.scss"/>
-                <script type="text/javascript" src="/event/static/src/js/field_icon_selection.js"></script>
-            </xpath>
-        </template>
-
-        <template id="assets_common" name="Event Assets Common" inherit_id="web.assets_common">
-            <xpath expr="//script[last()]" position="after">
-                <script type="text/javascript" src="/event/static/src/js/tours/event_tour.js"></script>
-            </xpath>
-        </template>
-    </data>
+        </data>
     <template id="event_default_descripton" name="Event default description">
         <section class="s_text_block">
             <h5>Join us for this 24 hours Event</h5>
diff --git a/addons/event_sale/__manifest__.py b/addons/event_sale/__manifest__.py
index 2121211f61c..2559cb4a20e 100644
--- a/addons/event_sale/__manifest__.py
+++ b/addons/event_sale/__manifest__.py
@@ -20,7 +20,6 @@ this event.
 """,
     'depends': ['event', 'sale_management'],
     'data': [
-        'views/assets.xml',
         'views/event_ticket_views.xml',
         'views/event_registration_views.xml',
         'views/event_views.xml',
@@ -36,5 +35,16 @@ this event.
     ],
     'demo': ['data/event_demo.xml'],
     'installable': True,
-    'auto_install': True
+    'auto_install': True,
+    'assets': {
+        'web.assets_backend': [
+            'event_sale/static/src/**/*',
+        ],
+        'web.assets_tests': [
+            'event_sale/static/tests/tours/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'event_sale/static/tests/event_configurator.test.js',
+        ],
+    }
 }
diff --git a/addons/event_sale/views/assets.xml b/addons/event_sale/views/assets.xml
deleted file mode 100644
index 4f0ebce23f6..00000000000
--- a/addons/event_sale/views/assets.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-<template id="assets_backend" inherit_id="web.assets_backend" name="event_sale assets backend">
-    <xpath expr="script[last()]" position="after">
-        <script type="text/javascript" src="/event_sale/static/src/js/event_configurator_controller.js"></script>
-        <script type="text/javascript" src="/event_sale/static/src/js/event_configurator_view.js"></script>
-        <script type="text/javascript" src="/event_sale/static/src/js/event_configurator_widget.js"></script>
-    </xpath>
-</template>
-<template id="assets_tests" name="Event Sale Assets Tests" inherit_id="web.assets_tests">
-    <xpath expr="." position="inside">
-        <script type="text/javascript" src="/event_sale/static/tests/tours/event_configurator_ui.js"></script>
-    </xpath>
-</template>
-<template id="qunit_suite" inherit_id="web.qunit_suite_tests" name="event_sale_tests">
-    <xpath expr="." position="inside">
-        <script type="text/javascript" src="/event_sale/static/tests/event_configurator.test.js"></script>
-    </xpath>
-</template>
-</odoo>
diff --git a/addons/fleet/__manifest__.py b/addons/fleet/__manifest__.py
index 813df720eb1..f61d1d356da 100644
--- a/addons/fleet/__manifest__.py
+++ b/addons/fleet/__manifest__.py
@@ -32,13 +32,11 @@ Main Features
         'security/fleet_security.xml',
         'security/ir.model.access.csv',
         'views/fleet_vehicle_model_views.xml',
-        'views/assets.xml',
         'views/fleet_vehicle_views.xml',
         'views/fleet_vehicle_cost_views.xml',
         'views/fleet_board_view.xml',
         'views/mail_activity_views.xml',
         'views/res_config_settings_views.xml',
-        'views/assets.xml',
         'data/fleet_cars_data.xml',
         'data/fleet_data.xml',
         'data/mail_data.xml',
@@ -48,4 +46,9 @@ Main Features
 
     'installable': True,
     'application': True,
+    'assets': {
+        'web.assets_backend': [
+            'fleet/static/src/**/*',
+        ],
+    }
 }
diff --git a/addons/fleet/views/assets.xml b/addons/fleet/views/assets.xml
deleted file mode 100644
index 97ce5f93e19..00000000000
--- a/addons/fleet/views/assets.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" inherit_id="web.assets_backend">
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/fleet/static/src/js/fleet_form.js"/>
-            <script type="text/javascript" src="/fleet/static/src/js/fleet_kanban.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/gamification/__manifest__.py b/addons/gamification/__manifest__.py
index 1c1f3bcc5e9..f3306862048 100644
--- a/addons/gamification/__manifest__.py
+++ b/addons/gamification/__manifest__.py
@@ -32,7 +32,6 @@ Both goals and badges are flexibles and can be adapted to a large range of modul
         'data/goal_base.xml',
         'data/badge.xml',
         'data/gamification_karma_rank_data.xml',
-        'views/gamification.xml',
         'views/gamification_karma_rank_views.xml',
         'views/gamification_karma_tracking_views.xml',
         'views/res_users_views.xml',
@@ -41,4 +40,9 @@ Both goals and badges are flexibles and can be adapted to a large range of modul
         'data/gamification_karma_rank_demo.xml',
         'data/gamification_karma_tracking_demo.xml',
     ],
+    'assets': {
+        'web.assets_backend': [
+            'gamification/static/src/**/*',
+        ],
+    }
 }
diff --git a/addons/gamification/views/gamification.xml b/addons/gamification/views/gamification.xml
deleted file mode 100644
index 08341ac83c0..00000000000
--- a/addons/gamification/views/gamification.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<odoo>
-    <template id="assets_backend" name="gamification assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/gamification/static/src/scss/gamification.scss"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/google_calendar/__manifest__.py b/addons/google_calendar/__manifest__.py
index 8e90d83ac8c..33a5303a346 100644
--- a/addons/google_calendar/__manifest__.py
+++ b/addons/google_calendar/__manifest__.py
@@ -7,7 +7,6 @@
     'category': 'Productivity',
     'description': "",
     'depends': ['google_account', 'calendar'],
-    'qweb': ['static/src/xml/*.xml'],
     'data': [
         'data/google_calendar_data.xml',
         'security/ir.model.access.csv',
@@ -15,9 +14,24 @@
         'views/res_config_settings_views.xml',
         'views/res_users_views.xml',
         'views/google_calendar_views.xml',
-        'views/google_calendar_templates.xml',
-    ],
+        ],
     'demo': [],
     'installable': True,
     'auto_install': False,
+    'assets': {
+        'web.assets_backend': [
+            'google_calendar/static/src/js/google_calendar_popover.js',
+            'google_calendar/static/src/js/google_calendar.js',
+            'google_calendar/static/src/scss/google_calendar.scss',
+        ],
+        'web.qunit_suite_tests': [
+            'google_calendar/static/tests/**/*',
+        ],
+        'web.qunit_mobile_suite_tests': [
+            'google_calendar/static/tests/mock_server.js',
+        ],
+        'web.assets_qweb': [
+            'google_calendar/static/src/xml/*.xml',
+        ],
+    }
 }
diff --git a/addons/google_calendar/views/google_calendar_templates.xml b/addons/google_calendar/views/google_calendar_templates.xml
deleted file mode 100644
index e6138433de6..00000000000
--- a/addons/google_calendar/views/google_calendar_templates.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="google_calendar assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/google_calendar/static/src/js/google_calendar_popover.js"></script>
-            <script type="text/javascript" src="/google_calendar/static/src/js/google_calendar.js"></script>
-        </xpath>
-        <xpath expr="link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/google_calendar/static/src/scss/google_calendar.scss"/>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" name="google_calendar_tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/google_calendar/static/tests/mock_server.js" />
-            <script type="text/javascript" src="/google_calendar/static/tests/google_calendar_tests.js"></script>
-        </xpath>
-    </template>
-
-    <template id="qunit_mobile_suite" name="mail_mobile_tests" inherit_id="web.qunit_mobile_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/google_calendar/static/tests/mock_server.js" />
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/google_drive/__manifest__.py b/addons/google_drive/__manifest__.py
index e04750d507f..fdbbabd42db 100644
--- a/addons/google_drive/__manifest__.py
+++ b/addons/google_drive/__manifest__.py
@@ -11,10 +11,8 @@
         'security/ir.model.access.csv',
         'data/google_drive_data.xml',
         'views/google_drive_views.xml',
-        'views/google_drive_templates.xml',
         'views/res_config_settings_views.xml',
     ],
-    'qweb': ['static/src/xml/*.xml'],
     'demo': [
         'data/google_drive_demo.xml'
     ],
@@ -25,5 +23,17 @@ Integrate google document to Odoo record.
 
 This module allows you to integrate google documents to any of your Odoo record quickly and easily using OAuth 2.0 for Installed Applications,
 You can configure your google Authorization Code from Settings > Configuration > General Settings by clicking on "Generate Google Authorization Code"
-"""
+""",
+    'assets': {
+        'web.assets_backend': [
+            'google_drive/static/src/css/google_drive.css',
+            'google_drive/static/src/js/gdrive.js',
+        ],
+        'web.qunit_suite_tests': [
+            'google_drive/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'google_drive/static/src/xml/*.xml',
+        ],
+    }
 }
diff --git a/addons/google_drive/views/google_drive_templates.xml b/addons/google_drive/views/google_drive_templates.xml
deleted file mode 100644
index 7a02753a2e6..00000000000
--- a/addons/google_drive/views/google_drive_templates.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets_backend" name="google_drive assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" href="/google_drive/static/src/css/google_drive.css"/>
-            <script type="text/javascript" src="/google_drive/static/src/js/gdrive.js"></script>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" name="google_drive tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/google_drive/static/tests/mock_server.js"></script>
-            <script type="text/javascript" src="/google_drive/static/tests/gdrive_test.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/google_recaptcha/__manifest__.py b/addons/google_recaptcha/__manifest__.py
index 9163c09ab45..be5f2516895 100644
--- a/addons/google_recaptcha/__manifest__.py
+++ b/addons/google_recaptcha/__manifest__.py
@@ -10,8 +10,13 @@
     """,
     'depends': ['base_setup'],
     'data': [
-        'views/assets.xml',
         'views/res_config_settings_view.xml',
     ],
     'auto_install': False,
+    'assets': {
+        'web.assets_frontend': [
+            'google_recaptcha/static/src/scss/recaptcha.scss',
+            'google_recaptcha/static/src/js/recaptcha.js',
+        ],
+    }
 }
diff --git a/addons/google_recaptcha/views/assets.xml b/addons/google_recaptcha/views/assets.xml
deleted file mode 100644
index 563b9d356d2..00000000000
--- a/addons/google_recaptcha/views/assets.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_frontend" inherit_id="web.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/google_recaptcha/static/src/scss/recaptcha.scss"/>
-    </xpath>
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/google_recaptcha/static/src/js/recaptcha.js"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/addons/google_spreadsheet/__manifest__.py b/addons/google_spreadsheet/__manifest__.py
index 9f017a459de..fbb2f6fecc2 100644
--- a/addons/google_spreadsheet/__manifest__.py
+++ b/addons/google_spreadsheet/__manifest__.py
@@ -13,11 +13,17 @@ The module adds the possibility to display data from Odoo in Google Spreadsheets
     'data': [
         'data/google_spreadsheet_data.xml',
         'views/google_spreadsheet_views.xml',
-        'views/google_spreadsheet_templates.xml',
         'views/res_config_settings_views.xml',
     ],
-    'qweb': ['static/src/xml/*.xml'],
     'demo': [],
     'installable': True,
     'auto_install': False,
+    'assets': {
+        'web.assets_backend': [
+            'google_spreadsheet/static/src/js/**/*',
+        ],
+        'web.assets_qweb': [
+            'google_spreadsheet/static/src/xml/*.xml',
+        ],
+    }
 }
diff --git a/addons/google_spreadsheet/views/google_spreadsheet_templates.xml b/addons/google_spreadsheet/views/google_spreadsheet_templates.xml
deleted file mode 100644
index dffccdd0168..00000000000
--- a/addons/google_spreadsheet/views/google_spreadsheet_templates.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-        <template id="assets_backend" name="google_spreadsheet assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/google_spreadsheet/static/src/js/add_to_google_spreadsheet_menu.js"></script>
-            </xpath>
-        </template>
-
-</odoo>
diff --git a/addons/hr/__manifest__.py b/addons/hr/__manifest__.py
index 601bfdf8ca2..80d52698994 100644
--- a/addons/hr/__manifest__.py
+++ b/addons/hr/__manifest__.py
@@ -36,7 +36,6 @@
         'views/hr_department_views.xml',
         'views/hr_work_location_views.xml',
         'views/hr_views.xml',
-        'views/hr_templates.xml',
         'views/res_config_settings_views.xml',
         'views/mail_channel_views.xml',
         'views/res_users.xml',
@@ -48,8 +47,29 @@
     'installable': True,
     'application': True,
     'auto_install': False,
-    'qweb': [
-        'static/src/bugfix/bugfix.xml',
-        'static/src/xml/hr_templates.xml',
-    ],
+    'assets': {
+        'web.assets_backend': [
+            'hr/static/src/scss/hr.scss',
+            'hr/static/src/bugfix/bugfix.scss',
+            'hr/static/src/bugfix/bugfix.js',
+            'hr/static/src/js/chat.js',
+            'hr/static/src/js/language.js',
+            'hr/static/src/js/many2one_avatar_employee.js',
+            'hr/static/src/js/standalone_m2o_avatar_employee.js',
+            'hr/static/src/models/employee/employee.js',
+            'hr/static/src/models/messaging/messaging.js',
+            'hr/static/src/models/partner/partner.js',
+            'hr/static/src/models/user/user.js',
+        ],
+        'web.qunit_suite_tests': [
+            'hr/static/src/bugfix/bugfix_tests.js',
+            'hr/static/tests/helpers/mock_models.js',
+            'hr/static/tests/many2one_avatar_employee_tests.js',
+            'hr/static/tests/standalone_m2o_avatar_employee_tests.js',
+        ],
+        'web.assets_qweb': [
+            'hr/static/src/bugfix/bugfix.xml',
+            'hr/static/src/xml/hr_templates.xml',
+        ],
+    }
 }
diff --git a/addons/hr/views/hr_templates.xml b/addons/hr/views/hr_templates.xml
deleted file mode 100644
index 5d4bcd9da3e..00000000000
--- a/addons/hr/views/hr_templates.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets_backend" name="hr assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/hr/static/src/scss/hr.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/hr/static/src/bugfix/bugfix.scss"/>
-
-            <script type="text/javascript" src="/hr/static/src/bugfix/bugfix.js"/>
-            <script type="text/javascript" src="/hr/static/src/js/chat.js"></script>
-            <script type="text/javascript" src="/hr/static/src/js/language.js"></script>
-            <script type="text/javascript" src="/hr/static/src/js/many2one_avatar_employee.js"></script>
-            <script type="text/javascript" src="/hr/static/src/js/standalone_m2o_avatar_employee.js"></script>
-            <script type="text/javascript" src="/hr/static/src/models/employee/employee.js"/>
-            <script type="text/javascript" src="/hr/static/src/models/messaging/messaging.js"/>
-            <script type="text/javascript" src="/hr/static/src/models/partner/partner.js"/>
-            <script type="text/javascript" src="/hr/static/src/models/user/user.js"/>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" name="hr tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/hr/static/src/bugfix/bugfix_tests.js"/>
-            <script type="text/javascript" src="/hr/static/tests/helpers/mock_models.js"/>
-            <script type="text/javascript" src="/hr/static/tests/many2one_avatar_employee_tests.js"></script>
-            <script type="text/javascript" src="/hr/static/tests/standalone_m2o_avatar_employee_tests.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/hr_attendance/__manifest__.py b/addons/hr_attendance/__manifest__.py
index 92aae4472b3..c066f65da63 100644
--- a/addons/hr_attendance/__manifest__.py
+++ b/addons/hr_attendance/__manifest__.py
@@ -20,7 +20,6 @@ actions(Check in/Check out) performed by them.
     'data': [
         'security/hr_attendance_security.xml',
         'security/ir.model.access.csv',
-        'views/web_asset_backend_template.xml',
         'views/hr_attendance_view.xml',
         'views/hr_department_view.xml',
         'views/hr_employee_view.xml',
@@ -31,8 +30,22 @@ actions(Check in/Check out) performed by them.
     ],
     'installable': True,
     'auto_install': False,
-    'qweb': [
-        "static/src/xml/attendance.xml",
-    ],
     'application': True,
+    'assets': {
+        'web.assets_backend': [
+            'hr_attendance/static/src/js/employee_kanban_view_handler.js',
+            'hr_attendance/static/src/js/greeting_message.js',
+            'hr_attendance/static/src/js/kiosk_mode.js',
+            'hr_attendance/static/src/js/kiosk_confirm.js',
+            'hr_attendance/static/src/js/my_attendances.js',
+            'hr_attendance/static/src/js/time_widget.js',
+            'hr_attendance/static/src/scss/hr_attendance.scss',
+        ],
+        'web.qunit_suite_tests': [
+            ('after', 'web/static/tests/views/kanban_tests.js', 'hr_attendance/static/tests/hr_attendance_tests.js'),
+        ],
+        'web.assets_qweb': [
+            'hr_attendance/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/hr_attendance/views/web_asset_backend_template.xml b/addons/hr_attendance/views/web_asset_backend_template.xml
deleted file mode 100644
index 3a0fb87f4c2..00000000000
--- a/addons/hr_attendance/views/web_asset_backend_template.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="hr_attendance assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/hr_attendance/static/src/js/employee_kanban_view_handler.js"></script>
-            <script type="text/javascript" src="/hr_attendance/static/src/js/greeting_message.js"></script>
-            <script type="text/javascript" src="/hr_attendance/static/src/js/kiosk_mode.js"></script>
-            <script type="text/javascript" src="/hr_attendance/static/src/js/kiosk_confirm.js"></script>
-            <script type="text/javascript" src="/hr_attendance/static/src/js/my_attendances.js"></script>
-            <script type="text/javascript" src="/hr_attendance/static/src/js/time_widget.js"></script>
-            <link rel="stylesheet" type="text/scss" href="/hr_attendance/static/src/scss/hr_attendance.scss"/>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" name="hr attendance tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="//script[contains(@src, '/web/static/tests/views/kanban_tests.js')]" position="after">
-            <script type="text/javascript" src="/hr_attendance/static/tests/hr_attendance_tests.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/hr_contract/__manifest__.py b/addons/hr_contract/__manifest__.py
index 89e714418e4..fb47f3ec376 100644
--- a/addons/hr_contract/__manifest__.py
+++ b/addons/hr_contract/__manifest__.py
@@ -25,7 +25,6 @@ You can assign several contracts per employee.
         'data/hr_contract_data.xml',
         'report/hr_contract_history_report_views.xml',
         'views/hr_contract_views.xml',
-        'views/assets.xml',
         'views/resource_calendar_views.xml',
         'wizard/hr_departure_wizard_views.xml',
     ],
@@ -33,4 +32,9 @@ You can assign several contracts per employee.
     'installable': True,
     'auto_install': False,
     'application': True,
+    'assets': {
+        'web.assets_backend': [
+            'hr_contract/static/src/**/*',
+        ],
+    }
 }
diff --git a/addons/hr_contract/views/assets.xml b/addons/hr_contract/views/assets.xml
deleted file mode 100644
index 446cffb67c8..00000000000
--- a/addons/hr_contract/views/assets.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<odoo>
-    <template id="assets_backend" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/hr_contract/static/src/scss/state_selection.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/hr_contract/static/src/scss/calendar_mismatch.scss"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/hr_expense/__manifest__.py b/addons/hr_expense/__manifest__.py
index 6033895df55..732d8ab4a69 100644
--- a/addons/hr_expense/__manifest__.py
+++ b/addons/hr_expense/__manifest__.py
@@ -42,16 +42,26 @@ This module also uses analytic accounting and is compatible with the invoice on
         'security/ir_rule.xml',
         'report/hr_expense_report.xml',
         'views/hr_department_views.xml',
-        'views/assets.xml',
         'views/res_config_settings_views.xml',
         'views/account_journal_dashboard.xml',
     ],
     'demo': ['data/hr_expense_demo.xml'],
-    'qweb': [
-        "static/src/xml/documents_upload_views.xml",
-        "static/src/xml/expense_dashboard.xml",
-        "static/src/xml/expense_qr_modal_template.xml",
-    ],
     'installable': True,
     'application': True,
+    'assets': {
+        'web.assets_backend': [
+            'hr_expense/static/src/js/expense_views.js',
+            'hr_expense/static/src/js/expense_form_view.js',
+            'hr_expense/static/src/js/expense_qr_code_action.js',
+            'hr_expense/static/src/js/upload_mixin.js',
+            'hr_expense/static/src/scss/hr_expense.scss',
+        ],
+        'web.assets_tests': [
+            'hr_expense/static/src/js/tours/hr_expense.js',
+            'hr_expense/static/tests/tours/expense_upload_tours.js',
+        ],
+        'web.assets_qweb': [
+            'hr_expense/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/hr_expense/views/assets.xml b/addons/hr_expense/views/assets.xml
deleted file mode 100644
index e9f2ff60178..00000000000
--- a/addons/hr_expense/views/assets.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <template id="assets_backend" name="HR Expense Assets assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/hr_expense/static/src/js/expense_views.js"/>
-                <script type="text/javascript" src="/hr_expense/static/src/js/expense_form_view.js"/>
-                <script type="text/javascript" src="/hr_expense/static/src/js/expense_qr_code_action.js"/>
-                <script type="text/javascript" src="/hr_expense/static/src/js/upload_mixin.js"/>
-            </xpath>
-            <xpath expr="link[last()]" position="after">
-                <link rel="stylesheet" type="text/scss" href="/hr_expense/static/src/scss/hr_expense.scss"/>
-            </xpath>
-        </template>
-        <template id="assets_tests" name="HR Expense Assets Tests" inherit_id="web.assets_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/hr_expense/static/src/js/tours/hr_expense.js"></script>
-                <script type="text/javascript" src="/hr_expense/static/tests/tours/expense_upload_tours.js"></script>
-            </xpath>
-        </template>
-    </data>
-</odoo>
diff --git a/addons/hr_gamification/__manifest__.py b/addons/hr_gamification/__manifest__.py
index 2509357e3bc..5404277c640 100644
--- a/addons/hr_gamification/__manifest__.py
+++ b/addons/hr_gamification/__manifest__.py
@@ -17,7 +17,11 @@ Badge received are displayed on the user profile.
         'wizard/gamification_badge_user_wizard_views.xml',
         'views/gamification_views.xml',
         'views/hr_employee_views.xml',
-        'views/gamification_templates.xml',
-    ],
+        ],
     'auto_install': True,
+    'assets': {
+        'web.assets_backend': [
+            'hr_gamification/static/**/*',
+        ],
+    }
 }
diff --git a/addons/hr_gamification/views/gamification_templates.xml b/addons/hr_gamification/views/gamification_templates.xml
deleted file mode 100644
index edf3195ddad..00000000000
--- a/addons/hr_gamification/views/gamification_templates.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-        <template id="assets_backend" name="hr_gamification assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/hr_gamification/static/src/js/gamification.js"></script>
-            </xpath>
-        </template>
-
-</odoo>
diff --git a/addons/hr_holidays/__manifest__.py b/addons/hr_holidays/__manifest__.py
index 8d18f022ca4..8f21378806d 100644
--- a/addons/hr_holidays/__manifest__.py
+++ b/addons/hr_holidays/__manifest__.py
@@ -49,20 +49,41 @@ A synchronization with an internal agenda (Meetings of the CRM module) is also p
         'report/hr_leave_report_calendar.xml',
 
         'views/hr_views.xml',
-        'views/hr_leave_template.xml',
         'views/hr_holidays_views.xml',
     ],
     'demo': [
         'data/hr_holidays_demo.xml',
     ],
-    'qweb': [
-        'static/src/bugfix/bugfix.xml',
-        'static/src/components/partner_im_status_icon/partner_im_status_icon.xml',
-        'static/src/components/thread_icon/thread_icon.xml',
-        'static/src/components/thread_view/thread_view.xml',
-        'static/src/xml/*.xml',
-    ],
     'installable': True,
     'application': True,
     'auto_install': False,
+    'assets': {
+        'web.assets_backend': [
+            'hr_holidays/static/src/js/time_off_calendar.js',
+            'hr_holidays/static/src/js/leave_stats_widget.js',
+            'hr_holidays/static/src/bugfix/bugfix.js',
+            'hr_holidays/static/src/components/thread_view/thread_view.js',
+            'hr_holidays/static/src/models/partner/partner.js',
+            'hr_holidays/static/src/scss/time_off.scss',
+            'hr_holidays/static/src/bugfix/bugfix.scss',
+            'hr_holidays/static/src/components/thread_view/thread_view.scss',
+        ],
+        'web.tests_assets': [
+            'hr_holidays/static/tests/helpers/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'hr_holidays/static/src/bugfix/bugfix_tests.js',
+            'hr_holidays/static/src/components/partner_im_status_icon/partner_im_status_icon_tests.js',
+            'hr_holidays/static/src/components/thread_icon/thread_icon_tests.js',
+            'hr_holidays/static/src/components/thread_view/thread_view_tests.js',
+            'hr_holidays/static/tests/test_leave_stats_widget.js',
+        ],
+        'web.assets_qweb': [
+            'hr_holidays/static/src/bugfix/bugfix.xml',
+            'hr_holidays/static/src/components/partner_im_status_icon/partner_im_status_icon.xml',
+            'hr_holidays/static/src/components/thread_icon/thread_icon.xml',
+            'hr_holidays/static/src/components/thread_view/thread_view.xml',
+            'hr_holidays/static/src/xml/*.xml',
+        ],
+    }
 }
diff --git a/addons/hr_holidays/views/hr_leave_template.xml b/addons/hr_holidays/views/hr_leave_template.xml
deleted file mode 100644
index 68e8706341e..00000000000
--- a/addons/hr_holidays/views/hr_leave_template.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-  <template id="assets_backend" inherit_id="web.assets_backend">
-    <xpath expr="script[last()]" position="after">
-      <script type="text/javascript" src="/hr_holidays/static/src/js/time_off_calendar.js"></script>
-      <script type="text/javascript" src="/hr_holidays/static/src/js/leave_stats_widget.js"></script>
-      <script type="text/javascript" src="/hr_holidays/static/src/bugfix/bugfix.js"/>
-      <script type="text/javascript" src="/hr_holidays/static/src/components/thread_view/thread_view.js"/>
-      <script type="text/javascript" src="/hr_holidays/static/src/models/partner/partner.js"/>
-    </xpath>
-    <xpath expr="link[last()]" position="after">
-      <link rel="stylesheet" type="text/scss" href="/hr_holidays/static/src/scss/time_off.scss"/>
-      <link rel="stylesheet" type="text/scss" href="/hr_holidays/static/src/bugfix/bugfix.scss"/>
-      <link rel="stylesheet" type="text/scss" href="/hr_holidays/static/src/components/thread_view/thread_view.scss"/>
-    </xpath>
-  </template>
-  <template id="tests_assets" name="hr_holidays_tests_assets" inherit_id="web.tests_assets">
-    <xpath expr="." position="inside">
-      <script type="text/javascript" src="/hr_holidays/static/tests/helpers/mock_models.js"/>
-      <script type="text/javascript" src="/hr_holidays/static/tests/helpers/mock_server.js"/>
-    </xpath>
-  </template>
-  <template id="qunit_suite" name="hr_holidays_qunit_suite" inherit_id="web.qunit_suite_tests">
-      <xpath expr="." position="inside">
-          <script type="text/javascript" src="/hr_holidays/static/src/bugfix/bugfix_tests.js"></script>
-          <script type="text/javascript" src="/hr_holidays/static/src/components/partner_im_status_icon/partner_im_status_icon_tests.js"/>
-          <script type="text/javascript" src="/hr_holidays/static/src/components/thread_icon/thread_icon_tests.js"/>
-          <script type="text/javascript" src="/hr_holidays/static/src/components/thread_view/thread_view_tests.js"/>
-          <script type="text/javascript" src="/hr_holidays/static/tests/test_leave_stats_widget.js"></script>
-      </xpath>
-  </template>
-</odoo>
diff --git a/addons/hr_org_chart/__manifest__.py b/addons/hr_org_chart/__manifest__.py
index ed0982c0867..57ddba052bb 100644
--- a/addons/hr_org_chart/__manifest__.py
+++ b/addons/hr_org_chart/__manifest__.py
@@ -16,10 +16,21 @@ This module extend the employee form with a organizational chart.
     'depends': ['hr'],
     'auto_install': True,
     'data': [
-        'views/hr_templates.xml',
         'views/hr_views.xml'
     ],
-    'qweb': [
-        'static/src/xml/hr_org_chart.xml',
-    ]
+    'assets': {
+        'web._assets_primary_variables': [
+            'hr_org_chart/static/src/scss/variables.scss',
+        ],
+        'web.assets_backend': [
+            'hr_org_chart/static/src/scss/hr_org_chart.scss',
+            'hr_org_chart/static/src/js/hr_org_chart.js',
+        ],
+        'web.qunit_suite_tests': [
+            'hr_org_chart/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'hr_org_chart/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/hr_org_chart/views/hr_templates.xml b/addons/hr_org_chart/views/hr_templates.xml
deleted file mode 100644
index 7e3fdf0b645..00000000000
--- a/addons/hr_org_chart/views/hr_templates.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="web._assets_primary_variables">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/hr_org_chart/static/src/scss/variables.scss"/>
-        </xpath>
-    </template>
-
-    <template id="assets_backend" name="hr_org_chart_assets_backend" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/hr_org_chart/static/src/scss/hr_org_chart.scss"/>
-            <script type="text/javascript" src="/hr_org_chart/static/src/js/hr_org_chart.js"></script>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" inherit_id="web.qunit_suite_tests">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/hr_org_chart/static/tests/hr_org_chart_tests.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/hr_recruitment/__manifest__.py b/addons/hr_recruitment/__manifest__.py
index 38bfe6c25d0..c1eddbcacde 100644
--- a/addons/hr_recruitment/__manifest__.py
+++ b/addons/hr_recruitment/__manifest__.py
@@ -28,7 +28,6 @@
         'data/hr_recruitment_data.xml',
         'views/hr_recruitment_views.xml',
         'views/res_config_settings_views.xml',
-        'views/hr_recruitment_templates.xml',
         'views/hr_department_views.xml',
         'views/hr_job_views.xml',
         'views/mail_activity_views.xml',
@@ -41,4 +40,11 @@
     'installable': True,
     'auto_install': False,
     'application': True,
+    'assets': {
+        'web.assets_backend': [
+            'hr_recruitment/static/src/scss/hr_job.scss',
+            'hr_recruitment/static/src/js/recruitment.js',
+            'hr_recruitment/static/src/js/tours/hr_recruitment.js',
+        ],
+    }
 }
diff --git a/addons/hr_recruitment/views/hr_recruitment_templates.xml b/addons/hr_recruitment/views/hr_recruitment_templates.xml
deleted file mode 100644
index a4fce72861d..00000000000
--- a/addons/hr_recruitment/views/hr_recruitment_templates.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <template id="assets_backend" name="hr_recruitment assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" type="text/scss" href="/hr_recruitment/static/src/scss/hr_job.scss"/>
-                <script type="text/javascript" src="/hr_recruitment/static/src/js/recruitment.js"></script>
-                <script type="text/javascript" src="/hr_recruitment/static/src/js/tours/hr_recruitment.js"></script>
-            </xpath>
-        </template>
-        <template id="assets_tests" name="HR Recruitment Assets Tests" inherit_id="web.assets_tests">
-            <xpath expr="." position="inside">
-            </xpath>
-        </template>
-    </data>
-</odoo>
diff --git a/addons/hr_skills/__manifest__.py b/addons/hr_skills/__manifest__.py
index 8b3c6697a71..116077a1fb4 100644
--- a/addons/hr_skills/__manifest__.py
+++ b/addons/hr_skills/__manifest__.py
@@ -19,7 +19,6 @@ This module introduces skills and resumé management for employees.
         'security/ir.model.access.csv',
         'security/hr_skills_security.xml',
         'views/hr_views.xml',
-        'views/hr_templates.xml',
         'data/hr_resume_data.xml',
     ],
     'demo': [
@@ -27,10 +26,18 @@ This module introduces skills and resumé management for employees.
         'data/hr.employee.skill.csv',
         'data/hr.resume.line.csv',
     ],
-    'qweb': [
-        'static/src/xml/resume_templates.xml',
-        'static/src/xml/skills_templates.xml',
-    ],
     'installable': True,
     'application': True,
+    'assets': {
+        'web.assets_backend': [
+            'hr_skills/static/src/css/hr_skills.scss',
+            'hr_skills/static/src/js/resume_widget.js',
+        ],
+        'web.qunit_suite_tests': [
+            'hr_skills/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'hr_skills/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/hr_skills/views/hr_templates.xml b/addons/hr_skills/views/hr_templates.xml
deleted file mode 100644
index 18f28143b79..00000000000
--- a/addons/hr_skills/views/hr_templates.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="hr_skills_assets_backend" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/hr_skills/static/src/css/hr_skills.scss"/>
-            <script type="text/javascript" src="/hr_skills/static/src/js/resume_widget.js"></script>
-        </xpath>
-    </template>
-    <template id="qunit_suite" name="hr_skills_qunit_suite" inherit_id="web.qunit_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/hr_skills/static/tests/widget_tests.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/hr_skills_slides/__manifest__.py b/addons/hr_skills_slides/__manifest__.py
index d85aa5829b9..6db2096f7b7 100644
--- a/addons/hr_skills_slides/__manifest__.py
+++ b/addons/hr_skills_slides/__manifest__.py
@@ -18,8 +18,13 @@ This module add completed courses to resumé for employees.
         'views/hr_templates.xml',
         'data/hr_resume_data.xml',
     ],
-    'qweb': [
-        'static/src/xml/resume_templates.xml',
-    ],
     'auto_install': True,
+    'assets': {
+        'web.assets_backend': [
+            'hr_skills_slides/static/src/scss/**/*',
+        ],
+        'web.assets_qweb': [
+            'hr_skills_slides/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/hr_skills_slides/views/hr_templates.xml b/addons/hr_skills_slides/views/hr_templates.xml
index be9ae969d56..e1a652155c9 100644
--- a/addons/hr_skills_slides/views/hr_templates.xml
+++ b/addons/hr_skills_slides/views/hr_templates.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="assets_backend" name="hr_skills_assets_backend" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/hr_skills_slides/static/src/scss/hr_skills.scss"/>
-        </xpath>
-    </template>
-
     <record id="resume_slides_line_view_form" model="ir.ui.view">
         <field name="name">hr.resume.line.form</field>
         <field name="model">hr.resume.line</field>
diff --git a/addons/hr_skills_survey/__manifest__.py b/addons/hr_skills_survey/__manifest__.py
index 875dd961f73..1d7355e89b9 100644
--- a/addons/hr_skills_survey/__manifest__.py
+++ b/addons/hr_skills_survey/__manifest__.py
@@ -18,8 +18,13 @@ This module adds certification to resumé for employees.
         'views/hr_templates.xml',
         'data/hr_resume_data.xml',
     ],
-    'qweb': [
-        'static/src/xml/resume_templates.xml',
-    ],
     'auto_install': True,
+    'assets': {
+        'web.assets_backend': [
+            'hr_skills_survey/static/src/scss/**/*',
+        ],
+        'web.assets_qweb': [
+            'hr_skills_survey/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/hr_skills_survey/views/hr_templates.xml b/addons/hr_skills_survey/views/hr_templates.xml
index 365a7240e52..2a8f6d10c15 100644
--- a/addons/hr_skills_survey/views/hr_templates.xml
+++ b/addons/hr_skills_survey/views/hr_templates.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="assets_backend" name="hr_skills_survey_assets_backend" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/hr_skills_survey/static/src/scss/hr_skills.scss"/>
-        </xpath>
-    </template>
-
     <record id="resume_survey_line_view_form" model="ir.ui.view">
         <field name="name">hr.resume.line.form</field>
         <field name="model">hr.resume.line</field>
diff --git a/addons/hr_timesheet/__manifest__.py b/addons/hr_timesheet/__manifest__.py
index 2d34a0159f3..c78d2fb2194 100644
--- a/addons/hr_timesheet/__manifest__.py
+++ b/addons/hr_timesheet/__manifest__.py
@@ -25,7 +25,6 @@ up a management by affair.
         'security/hr_timesheet_security.xml',
         'security/ir.model.access.csv',
         'data/digest_data.xml',
-        'views/assets.xml',
         'views/hr_timesheet_views.xml',
         'views/res_config_settings_views.xml',
         'views/project_views.xml',
@@ -37,9 +36,6 @@ up a management by affair.
         'data/hr_timesheet_data.xml',
         'wizard/project_task_create_timesheet_views.xml',
     ],
-    'qweb': [
-        "static/src/xml/qr_modal_template.xml",
-    ],
     'demo': [
         'data/hr_timesheet_demo.xml',
     ],
@@ -47,4 +43,21 @@ up a management by affair.
     'application': False,
     'auto_install': False,
     'post_init_hook': 'create_internal_project',
+    'assets': {
+        'web.assets_backend': [
+            'hr_timesheet/static/src/scss/timesheets_task_form.scss',
+            'hr_timesheet/static/src/js/task_with_hours.js',
+            'hr_timesheet/static/src/js/timesheet_uom.js',
+            'hr_timesheet/static/src/js/timesheet_factor.js',
+            'hr_timesheet/static/src/js/timesheet_config_form_view.js',
+            'hr_timesheet/static/src/js/qr_code_action.js',
+            'hr_timesheet/static/src/js/timesheet_graph.js',
+        ],
+        'web.qunit_suite_tests': [
+            'hr_timesheet/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'hr_timesheet/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/hr_timesheet/views/assets.xml b/addons/hr_timesheet/views/assets.xml
deleted file mode 100644
index f03bc71c7a1..00000000000
--- a/addons/hr_timesheet/views/assets.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <template id="assets_backend" name="timesheet assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link type="text/scss" href="/hr_timesheet/static/src/scss/timesheets_task_form.scss" rel="stylesheet"/>
-            <script type="text/javascript" src="/hr_timesheet/static/src/js/task_with_hours.js"></script>
-            <script type="text/javascript" src="/hr_timesheet/static/src/js/timesheet_uom.js"/>
-            <script type="text/javascript" src="/hr_timesheet/static/src/js/timesheet_factor.js"/>
-            <script type="text/javascript" src="/hr_timesheet/static/src/js/timesheet_config_form_view.js"/>
-            <script type="text/javascript" src="/hr_timesheet/static/src/js/qr_code_action.js"/>
-            <script type="text/javascript" src="/hr_timesheet/static/src/js/timesheet_graph.js"/>
-        </xpath>
-    </template>
-    <template id="qunit_suite" name="hr tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/hr_timesheet/static/tests/timesheet_uom_common.js"/>
-            <script type="text/javascript" src="/hr_timesheet/static/tests/timesheet_uom_tests.js"/>
-            <script type="text/javascript" src="/hr_timesheet/static/tests/timesheet_graph_tests.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/hr_work_entry/__manifest__.py b/addons/hr_work_entry/__manifest__.py
index 2c46d732575..2e28d4493cf 100644
--- a/addons/hr_work_entry/__manifest__.py
+++ b/addons/hr_work_entry/__manifest__.py
@@ -19,7 +19,9 @@
         'views/hr_employee_views.xml',
         'views/resource_calendar_views.xml',
     ],
-    'qweb': [
-        "static/src/xml/work_entry_templates.xml",
-    ],
+    'assets': {
+        'web.assets_qweb': [
+            'hr_work_entry/static/**/*',
+        ],
+    }
 }
diff --git a/addons/hr_work_entry_contract/__manifest__.py b/addons/hr_work_entry_contract/__manifest__.py
index ebf60f36bef..160da5a1984 100644
--- a/addons/hr_work_entry_contract/__manifest__.py
+++ b/addons/hr_work_entry_contract/__manifest__.py
@@ -17,7 +17,6 @@
         'security/ir.model.access.csv',
         'wizard/create_company_global_time_off_views.xml',
         'data/hr_work_entry_data.xml',
-        'views/hr_work_entry_template.xml',
         'views/hr_work_entry_views.xml',
         'views/resource_views.xml',
         'wizard/hr_work_entry_regeneration_wizard_views.xml',
@@ -25,5 +24,9 @@
     'demo': [
         'data/hr_work_entry_demo.xml',
     ],
-
+    'assets': {
+        'web.assets_backend': [
+            'hr_work_entry_contract/static/src/**/*',
+        ],
+    }
 }
diff --git a/addons/hr_work_entry_contract/views/hr_work_entry_template.xml b/addons/hr_work_entry_contract/views/hr_work_entry_template.xml
deleted file mode 100644
index cdef96f9d7c..00000000000
--- a/addons/hr_work_entry_contract/views/hr_work_entry_template.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets_backend" inherit_id="web.assets_backend">
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/hr_work_entry_contract/static/src/js/work_entries_controller_mixin.js"></script>
-            <script type="text/javascript" src="/hr_work_entry_contract/static/src/js/work_entries_calendar.js"></script>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/addons/iap/__manifest__.py b/addons/iap/__manifest__.py
index 5d13d6739bd..2782009cfc8 100644
--- a/addons/iap/__manifest__.py
+++ b/addons/iap/__manifest__.py
@@ -16,12 +16,19 @@ to support In-App purchases inside Odoo. """,
     'data': [
         'security/ir.model.access.csv',
         'security/ir_rule.xml',
-        'views/assets.xml',
         'views/iap_views.xml',
         'views/res_config_settings.xml',
     ],
-    'qweb': [
-        'static/src/xml/iap_templates.xml',
-    ],
     'auto_install': True,
+    'assets': {
+        'web.assets_backend': [
+            'iap/static/src/js/**/*',
+        ],
+        'web.tests_assets': [
+            'iap/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'iap/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/iap/views/assets.xml b/addons/iap/views/assets.xml
deleted file mode 100644
index 99b7ce6913d..00000000000
--- a/addons/iap/views/assets.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="iap assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/iap/static/src/js/iap_credit.js"></script>
-            <script type="text/javascript" src="/iap/static/src/js/crash_manager.js"></script>
-            <script type="text/javascript" src="/iap/static/src/js/iap_buy_more_credits.js"></script>
-        </xpath>
-    </template>
-
-    <template id="tests_assets" name="iap tests assets" inherit_id="web.tests_assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/iap/static/tests/helpers/mock_server.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py
index 254ea1de120..52e68fb31a7 100644
--- a/addons/im_livechat/__manifest__.py
+++ b/addons/im_livechat/__manifest__.py
@@ -39,13 +39,46 @@ Help your customers with this chat, and analyse their feedback.
         'data/mail_shortcode_demo.xml',
     ],
     'depends': ["mail", "rating", "digest"],
-    'qweb': [
-        'static/src/bugfix/bugfix.xml',
-        'static/src/components/composer/composer.xml',
-        'static/src/components/discuss_sidebar/discuss_sidebar.xml',
-        'static/src/components/thread_icon/thread_icon.xml',
-    ],
     'installable': True,
     'auto_install': False,
     'application': True,
+    'assets': {
+        'web.assets_backend': [
+            'im_livechat/static/src/js/im_livechat_channel_form_view.js',
+            'im_livechat/static/src/js/im_livechat_channel_form_controller.js',
+            'im_livechat/static/src/bugfix/bugfix.js',
+            'im_livechat/static/src/components/discuss/discuss.js',
+            'im_livechat/static/src/components/discuss_sidebar/discuss_sidebar.js',
+            'im_livechat/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js',
+            'im_livechat/static/src/components/notification_list/notification_list.js',
+            'im_livechat/static/src/components/thread_needaction_preview/thread_needaction_preview.js',
+            'im_livechat/static/src/components/thread_preview/thread_preview.js',
+            'im_livechat/static/src/models/messaging_initializer/messaging_initializer.js',
+            'im_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler.js',
+            'im_livechat/static/src/models/partner/partner.js',
+            'im_livechat/static/src/models/thread/thread.js',
+            'im_livechat/static/src/widgets/discuss/discuss.js',
+            'im_livechat/static/src/bugfix/bugfix.scss',
+            'im_livechat/static/src/scss/im_livechat_history.scss',
+            'im_livechat/static/src/scss/im_livechat_form.scss',
+        ],
+        'web.qunit_suite_tests': [
+            'im_livechat/static/src/bugfix/bugfix_tests.js',
+            'im_livechat/static/src/components/chat_window_manager/chat_window_manager_tests.js',
+            'im_livechat/static/src/components/composer/composer_tests.js',
+            'im_livechat/static/src/components/discuss/discuss_tests.js',
+            'im_livechat/static/src/components/messaging_menu/messaging_menu_tests.js',
+            'im_livechat/static/src/components/thread_icon/thread_icon_tests.js',
+            'im_livechat/static/src/components/thread_textual_typing_status/thread_textual_typing_status_tests.js',
+            'im_livechat/static/src/legacy/public_livechat.js',
+            'im_livechat/static/tests/helpers/mock_models.js',
+            'im_livechat/static/tests/helpers/mock_server.js',
+        ],
+        'web.assets_qweb': [
+            'im_livechat/static/src/bugfix/bugfix.xml',
+            'im_livechat/static/src/components/composer/composer.xml',
+            'im_livechat/static/src/components/discuss_sidebar/discuss_sidebar.xml',
+            'im_livechat/static/src/components/thread_icon/thread_icon.xml',
+        ],
+    }
 }
diff --git a/addons/im_livechat/views/im_livechat_channel_templates.xml b/addons/im_livechat/views/im_livechat_channel_templates.xml
index 35f81330259..0d7a46b43a5 100644
--- a/addons/im_livechat/views/im_livechat_channel_templates.xml
+++ b/addons/im_livechat/views/im_livechat_channel_templates.xml
@@ -5,44 +5,6 @@
         <!--
             Integrate Livechat Conversation in the Discuss
         -->
-        <template id="assets_backend" name="im_livechat assets backend" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/im_livechat/static/src/js/im_livechat_channel_form_view.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/js/im_livechat_channel_form_controller.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/bugfix/bugfix.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/components/discuss/discuss.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/components/discuss_sidebar/discuss_sidebar.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/components/notification_list/notification_list.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/components/thread_needaction_preview/thread_needaction_preview.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/components/thread_preview/thread_preview.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/models/messaging_initializer/messaging_initializer.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/models/partner/partner.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/models/thread/thread.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/widgets/discuss/discuss.js"></script>
-
-                <link rel="stylesheet" type="text/scss" href="/im_livechat/static/src/bugfix/bugfix.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/im_livechat/static/src/scss/im_livechat_history.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/im_livechat/static/src/scss/im_livechat_form.scss"/>
-            </xpath>
-        </template>
-
-        <template id="qunit_suite" name="livechat_tests" inherit_id="web.qunit_suite_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/im_livechat/static/src/bugfix/bugfix_tests.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/components/chat_window_manager/chat_window_manager_tests.js"/>
-                <script type="text/javascript" src="/im_livechat/static/src/components/composer/composer_tests.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/components/discuss/discuss_tests.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/components/messaging_menu/messaging_menu_tests.js"/>
-                <script type="text/javascript" src="/im_livechat/static/src/components/thread_icon/thread_icon_tests.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/components/thread_textual_typing_status/thread_textual_typing_status_tests.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/legacy/public_livechat.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/tests/helpers/mock_models.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/tests/helpers/mock_server.js"></script>
-            </xpath>
-        </template>
-
         <!--
             Template rendering the external HTML support page
         -->
diff --git a/addons/l10n_ar/__manifest__.py b/addons/l10n_ar/__manifest__.py
index a15f7292afa..e808b75564b 100644
--- a/addons/l10n_ar/__manifest__.py
+++ b/addons/l10n_ar/__manifest__.py
@@ -87,7 +87,6 @@ Master Data:
         'data/res_partner_data.xml',
         'data/res.currency.csv',
         'data/res.country.csv',
-        'views/l10n_ar.xml',
         'views/account_move_view.xml',
         'views/res_partner_view.xml',
         'views/res_company_view.xml',
@@ -122,4 +121,9 @@ Master Data:
     'installable': True,
     'auto_install': False,
     'application': False,
+    'assets': {
+        'web.assets_backend': [
+            'l10n_ar/static/src/**/*',
+        ],
+    }
 }
diff --git a/addons/l10n_ar/views/l10n_ar.xml b/addons/l10n_ar/views/l10n_ar.xml
deleted file mode 100644
index 08586bf67bf..00000000000
--- a/addons/l10n_ar/views/l10n_ar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="account assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/l10n_ar/static/src/js/tours/account.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/l10n_ch/__manifest__.py b/addons/l10n_ch/__manifest__.py
index d7cdf627f12..3b62a7390d1 100644
--- a/addons/l10n_ch/__manifest__.py
+++ b/addons/l10n_ch/__manifest__.py
@@ -51,5 +51,9 @@ Here is how it works:
         'demo/demo_company.xml',
     ],
     'post_init_hook': 'post_init',
-
+    'assets': {
+        'web.report_assets_common': [
+            'l10n_ch/static/src/scss/**/*',
+        ],
+    }
 }
diff --git a/addons/l10n_ch/report/isr_report.xml b/addons/l10n_ch/report/isr_report.xml
index 58f09b55a80..bf00b2e64c5 100644
--- a/addons/l10n_ch/report/isr_report.xml
+++ b/addons/l10n_ch/report/isr_report.xml
@@ -31,12 +31,6 @@
             report is only available to be printed for out invoices after
             'draft' state, if the fields required by the ISR have been set.-->
 
-        <template id="assets_common" name="l10n_ch_isr_report" inherit_id="web.report_assets_common">
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" type="text/scss" href="/l10n_ch/static/src/scss/report_isr.scss"/>
-            </xpath>
-        </template>
-
         <template id="l10n_ch_isr_report_template">
             <t t-call="web.external_layout">
                 <t t-set="split_total_amount" t-value="invoice.split_total_amount()"/>
diff --git a/addons/l10n_ch/report/swissqr_report.xml b/addons/l10n_ch/report/swissqr_report.xml
index 4d9181f1205..a2d39223ac0 100644
--- a/addons/l10n_ch/report/swissqr_report.xml
+++ b/addons/l10n_ch/report/swissqr_report.xml
@@ -13,12 +13,6 @@
             <field name="attachment">'QR-bill-' + object.name + '.pdf'</field>
         </record>
 
-        <template id="assets_common_qr" inherit_id="web.report_assets_common">
-            <xpath expr="." position="inside">
-                <link type="text/scss" rel="stylesheet" href="/l10n_ch/static/src/scss/report_swissqr.scss"/>
-            </xpath>
-        </template>
-
         <template id="l10n_ch_swissqr_template">
             <t t-set="o" t-value="o.with_context(lang=lang)"/>
             <t t-call="web.external_layout">
diff --git a/addons/l10n_co_pos/__manifest__.py b/addons/l10n_co_pos/__manifest__.py
index 6aff2929d27..32716cd2e5b 100644
--- a/addons/l10n_co_pos/__manifest__.py
+++ b/addons/l10n_co_pos/__manifest__.py
@@ -13,10 +13,14 @@
         'point_of_sale'
     ],
     'data': [
-        'views/templates.xml',
         'views/views.xml'
     ],
-    'qweb': [
-        'static/src/xml/pos.xml'
-    ],
+    'assets': {
+        'point_of_sale.assets': [
+            'l10n_co_pos/static/src/js/**/*',
+        ],
+        'web.assets_qweb': [
+            'l10n_co_pos/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/l10n_co_pos/views/templates.xml b/addons/l10n_co_pos/views/templates.xml
deleted file mode 100644
index 5e38a119a1a..00000000000
--- a/addons/l10n_co_pos/views/templates.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets" inherit_id="point_of_sale.assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/l10n_co_pos/static/src/js/pos.js"></script>
-            <script type="text/javascript" src="/l10n_co_pos/static/src/js/PaymentScreen.js"></script>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/addons/l10n_de/__manifest__.py b/addons/l10n_de/__manifest__.py
index 4f3a6110049..5ad567c7f1b 100644
--- a/addons/l10n_de/__manifest__.py
+++ b/addons/l10n_de/__manifest__.py
@@ -25,4 +25,9 @@ German accounting chart and localization.
         'report/din5008_report.xml',
         'data/report_layout.xml',
     ],
+    'assets': {
+        'web.report_assets_common': [
+            'l10n_de/static/src/**/*',
+        ],
+    }
 }
diff --git a/addons/l10n_de/report/din5008_report.xml b/addons/l10n_de/report/din5008_report.xml
index 066946278c6..8dabcac1fb2 100644
--- a/addons/l10n_de/report/din5008_report.xml
+++ b/addons/l10n_de/report/din5008_report.xml
@@ -16,12 +16,6 @@
             <field name="header_spacing">45</field>
         </record>
 
-        <template id="assets_common" name="l10n_de_din5008_report" inherit_id="web.report_assets_common">
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" type="text/scss" href="/l10n_de/static/src/scss/report_din5008.scss"/>
-            </xpath>
-        </template>
-
         <!-- New report layout for din5008 format -->
         <template id="external_layout_din5008">
             <t t-if="not o and doc">
diff --git a/addons/l10n_fr_pos_cert/__manifest__.py b/addons/l10n_fr_pos_cert/__manifest__.py
index c6af794126a..5cd127800b1 100644
--- a/addons/l10n_fr_pos_cert/__manifest__.py
+++ b/addons/l10n_fr_pos_cert/__manifest__.py
@@ -28,7 +28,6 @@ The module adds following features:
     'application': False,
     'data': [
         'views/account_views.xml',
-        'views/l10n_fr_pos_cert_templates.xml',
         'views/pos_views.xml',
         'views/account_sale_closure.xml',
         'views/pos_inalterability_menuitem.xml',
@@ -37,6 +36,13 @@ The module adds following features:
         'security/ir.model.access.csv',
         'security/account_closing_intercompany.xml',
     ],
-    'qweb': ['static/src/xml/OrderReceipt.xml'],
     'post_init_hook': '_setup_inalterability',
+    'assets': {
+        'point_of_sale.assets': [
+            'l10n_fr_pos_cert/static/src/js/**/*',
+        ],
+        'web.assets_qweb': [
+            'l10n_fr_pos_cert/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/l10n_fr_pos_cert/views/l10n_fr_pos_cert_templates.xml b/addons/l10n_fr_pos_cert/views/l10n_fr_pos_cert_templates.xml
deleted file mode 100644
index 739d9dc93ec..00000000000
--- a/addons/l10n_fr_pos_cert/views/l10n_fr_pos_cert_templates.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets" inherit_id="point_of_sale.assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/l10n_fr_pos_cert/static/src/js/pos.js"></script>
-            <script type="text/javascript" src="/l10n_fr_pos_cert/static/src/js/NumpadWidget.js"></script>
-            <script type="text/javascript" src="/l10n_fr_pos_cert/static/src/js/PaymentScreen.js"></script>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/addons/l10n_in_pos/__manifest__.py b/addons/l10n_in_pos/__manifest__.py
index 17f89184f69..1faf8f9054f 100644
--- a/addons/l10n_in_pos/__manifest__.py
+++ b/addons/l10n_in_pos/__manifest__.py
@@ -11,14 +11,16 @@
         'l10n_in',
         'point_of_sale'
     ],
-    'data': [
-        'views/point_of_sale.xml',
-    ],
     'demo': [
         'data/product_demo.xml',
     ],
-    'qweb': [
-        'static/src/xml/pos_receipt.xml',
-    ],
     'auto_install': True,
+    'assets': {
+        'point_of_sale.assets': [
+            'l10n_in_pos/static/src/js/**/*',
+        ],
+        'web.assets_qweb': [
+            'l10n_in_pos/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/l10n_in_pos/views/point_of_sale.xml b/addons/l10n_in_pos/views/point_of_sale.xml
deleted file mode 100644
index 49c54c79515..00000000000
--- a/addons/l10n_in_pos/views/point_of_sale.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets" inherit_id="point_of_sale.assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/l10n_in_pos/static/src/js/receipt.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/lunch/__manifest__.py b/addons/lunch/__manifest__.py
index d56aedf3a89..b6844e07f72 100644
--- a/addons/lunch/__manifest__.py
+++ b/addons/lunch/__manifest__.py
@@ -38,8 +38,38 @@ If you want to save your employees' time and avoid them to always have coins in
         'data/lunch_data.xml',
     ],
     'demo': ['data/lunch_demo.xml'],
-    'qweb': ['static/src/xml/lunch_templates.xml', ],
     'installable': True,
     'application': True,
     'certificate': '001292377792581874189',
+    'assets': {
+        'web.assets_backend': [
+            'lunch/static/src/scss/lunch_view.scss',
+            'lunch/static/src/scss/lunch_kanban.scss',
+            'lunch/static/src/scss/lunch_list.scss',
+            'lunch/static/src/js/lunch_controller_common.js',
+            'lunch/static/src/js/lunch_widget.js',
+            'lunch/static/src/js/lunch_mobile.js',
+            'lunch/static/src/js/lunch_payment_dialog.js',
+            'lunch/static/src/js/lunch_kanban_view.js',
+            'lunch/static/src/js/lunch_kanban_controller.js',
+            'lunch/static/src/js/lunch_kanban_renderer.js',
+            'lunch/static/src/js/lunch_kanban_record.js',
+            'lunch/static/src/js/lunch_model_extension.js',
+            'lunch/static/src/js/lunch_list_view.js',
+            'lunch/static/src/js/lunch_list_controller.js',
+            'lunch/static/src/js/lunch_list_renderer.js',
+        ],
+        'web.qunit_suite_tests': [
+            'lunch/static/tests/lunch_test_utils.js',
+            'lunch/static/tests/lunch_kanban_tests.js',
+            'lunch/static/tests/lunch_list_tests.js',
+        ],
+        'web.qunit_mobile_suite_tests': [
+            'lunch/static/tests/lunch_test_utils.js',
+            'lunch/static/tests/lunch_kanban_mobile_tests.js',
+        ],
+        'web.assets_qweb': [
+            'lunch/static/src/xml/lunch_templates.xml',
+        ],
+    }
 }
diff --git a/addons/lunch/views/lunch_templates.xml b/addons/lunch/views/lunch_templates.xml
index ff943deb685..42b4d9824b9 100644
--- a/addons/lunch/views/lunch_templates.xml
+++ b/addons/lunch/views/lunch_templates.xml
@@ -1,41 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="assets_backend" name="lunch assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/lunch/static/src/scss/lunch_view.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/lunch/static/src/scss/lunch_kanban.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/lunch/static/src/scss/lunch_list.scss"/>
-
-            <script type="text/javascript" src="/lunch/static/src/js/lunch_controller_common.js"></script>
-            <script type="text/javascript" src="/lunch/static/src/js/lunch_widget.js"></script>
-            <script type="text/javascript" src="/lunch/static/src/js/lunch_mobile.js"></script>
-            <script type="text/javascript" src="/lunch/static/src/js/lunch_payment_dialog.js"></script>
-            <script type="text/javascript" src="/lunch/static/src/js/lunch_kanban_view.js"></script>
-            <script type="text/javascript" src="/lunch/static/src/js/lunch_kanban_controller.js"></script>
-            <script type="text/javascript" src="/lunch/static/src/js/lunch_kanban_renderer.js"></script>
-            <script type="text/javascript" src="/lunch/static/src/js/lunch_kanban_record.js"></script>
-            <script type="text/javascript" src="/lunch/static/src/js/lunch_model_extension.js"></script>
-            <script type="text/javascript" src="/lunch/static/src/js/lunch_list_view.js"></script>
-            <script type="text/javascript" src="/lunch/static/src/js/lunch_list_controller.js"></script>
-            <script type="text/javascript" src="/lunch/static/src/js/lunch_list_renderer.js"></script>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" name="lunch tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/lunch/static/tests/lunch_test_utils.js"></script>
-            <script type="text/javascript" src="/lunch/static/tests/lunch_kanban_tests.js"></script>
-            <script type="text/javascript" src="/lunch/static/tests/lunch_list_tests.js"></script>
-        </xpath>
-    </template>
-
-    <template id="qunit_mobile_suite" name="lunch mobile tests" inherit_id="web.qunit_mobile_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/lunch/static/tests/lunch_test_utils.js"></script>
-            <script type="text/javascript" src="/lunch/static/tests/lunch_kanban_mobile_tests.js"></script>
-        </xpath>
-    </template>
-
     <template id="lunch_payment_dialog" name="Lunch Payment Dialog">
         To add some money to your wallet, please contact your lunch manager.
     </template>
diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index ad131dc15f3..af4b10a36ca 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -10,7 +10,6 @@
     'website': 'https://www.odoo.com/page/discuss',
     'depends': ['base', 'base_setup', 'bus', 'web_tour'],
     'data': [
-        'views/assets.xml',
         'wizard/invite_view.xml',
         'wizard/mail_blacklist_remove_view.xml',
         'wizard/mail_compose_message_view.xml',
@@ -52,79 +51,374 @@
     ],
     'installable': True,
     'application': True,
-    'qweb': [
-        'static/src/xml/activity.xml',
-        'static/src/xml/activity_view.xml',
-        'static/src/xml/composer.xml',
-        'static/src/xml/many2one_avatar_user.xml',
-        'static/src/xml/systray.xml',
-        'static/src/xml/thread.xml',
-        'static/src/xml/web_kanban_activity.xml',
-        'static/src/xml/text_emojis.xml',
-
-        'static/src/bugfix/bugfix.xml',
-        'static/src/components/activity/activity.xml',
-        'static/src/components/activity_box/activity_box.xml',
-        'static/src/components/activity_mark_done_popover/activity_mark_done_popover.xml',
-        'static/src/components/attachment/attachment.xml',
-        'static/src/components/attachment_box/attachment_box.xml',
-        'static/src/components/attachment_delete_confirm_dialog/attachment_delete_confirm_dialog.xml',
-        'static/src/components/attachment_list/attachment_list.xml',
-        'static/src/components/attachment_viewer/attachment_viewer.xml',
-        'static/src/components/autocomplete_input/autocomplete_input.xml',
-        'static/src/components/chat_window/chat_window.xml',
-        'static/src/components/chat_window_header/chat_window_header.xml',
-        'static/src/components/chat_window_hidden_menu/chat_window_hidden_menu.xml',
-        'static/src/components/chat_window_manager/chat_window_manager.xml',
-        'static/src/components/chatter/chatter.xml',
-        'static/src/components/chatter_container/chatter_container.xml',
-        'static/src/components/chatter_topbar/chatter_topbar.xml',
-        'static/src/components/composer/composer.xml',
-        'static/src/components/composer_suggested_recipient/composer_suggested_recipient.xml',
-        'static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.xml',
-        'static/src/components/composer_suggestion/composer_suggestion.xml',
-        'static/src/components/composer_suggestion_list/composer_suggestion_list.xml',
-        'static/src/components/composer_text_input/composer_text_input.xml',
-        'static/src/components/dialog/dialog.xml',
-        'static/src/components/dialog_manager/dialog_manager.xml',
-        'static/src/components/discuss/discuss.xml',
-        'static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection.xml',
-        'static/src/components/discuss_sidebar/discuss_sidebar.xml',
-        'static/src/components/discuss_sidebar_item/discuss_sidebar_item.xml',
-        'static/src/components/drop_zone/drop_zone.xml',
-        'static/src/components/editable_text/editable_text.xml',
-        'static/src/components/emojis_popover/emojis_popover.xml',
-        'static/src/components/file_uploader/file_uploader.xml',
-        'static/src/components/follow_button/follow_button.xml',
-        'static/src/components/follower/follower.xml',
-        'static/src/components/follower_list_menu/follower_list_menu.xml',
-        'static/src/components/follower_subtype/follower_subtype.xml',
-        'static/src/components/follower_subtype_list/follower_subtype_list.xml',
-        'static/src/components/mail_template/mail_template.xml',
-        'static/src/components/message/message.xml',
-        'static/src/components/message_author_prefix/message_author_prefix.xml',
-        'static/src/components/message_list/message_list.xml',
-        'static/src/components/message_seen_indicator/message_seen_indicator.xml',
-        'static/src/components/messaging_menu/messaging_menu.xml',
-        'static/src/components/mobile_messaging_navbar/mobile_messaging_navbar.xml',
-        'static/src/components/moderation_ban_dialog/moderation_ban_dialog.xml',
-        'static/src/components/moderation_discard_dialog/moderation_discard_dialog.xml',
-        'static/src/components/moderation_reject_dialog/moderation_reject_dialog.xml',
-        'static/src/components/notification_alert/notification_alert.xml',
-        'static/src/components/notification_group/notification_group.xml',
-        'static/src/components/notification_list/notification_list.xml',
-        'static/src/components/notification_popover/notification_popover.xml',
-        'static/src/components/notification_request/notification_request.xml',
-        'static/src/components/partner_im_status_icon/partner_im_status_icon.xml',
-        'static/src/components/thread_icon/thread_icon.xml',
-        'static/src/components/thread_needaction_preview/thread_needaction_preview.xml',
-        'static/src/components/thread_preview/thread_preview.xml',
-        'static/src/components/thread_textual_typing_status/thread_textual_typing_status.xml',
-        'static/src/components/thread_typing_icon/thread_typing_icon.xml',
-        'static/src/components/thread_view/thread_view.xml',
-        'static/src/widgets/common.xml',
-        'static/src/widgets/discuss/discuss.xml',
-        'static/src/widgets/discuss_invite_partner_dialog/discuss_invite_partner_dialog.xml',
-        'static/src/widgets/messaging_menu/messaging_menu.xml',
-    ],
+    'assets': {
+        'web._assets_primary_variables': [
+            'mail/static/src/scss/variables.scss',
+        ],
+        'web.assets_backend': [
+            'mail/static/src/js/core/translation.js',
+            'mail/static/src/js/many2many_tags_email.js',
+            'mail/static/src/js/many2one_avatar_user.js',
+            'mail/static/src/js/field_char.js',
+            'mail/static/src/js/document_viewer.js',
+            'mail/static/src/js/basic_view.js',
+            'mail/static/src/js/systray/systray_activity_menu.js',
+            'mail/static/src/js/tours/mail.js',
+            'mail/static/src/js/tools/debug_manager.js',
+            'mail/static/src/js/custom_filter_item.js',
+            'mail/static/src/js/utils.js',
+            'mail/static/src/js/activity.js',
+            'mail/static/src/js/views/activity/activity_view.js',
+            'mail/static/src/js/views/activity/activity_model.js',
+            'mail/static/src/js/views/activity/activity_controller.js',
+            'mail/static/src/js/views/activity/activity_renderer.js',
+            'mail/static/src/js/views/activity/activity_record.js',
+            'mail/static/src/js/views/activity/activity_cell.js',
+            'mail/static/src/js/emojis.js',
+            'mail/static/src/js/emojis_mixin.js',
+            'mail/static/src/js/field_emojis_common.js',
+            'mail/static/src/js/field_char_emojis.js',
+            'mail/static/src/js/field_text_emojis.js',
+            'mail/static/src/scss/emojis.scss',
+            'mail/static/src/variables.scss',
+            'mail/static/src/scss/discuss.scss',
+            'mail/static/src/scss/composer.scss',
+            'mail/static/src/scss/thread.scss',
+            'mail/static/src/scss/systray.scss',
+            'mail/static/src/scss/mail_activity.scss',
+            'mail/static/src/scss/many2one_avatar_user.scss',
+            'mail/static/src/scss/activity_view.scss',
+            'mail/static/src/scss/kanban_view.scss',
+            'mail/static/src/bugfix/bugfix.js',
+            'mail/static/src/component_hooks/use_drag_visible_dropzone/use_drag_visible_dropzone.js',
+            'mail/static/src/component_hooks/use_refs/use_refs.js',
+            'mail/static/src/component_hooks/use_rendered_values/use_rendered_values.js',
+            'mail/static/src/component_hooks/use_should_update_based_on_props/use_should_update_based_on_props.js',
+            'mail/static/src/component_hooks/use_store/use_store.js',
+            'mail/static/src/component_hooks/use_update/use_update.js',
+            'mail/static/src/components/activity/activity.js',
+            'mail/static/src/components/activity_box/activity_box.js',
+            'mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.js',
+            'mail/static/src/components/attachment/attachment.js',
+            'mail/static/src/components/attachment_box/attachment_box.js',
+            'mail/static/src/components/attachment_delete_confirm_dialog/attachment_delete_confirm_dialog.js',
+            'mail/static/src/components/attachment_list/attachment_list.js',
+            'mail/static/src/components/attachment_viewer/attachment_viewer.js',
+            'mail/static/src/components/autocomplete_input/autocomplete_input.js',
+            'mail/static/src/components/chat_window/chat_window.js',
+            'mail/static/src/components/chat_window_header/chat_window_header.js',
+            'mail/static/src/components/chat_window_hidden_menu/chat_window_hidden_menu.js',
+            'mail/static/src/components/chat_window_manager/chat_window_manager.js',
+            'mail/static/src/components/chatter/chatter.js',
+            'mail/static/src/components/chatter_container/chatter_container.js',
+            'mail/static/src/components/chatter_topbar/chatter_topbar.js',
+            'mail/static/src/components/composer/composer.js',
+            'mail/static/src/components/composer_suggested_recipient/composer_suggested_recipient.js',
+            'mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.js',
+            'mail/static/src/components/composer_suggestion/composer_suggestion.js',
+            'mail/static/src/components/composer_suggestion_list/composer_suggestion_list.js',
+            'mail/static/src/components/composer_text_input/composer_text_input.js',
+            'mail/static/src/components/dialog/dialog.js',
+            'mail/static/src/components/dialog_manager/dialog_manager.js',
+            'mail/static/src/components/discuss/discuss.js',
+            'mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection.js',
+            'mail/static/src/components/discuss_sidebar/discuss_sidebar.js',
+            'mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js',
+            'mail/static/src/components/drop_zone/drop_zone.js',
+            'mail/static/src/components/editable_text/editable_text.js',
+            'mail/static/src/components/emojis_popover/emojis_popover.js',
+            'mail/static/src/components/file_uploader/file_uploader.js',
+            'mail/static/src/components/follow_button/follow_button.js',
+            'mail/static/src/components/follower/follower.js',
+            'mail/static/src/components/follower_list_menu/follower_list_menu.js',
+            'mail/static/src/components/follower_subtype/follower_subtype.js',
+            'mail/static/src/components/follower_subtype_list/follower_subtype_list.js',
+            'mail/static/src/components/mail_template/mail_template.js',
+            'mail/static/src/components/message/message.js',
+            'mail/static/src/components/message_author_prefix/message_author_prefix.js',
+            'mail/static/src/components/message_list/message_list.js',
+            'mail/static/src/components/message_seen_indicator/message_seen_indicator.js',
+            'mail/static/src/components/messaging_menu/messaging_menu.js',
+            'mail/static/src/components/mobile_messaging_navbar/mobile_messaging_navbar.js',
+            'mail/static/src/components/moderation_ban_dialog/moderation_ban_dialog.js',
+            'mail/static/src/components/moderation_discard_dialog/moderation_discard_dialog.js',
+            'mail/static/src/components/moderation_reject_dialog/moderation_reject_dialog.js',
+            'mail/static/src/components/notification_alert/notification_alert.js',
+            'mail/static/src/components/notification_group/notification_group.js',
+            'mail/static/src/components/notification_list/notification_list.js',
+            'mail/static/src/components/notification_popover/notification_popover.js',
+            'mail/static/src/components/notification_request/notification_request.js',
+            'mail/static/src/components/partner_im_status_icon/partner_im_status_icon.js',
+            'mail/static/src/components/thread_icon/thread_icon.js',
+            'mail/static/src/components/thread_needaction_preview/thread_needaction_preview.js',
+            'mail/static/src/components/thread_preview/thread_preview.js',
+            'mail/static/src/components/thread_textual_typing_status/thread_textual_typing_status.js',
+            'mail/static/src/components/thread_typing_icon/thread_typing_icon.js',
+            'mail/static/src/components/thread_view/thread_view.js',
+            'mail/static/src/model/model_core.js',
+            'mail/static/src/model/model_errors.js',
+            'mail/static/src/model/model_field.js',
+            'mail/static/src/model/model_field_command.js',
+            'mail/static/src/model/model_manager.js',
+            'mail/static/src/models/activity/activity.js',
+            'mail/static/src/models/activity_type/activity_type.js',
+            'mail/static/src/models/attachment/attachment.js',
+            'mail/static/src/models/attachment_viewer/attachment_viewer.js',
+            'mail/static/src/models/canned_response/canned_response.js',
+            'mail/static/src/models/channel_command/channel_command.js',
+            'mail/static/src/models/chat_window/chat_window.js',
+            'mail/static/src/models/chat_window_manager/chat_window_manager.js',
+            'mail/static/src/models/chatter/chatter.js',
+            'mail/static/src/models/composer/composer.js',
+            'mail/static/src/models/country/country.js',
+            'mail/static/src/models/device/device.js',
+            'mail/static/src/models/dialog/dialog.js',
+            'mail/static/src/models/dialog_manager/dialog_manager.js',
+            'mail/static/src/models/discuss/discuss.js',
+            'mail/static/src/models/follower/follower.js',
+            'mail/static/src/models/follower_subtype/follower_subtype.js',
+            'mail/static/src/models/follower_subtype_list/follower_subtype_list.js',
+            'mail/static/src/models/locale/locale.js',
+            'mail/static/src/models/mail_template/mail_template.js',
+            'mail/static/src/models/message/message.js',
+            'mail/static/src/models/message_seen_indicator/message_seen_indicator.js',
+            'mail/static/src/models/messaging/messaging.js',
+            'mail/static/src/models/messaging_initializer/messaging_initializer.js',
+            'mail/static/src/models/messaging_menu/messaging_menu.js',
+            'mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js',
+            'mail/static/src/models/model/model.js',
+            'mail/static/src/models/notification/notification.js',
+            'mail/static/src/models/notification_group/notification_group.js',
+            'mail/static/src/models/notification_group_manager/notification_group_manager.js',
+            'mail/static/src/models/partner/partner.js',
+            'mail/static/src/models/suggested_recipient_info/suggested_recipient_info.js',
+            'mail/static/src/models/thread/thread.js',
+            'mail/static/src/models/thread_cache/thread_cache.js',
+            'mail/static/src/models/thread_partner_seen_info/thread_partner_seen_info.js',
+            'mail/static/src/models/thread_view/thread_view.js',
+            'mail/static/src/models/thread_view/thread_viewer.js',
+            'mail/static/src/models/user/user.js',
+            'mail/static/src/services/chat_window_service/chat_window_service.js',
+            'mail/static/src/services/dialog_service/dialog_service.js',
+            'mail/static/src/services/messaging/messaging.js',
+            'mail/static/src/utils/deferred/deferred.js',
+            'mail/static/src/utils/throttle/throttle.js',
+            'mail/static/src/utils/timer/timer.js',
+            'mail/static/src/utils/utils.js',
+            'mail/static/src/widgets/discuss/discuss.js',
+            'mail/static/src/widgets/discuss_invite_partner_dialog/discuss_invite_partner_dialog.js',
+            'mail/static/src/widgets/form_renderer/form_renderer.js',
+            'mail/static/src/widgets/messaging_menu/messaging_menu.js',
+            'mail/static/src/widgets/notification_alert/notification_alert.js',
+            'mail/static/src/components/notification_list/notification_list_item.scss',
+            'mail/static/src/bugfix/bugfix.scss',
+            'mail/static/src/components/activity/activity.scss',
+            'mail/static/src/components/activity_box/activity_box.scss',
+            'mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.scss',
+            'mail/static/src/components/attachment/attachment.scss',
+            'mail/static/src/components/attachment_box/attachment_box.scss',
+            'mail/static/src/components/attachment_list/attachment_list.scss',
+            'mail/static/src/components/attachment_viewer/attachment_viewer.scss',
+            'mail/static/src/components/chat_window/chat_window.scss',
+            'mail/static/src/components/chat_window_header/chat_window_header.scss',
+            'mail/static/src/components/chat_window_hidden_menu/chat_window_hidden_menu.scss',
+            'mail/static/src/components/chat_window_manager/chat_window_manager.scss',
+            'mail/static/src/components/chatter/chatter.scss',
+            'mail/static/src/components/chatter_container/chatter_container.scss',
+            'mail/static/src/components/chatter_topbar/chatter_topbar.scss',
+            'mail/static/src/components/composer/composer.scss',
+            'mail/static/src/components/composer_suggested_recipient/composer_suggested_recipient.scss',
+            'mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.scss',
+            'mail/static/src/components/composer_suggestion/composer_suggestion.scss',
+            'mail/static/src/components/composer_suggestion_list/composer_suggestion_list.scss',
+            'mail/static/src/components/composer_text_input/composer_text_input.scss',
+            'mail/static/src/components/dialog/dialog.scss',
+            'mail/static/src/components/discuss/discuss.scss',
+            'mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection.scss',
+            'mail/static/src/components/discuss_sidebar/discuss_sidebar.scss',
+            'mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.scss',
+            'mail/static/src/components/drop_zone/drop_zone.scss',
+            'mail/static/src/components/emojis_popover/emojis_popover.scss',
+            'mail/static/src/components/file_uploader/file_uploader.scss',
+            'mail/static/src/components/follow_button/follow_button.scss',
+            'mail/static/src/components/follower/follower.scss',
+            'mail/static/src/components/follower_list_menu/follower_list_menu.scss',
+            'mail/static/src/components/follower_subtype/follower_subtype.scss',
+            'mail/static/src/components/follower_subtype_list/follower_subtype_list.scss',
+            'mail/static/src/components/mail_template/mail_template.scss',
+            'mail/static/src/components/message/message.scss',
+            'mail/static/src/components/message_author_prefix/message_author_prefix.scss',
+            'mail/static/src/components/message_list/message_list.scss',
+            'mail/static/src/components/message_seen_indicator/message_seen_indicator.scss',
+            'mail/static/src/components/messaging_menu/messaging_menu.scss',
+            'mail/static/src/components/mobile_messaging_navbar/mobile_messaging_navbar.scss',
+            'mail/static/src/components/notification_group/notification_group.scss',
+            'mail/static/src/components/notification_list/notification_list.scss',
+            'mail/static/src/components/notification_popover/notification_popover.scss',
+            'mail/static/src/components/notification_request/notification_request.scss',
+            'mail/static/src/components/partner_im_status_icon/partner_im_status_icon.scss',
+            'mail/static/src/components/thread_icon/thread_icon.scss',
+            'mail/static/src/components/thread_needaction_preview/thread_needaction_preview.scss',
+            'mail/static/src/components/thread_preview/thread_preview.scss',
+            'mail/static/src/components/thread_textual_typing_status/thread_textual_typing_status.scss',
+            'mail/static/src/components/thread_typing_icon/thread_typing_icon.scss',
+            'mail/static/src/components/thread_view/thread_view.scss',
+            'mail/static/src/widgets/discuss/discuss.scss',
+            'mail/static/src/widgets/form_renderer/form_renderer.scss',
+        ],
+        'web.assets_backend_prod_only': [
+            'mail/static/src/js/main.js',
+        ],
+        'web.assets_tests': [
+            'mail/static/tests/tours/**/*',
+        ],
+        'web.tests_assets': [
+            'mail/static/src/env/test_env.js',
+            'mail/static/src/utils/test_utils.js',
+            'mail/static/tests/helpers/mock_models.js',
+            'mail/static/tests/helpers/mock_server.js',
+        ],
+        'web.qunit_suite_tests': [
+            'mail/static/tests/chatter_tests.js',
+            'mail/static/tests/mail_utils_tests.js',
+            'mail/static/tests/document_viewer_tests.js',
+            'mail/static/tests/many2one_avatar_user_tests.js',
+            'mail/static/tests/systray/systray_activity_menu_tests.js',
+            'mail/static/tests/tools/debug_manager_tests.js',
+            'mail/static/tests/activity_tests.js',
+            'mail/static/src/bugfix/bugfix_tests.js',
+            'mail/static/src/component_hooks/use_store/use_store_tests.js',
+            'mail/static/src/components/activity/activity_tests.js',
+            'mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover_tests.js',
+            'mail/static/src/components/attachment/attachment_tests.js',
+            'mail/static/src/components/attachment_box/attachment_box_tests.js',
+            'mail/static/src/components/chat_window_manager/chat_window_manager_tests.js',
+            'mail/static/src/components/chatter/chatter_tests.js',
+            'mail/static/src/components/chatter/chatter_suggested_recipient_tests.js',
+            'mail/static/src/components/chatter_topbar/chatter_topbar_tests.js',
+            'mail/static/src/components/composer/composer_tests.js',
+            'mail/static/src/components/composer_suggestion/composer_suggestion_canned_response_tests.js',
+            'mail/static/src/components/composer_suggestion/composer_suggestion_channel_tests.js',
+            'mail/static/src/components/composer_suggestion/composer_suggestion_command_tests.js',
+            'mail/static/src/components/composer_suggestion/composer_suggestion_partner_tests.js',
+            'mail/static/src/components/dialog_manager/dialog_manager_tests.js',
+            'mail/static/src/components/discuss/tests/discuss_domain_tests.js',
+            'mail/static/src/components/discuss/tests/discuss_inbox_tests.js',
+            'mail/static/src/components/discuss/tests/discuss_moderation_tests.js',
+            'mail/static/src/components/discuss/tests/discuss_pinned_tests.js',
+            'mail/static/src/components/discuss/tests/discuss_sidebar_tests.js',
+            'mail/static/src/components/discuss/tests/discuss_tests.js',
+            'mail/static/src/components/file_uploader/file_uploader_tests.js',
+            'mail/static/src/components/follow_button/follow_button_tests.js',
+            'mail/static/src/components/follower/follower_tests.js',
+            'mail/static/src/components/follower_list_menu/follower_list_menu_tests.js',
+            'mail/static/src/components/follower_subtype/follower_subtype_tests.js',
+            'mail/static/src/components/message/message_tests.js',
+            'mail/static/src/components/message_seen_indicator/message_seen_indicator_tests.js',
+            'mail/static/src/components/messaging_menu/messaging_menu_tests.js',
+            'mail/static/src/components/notification_list/notification_list_notification_group_tests.js',
+            'mail/static/src/components/notification_list/notification_list_tests.js',
+            'mail/static/src/components/partner_im_status_icon/partner_im_status_icon_tests.js',
+            'mail/static/src/components/thread_icon/thread_icon_tests.js',
+            'mail/static/src/components/thread_needaction_preview/thread_needaction_preview_tests.js',
+            'mail/static/src/components/thread_preview/thread_preview_tests.js',
+            'mail/static/src/components/thread_textual_typing_status/thread_textual_typing_status_tests.js',
+            'mail/static/src/components/thread_view/thread_view_tests.js',
+            'mail/static/src/model/tests/test_models.js',
+            'mail/static/src/model/tests/model_field_command/clear_tests.js',
+            'mail/static/src/model/tests/model_field_command/create_tests.js',
+            'mail/static/src/model/tests/model_field_command/insert_and_replace_tests.js',
+            'mail/static/src/model/tests/model_field_command/insert_tests.js',
+            'mail/static/src/model/tests/model_field_command/link_tests.js',
+            'mail/static/src/model/tests/model_field_command/replace_tests.js',
+            'mail/static/src/model/tests/model_field_command/set_tests.js',
+            'mail/static/src/model/tests/model_field_command/unlink_all_tests.js',
+            'mail/static/src/model/tests/model_field_command/unlink_tests.js',
+            'mail/static/src/models/attachment/attachment_tests.js',
+            'mail/static/src/models/message/message_tests.js',
+            'mail/static/src/models/messaging/messaging_tests.js',
+            'mail/static/src/models/thread/thread_tests.js',
+            'mail/static/src/utils/throttle/throttle_tests.js',
+            'mail/static/src/utils/timer/timer_tests.js',
+            'mail/static/src/widgets/form_renderer/form_renderer_tests.js',
+            'mail/static/src/widgets/notification_alert/notification_alert_tests.js',
+        ],
+        'web.qunit_mobile_suite_tests': [
+            'mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection_tests.js',
+        ],
+        'web.assets_qweb': [
+            'mail/static/src/xml/activity.xml',
+            'mail/static/src/xml/activity_view.xml',
+            'mail/static/src/xml/composer.xml',
+            'mail/static/src/xml/many2one_avatar_user.xml',
+            'mail/static/src/xml/systray.xml',
+            'mail/static/src/xml/thread.xml',
+            'mail/static/src/xml/web_kanban_activity.xml',
+            'mail/static/src/xml/text_emojis.xml',
+            'mail/static/src/bugfix/bugfix.xml',
+            'mail/static/src/components/activity/activity.xml',
+            'mail/static/src/components/activity_box/activity_box.xml',
+            'mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.xml',
+            'mail/static/src/components/attachment/attachment.xml',
+            'mail/static/src/components/attachment_box/attachment_box.xml',
+            'mail/static/src/components/attachment_delete_confirm_dialog/attachment_delete_confirm_dialog.xml',
+            'mail/static/src/components/attachment_list/attachment_list.xml',
+            'mail/static/src/components/attachment_viewer/attachment_viewer.xml',
+            'mail/static/src/components/autocomplete_input/autocomplete_input.xml',
+            'mail/static/src/components/chat_window/chat_window.xml',
+            'mail/static/src/components/chat_window_header/chat_window_header.xml',
+            'mail/static/src/components/chat_window_hidden_menu/chat_window_hidden_menu.xml',
+            'mail/static/src/components/chat_window_manager/chat_window_manager.xml',
+            'mail/static/src/components/chatter/chatter.xml',
+            'mail/static/src/components/chatter_container/chatter_container.xml',
+            'mail/static/src/components/chatter_topbar/chatter_topbar.xml',
+            'mail/static/src/components/composer/composer.xml',
+            'mail/static/src/components/composer_suggested_recipient/composer_suggested_recipient.xml',
+            'mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.xml',
+            'mail/static/src/components/composer_suggestion/composer_suggestion.xml',
+            'mail/static/src/components/composer_suggestion_list/composer_suggestion_list.xml',
+            'mail/static/src/components/composer_text_input/composer_text_input.xml',
+            'mail/static/src/components/dialog/dialog.xml',
+            'mail/static/src/components/dialog_manager/dialog_manager.xml',
+            'mail/static/src/components/discuss/discuss.xml',
+            'mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection.xml',
+            'mail/static/src/components/discuss_sidebar/discuss_sidebar.xml',
+            'mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.xml',
+            'mail/static/src/components/drop_zone/drop_zone.xml',
+            'mail/static/src/components/editable_text/editable_text.xml',
+            'mail/static/src/components/emojis_popover/emojis_popover.xml',
+            'mail/static/src/components/file_uploader/file_uploader.xml',
+            'mail/static/src/components/follow_button/follow_button.xml',
+            'mail/static/src/components/follower/follower.xml',
+            'mail/static/src/components/follower_list_menu/follower_list_menu.xml',
+            'mail/static/src/components/follower_subtype/follower_subtype.xml',
+            'mail/static/src/components/follower_subtype_list/follower_subtype_list.xml',
+            'mail/static/src/components/mail_template/mail_template.xml',
+            'mail/static/src/components/message/message.xml',
+            'mail/static/src/components/message_author_prefix/message_author_prefix.xml',
+            'mail/static/src/components/message_list/message_list.xml',
+            'mail/static/src/components/message_seen_indicator/message_seen_indicator.xml',
+            'mail/static/src/components/messaging_menu/messaging_menu.xml',
+            'mail/static/src/components/mobile_messaging_navbar/mobile_messaging_navbar.xml',
+            'mail/static/src/components/moderation_ban_dialog/moderation_ban_dialog.xml',
+            'mail/static/src/components/moderation_discard_dialog/moderation_discard_dialog.xml',
+            'mail/static/src/components/moderation_reject_dialog/moderation_reject_dialog.xml',
+            'mail/static/src/components/notification_alert/notification_alert.xml',
+            'mail/static/src/components/notification_group/notification_group.xml',
+            'mail/static/src/components/notification_list/notification_list.xml',
+            'mail/static/src/components/notification_popover/notification_popover.xml',
+            'mail/static/src/components/notification_request/notification_request.xml',
+            'mail/static/src/components/partner_im_status_icon/partner_im_status_icon.xml',
+            'mail/static/src/components/thread_icon/thread_icon.xml',
+            'mail/static/src/components/thread_needaction_preview/thread_needaction_preview.xml',
+            'mail/static/src/components/thread_preview/thread_preview.xml',
+            'mail/static/src/components/thread_textual_typing_status/thread_textual_typing_status.xml',
+            'mail/static/src/components/thread_typing_icon/thread_typing_icon.xml',
+            'mail/static/src/components/thread_view/thread_view.xml',
+            'mail/static/src/widgets/common.xml',
+            'mail/static/src/widgets/discuss/discuss.xml',
+            'mail/static/src/widgets/discuss_invite_partner_dialog/discuss_invite_partner_dialog.xml',
+            'mail/static/src/widgets/messaging_menu/messaging_menu.xml',
+        ],
+    }
 }
diff --git a/addons/mail/views/assets.xml b/addons/mail/views/assets.xml
deleted file mode 100644
index 95db3ceaa5e..00000000000
--- a/addons/mail/views/assets.xml
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <template id="_assets_primary_variables" inherit_id="web._assets_primary_variables">
-            <xpath expr="//link[last()]" position="after">
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/scss/variables.scss"/>
-            </xpath>
-        </template>
-
-        <template id="assets_backend" name="mail assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/mail/static/src/js/core/translation.js"></script>
-
-                <script type="text/javascript" src="/mail/static/src/js/many2many_tags_email.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/many2one_avatar_user.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/field_char.js"></script>
-
-                <!-- Widgets -->
-                <script type="text/javascript" src="/mail/static/src/js/document_viewer.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/basic_view.js"></script>
-                <!-- systray -->
-                <script type="text/javascript" src="/mail/static/src/js/systray/systray_activity_menu.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/tours/mail.js"></script>
-                <!-- tools -->
-                <script type="text/javascript" src="/mail/static/src/js/tools/debug_manager.js"></script>
-                <!-- filter menu -->
-                <script type="text/javascript" src="/mail/static/src/js/custom_filter_item.js"></script>
-                <!-- utils -->
-                <script type="text/javascript" src="/mail/static/src/js/utils.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/activity.js"></script>
-                <!-- Activity view type -->
-                <script type="text/javascript" src="/mail/static/src/js/views/activity/activity_view.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/views/activity/activity_model.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/views/activity/activity_controller.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/views/activity/activity_renderer.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/views/activity/activity_record.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/views/activity/activity_cell.js"></script>
-                <!-- Emojis -->
-                <script type="text/javascript" src="/mail/static/src/js/emojis.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/emojis_mixin.js"/>
-                <script type="text/javascript" src="/mail/static/src/js/field_emojis_common.js"/>
-                <script type="text/javascript" src="/mail/static/src/js/field_char_emojis.js"/>
-                <script type="text/javascript" src="/mail/static/src/js/field_text_emojis.js"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/scss/emojis.scss"/>
-                <!-- Others -->
-
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/variables.scss"/>
-
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/scss/discuss.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/scss/composer.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/scss/thread.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/scss/systray.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/scss/mail_activity.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/scss/many2one_avatar_user.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/scss/activity_view.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/scss/kanban_view.scss"/>
-
-                <script type="text/javascript" src="/mail/static/src/bugfix/bugfix.js"></script>
-                <script type="text/javascript" src="/mail/static/src/component_hooks/use_drag_visible_dropzone/use_drag_visible_dropzone.js"></script>
-                <script type="text/javascript" src="/mail/static/src/component_hooks/use_refs/use_refs.js"></script>
-                <script type="text/javascript" src="/mail/static/src/component_hooks/use_rendered_values/use_rendered_values.js"/>
-                <script type="text/javascript" src="/mail/static/src/component_hooks/use_should_update_based_on_props/use_should_update_based_on_props.js"/>
-                <script type="text/javascript" src="/mail/static/src/component_hooks/use_store/use_store.js"></script>
-                <script type="text/javascript" src="/mail/static/src/component_hooks/use_update/use_update.js"/>
-                <script type="text/javascript" src="/mail/static/src/components/activity/activity.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/activity_box/activity_box.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/attachment/attachment.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/attachment_box/attachment_box.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/attachment_delete_confirm_dialog/attachment_delete_confirm_dialog.js"/>
-                <script type="text/javascript" src="/mail/static/src/components/attachment_list/attachment_list.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/attachment_viewer/attachment_viewer.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/autocomplete_input/autocomplete_input.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/chat_window/chat_window.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/chat_window_header/chat_window_header.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/chat_window_hidden_menu/chat_window_hidden_menu.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/chat_window_manager/chat_window_manager.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/chatter/chatter.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/chatter_container/chatter_container.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/chatter_topbar/chatter_topbar.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/composer/composer.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/composer_suggested_recipient/composer_suggested_recipient.js"/>
-                <script type="text/javascript" src="/mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.js"/>
-                <script type="text/javascript" src="/mail/static/src/components/composer_suggestion/composer_suggestion.js"/>
-                <script type="text/javascript" src="/mail/static/src/components/composer_suggestion_list/composer_suggestion_list.js"/>
-                <script type="text/javascript" src="/mail/static/src/components/composer_text_input/composer_text_input.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/dialog/dialog.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/dialog_manager/dialog_manager.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/discuss/discuss.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/discuss_sidebar/discuss_sidebar.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/drop_zone/drop_zone.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/editable_text/editable_text.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/emojis_popover/emojis_popover.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/file_uploader/file_uploader.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/follow_button/follow_button.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/follower/follower.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/follower_list_menu/follower_list_menu.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/follower_subtype/follower_subtype.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/follower_subtype_list/follower_subtype_list.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/mail_template/mail_template.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/message/message.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/message_author_prefix/message_author_prefix.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/message_list/message_list.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/message_seen_indicator/message_seen_indicator.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/messaging_menu/messaging_menu.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/mobile_messaging_navbar/mobile_messaging_navbar.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/moderation_ban_dialog/moderation_ban_dialog.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/moderation_discard_dialog/moderation_discard_dialog.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/moderation_reject_dialog/moderation_reject_dialog.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/notification_alert/notification_alert.js"/>
-                <script type="text/javascript" src="/mail/static/src/components/notification_group/notification_group.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/notification_list/notification_list.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/notification_popover/notification_popover.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/notification_request/notification_request.js"/>
-                <script type="text/javascript" src="/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/thread_icon/thread_icon.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/thread_preview/thread_preview.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/thread_textual_typing_status/thread_textual_typing_status.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/thread_typing_icon/thread_typing_icon.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/thread_view/thread_view.js"></script>
-                <script type="text/javascript" src="/mail/static/src/model/model_core.js"></script>
-                <script type="text/javascript" src="/mail/static/src/model/model_errors.js"></script>
-                <script type="text/javascript" src="/mail/static/src/model/model_field.js"></script>
-                <script type="text/javascript" src="/mail/static/src/model/model_field_command.js"></script>
-                <script type="text/javascript" src="/mail/static/src/model/model_manager.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/activity/activity.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/activity_type/activity_type.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/attachment/attachment.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/attachment_viewer/attachment_viewer.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/canned_response/canned_response.js"/>
-                <script type="text/javascript" src="/mail/static/src/models/channel_command/channel_command.js"/>
-                <script type="text/javascript" src="/mail/static/src/models/chat_window/chat_window.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/chat_window_manager/chat_window_manager.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/chatter/chatter.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/composer/composer.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/country/country.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/device/device.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/dialog/dialog.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/dialog_manager/dialog_manager.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/discuss/discuss.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/follower/follower.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/follower_subtype/follower_subtype.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/follower_subtype_list/follower_subtype_list.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/locale/locale.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/mail_template/mail_template.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/message/message.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/message_seen_indicator/message_seen_indicator.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/messaging/messaging.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/messaging_initializer/messaging_initializer.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/messaging_menu/messaging_menu.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/model/model.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/notification/notification.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/notification_group/notification_group.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/notification_group_manager/notification_group_manager.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/partner/partner.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/suggested_recipient_info/suggested_recipient_info.js"/>
-                <script type="text/javascript" src="/mail/static/src/models/thread/thread.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/thread_cache/thread_cache.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/thread_partner_seen_info/thread_partner_seen_info.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/thread_view/thread_view.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/thread_view/thread_viewer.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/user/user.js"></script>
-                <script type="text/javascript" src="/mail/static/src/services/chat_window_service/chat_window_service.js"></script>
-                <script type="text/javascript" src="/mail/static/src/services/dialog_service/dialog_service.js"></script>
-                <script type="text/javascript" src="/mail/static/src/services/messaging/messaging.js"/>
-                <script type="text/javascript" src="/mail/static/src/utils/deferred/deferred.js"></script>
-                <script type="text/javascript" src="/mail/static/src/utils/throttle/throttle.js"></script>
-                <script type="text/javascript" src="/mail/static/src/utils/timer/timer.js"></script>
-                <script type="text/javascript" src="/mail/static/src/utils/utils.js"></script>
-                <script type="text/javascript" src="/mail/static/src/widgets/discuss/discuss.js"></script>
-                <script type="text/javascript" src="/mail/static/src/widgets/discuss_invite_partner_dialog/discuss_invite_partner_dialog.js"></script>
-                <script type="text/javascript" src="/mail/static/src/widgets/form_renderer/form_renderer.js"></script>
-                <script type="text/javascript" src="/mail/static/src/widgets/messaging_menu/messaging_menu.js"></script>
-                <script type="text/javascript" src="/mail/static/src/widgets/notification_alert/notification_alert.js"/>
-
-                <!-- notification_list_item.scss contains variables/mixins, it must be positioned before sub-components of NotificationList -->
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/notification_list/notification_list_item.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/bugfix/bugfix.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/activity/activity.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/activity_box/activity_box.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/attachment/attachment.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/attachment_box/attachment_box.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/attachment_list/attachment_list.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/attachment_viewer/attachment_viewer.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/chat_window/chat_window.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/chat_window_header/chat_window_header.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/chat_window_hidden_menu/chat_window_hidden_menu.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/chat_window_manager/chat_window_manager.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/chatter/chatter.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/chatter_container/chatter_container.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/chatter_topbar/chatter_topbar.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/composer/composer.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/composer_suggested_recipient/composer_suggested_recipient.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/composer_suggestion/composer_suggestion.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/composer_suggestion_list/composer_suggestion_list.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/composer_text_input/composer_text_input.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/dialog/dialog.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/discuss/discuss.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/discuss_sidebar/discuss_sidebar.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/drop_zone/drop_zone.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/emojis_popover/emojis_popover.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/file_uploader/file_uploader.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/follow_button/follow_button.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/follower/follower.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/follower_list_menu/follower_list_menu.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/follower_subtype/follower_subtype.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/follower_subtype_list/follower_subtype_list.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/mail_template/mail_template.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/message/message.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/message_author_prefix/message_author_prefix.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/message_list/message_list.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/message_seen_indicator/message_seen_indicator.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/messaging_menu/messaging_menu.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/mobile_messaging_navbar/mobile_messaging_navbar.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/notification_group/notification_group.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/notification_list/notification_list.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/notification_popover/notification_popover.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/notification_request/notification_request.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/thread_icon/thread_icon.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/thread_preview/thread_preview.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/thread_textual_typing_status/thread_textual_typing_status.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/thread_typing_icon/thread_typing_icon.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/components/thread_view/thread_view.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/widgets/discuss/discuss.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail/static/src/widgets/form_renderer/form_renderer.scss"/>
-            </xpath>
-        </template>
-
-        <template id="assets_backend_prod_only" name="mail prod only assets" inherit_id="web.assets_backend_prod_only">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/mail/static/src/js/main.js"></script>
-            </xpath>
-        </template>
-
-        <template id="assets_tests" name="Mail Assets Tests" inherit_id="web.assets_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/mail/static/tests/tours/mail_full_composer_test_tour.js"/>
-            </xpath>
-        </template>
-
-        <template id="tests_assets" name="mail_tests_assets" inherit_id="web.tests_assets">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/mail/static/src/env/test_env.js"></script>
-                <script type="text/javascript" src="/mail/static/src/utils/test_utils.js"></script>
-                <script type="text/javascript" src="/mail/static/tests/helpers/mock_models.js"></script>
-                <script type="text/javascript" src="/mail/static/tests/helpers/mock_server.js"></script>
-            </xpath>
-        </template>
-
-        <template id="qunit_suite" name="mail_tests" inherit_id="web.qunit_suite_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/mail/static/tests/chatter_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/tests/mail_utils_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/tests/document_viewer_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/tests/many2one_avatar_user_tests.js"></script>
-                <!-- systray -->
-                <script type="text/javascript" src="/mail/static/tests/systray/systray_activity_menu_tests.js"></script>
-                <!-- tools -->
-                <script type="text/javascript" src="/mail/static/tests/tools/debug_manager_tests.js"></script>>
-                <!-- activity view -->
-                <script type="text/javascript" src="/mail/static/tests/activity_tests.js"></script>
-
-                <script type="text/javascript" src="/mail/static/src/bugfix/bugfix_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/component_hooks/use_store/use_store_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/activity/activity_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/activity_mark_done_popover/activity_mark_done_popover_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/attachment/attachment_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/attachment_box/attachment_box_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/chat_window_manager/chat_window_manager_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/chatter/chatter_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/chatter/chatter_suggested_recipient_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/chatter_topbar/chatter_topbar_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/composer/composer_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/composer_suggestion/composer_suggestion_canned_response_tests.js"/>
-                <script type="text/javascript" src="/mail/static/src/components/composer_suggestion/composer_suggestion_channel_tests.js"/>
-                <script type="text/javascript" src="/mail/static/src/components/composer_suggestion/composer_suggestion_command_tests.js"/>
-                <script type="text/javascript" src="/mail/static/src/components/composer_suggestion/composer_suggestion_partner_tests.js"/>
-                <script type="text/javascript" src="/mail/static/src/components/dialog_manager/dialog_manager_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/discuss/tests/discuss_domain_tests.js"/>
-                <script type="text/javascript" src="/mail/static/src/components/discuss/tests/discuss_inbox_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/discuss/tests/discuss_moderation_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/discuss/tests/discuss_pinned_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/discuss/tests/discuss_sidebar_tests.js"/>
-                <script type="text/javascript" src="/mail/static/src/components/discuss/tests/discuss_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/file_uploader/file_uploader_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/follow_button/follow_button_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/follower/follower_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/follower_list_menu/follower_list_menu_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/follower_subtype/follower_subtype_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/message/message_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/message_seen_indicator/message_seen_indicator_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/messaging_menu/messaging_menu_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/notification_list/notification_list_notification_group_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/notification_list/notification_list_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/partner_im_status_icon/partner_im_status_icon_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/thread_icon/thread_icon_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/thread_needaction_preview/thread_needaction_preview_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/thread_preview/thread_preview_tests.js"/>
-                <script type="text/javascript" src="/mail/static/src/components/thread_textual_typing_status/thread_textual_typing_status_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/components/thread_view/thread_view_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/model/tests/test_models.js"/>
-                <script type="text/javascript" src="/mail/static/src/model/tests/model_field_command/clear_tests.js"/>
-                <script type="text/javascript" src="/mail/static/src/model/tests/model_field_command/create_tests.js"/>
-                <script type="text/javascript" src="/mail/static/src/model/tests/model_field_command/insert_and_replace_tests.js"/>
-                <script type="text/javascript" src="/mail/static/src/model/tests/model_field_command/insert_tests.js"/>
-                <script type="text/javascript" src="/mail/static/src/model/tests/model_field_command/link_tests.js"/>
-                <script type="text/javascript" src="/mail/static/src/model/tests/model_field_command/replace_tests.js"/>
-                <script type="text/javascript" src="/mail/static/src/model/tests/model_field_command/set_tests.js"/>
-                <script type="text/javascript" src="/mail/static/src/model/tests/model_field_command/unlink_all_tests.js"/>
-                <script type="text/javascript" src="/mail/static/src/model/tests/model_field_command/unlink_tests.js"/>
-                <script type="text/javascript" src="/mail/static/src/models/attachment/attachment_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/message/message_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/messaging/messaging_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/models/thread/thread_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/utils/throttle/throttle_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/utils/timer/timer_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/widgets/form_renderer/form_renderer_tests.js"></script>
-                <script type="text/javascript" src="/mail/static/src/widgets/notification_alert/notification_alert_tests.js"/>
-            </xpath>
-        </template>
-
-        <template id="qunit_mobile_suite" name="mail_qunit_mobile_suite" inherit_id="web.qunit_mobile_suite_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection_tests.js"/>
-            </xpath>
-        </template>
-    </data>
-</odoo>
diff --git a/addons/mail_bot/__manifest__.py b/addons/mail_bot/__manifest__.py
index 033ac0b7195..37ecbb6f4f4 100644
--- a/addons/mail_bot/__manifest__.py
+++ b/addons/mail_bot/__manifest__.py
@@ -13,14 +13,28 @@
     'installable': True,
     'application': False,
     'data': [
-        'views/assets.xml',
         'views/res_users_views.xml',
         'data/mailbot_data.xml',
     ],
     'demo': [
         'data/mailbot_demo.xml',
     ],
-    'qweb': [
-        'static/src/bugfix/bugfix.xml',
-    ],
+    'assets': {
+        'web.assets_backend': [
+            'mail_bot/static/src/bugfix/bugfix.js',
+            'mail_bot/static/src/models/messaging_initializer/messaging_initializer.js',
+            'mail_bot/static/src/scss/odoobot_style.scss',
+            'mail_bot/static/src/bugfix/bugfix.scss',
+        ],
+        'web.tests_assets': [
+            'mail_bot/static/tests/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'mail_bot/static/src/bugfix/bugfix_tests.js',
+            'mail_bot/static/src/models/messaging_initializer/messaging_initializer_tests.js',
+        ],
+        'web.assets_qweb': [
+            'mail_bot/static/src/bugfix/bugfix.xml',
+        ],
+    }
 }
diff --git a/addons/mail_bot/views/assets.xml b/addons/mail_bot/views/assets.xml
deleted file mode 100644
index e41f3ed6f03..00000000000
--- a/addons/mail_bot/views/assets.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <template id="assets_backend" name="mailbot assets" inherit_id="web.assets_backend">
-            <xpath expr="script[last()]" position="after">
-                <script type="text/javascript" src="/mail_bot/static/src/bugfix/bugfix.js"></script>
-                <script type="text/javascript" src="/mail_bot/static/src/models/messaging_initializer/messaging_initializer.js"></script>
-            </xpath>
-            <xpath expr="link[last()]" position="after">
-                <link rel="stylesheet" type="text/scss" href="/mail_bot/static/src/scss/odoobot_style.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/mail_bot/static/src/bugfix/bugfix.scss"/>
-            </xpath>
-        </template>
-
-        <template id="tests_assets" name="mail_bot tests assets" inherit_id="web.tests_assets">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/mail_bot/static/tests/helpers/mock_server.js"/>
-            </xpath>
-        </template>
-
-        <template id="qunit_suite" name="mailbot_tests" inherit_id="web.qunit_suite_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/mail_bot/static/src/bugfix/bugfix_tests.js"></script>
-                <script type="text/javascript" src="/mail_bot/static/src/models/messaging_initializer/messaging_initializer_tests.js"></script>
-            </xpath>
-        </template>
-    </data>
-</odoo>
diff --git a/addons/maintenance/__manifest__.py b/addons/maintenance/__manifest__.py
index 3114929c44e..178a3b7833e 100644
--- a/addons/maintenance/__manifest__.py
+++ b/addons/maintenance/__manifest__.py
@@ -16,11 +16,15 @@
         'data/maintenance_data.xml',
         'data/mail_data.xml',
         'views/maintenance_views.xml',
-        'views/maintenance_templates.xml',
         'views/mail_activity_views.xml',
         'data/maintenance_cron.xml',
     ],
     'demo': ['data/maintenance_demo.xml'],
     'installable': True,
     'application': True,
+    'assets': {
+        'web.assets_backend': [
+            'maintenance/static/src/**/*',
+        ],
+    }
 }
diff --git a/addons/maintenance/views/maintenance_templates.xml b/addons/maintenance/views/maintenance_templates.xml
deleted file mode 100644
index b6ca68f323c..00000000000
--- a/addons/maintenance/views/maintenance_templates.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="maintenance assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/maintenance/static/src/scss/maintenance_team_dashboard.scss"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py
index 5565c31a1f4..69ae29f29c0 100644
--- a/addons/mass_mailing/__manifest__.py
+++ b/addons/mass_mailing/__manifest__.py
@@ -47,8 +47,35 @@
     'demo': [
         'data/mass_mailing_demo.xml',
     ],
-    'qweb': [
-        'static/src/xml/*.xml',
-    ],
     'application': True,
+    'assets': {
+        'web.assets_backend': [
+            'mass_mailing/static/src/scss/mass_mailing.scss',
+            'mass_mailing/static/src/scss/mass_mailing_mobile.scss',
+            'mass_mailing/static/src/css/email_template.css',
+            'mass_mailing/static/src/js/mass_mailing.js',
+            'mass_mailing/static/src/js/mass_mailing_widget.js',
+            'mass_mailing/static/src/js/unsubscribe.js',
+        ],
+        'mass_mailing.assets_mail_themes': [
+            'mass_mailing/static/src/scss/themes/**/*',
+        ],
+        'mass_mailing.assets_mail_themes_edition': [
+            ('include', 'web._assets_helpers'),
+            'web/static/lib/bootstrap/scss/_variables.scss',
+            'mass_mailing/static/src/scss/mass_mailing.ui.scss',
+            'web/static/src/scss/webclient.scss',
+        ],
+        'web.assets_common': [
+            'mass_mailing/static/src/js/tours/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'mass_mailing/static/tests/field_html_test.js',
+            'mass_mailing/static/src/js/mass_mailing_snippets.js',
+            'mass_mailing/static/tests/mass_mailing_html_tests.js',
+        ],
+        'web.assets_qweb': [
+            'mass_mailing/static/src/xml/*.xml',
+        ],
+    }
 }
diff --git a/addons/mass_mailing/views/assets.xml b/addons/mass_mailing/views/assets.xml
index 574f0dddc6f..cb93b2e7113 100644
--- a/addons/mass_mailing/views/assets.xml
+++ b/addons/mass_mailing/views/assets.xml
@@ -1,31 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="assets_backend" name="mass_mailing assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/mass_mailing/static/src/scss/mass_mailing.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/mass_mailing/static/src/scss/mass_mailing_mobile.scss"/>
-            <link rel="stylesheet" href="/mass_mailing/static/src/css/email_template.css"/>
-
-            <script type="text/javascript" src="/mass_mailing/static/src/js/mass_mailing.js"></script>
-            <script type="text/javascript" src="/mass_mailing/static/src/js/mass_mailing_widget.js"></script>
-        </xpath>
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/mass_mailing/static/src/js/unsubscribe.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_mail_themes">
-        <link rel="stylesheet" type="text/scss" href="/mass_mailing/static/src/scss/themes/theme_basic.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/mass_mailing/static/src/scss/themes/theme_default.scss"/>
-    </template>
-
-    <template id="assets_mail_themes_edition"> <!-- maybe to remove and convert into a field dumy with attr invisible if the template is not selected -->
-        <t t-call="web._assets_helpers"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/mass_mailing/static/src/scss/mass_mailing.ui.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/webclient.scss"/>
-    </template>
-
     <template id="iframe_css_assets_edit" groups="base.group_user">
         <t t-call-assets="mass_mailing.assets_mail_themes" t-js="false"/>
         <t t-call="mass_mailing.mass_mailing_mail_style"/>
@@ -36,27 +10,7 @@
         <link rel="stylesheet" type="text/scss" href="/mass_mailing/static/src/css/basic_theme_readonly.css"/>
     </template>
 
-    <template id="assets_common" name="Mass Mailing Assets Common" inherit_id="web.assets_common">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javscript" src="/mass_mailing/static/src/js/tours/mass_mailing_tour.js"/>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" inherit_id="web.qunit_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/mass_mailing/static/tests/field_html_test.js"/>
-            <script type="text/javascript" src="/mass_mailing/static/src/js/mass_mailing_snippets.js"/>
-            <script type="text/javascript" src="/mass_mailing/static/tests/mass_mailing_html_tests.js"/>
-        </xpath>
-    </template>
-
     <template id="mass_mailing_mail_style">
-        <!--
-        Reference: https://litmus.com/community/learning/24-how-to-code-a-responsive-email-from-scratch
-        https://www.campaignmonitor.com/css/link-element/link-in-head/
-
-        This template is meant to put inline CSS into an email's head
-        -->
         <style>
             @media screen and (max-width: 768px) {
                 .o_mail_col_mv {
@@ -72,4 +26,5 @@
             }
         </style>
     </template>
-</odoo>
+
+    </odoo>
diff --git a/addons/microsoft_calendar/__manifest__.py b/addons/microsoft_calendar/__manifest__.py
index 54ee5428ce4..959042caaf4 100644
--- a/addons/microsoft_calendar/__manifest__.py
+++ b/addons/microsoft_calendar/__manifest__.py
@@ -7,7 +7,6 @@
     'category': 'Productivity',
     'description': "",
     'depends': ['microsoft_account', 'calendar'],
-    'qweb': ['static/src/xml/*.xml'],
     'data': [
         'data/microsoft_calendar_data.xml',
         'security/ir.model.access.csv',
@@ -15,10 +14,19 @@
         'views/res_config_settings_views.xml',
         'views/res_users_views.xml',
         'views/microsoft_calendar_views.xml',
-        'views/microsoft_calendar_templates.xml',
-    ],
+        ],
     'demo': [],
     'installable': True,
     'auto_install': False,
     'post_init_hook': 'init_initiating_microsoft_uuid',
+    'assets': {
+        'web.assets_backend': [
+            'microsoft_calendar/static/src/js/microsoft_calendar_popover.js',
+            'microsoft_calendar/static/src/js/microsoft_calendar.js',
+            'microsoft_calendar/static/src/scss/microsoft_calendar.scss',
+        ],
+        'web.assets_qweb': [
+            'microsoft_calendar/static/src/xml/*.xml',
+        ],
+    }
 }
diff --git a/addons/microsoft_calendar/views/microsoft_calendar_templates.xml b/addons/microsoft_calendar/views/microsoft_calendar_templates.xml
deleted file mode 100644
index 7b338c22dc0..00000000000
--- a/addons/microsoft_calendar/views/microsoft_calendar_templates.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="microsoft_calendar assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/microsoft_calendar/static/src/js/microsoft_calendar_popover.js"></script>
-            <script type="text/javascript" src="/microsoft_calendar/static/src/js/microsoft_calendar.js"></script>
-        </xpath>
-        <xpath expr="link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/microsoft_calendar/static/src/scss/microsoft_calendar.scss"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/mrp/__manifest__.py b/addons/mrp/__manifest__.py
index 9da53684c4f..29068b416bd 100644
--- a/addons/mrp/__manifest__.py
+++ b/addons/mrp/__manifest__.py
@@ -37,7 +37,6 @@
         'views/mrp_unbuild_views.xml',
         'views/ir_attachment_view.xml',
         'views/res_config_settings_views.xml',
-        'views/assets.xml',
         'views/stock_scrap_views.xml',
         'report/report_deliveryslip.xml',
         'report/mrp_report_views_main.xml',
@@ -47,7 +46,6 @@
         'report/report_stock_rule.xml',
         'report/mrp_zebra_production_templates.xml',
     ],
-    'qweb': ['static/src/xml/*.xml'],
     'demo': [
         'data/mrp_demo.xml',
     ],
@@ -56,4 +54,31 @@
     'pre_init_hook': '_pre_init_mrp',
     'post_init_hook': '_create_warehouse_data',
     'uninstall_hook': 'uninstall_hook',
+    'assets': {
+        'web.assets_backend': [
+            'mrp/static/src/scss/mrp_workorder_kanban.scss',
+            'mrp/static/src/js/mrp.js',
+            'mrp/static/src/js/mrp_bom_report.js',
+            'mrp/static/src/js/mrp_workorder_popover.js',
+            'mrp/static/src/js/mrp_documents_controller_mixin.js',
+            'mrp/static/src/js/mrp_documents_document_viewer.js',
+            'mrp/static/src/js/mrp_documents_kanban_controller.js',
+            'mrp/static/src/js/mrp_documents_kanban_record.js',
+            'mrp/static/src/js/mrp_documents_kanban_renderer.js',
+            'mrp/static/src/js/mrp_document_kanban_view.js',
+            'mrp/static/src/js/mrp_should_consume.js',
+        ],
+        'web.assets_common': [
+            'mrp/static/src/scss/mrp_bom_report.scss',
+            'mrp/static/src/scss/mrp_fields.scss',
+            'mrp/static/src/scss/mrp_gantt.scss',
+            'mrp/static/src/scss/mrp_document_kanban_view.scss',
+        ],
+        'web.qunit_suite_tests': [
+            'mrp/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'mrp/static/src/xml/*.xml',
+        ],
+    }
 }
diff --git a/addons/mrp/views/assets.xml b/addons/mrp/views/assets.xml
deleted file mode 100644
index e3e70ccfad1..00000000000
--- a/addons/mrp/views/assets.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="mrp assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/mrp/static/src/scss/mrp_workorder_kanban.scss" />
-            <script type="text/javascript" src="/mrp/static/src/js/mrp.js"></script>
-            <script type="text/javascript" src="/mrp/static/src/js/mrp_bom_report.js"></script>
-            <script type="text/javascript" src="/mrp/static/src/js/mrp_workorder_popover.js"></script>
-            <script type="text/javascript" src="/mrp/static/src/js/mrp_documents_controller_mixin.js"></script>
-            <script type="text/javascript" src="/mrp/static/src/js/mrp_documents_document_viewer.js"></script>
-            <script type="text/javascript" src="/mrp/static/src/js/mrp_documents_kanban_controller.js"></script>
-            <script type="text/javascript" src="/mrp/static/src/js/mrp_documents_kanban_record.js"></script>
-            <script type="text/javascript" src="/mrp/static/src/js/mrp_documents_kanban_renderer.js"></script>
-            <script type="text/javascript" src="/mrp/static/src/js/mrp_document_kanban_view.js"></script>
-            <script type="text/javascript" src="/mrp/static/src/js/mrp_should_consume.js"></script>
-        </xpath>
-   </template>
-
-    <template id="assets_common" name="mrp bom common assets" inherit_id="web.assets_common">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/mrp/static/src/scss/mrp_bom_report.scss" />
-            <link rel="stylesheet" type="text/scss" href="/mrp/static/src/scss/mrp_fields.scss" />
-            <link rel="stylesheet" type="text/scss" href="/mrp/static/src/scss/mrp_gantt.scss" />
-            <link rel="stylesheet" type="text/scss" href="/mrp/static/src/scss/mrp_document_kanban_view.scss" />
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" inherit_id="web.qunit_suite_tests">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/mrp/static/tests/mrp_tests.js"/>
-            <script type="text/javascript" src="/mrp/static/tests/mrp_document_kanban_tests.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/note/__manifest__.py b/addons/note/__manifest__.py
index f5c8b40467b..90a6e3626b2 100644
--- a/addons/note/__manifest__.py
+++ b/addons/note/__manifest__.py
@@ -19,17 +19,25 @@
         'data/note_data.xml',
         'data/res_users_data.xml',
         'views/note_views.xml',
-        'views/note_templates.xml',
-    ],
+        ],
     'demo': [
         'data/note_demo.xml',
     ],
-    'qweb': [
-        'static/src/xml/systray.xml',
-    ],
     'test': [
     ],
     'installable': True,
     'application': True,
     'auto_install': False,
+    'assets': {
+        'web.assets_backend': [
+            'note/static/src/scss/note.scss',
+            'note/static/src/js/systray_activity_menu.js',
+        ],
+        'web.qunit_suite_tests': [
+            'note/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'note/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/note/views/note_templates.xml b/addons/note/views/note_templates.xml
deleted file mode 100644
index 0076d8f0316..00000000000
--- a/addons/note/views/note_templates.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" inherit_id="web.assets_backend">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/note/static/src/scss/note.scss"/>
-        </xpath>
-        <xpath expr="//script[last()]" position="after">
-             <script type="text/javascript" src="/note/static/src/js/systray_activity_menu.js"></script>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" name="note_tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/note/static/tests/systray_activity_menu_tests.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/pad/__manifest__.py b/addons/pad/__manifest__.py
index b129218e23b..599c98b67e6 100644
--- a/addons/pad/__manifest__.py
+++ b/addons/pad/__manifest__.py
@@ -14,10 +14,20 @@ pads (by default, http://etherpad.com/).
     """,
     'depends': ['web', 'base_setup'],
     'data': [
-        'views/pad.xml',
         'views/res_config_settings_views.xml',
     ],
     'demo': ['data/pad_demo.xml'],
     'web': True,
-    'qweb': ['static/src/xml/pad.xml']
+    'assets': {
+        'web.assets_backend': [
+            'pad/static/src/css/etherpad.css',
+            'pad/static/src/js/pad.js',
+        ],
+        'web.qunit_suite_tests': [
+            'pad/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'pad/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/pad/views/pad.xml b/addons/pad/views/pad.xml
deleted file mode 100644
index 462797d4415..00000000000
--- a/addons/pad/views/pad.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="pad assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" href="/pad/static/src/css/etherpad.css"/>
-            <script type="text/javascript" src="/pad/static/src/js/pad.js" />
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" name="pad tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/pad/static/tests/pad_tests.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/pad_project/__manifest__.py b/addons/pad_project/__manifest__.py
index 142784a1c91..f10cdf221eb 100644
--- a/addons/pad_project/__manifest__.py
+++ b/addons/pad_project/__manifest__.py
@@ -16,7 +16,11 @@ This module adds a PAD in all project form views.
         'views/res_config_settings_views.xml',
         'views/project_views.xml',
         'views/project_portal_templates.xml',
-        'views/project_portal_assets.xml'
-    ],
+        ],
     'auto_install': True,
+    'assets': {
+        'web.assets_frontend': [
+            'pad_project/static/**/*',
+        ],
+    }
 }
diff --git a/addons/pad_project/views/project_portal_assets.xml b/addons/pad_project/views/project_portal_assets.xml
deleted file mode 100644
index ef773412517..00000000000
--- a/addons/pad_project/views/project_portal_assets.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="project_portal_assets_frontend" name="project portal assets" inherit_id="web.assets_frontend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" href="/pad_project/static/src/css/pad_project.css"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/partner_autocomplete/__manifest__.py b/addons/partner_autocomplete/__manifest__.py
index ee45825d709..47505fdb4af 100644
--- a/addons/partner_autocomplete/__manifest__.py
+++ b/addons/partner_autocomplete/__manifest__.py
@@ -16,14 +16,28 @@
     ],
     'data': [
         'security/ir.model.access.csv',
-        'views/partner_autocomplete_assets.xml',
         'views/res_partner_views.xml',
         'views/res_company_views.xml',
         'views/res_config_settings_views.xml',
         'data/cron.xml',
     ],
-    'qweb': [
-        'static/src/xml/partner_autocomplete.xml',
-    ],
     'auto_install': True,
+    'assets': {
+        'web.assets_backend': [
+            'partner_autocomplete/static/src/scss/partner_autocomplete.scss',
+            'partner_autocomplete/static/src/js/partner_autocomplete_core.js',
+            'partner_autocomplete/static/src/js/partner_autocomplete_fieldchar.js',
+            'partner_autocomplete/static/src/js/partner_autocomplete_many2one.js',
+            'partner_autocomplete/static/src/js/web_company_autocomplete.js',
+        ],
+        'web.tests_assets': [
+            'partner_autocomplete/static/lib/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'partner_autocomplete/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'partner_autocomplete/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/partner_autocomplete/views/partner_autocomplete_assets.xml b/addons/partner_autocomplete/views/partner_autocomplete_assets.xml
deleted file mode 100644
index 2e2e9b6936c..00000000000
--- a/addons/partner_autocomplete/views/partner_autocomplete_assets.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="Partner Autocomplete Assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/partner_autocomplete/static/src/scss/partner_autocomplete.scss"/>
-            <script type="text/javascript" src="/partner_autocomplete/static/src/js/partner_autocomplete_core.js" />
-            <script type="text/javascript" src="/partner_autocomplete/static/src/js/partner_autocomplete_fieldchar.js" />
-            <script type="text/javascript" src="/partner_autocomplete/static/src/js/partner_autocomplete_many2one.js" />
-            <script type="text/javascript" src="/partner_autocomplete/static/src/js/web_company_autocomplete.js" />
-        </xpath>
-    </template>
-
-    <template id="tests_assets" inherit_id="web.tests_assets">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/partner_autocomplete/static/lib/jsvat.js"/>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" inherit_id="web.qunit_suite_tests">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/partner_autocomplete/static/tests/partner_autocomplete_tests.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/payment/__manifest__.py b/addons/payment/__manifest__.py
index 81556f7d08c..207d6ff3971 100644
--- a/addons/payment/__manifest__.py
+++ b/addons/payment/__manifest__.py
@@ -13,7 +13,6 @@
         'data/payment_acquirer_data.xml',
         'data/payment_cron.xml',
 
-        'views/assets.xml',
         'views/payment_portal_templates.xml',
         'views/payment_templates.xml',
 
@@ -33,4 +32,18 @@
         'wizards/payment_link_wizard_views.xml',
     ],
     'auto_install': True,
+    'assets': {
+        'web.assets_frontend': [
+            'payment/static/src/scss/portal_payment.scss',
+            'payment/static/src/scss/payment_form.scss',
+            'payment/static/lib/jquery.payment/jquery.payment.js',
+            'payment/static/src/js/checkout_form.js',
+            'payment/static/src/js/manage_form.js',
+            'payment/static/src/js/payment_form_mixin.js',
+            'payment/static/src/js/post_processing.js',
+        ],
+        'web.assets_backend': [
+            'payment/static/src/scss/payment_acquirer.scss',
+        ],
+    }
 }
diff --git a/addons/payment/views/assets.xml b/addons/payment/views/assets.xml
deleted file mode 100644
index ce527c4341f..00000000000
--- a/addons/payment/views/assets.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets_frontend" inherit_id="web.assets_frontend">
-        <xpath expr="link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/payment/static/src/scss/portal_payment.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/payment/static/src/scss/payment_form.scss"/>
-        </xpath>
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/payment/static/lib/jquery.payment/jquery.payment.js"></script>
-            <script type="text/javascript" src="/payment/static/src/js/checkout_form.js"></script>
-            <script type="text/javascript" src="/payment/static/src/js/manage_form.js"></script>
-            <script type="text/javascript" src="/payment/static/src/js/payment_form_mixin.js"></script>
-            <script type="text/javascript" src="/payment/static/src/js/post_processing.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_backend" name="Payment Assets Backend" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet"
-                  type="text/scss"
-                  href="/payment/static/src/scss/payment_acquirer.scss"/>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/addons/payment_adyen/__manifest__.py b/addons/payment_adyen/__manifest__.py
index 87953dc43b5..acca464c070 100644
--- a/addons/payment_adyen/__manifest__.py
+++ b/addons/payment_adyen/__manifest__.py
@@ -9,7 +9,6 @@
     'description': """Adyen Payment Acquirer""",
     'depends': ['payment'],
     'data': [
-        'views/assets.xml',
         'views/payment_adyen_templates.xml',
         'views/payment_views.xml',
         'data/payment_acquirer_data.xml',  # Depends on views/payment_adyen_templates.xml
@@ -17,4 +16,11 @@
     'application': True,
     'post_init_hook': 'create_missing_journals',
     'uninstall_hook': 'uninstall_hook',
+    'assets': {
+        'web.assets_frontend': [
+            'https://checkoutshopper-live.adyen.com/checkoutshopper/sdk/3.9.4/adyen.css',
+            'https://checkoutshopper-live.adyen.com/checkoutshopper/sdk/3.9.4/adyen.js',
+            'payment_adyen/static/src/js/payment_form.js',
+        ],
+    }
 }
diff --git a/addons/payment_adyen/views/assets.xml b/addons/payment_adyen/views/assets.xml
deleted file mode 100644
index e950ba8447e..00000000000
--- a/addons/payment_adyen/views/assets.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets_frontend" inherit_id="web.assets_frontend">
-        <xpath expr="link[last()]" position="after">
-            <link rel="stylesheet"
-                  href="https://checkoutshopper-live.adyen.com/checkoutshopper/sdk/3.9.4/adyen.css"
-                  integrity="sha384-6qrXvoxlnBlrflZQ9g5Yf5oZapUSSXctPxacP9oRcEukbEO7lXisuSyMKG8pDX8V"
-                  crossorigin="anonymous"/>
-        </xpath>
-        <xpath expr="script[last()]" position="after">
-            <script src="https://checkoutshopper-live.adyen.com/checkoutshopper/sdk/3.9.4/adyen.js"
-                    integrity="sha384-/rpftrZptnl7EIuIvqz4PAEehQoysKXmwqUAGyH9lK3WHgcvY0lWj/S5LH7xrbf+"
-                    crossorigin="anonymous"/>
-            <!-- Load after fetching Adyen SDK -->
-            <script type="text/javascript" src="/payment_adyen/static/src/js/payment_form.js"/>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/addons/payment_authorize/__manifest__.py b/addons/payment_authorize/__manifest__.py
index 2c45c3ab757..c1215dbbbae 100644
--- a/addons/payment_authorize/__manifest__.py
+++ b/addons/payment_authorize/__manifest__.py
@@ -9,7 +9,6 @@
     'description': """Authorize.Net Payment Acquirer""",
     'depends': ['payment'],
     'data': [
-        'views/assets.xml',
         'views/payment_views.xml',
         'views/payment_authorize_templates.xml',
         'data/payment_acquirer_data.xml',
@@ -17,4 +16,10 @@
     'application': True,
     'post_init_hook': 'create_missing_journals',
     'uninstall_hook': 'uninstall_hook',
+    'assets': {
+        'web.assets_frontend': [
+            'payment_authorize/static/src/scss/payment_authorize.scss',
+            'payment_authorize/static/src/js/payment_form.js',
+        ],
+    }
 }
diff --git a/addons/payment_authorize/views/assets.xml b/addons/payment_authorize/views/assets.xml
deleted file mode 100644
index cecaa60424d..00000000000
--- a/addons/payment_authorize/views/assets.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets_frontend" inherit_id="web.assets_frontend">
-        <xpath expr="link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/payment_authorize/static/src/scss/payment_authorize.scss"/>
-        </xpath>
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/payment_authorize/static/src/js/payment_form.js"/>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/addons/payment_stripe/__manifest__.py b/addons/payment_stripe/__manifest__.py
index 0b9275d7bad..ba9ec43151a 100644
--- a/addons/payment_stripe/__manifest__.py
+++ b/addons/payment_stripe/__manifest__.py
@@ -9,11 +9,16 @@
     'description': """Stripe Payment Acquirer""",
     'depends': ['payment'],
     'data': [
-        'views/assets.xml',
         'views/payment_views.xml',
         'data/payment_acquirer_data.xml',
     ],
     'application': True,
     'post_init_hook': 'create_missing_journals',
     'uninstall_hook': 'uninstall_hook',
+    'assets': {
+        'web.assets_frontend': [
+            'https://js.stripe.com/v3/',
+            'payment_stripe/static/src/js/payment_form.js',
+        ],
+    }
 }
diff --git a/addons/payment_stripe/views/assets.xml b/addons/payment_stripe/views/assets.xml
deleted file mode 100644
index 29382996a5d..00000000000
--- a/addons/payment_stripe/views/assets.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets_frontend" inherit_id="web.assets_frontend">
-        <xpath expr="script[last()]" position="after">
-            <script src="https://js.stripe.com/v3/"/>
-            <script type="text/javascript" src="/payment_stripe/static/src/js/payment_form.js"/>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/addons/payment_test/__manifest__.py b/addons/payment_test/__manifest__.py
index 66526843420..356c5e48b7b 100644
--- a/addons/payment_test/__manifest__.py
+++ b/addons/payment_test/__manifest__.py
@@ -10,10 +10,14 @@ It should never be used in production environment. Make sure to disable it befor
 """,
     'depends': ['payment'],
     'data': [
-        'views/assets.xml',
         'views/payment_test_templates.xml',
         'data/payment_acquirer_data.xml',
     ],
     'post_init_hook': 'create_missing_journals',
     'uninstall_hook': 'uninstall_hook',
+    'assets': {
+        'web.assets_frontend': [
+            'payment_test/static/src/js/**/*',
+        ],
+    }
 }
diff --git a/addons/payment_test/views/assets.xml b/addons/payment_test/views/assets.xml
deleted file mode 100644
index bfa0a4e875f..00000000000
--- a/addons/payment_test/views/assets.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets_frontend" inherit_id="web.assets_frontend">
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/payment_test/static/src/js/payment_form.js"/>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/addons/point_of_sale/__manifest__.py b/addons/point_of_sale/__manifest__.py
index a317df78906..4bf64ba75a0 100644
--- a/addons/point_of_sale/__manifest__.py
+++ b/addons/point_of_sale/__manifest__.py
@@ -47,80 +47,126 @@
     ],
     'installable': True,
     'application': True,
-    'qweb': [
-        'static/src/xml/Chrome.xml',
-        'static/src/xml/debug_manager.xml',
-        'static/src/xml/Screens/ProductScreen/ProductScreen.xml',
-        'static/src/xml/Screens/ClientListScreen/ClientLine.xml',
-        'static/src/xml/Screens/ClientListScreen/ClientDetailsEdit.xml',
-        'static/src/xml/Screens/ClientListScreen/ClientListScreen.xml',
-        'static/src/xml/Screens/OrderManagementScreen/ControlButtons/InvoiceButton.xml',
-        'static/src/xml/Screens/OrderManagementScreen/ControlButtons/ReprintReceiptButton.xml',
-        'static/src/xml/Screens/OrderManagementScreen/OrderManagementScreen.xml',
-        'static/src/xml/Screens/OrderManagementScreen/MobileOrderManagementScreen.xml',
-        'static/src/xml/Screens/OrderManagementScreen/OrderManagementControlPanel.xml',
-        'static/src/xml/Screens/OrderManagementScreen/OrderList.xml',
-        'static/src/xml/Screens/OrderManagementScreen/OrderRow.xml',
-        'static/src/xml/Screens/OrderManagementScreen/OrderDetails.xml',
-        'static/src/xml/Screens/OrderManagementScreen/OrderlineDetails.xml',
-        'static/src/xml/Screens/OrderManagementScreen/ReprintReceiptScreen.xml',
-        'static/src/xml/Screens/TicketScreen/TicketScreen.xml',
-        'static/src/xml/Screens/PaymentScreen/PSNumpadInputButton.xml',
-        'static/src/xml/Screens/PaymentScreen/PaymentScreenNumpad.xml',
-        'static/src/xml/Screens/PaymentScreen/PaymentScreenElectronicPayment.xml',
-        'static/src/xml/Screens/PaymentScreen/PaymentScreenPaymentLines.xml',
-        'static/src/xml/Screens/PaymentScreen/PaymentScreenStatus.xml',
-        'static/src/xml/Screens/PaymentScreen/PaymentMethodButton.xml',
-        'static/src/xml/Screens/PaymentScreen/PaymentScreen.xml',
-        'static/src/xml/Screens/ProductScreen/Orderline.xml',
-        'static/src/xml/Screens/ProductScreen/OrderSummary.xml',
-        'static/src/xml/Screens/ProductScreen/OrderWidget.xml',
-        'static/src/xml/Screens/ProductScreen/NumpadWidget.xml',
-        'static/src/xml/Screens/ProductScreen/ActionpadWidget.xml',
-        'static/src/xml/Screens/ProductScreen/CategoryBreadcrumb.xml',
-        'static/src/xml/Screens/ProductScreen/CategoryButton.xml',
-        'static/src/xml/Screens/ProductScreen/CategorySimpleButton.xml',
-        'static/src/xml/Screens/ProductScreen/HomeCategoryBreadcrumb.xml',
-        'static/src/xml/Screens/ProductScreen/ProductsWidgetControlPanel.xml',
-        'static/src/xml/Screens/ProductScreen/ProductItem.xml',
-        'static/src/xml/Screens/ProductScreen/ProductList.xml',
-        'static/src/xml/Screens/ProductScreen/ProductsWidget.xml',
-        'static/src/xml/Screens/ReceiptScreen/WrappedProductNameLines.xml',
-        'static/src/xml/Screens/ReceiptScreen/OrderReceipt.xml',
-        'static/src/xml/Screens/ReceiptScreen/ReceiptScreen.xml',
-        'static/src/xml/Screens/ScaleScreen/ScaleScreen.xml',
-        'static/src/xml/ChromeWidgets/CashierName.xml',
-        'static/src/xml/ChromeWidgets/ProxyStatus.xml',
-        'static/src/xml/ChromeWidgets/SyncNotification.xml',
-        'static/src/xml/ChromeWidgets/OrderManagementButton.xml',
-        'static/src/xml/ChromeWidgets/HeaderButton.xml',
-        'static/src/xml/ChromeWidgets/SaleDetailsButton.xml',
-        'static/src/xml/ChromeWidgets/TicketButton.xml',
-        'static/src/xml/CustomerFacingDisplay/CustomerFacingDisplayOrder.xml',
-        'static/src/xml/SaleDetailsReport.xml',
-        'static/src/xml/Misc/Draggable.xml',
-        'static/src/xml/Misc/NotificationSound.xml',
-        'static/src/xml/Misc/SearchBar.xml',
-        'static/src/xml/ChromeWidgets/DebugWidget.xml',
-        'static/src/xml/Popups/ErrorPopup.xml',
-        'static/src/xml/Popups/ErrorBarcodePopup.xml',
-        'static/src/xml/Popups/ConfirmPopup.xml',
-        'static/src/xml/Popups/TextInputPopup.xml',
-        'static/src/xml/Popups/TextAreaPopup.xml',
-        'static/src/xml/Popups/ErrorTracebackPopup.xml',
-        'static/src/xml/Popups/SelectionPopup.xml',
-        'static/src/xml/Popups/EditListInput.xml',
-        'static/src/xml/Popups/EditListPopup.xml',
-        'static/src/xml/Popups/NumberPopup.xml',
-        'static/src/xml/Popups/OfflineErrorPopup.xml',
-        'static/src/xml/Popups/OrderImportPopup.xml',
-        'static/src/xml/Popups/ProductConfiguratorPopup.xml',
-        'static/src/xml/Popups/CashOpeningPopup.xml',
-        'static/src/xml/Screens/ProductScreen/ControlButtons/SetPricelistButton.xml',
-        'static/src/xml/Screens/ProductScreen/ControlButtons/SetFiscalPositionButton.xml',
-        'static/src/xml/ChromeWidgets/ClientScreenButton.xml',
-        'static/src/xml/Misc/MobileOrderWidget.xml',
-        'static/src/xml/Notification.xml',
-    ],
     'website': 'https://www.odoo.com/page/point-of-sale-shop',
+    'assets': {
+        'web.assets_tests': [
+            'point_of_sale/static/tests/tours/**/*',
+        ],
+        'point_of_sale.assets': [
+            'web/static/src/scss/fonts.scss',
+            'web/static/lib/fontawesome/css/font-awesome.css',
+            'point_of_sale/static/src/css/pos.css',
+            'point_of_sale/static/src/css/keyboard.css',
+            'point_of_sale/static/src/css/pos_receipts.css',
+            'web/static/src/scss/fontawesome_overridden.scss',
+            'point_of_sale/static/lib/html2canvas.js',
+            'point_of_sale/static/lib/backbone/backbone.js',
+            'point_of_sale/static/lib/waitfont.js',
+            'point_of_sale/static/lib/sha1.js',
+            'point_of_sale/static/src/js/utils.js',
+            'point_of_sale/static/src/js/ClassRegistry.js',
+            'point_of_sale/static/src/js/PosComponent.js',
+            'point_of_sale/static/src/js/PosContext.js',
+            'point_of_sale/static/src/js/ComponentRegistry.js',
+            'point_of_sale/static/src/js/Registries.js',
+            'point_of_sale/static/src/js/db.js',
+            'point_of_sale/static/src/js/models.js',
+            'point_of_sale/static/src/js/keyboard.js',
+            'point_of_sale/static/src/js/barcode_reader.js',
+            'point_of_sale/static/src/js/printers.js',
+            'point_of_sale/static/src/js/Gui.js',
+            'point_of_sale/static/src/js/PopupControllerMixin.js',
+            'point_of_sale/static/src/js/ControlButtonsMixin.js',
+            'point_of_sale/static/src/js/Chrome.js',
+            'point_of_sale/static/src/js/devices.js',
+            'point_of_sale/static/src/js/payment.js',
+            'point_of_sale/static/src/js/custom_hooks.js',
+            'point_of_sale/static/src/js/Screens/ProductScreen/ProductScreen.js',
+            'point_of_sale/static/src/js/Screens/ClientListScreen/ClientLine.js',
+            'point_of_sale/static/src/js/Screens/ClientListScreen/ClientDetailsEdit.js',
+            'point_of_sale/static/src/js/Screens/ClientListScreen/ClientListScreen.js',
+            'point_of_sale/static/src/js/Screens/OrderManagementScreen/ControlButtons/InvoiceButton.js',
+            'point_of_sale/static/src/js/Screens/OrderManagementScreen/ControlButtons/ReprintReceiptButton.js',
+            'point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderFetcher.js',
+            'point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderManagementScreen.js',
+            'point_of_sale/static/src/js/Screens/OrderManagementScreen/MobileOrderManagementScreen.js',
+            'point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderManagementControlPanel.js',
+            'point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderList.js',
+            'point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderRow.js',
+            'point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderDetails.js',
+            'point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderlineDetails.js',
+            'point_of_sale/static/src/js/Screens/OrderManagementScreen/ReprintReceiptScreen.js',
+            'point_of_sale/static/src/js/Screens/TicketScreen/TicketScreen.js',
+            'point_of_sale/static/src/js/Screens/PaymentScreen/PSNumpadInputButton.js',
+            'point_of_sale/static/src/js/Screens/PaymentScreen/PaymentScreenNumpad.js',
+            'point_of_sale/static/src/js/Screens/PaymentScreen/PaymentScreenElectronicPayment.js',
+            'point_of_sale/static/src/js/Screens/PaymentScreen/PaymentScreenPaymentLines.js',
+            'point_of_sale/static/src/js/Screens/PaymentScreen/PaymentScreenStatus.js',
+            'point_of_sale/static/src/js/Screens/PaymentScreen/PaymentMethodButton.js',
+            'point_of_sale/static/src/js/Screens/PaymentScreen/PaymentScreen.js',
+            'point_of_sale/static/src/js/Screens/ProductScreen/Orderline.js',
+            'point_of_sale/static/src/js/Screens/ProductScreen/OrderSummary.js',
+            'point_of_sale/static/src/js/Screens/ProductScreen/OrderWidget.js',
+            'point_of_sale/static/src/js/Screens/ProductScreen/NumpadWidget.js',
+            'point_of_sale/static/src/js/Screens/ProductScreen/ActionpadWidget.js',
+            'point_of_sale/static/src/js/Screens/ProductScreen/CategoryBreadcrumb.js',
+            'point_of_sale/static/src/js/Screens/ProductScreen/CategoryButton.js',
+            'point_of_sale/static/src/js/Screens/ProductScreen/CategorySimpleButton.js',
+            'point_of_sale/static/src/js/Screens/ProductScreen/HomeCategoryBreadcrumb.js',
+            'point_of_sale/static/src/js/Screens/ProductScreen/ProductsWidgetControlPanel.js',
+            'point_of_sale/static/src/js/Screens/ProductScreen/ProductItem.js',
+            'point_of_sale/static/src/js/Screens/ProductScreen/ProductList.js',
+            'point_of_sale/static/src/js/Screens/ProductScreen/ProductsWidget.js',
+            'point_of_sale/static/src/js/Screens/ReceiptScreen/WrappedProductNameLines.js',
+            'point_of_sale/static/src/js/Screens/ReceiptScreen/OrderReceipt.js',
+            'point_of_sale/static/src/js/Screens/ReceiptScreen/ReceiptScreen.js',
+            'point_of_sale/static/src/js/Screens/ScaleScreen/ScaleScreen.js',
+            'point_of_sale/static/src/js/ChromeWidgets/CashierName.js',
+            'point_of_sale/static/src/js/ChromeWidgets/ProxyStatus.js',
+            'point_of_sale/static/src/js/ChromeWidgets/SyncNotification.js',
+            'point_of_sale/static/src/js/ChromeWidgets/OrderManagementButton.js',
+            'point_of_sale/static/src/js/ChromeWidgets/HeaderButton.js',
+            'point_of_sale/static/src/js/ChromeWidgets/SaleDetailsButton.js',
+            'point_of_sale/static/src/js/ChromeWidgets/TicketButton.js',
+            'point_of_sale/static/src/js/Misc/Draggable.js',
+            'point_of_sale/static/src/js/Misc/NotificationSound.js',
+            'point_of_sale/static/src/js/Misc/IndependentToOrderScreen.js',
+            'point_of_sale/static/src/js/Misc/AbstractReceiptScreen.js',
+            'point_of_sale/static/src/js/Misc/SearchBar.js',
+            'point_of_sale/static/src/js/ChromeWidgets/DebugWidget.js',
+            'point_of_sale/static/src/js/Popups/AbstractAwaitablePopup.js',
+            'point_of_sale/static/src/js/Popups/ErrorPopup.js',
+            'point_of_sale/static/src/js/Popups/ErrorBarcodePopup.js',
+            'point_of_sale/static/src/js/Popups/ConfirmPopup.js',
+            'point_of_sale/static/src/js/Popups/TextInputPopup.js',
+            'point_of_sale/static/src/js/Popups/TextAreaPopup.js',
+            'point_of_sale/static/src/js/Popups/ErrorTracebackPopup.js',
+            'point_of_sale/static/src/js/Popups/SelectionPopup.js',
+            'point_of_sale/static/src/js/Popups/EditListInput.js',
+            'point_of_sale/static/src/js/Popups/EditListPopup.js',
+            'point_of_sale/static/src/js/Popups/NumberPopup.js',
+            'point_of_sale/static/src/js/Popups/OfflineErrorPopup.js',
+            'point_of_sale/static/src/js/Popups/OrderImportPopup.js',
+            'point_of_sale/static/src/js/Popups/ProductConfiguratorPopup.js',
+            'point_of_sale/static/src/js/Popups/CashOpeningPopup.js',
+            'point_of_sale/static/src/js/Screens/ProductScreen/ControlButtons/SetPricelistButton.js',
+            'point_of_sale/static/src/js/Screens/ProductScreen/ControlButtons/SetFiscalPositionButton.js',
+            'point_of_sale/static/src/js/ChromeWidgets/ClientScreenButton.js',
+            'point_of_sale/static/src/js/Misc/NumberBuffer.js',
+            'point_of_sale/static/src/js/Misc/MobileOrderWidget.js',
+            'point_of_sale/static/src/js/Notification.js',
+        ],
+        'web.assets_backend': [
+            'point_of_sale/static/src/scss/pos_dashboard.scss',
+            'point_of_sale/static/src/js/tours/point_of_sale.js',
+            'point_of_sale/static/src/js/debug_manager.js',
+            'point_of_sale/static/src/js/web_overrides/pos_config_form.js',
+        ],
+        'point_of_sale.pos_assets_backend': [
+            ('include', 'web.assets_backend'),
+        ],
+        'web.assets_qweb': [
+            'point_of_sale/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/point_of_sale/views/pos_assets_common.xml b/addons/point_of_sale/views/pos_assets_common.xml
index 102f97e2489..a1d14a64081 100644
--- a/addons/point_of_sale/views/pos_assets_common.xml
+++ b/addons/point_of_sale/views/pos_assets_common.xml
@@ -1,124 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="point_of_sale.assets" name="point_of_sale assets">
-    <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/fonts.scss"/>
-    <link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css"/>
-    <link rel="stylesheet" href="/point_of_sale/static/src/css/pos.css"/>
-    <link rel="stylesheet" href="/point_of_sale/static/src/css/keyboard.css"/>
-    <link rel="stylesheet" href="/point_of_sale/static/src/css/pos_receipts.css"/>
-    <link rel="stylesheet" type="text/less" href="/web/static/src/scss/fontawesome_overridden.scss"/>
-
-    <script type="text/javascript" src="/point_of_sale/static/lib/html2canvas.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/lib/backbone/backbone.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/lib/waitfont.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/lib/sha1.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/utils.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/ClassRegistry.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/PosComponent.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/PosContext.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/ComponentRegistry.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Registries.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/db.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/models.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/keyboard.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/barcode_reader.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/printers.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Gui.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/PopupControllerMixin.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/ControlButtonsMixin.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Chrome.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/devices.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/payment.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/custom_hooks.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ProductScreen/ProductScreen.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ClientListScreen/ClientLine.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ClientListScreen/ClientDetailsEdit.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ClientListScreen/ClientListScreen.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/OrderManagementScreen/ControlButtons/InvoiceButton.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/OrderManagementScreen/ControlButtons/ReprintReceiptButton.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderFetcher.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderManagementScreen.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/OrderManagementScreen/MobileOrderManagementScreen.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderManagementControlPanel.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderList.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderRow.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderDetails.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderlineDetails.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/OrderManagementScreen/ReprintReceiptScreen.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/TicketScreen/TicketScreen.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/PaymentScreen/PSNumpadInputButton.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/PaymentScreen/PaymentScreenNumpad.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/PaymentScreen/PaymentScreenElectronicPayment.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/PaymentScreen/PaymentScreenPaymentLines.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/PaymentScreen/PaymentScreenStatus.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/PaymentScreen/PaymentMethodButton.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/PaymentScreen/PaymentScreen.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ProductScreen/Orderline.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ProductScreen/OrderSummary.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ProductScreen/OrderWidget.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ProductScreen/NumpadWidget.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ProductScreen/ActionpadWidget.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ProductScreen/CategoryBreadcrumb.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ProductScreen/CategoryButton.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ProductScreen/CategorySimpleButton.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ProductScreen/HomeCategoryBreadcrumb.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ProductScreen/ProductsWidgetControlPanel.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ProductScreen/ProductItem.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ProductScreen/ProductList.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ProductScreen/ProductsWidget.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ReceiptScreen/WrappedProductNameLines.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ReceiptScreen/OrderReceipt.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ReceiptScreen/ReceiptScreen.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ScaleScreen/ScaleScreen.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/ChromeWidgets/CashierName.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/ChromeWidgets/ProxyStatus.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/ChromeWidgets/SyncNotification.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/ChromeWidgets/OrderManagementButton.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/ChromeWidgets/HeaderButton.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/ChromeWidgets/SaleDetailsButton.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/ChromeWidgets/TicketButton.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Misc/Draggable.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Misc/NotificationSound.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Misc/IndependentToOrderScreen.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Misc/AbstractReceiptScreen.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Misc/SearchBar.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/ChromeWidgets/DebugWidget.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Popups/AbstractAwaitablePopup.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Popups/ErrorPopup.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Popups/ErrorBarcodePopup.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Popups/ConfirmPopup.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Popups/TextInputPopup.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Popups/TextAreaPopup.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Popups/ErrorTracebackPopup.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Popups/SelectionPopup.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Popups/EditListInput.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Popups/EditListPopup.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Popups/NumberPopup.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Popups/OfflineErrorPopup.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Popups/OrderImportPopup.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Popups/ProductConfiguratorPopup.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Popups/CashOpeningPopup.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ProductScreen/ControlButtons/SetPricelistButton.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Screens/ProductScreen/ControlButtons/SetFiscalPositionButton.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/ChromeWidgets/ClientScreenButton.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Misc/NumberBuffer.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Misc/MobileOrderWidget.js"></script>
-    <script type="text/javascript" src="/point_of_sale/static/src/js/Notification.js"></script>
-</template>
-
-<template id="point_of_sale.assets_backend" name="hr assets" inherit_id="web.assets_backend">
-    <xpath expr="." position="inside">
-        <link rel="stylesheet" type="text/scss" href="/point_of_sale/static/src/scss/pos_dashboard.scss"/>
-        <script type="text/javascript" src="/point_of_sale/static/src/js/tours/point_of_sale.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/src/js/debug_manager.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/src/js/web_overrides/pos_config_form.js"></script>
-    </xpath>
-</template>
-
-<template id="point_of_sale.pos_assets_backend" name="POS UI Backend Assets" inherit_id="web.assets_backend" primary="True">
-</template>
-
 <template id="point_of_sale.assets_common" name="POS Assets Common">
     <t t-call-assets="point_of_sale.assets" t-js="false" />
     <t t-call-assets="web.assets_common" t-css="false" />
diff --git a/addons/point_of_sale/views/pos_assets_index.xml b/addons/point_of_sale/views/pos_assets_index.xml
index 6143bd2f98c..97ed1d4287b 100644
--- a/addons/point_of_sale/views/pos_assets_index.xml
+++ b/addons/point_of_sale/views/pos_assets_index.xml
@@ -2,32 +2,6 @@
 <odoo>
 
 <!-- This contains the tour assets. They are included during testing. -->
-<template id="assets_tests" name="Point Of Sale Assets Tests" inherit_id="web.assets_tests">
-    <xpath expr="." position="inside">
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/helpers/utils.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/helpers/ProductScreenTourMethods.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/helpers/TicketScreenTourMethods.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/helpers/PaymentScreenTourMethods.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/helpers/ProductConfiguratorTourMethods.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/helpers/OrderManagementScreenTourMethods.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/helpers/ClientListScreenTourMethods.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/helpers/ReceiptScreenTourMethods.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/helpers/ChromeTourMethods.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/helpers/NumberPopupTourMethods.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/helpers/ErrorPopupTourMethods.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/helpers/SelectionPopupTourMethods.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/helpers/CompositeTourMethods.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/point_of_sale.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/ProductScreen.tour.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/PaymentScreen.tour.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/ProductConfigurator.tour.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/OrderManagementScreen.tour.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/ReceiptScreen.tour.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/Chrome.tour.js"></script>
-        <script type="text/javascript" src="/point_of_sale/static/tests/tours/TicketScreen.tour.js"></script>
-    </xpath>
-</template>
-
 <template id="point_of_sale.index" name="POS Index">&lt;!DOCTYPE html&gt;
 <html>
     <head>
@@ -58,7 +32,6 @@
                 'login_number': login_number,
                 'debug': debug,
             })"/>;
-            odoo._modules = <t t-raw="get_modules_order()"/>;
         </script>
 
         <t t-call="point_of_sale.assets_common"/>
diff --git a/addons/point_of_sale/views/pos_assets_qunit.xml b/addons/point_of_sale/views/pos_assets_qunit.xml
index cad10a2ee11..e58b3059460 100644
--- a/addons/point_of_sale/views/pos_assets_qunit.xml
+++ b/addons/point_of_sale/views/pos_assets_qunit.xml
@@ -69,7 +69,6 @@
                     'session_info': session_info,
                     'debug': debug,
                 })"/>;
-                odoo._modules = <t t-raw="get_modules_order()"/>;
             </script>
 
             <t t-call="point_of_sale.assets_common" />
diff --git a/addons/portal/__manifest__.py b/addons/portal/__manifest__.py
index 30a5b4521f6..fabfe0eb8f5 100644
--- a/addons/portal/__manifest__.py
+++ b/addons/portal/__manifest__.py
@@ -20,13 +20,32 @@ a dependency towards website editing and customization capabilities.""",
         'security/ir.model.access.csv',
         'data/mail_template_data.xml',
         'data/mail_templates.xml',
-        'views/assets.xml',
         'views/portal_templates.xml',
         'wizard/portal_share_views.xml',
         'wizard/portal_wizard_views.xml',
     ],
-    'qweb': [
-        'static/src/xml/portal_chatter.xml',
-        'static/src/xml/portal_signature.xml',
-    ],
+    'assets': {
+        'web._assets_primary_variables': [
+            'portal/static/src/scss/primary_variables.scss',
+        ],
+        'web._assets_frontend_helpers': [
+            ('prepend', 'portal/static/src/scss/bootstrap_overridden.scss'),
+        ],
+        'web.assets_frontend': [
+            'portal/static/src/scss/bootstrap.extend.scss',
+            'portal/static/src/scss/portal.scss',
+            'portal/static/src/js/portal.js',
+            'portal/static/src/js/portal_chatter.js',
+            'portal/static/src/js/portal_composer.js',
+            'portal/static/src/js/portal_signature.js',
+            'portal/static/src/js/portal_sidebar.js',
+        ],
+        'web.assets_tests': [
+            'portal/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'portal/static/src/xml/portal_chatter.xml',
+            'portal/static/src/xml/portal_signature.xml',
+        ],
+    }
 }
diff --git a/addons/portal/views/assets.xml b/addons/portal/views/assets.xml
deleted file mode 100644
index 7c88c987202..00000000000
--- a/addons/portal/views/assets.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="_assets_primary_variables" inherit_id="web._assets_primary_variables">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/portal/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-    <template id="_assets_frontend_helpers" inherit_id="web_editor._assets_frontend_helpers">
-        <xpath expr="//link" position="before">
-            <link rel="stylesheet" type="text/scss" href="/portal/static/src/scss/bootstrap_overridden.scss"/>
-        </xpath>
-    </template>
-
-    <template id="assets_frontend" inherit_id="web_editor.assets_frontend" name="Portal Assets">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/portal/static/src/scss/bootstrap.extend.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/portal/static/src/scss/portal.scss"/>
-        </xpath>
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/portal/static/src/js/portal.js"></script>
-            <script type="text/javascript" src="/portal/static/src/js/portal_chatter.js"></script>
-            <script type="text/javascript" src="/portal/static/src/js/portal_composer.js"></script>
-            <script type="text/javascript" src="/portal/static/src/js/portal_signature.js"></script>
-            <script type="text/javascript" src="/portal/static/src/js/portal_sidebar.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_tests" name="Portal Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/portal/static/tests/tours/portal.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/portal_rating/__manifest__.py b/addons/portal_rating/__manifest__.py
index 273f594dad6..925b34da39f 100644
--- a/addons/portal_rating/__manifest__.py
+++ b/addons/portal_rating/__manifest__.py
@@ -14,10 +14,17 @@ inclusion of rating directly within the customer portal discuss widget.
         'rating',
     ],
     'data': [
-        'views/assets.xml',
         'views/rating_views.xml',
         'views/portal_templates.xml',
         'views/rating_templates.xml',
     ],
     'auto_install': True,
+    'assets': {
+        'web.assets_frontend': [
+            'portal_rating/static/src/scss/portal_rating.scss',
+            'portal_rating/static/src/js/portal_chatter.js',
+            'portal_rating/static/src/js/portal_composer.js',
+            'portal_rating/static/src/js/portal_rating_composer.js',
+        ],
+    }
 }
diff --git a/addons/portal_rating/views/assets.xml b/addons/portal_rating/views/assets.xml
deleted file mode 100644
index d962bea4e6d..00000000000
--- a/addons/portal_rating/views/assets.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_frontend" inherit_id="web_editor.assets_frontend" name="Portal Rating Assets">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/portal_rating/static/src/scss/portal_rating.scss"/>
-        </xpath>
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/portal_rating/static/src/js/portal_chatter.js"></script>
-            <script type="text/javascript" src="/portal_rating/static/src/js/portal_composer.js"></script>
-            <script type="text/javascript" src="/portal_rating/static/src/js/portal_rating_composer.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/pos_adyen/__manifest__.py b/addons/pos_adyen/__manifest__.py
index d34a34d5b47..51fb9d2d2fa 100644
--- a/addons/pos_adyen/__manifest__.py
+++ b/addons/pos_adyen/__manifest__.py
@@ -12,10 +12,13 @@
         'views/adyen_account_views.xml',
         'views/pos_config_views.xml',
         'views/pos_payment_method_views.xml',
-        'views/point_of_sale_assets.xml',
         'views/res_config_settings_views.xml',
     ],
     'depends': ['adyen_platforms', 'point_of_sale'],
-    'qweb': ['static/src/xml/pos.xml'],
     'installable': True,
+    'assets': {
+        'point_of_sale.assets': [
+            'pos_adyen/static/**/*',
+        ],
+    }
 }
diff --git a/addons/pos_adyen/views/point_of_sale_assets.xml b/addons/pos_adyen/views/point_of_sale_assets.xml
deleted file mode 100644
index bd738dcfccc..00000000000
--- a/addons/pos_adyen/views/point_of_sale_assets.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets" inherit_id="point_of_sale.assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/pos_adyen/static/src/js/payment_adyen.js"></script>
-            <script type="text/javascript" src="/pos_adyen/static/src/js/models.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/pos_cache/__manifest__.py b/addons/pos_cache/__manifest__.py
index 6eb3b050b6f..4fe30d7fc7b 100644
--- a/addons/pos_cache/__manifest__.py
+++ b/addons/pos_cache/__manifest__.py
@@ -17,6 +17,10 @@ time it takes to load a POS session with a lot of products.
         'data/pos_cache_data.xml',
         'security/ir.model.access.csv',
         'views/pos_cache_views.xml',
-        'views/pos_cache_templates.xml',
-    ]
+        ],
+    'assets': {
+        'point_of_sale.assets': [
+            'pos_cache/static/**/*',
+        ],
+    }
 }
diff --git a/addons/pos_cache/views/pos_cache_templates.xml b/addons/pos_cache/views/pos_cache_templates.xml
deleted file mode 100644
index 6866bd2a24f..00000000000
--- a/addons/pos_cache/views/pos_cache_templates.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <template id="assets" inherit_id="point_of_sale.assets">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/pos_cache/static/src/js/pos_cache.js"></script>
-            </xpath>
-        </template>
-    </data>
-</odoo>
diff --git a/addons/pos_coupon/__manifest__.py b/addons/pos_coupon/__manifest__.py
index d2f1d7aca01..f06eba79b7b 100644
--- a/addons/pos_coupon/__manifest__.py
+++ b/addons/pos_coupon/__manifest__.py
@@ -17,17 +17,27 @@
         "views/coupon_program_views.xml",
         "views/pos_config_views.xml",
         "views/res_config_settings_views.xml",
-        "views/assets_common.xml",
-    ],
+        ],
     "demo": [
         "demo/pos_coupon_demo.xml",
     ],
-    "qweb": [
-        "static/src/xml/ControlButtons/PromoCodeButton.xml",
-        "static/src/xml/ControlButtons/ResetProgramsButton.xml",
-        "static/src/xml/ActivePrograms.xml",
-        "static/src/xml/OrderReceipt.xml",
-        "static/src/xml/OrderWidget.xml",
-    ],
     "installable": True,
+    'assets': {
+        'point_of_sale.assets': [
+            'pos_coupon/static/src/css/coupon.css',
+            'pos_coupon/static/src/js/coupon.js',
+            'pos_coupon/static/src/js/Orderline.js',
+            'pos_coupon/static/src/js/PaymentScreen.js',
+            'pos_coupon/static/src/js/ProductScreen.js',
+            'pos_coupon/static/src/js/ActivePrograms.js',
+            'pos_coupon/static/src/js/ControlButtons/PromoCodeButton.js',
+            'pos_coupon/static/src/js/ControlButtons/ResetProgramsButton.js',
+        ],
+        'web.assets_tests': [
+            'pos_coupon/static/src/js/tours/**/*',
+        ],
+        'web.assets_qweb': [
+            'pos_coupon/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/pos_coupon/views/assets_common.xml b/addons/pos_coupon/views/assets_common.xml
deleted file mode 100644
index 73118825ea9..00000000000
--- a/addons/pos_coupon/views/assets_common.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <template id="assets" inherit_id="point_of_sale.assets">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" href="/pos_coupon/static/src/css/coupon.css"/>
-            <script type="text/javascript" src="/pos_coupon/static/src/js/coupon.js"></script>
-            <script type="text/javascript" src="/pos_coupon/static/src/js/Orderline.js"></script>
-            <script type="text/javascript" src="/pos_coupon/static/src/js/PaymentScreen.js"></script>
-            <script type="text/javascript" src="/pos_coupon/static/src/js/ProductScreen.js"></script>
-            <script type="text/javascript" src="/pos_coupon/static/src/js/ActivePrograms.js"></script>
-            <script type="text/javascript" src="/pos_coupon/static/src/js/ControlButtons/PromoCodeButton.js"></script>
-            <script type="text/javascript" src="/pos_coupon/static/src/js/ControlButtons/ResetProgramsButton.js"></script>
-        </xpath>
-    </template>
-    <template id="pos_coupon.assets_tests" name="POS Coupon Test Assets" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/pos_coupon/static/src/js/tours/PosCouponTourMethods.js"></script>
-            <script type="text/javascript" src="/pos_coupon/static/src/js/tours/PosCoupon1.tour.js"></script>
-            <script type="text/javascript" src="/pos_coupon/static/src/js/tours/PosCoupon2.tour.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/pos_discount/__manifest__.py b/addons/pos_discount/__manifest__.py
index bc002def931..71009ae45e8 100644
--- a/addons/pos_discount/__manifest__.py
+++ b/addons/pos_discount/__manifest__.py
@@ -17,10 +17,14 @@ discount to a customer.
     'depends': ['point_of_sale'],
     'data': [
         'views/pos_discount_views.xml',
-        'views/pos_discount_templates.xml'
-    ],
-    'qweb': [
-        'static/src/xml/DiscountButton.xml',
-    ],
+        ],
     'installable': True,
+    'assets': {
+        'point_of_sale.assets': [
+            'pos_discount/static/src/js/**/*',
+        ],
+        'web.assets_qweb': [
+            'pos_discount/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/pos_discount/views/pos_discount_templates.xml b/addons/pos_discount/views/pos_discount_templates.xml
deleted file mode 100644
index 711be66f306..00000000000
--- a/addons/pos_discount/views/pos_discount_templates.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-        <template id="assets" inherit_id="point_of_sale.assets">
-          <xpath expr="." position="inside">
-              <script type="text/javascript" src="/pos_discount/static/src/js/DiscountButton.js"></script>
-              <script type="text/javascript" src="/pos_discount/static/src/js/models.js"></script>
-          </xpath>
-        </template>
-
-</odoo>
diff --git a/addons/pos_epson_printer/__manifest__.py b/addons/pos_epson_printer/__manifest__.py
index c4093d17498..7feaa692330 100644
--- a/addons/pos_epson_printer/__manifest__.py
+++ b/addons/pos_epson_printer/__manifest__.py
@@ -14,12 +14,16 @@ Use Epson ePOS Printers without the IoT Box in the Point of Sale
 """,
     'depends': ['point_of_sale'],
     'data': [
-        'views/point_of_sale_assets.xml',
         'views/pos_config_views.xml',
     ],
-    'qweb': [
-        'static/src/xml/epos_templates.xml'
-    ],
     'installable': True,
     'auto_install': True,
+    'assets': {
+        'point_of_sale.assets': [
+            'pos_epson_printer/static/src/js/**/*',
+        ],
+        'web.assets_qweb': [
+            'pos_epson_printer/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/pos_epson_printer/views/point_of_sale_assets.xml b/addons/pos_epson_printer/views/point_of_sale_assets.xml
deleted file mode 100644
index 3af9f46425f..00000000000
--- a/addons/pos_epson_printer/views/point_of_sale_assets.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets" inherit_id="point_of_sale.assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/pos_epson_printer/static/src/js/pos_epson_printer.js"></script>
-            <script type="text/javascript" src="/pos_epson_printer/static/src/js/printers.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/pos_epson_printer_restaurant/__manifest__.py b/addons/pos_epson_printer_restaurant/__manifest__.py
index 79ecbcf325f..6a1c12097f4 100644
--- a/addons/pos_epson_printer_restaurant/__manifest__.py
+++ b/addons/pos_epson_printer_restaurant/__manifest__.py
@@ -14,9 +14,13 @@ Use Epson Printers as Order Printers in the Point of Sale without the IoT Box
 """,
     'depends': ['pos_epson_printer', 'pos_restaurant'],
     'data': [
-        'views/point_of_sale_assets.xml',
         'views/pos_restaurant_views.xml',
     ],
     'installable': True,
     'auto_install': True,
+    'assets': {
+        'point_of_sale.assets': [
+            'pos_epson_printer_restaurant/static/**/*',
+        ],
+    }
 }
diff --git a/addons/pos_epson_printer_restaurant/views/point_of_sale_assets.xml b/addons/pos_epson_printer_restaurant/views/point_of_sale_assets.xml
deleted file mode 100644
index 08db660f9bd..00000000000
--- a/addons/pos_epson_printer_restaurant/views/point_of_sale_assets.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets" inherit_id="point_of_sale.assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/pos_epson_printer_restaurant/static/src/js/multiprint.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/pos_hr/__manifest__.py b/addons/pos_hr/__manifest__.py
index 6ad2705c0d1..a3305245e30 100644
--- a/addons/pos_hr/__manifest__.py
+++ b/addons/pos_hr/__manifest__.py
@@ -15,16 +15,26 @@ The actual till still requires one user but an unlimited number of employees can
 
     'data': [
         'views/pos_config.xml',
-        'views/point_of_sale.xml',
         'views/pos_order_view.xml',
         'views/pos_order_report_view.xml',
     ],
     'installable': True,
     'auto_install': True,
-    'qweb': [
-        'static/src/xml/HeaderLockButton.xml',
-        'static/src/xml/Chrome.xml',
-        'static/src/xml/CashierName.xml',
-        'static/src/xml/LoginScreen.xml',
-    ],
+    'assets': {
+        'point_of_sale.assets': [
+            'pos_hr/static/src/css/pos.css',
+            'pos_hr/static/src/js/models.js',
+            'pos_hr/static/src/js/useSelectEmployee.js',
+            'pos_hr/static/src/js/Chrome.js',
+            'pos_hr/static/src/js/HeaderLockButton.js',
+            'pos_hr/static/src/js/CashierName.js',
+            'pos_hr/static/src/js/LoginScreen.js',
+        ],
+        'web.assets_tests': [
+            'pos_hr/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'pos_hr/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/pos_hr/views/point_of_sale.xml b/addons/pos_hr/views/point_of_sale.xml
deleted file mode 100644
index 4c768bc1d11..00000000000
--- a/addons/pos_hr/views/point_of_sale.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-     <template id="assets" inherit_id="point_of_sale.assets">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" href="/pos_hr/static/src/css/pos.css"/>
-
-            <script type="text/javascript" src="/pos_hr/static/src/js/models.js"></script>
-            <script type="text/javascript" src="/pos_hr/static/src/js/useSelectEmployee.js"></script>
-            <script type="text/javascript" src="/pos_hr/static/src/js/Chrome.js"></script>
-            <script type="text/javascript" src="/pos_hr/static/src/js/HeaderLockButton.js"></script>
-            <script type="text/javascript" src="/pos_hr/static/src/js/CashierName.js"></script>
-            <script type="text/javascript" src="/pos_hr/static/src/js/LoginScreen.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_tests" name="Pos Hr Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/pos_hr/static/tests/tours/PosHrTourMethods.js"></script>
-            <script type="text/javascript" src="/pos_hr/static/tests/tours/PosHrTour.js"></script>
-        </xpath>
-    </template>
-</odoo>
-
diff --git a/addons/pos_mercury/__manifest__.py b/addons/pos_mercury/__manifest__.py
index 397b15316ed..f0ab53a60c4 100644
--- a/addons/pos_mercury/__manifest__.py
+++ b/addons/pos_mercury/__manifest__.py
@@ -25,7 +25,6 @@ following:
     'data': [
         'data/pos_mercury_data.xml',
         'security/ir.model.access.csv',
-        'views/pos_mercury_templates.xml',
         'views/pos_mercury_views.xml',
         'views/pos_mercury_transaction_templates.xml',
         'views/pos_config_setting_views.xml',
@@ -33,11 +32,20 @@ following:
     'demo': [
         'data/pos_mercury_demo.xml',
     ],
-    'qweb': [
-        'static/src/xml/OrderReceipt.xml',
-        'static/src/xml/PaymentScreenPaymentLines.xml',
-        'static/src/xml/PaymentTransactionPopup.xml',
-    ],
     'installable': True,
     'auto_install': False,
+    'assets': {
+        'point_of_sale.assets': [
+            'pos_mercury/static/src/js/pos_mercury.js',
+            'pos_mercury/static/src/js/OrderReceipt.js',
+            'pos_mercury/static/src/js/PaymentScreen.js',
+            'pos_mercury/static/src/js/PaymentScreenPaymentLines.js',
+            'pos_mercury/static/src/js/PaymentTransactionPopup.js',
+            'pos_mercury/static/src/js/ProductScreen.js',
+            'pos_mercury/static/src/css/pos_mercury.css',
+        ],
+        'web.assets_qweb': [
+            'pos_mercury/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/pos_mercury/views/pos_mercury_templates.xml b/addons/pos_mercury/views/pos_mercury_templates.xml
deleted file mode 100644
index 4233cda51ee..00000000000
--- a/addons/pos_mercury/views/pos_mercury_templates.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-
-        <template id="assets" inherit_id="point_of_sale.assets">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/pos_mercury/static/src/js/pos_mercury.js"></script>
-                <script type="text/javascript" src="/pos_mercury/static/src/js/OrderReceipt.js"></script>
-                <script type="text/javascript" src="/pos_mercury/static/src/js/PaymentScreen.js"></script>
-                <script type="text/javascript" src="/pos_mercury/static/src/js/PaymentScreenPaymentLines.js"></script>
-                <script type="text/javascript" src="/pos_mercury/static/src/js/PaymentTransactionPopup.js"></script>
-                <script type="text/javascript" src="/pos_mercury/static/src/js/ProductScreen.js"></script>
-                <link rel="stylesheet" href="/pos_mercury/static/src/css/pos_mercury.css"/>
-            </xpath>
-        </template>
-
-    </data>
-</odoo>
diff --git a/addons/pos_restaurant/__manifest__.py b/addons/pos_restaurant/__manifest__.py
index ad766ec99d5..fa6fc8c9013 100644
--- a/addons/pos_restaurant/__manifest__.py
+++ b/addons/pos_restaurant/__manifest__.py
@@ -25,37 +25,52 @@ This module adds several features to the Point of Sale that are specific to rest
         'views/pos_config_views.xml',
         'views/pos_restaurant_templates.xml',
     ],
-    'qweb': [
-        'static/src/xml/Resizeable.xml',
-        'static/src/xml/Chrome.xml',
-        'static/src/xml/Screens/TicketScreen.xml',
-        'static/src/xml/Screens/OrderManagementScreen/OrderList.xml',
-        'static/src/xml/Screens/OrderManagementScreen/OrderRow.xml',
-        'static/src/xml/Screens/ProductScreen/ControlButtons/OrderlineNoteButton.xml',
-        'static/src/xml/Screens/ProductScreen/ControlButtons/TableGuestsButton.xml',
-        'static/src/xml/Screens/ProductScreen/ControlButtons/PrintBillButton.xml',
-        'static/src/xml/Screens/ProductScreen/ControlButtons/SubmitOrderButton.xml',
-        'static/src/xml/Screens/ProductScreen/ControlButtons/SplitBillButton.xml',
-        'static/src/xml/Screens/ProductScreen/ControlButtons/TransferOrderButton.xml',
-        'static/src/xml/Screens/BillScreen.xml',
-        'static/src/xml/Screens/SplitBillScreen/SplitBillScreen.xml',
-        'static/src/xml/Screens/SplitBillScreen/SplitOrderline.xml',
-        'static/src/xml/Screens/ReceiptScreen/OrderReceipt.xml',
-        'static/src/xml/Screens/ProductScreen/Orderline.xml',
-        'static/src/xml/Screens/PaymentScreen/PaymentScreen.xml',
-        'static/src/xml/Screens/PaymentScreen/PaymentScreenElectronicPayment.xml',
-        'static/src/xml/Screens/FloorScreen/FloorScreen.xml',
-        'static/src/xml/Screens/FloorScreen/EditBar.xml',
-        'static/src/xml/Screens/FloorScreen/TableWidget.xml',
-        'static/src/xml/Screens/FloorScreen/EditableTable.xml',
-        'static/src/xml/Screens/TipScreen.xml',
-        'static/src/xml/ChromeWidgets/BackToFloorButton.xml',
-        'static/src/xml/multiprint.xml',
-        'static/src/xml/TipReceipt.xml',
-    ],
     'demo': [
         'data/pos_restaurant_demo.xml',
     ],
     'installable': True,
     'auto_install': False,
+    'assets': {
+        'point_of_sale.assets': [
+            'pos_restaurant/static/lib/js/jquery.ui.touch-punch.js',
+            'pos_restaurant/static/src/js/multiprint.js',
+            'pos_restaurant/static/src/js/floors.js',
+            'pos_restaurant/static/src/js/notes.js',
+            'pos_restaurant/static/src/js/payment.js',
+            'pos_restaurant/static/src/js/Resizeable.js',
+            'pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/OrderlineNoteButton.js',
+            'pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/TableGuestsButton.js',
+            'pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/PrintBillButton.js',
+            'pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/SubmitOrderButton.js',
+            'pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/SplitBillButton.js',
+            'pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/TransferOrderButton.js',
+            'pos_restaurant/static/src/js/Screens/ProductScreen/Orderline.js',
+            'pos_restaurant/static/src/js/Screens/BillScreen.js',
+            'pos_restaurant/static/src/js/Screens/SplitBillScreen/SplitBillScreen.js',
+            'pos_restaurant/static/src/js/Screens/SplitBillScreen/SplitOrderline.js',
+            'pos_restaurant/static/src/js/Screens/FloorScreen/FloorScreen.js',
+            'pos_restaurant/static/src/js/Screens/FloorScreen/EditBar.js',
+            'pos_restaurant/static/src/js/Screens/FloorScreen/TableWidget.js',
+            'pos_restaurant/static/src/js/Screens/FloorScreen/EditableTable.js',
+            'pos_restaurant/static/src/js/Screens/OrderManagementScreen/OrderManagementScreen.js',
+            'pos_restaurant/static/src/js/Screens/OrderManagementScreen/OrderRow.js',
+            'pos_restaurant/static/src/js/Screens/TicketScreen.js',
+            'pos_restaurant/static/src/js/ChromeWidgets/BackToFloorButton.js',
+            'pos_restaurant/static/src/js/ChromeWidgets/TicketButton.js',
+            'pos_restaurant/static/src/js/Chrome.js',
+            'pos_restaurant/static/src/js/Screens/ReceiptScreen/ReceiptScreen.js',
+            'pos_restaurant/static/src/js/Screens/PaymentScreen.js',
+            'pos_restaurant/static/src/js/Screens/TipScreen.js',
+            ('after', 'point_of_sale/static/src/css/pos.css', 'pos_restaurant/static/src/css/restaurant.css'),
+        ],
+        'web.assets_backend': [
+            'point_of_sale/static/src/scss/pos_dashboard.scss',
+        ],
+        'web.assets_tests': [
+            'pos_restaurant/static/tests/tours/**/*',
+        ],
+        'web.assets_qweb': [
+            'pos_restaurant/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/pos_restaurant/views/pos_restaurant_templates.xml b/addons/pos_restaurant/views/pos_restaurant_templates.xml
index 198eaf772db..43b6a9fc049 100644
--- a/addons/pos_restaurant/views/pos_restaurant_templates.xml
+++ b/addons/pos_restaurant/views/pos_restaurant_templates.xml
@@ -1,69 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <template id="assets" inherit_id="point_of_sale.assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/pos_restaurant/static/lib/js/jquery.ui.touch-punch.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/multiprint.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/floors.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/notes.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/payment.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Resizeable.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/OrderlineNoteButton.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/TableGuestsButton.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/PrintBillButton.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/SubmitOrderButton.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/SplitBillButton.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/TransferOrderButton.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/ProductScreen/Orderline.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/BillScreen.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/SplitBillScreen/SplitBillScreen.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/SplitBillScreen/SplitOrderline.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/FloorScreen/FloorScreen.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/FloorScreen/EditBar.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/FloorScreen/TableWidget.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/FloorScreen/EditableTable.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/OrderManagementScreen/OrderManagementScreen.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/OrderManagementScreen/OrderRow.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/TicketScreen.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/ChromeWidgets/BackToFloorButton.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/ChromeWidgets/TicketButton.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Chrome.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/ReceiptScreen/ReceiptScreen.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/PaymentScreen.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/src/js/Screens/TipScreen.js"></script>
-        </xpath>
-        <xpath expr="//link[@href='/point_of_sale/static/src/css/pos.css']" position="after">
-            <link rel="stylesheet" href="/pos_restaurant/static/src/css/restaurant.css"/>
-        </xpath>
-    </template>
-
-    <template id="assets_backend" name="hr assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/point_of_sale/static/src/scss/pos_dashboard.scss"/>
-        </xpath>
-    </template>
-
-    <template id="assets_tests" name="POS Restaurant Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/pos_restaurant/static/tests/tours/helpers/ProductScreenTourMethods.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/tests/tours/helpers/ChromeTourMethods.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/tests/tours/helpers/FloorScreenTourMethods.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/tests/tours/helpers/SplitBillScreenTourMethods.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/tests/tours/helpers/TextAreaPopupTourMethods.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/tests/tours/helpers/TextInputPopupTourMethods.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/tests/tours/helpers/BillScreenTourMethods.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/tests/tours/helpers/TipScreenTourMethods.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/tests/tours/pos_restaurant.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/tests/tours/SplitBillScreen.tour.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/tests/tours/ControlButtons.tour.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/tests/tours/FloorScreen.tour.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/tests/tours/OrderManagementScreen.tour.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/tests/tours/TicketScreen.tour.js"></script>
-            <script type="text/javascript" src="/pos_restaurant/static/tests/tours/TipScreen.tour.js"></script>
-        </xpath>
-    </template>
-
     <template id="pos_restaurant.qunit_suite_tests" inherit_id="point_of_sale.qunit_suite_tests">
         <xpath expr="." position="inside">
             <script type="text/javascript" src="/pos_restaurant/static/tests/unit/test_FloorScreen.js"></script>
diff --git a/addons/pos_restaurant_adyen/__manifest__.py b/addons/pos_restaurant_adyen/__manifest__.py
index bb6a31f592f..2b2e9618a09 100644
--- a/addons/pos_restaurant_adyen/__manifest__.py
+++ b/addons/pos_restaurant_adyen/__manifest__.py
@@ -11,7 +11,11 @@
     'depends': ['pos_adyen', 'pos_restaurant', 'payment_adyen'],
     'data': [
         'views/pos_payment_method_views.xml',
-        'views/point_of_sale_assets.xml',
-    ],
+        ],
     'auto-install': True,
+    'assets': {
+        'point_of_sale.assets': [
+            'pos_restaurant_adyen/static/**/*',
+        ],
+    }
 }
diff --git a/addons/pos_restaurant_adyen/views/point_of_sale_assets.xml b/addons/pos_restaurant_adyen/views/point_of_sale_assets.xml
deleted file mode 100644
index 03533b1d4dc..00000000000
--- a/addons/pos_restaurant_adyen/views/point_of_sale_assets.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets" inherit_id="point_of_sale.assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/pos_restaurant_adyen/static/src/js/models.js"></script>
-            <script type="text/javascript" src="/pos_restaurant_adyen/static/src/js/payment_adyen.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/pos_six/__manifest__.py b/addons/pos_six/__manifest__.py
index 580f37fc1d9..22adbf86018 100644
--- a/addons/pos_six/__manifest__.py
+++ b/addons/pos_six/__manifest__.py
@@ -9,13 +9,20 @@
     'description': '',
     'data': [
         'views/pos_payment_method_views.xml',
-        'views/point_of_sale_assets.xml',
-    ],
-    'qweb': [
-        'static/src/xml/BalanceButton.xml',
-        'static/src/xml/Chrome.xml',
-    ],
+        ],
     'depends': ['point_of_sale'],
     'installable': True,
     'license': 'OEEL-1',
+    'assets': {
+        'point_of_sale.assets': [
+            'pos_six/static/lib/six_timapi/timapi.js',
+            'pos_six/static/src/js/BalanceButton.js',
+            'pos_six/static/src/js/Chrome.js',
+            'pos_six/static/src/js/models.js',
+            'pos_six/static/src/js/payment_six.js',
+        ],
+        'web.assets_qweb': [
+            'pos_six/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/pos_six/views/point_of_sale_assets.xml b/addons/pos_six/views/point_of_sale_assets.xml
deleted file mode 100644
index dbca83d95d5..00000000000
--- a/addons/pos_six/views/point_of_sale_assets.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets" inherit_id="point_of_sale.assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/pos_six/static/lib/six_timapi/timapi.js"></script>
-            <script type="text/javascript" src="/pos_six/static/src/js/BalanceButton.js"></script> -->
-            <script type="text/javascript" src="/pos_six/static/src/js/Chrome.js"></script>
-            <script type="text/javascript" src="/pos_six/static/src/js/models.js"></script>
-            <script type="text/javascript" src="/pos_six/static/src/js/payment_six.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/product/__manifest__.py b/addons/product/__manifest__.py
index 398ffcb0b5f..4e284376ebe 100644
--- a/addons/product/__manifest__.py
+++ b/addons/product/__manifest__.py
@@ -35,7 +35,6 @@ Print product labels with barcode.
         'views/product_views.xml',
         'views/product_template_views.xml',
         'views/product_pricelist_views.xml',
-        'views/product_templates.xml',
         'views/res_partner_views.xml',
         'report/product_reports.xml',
         'report/product_product_templates.xml',
@@ -43,10 +42,20 @@ Print product labels with barcode.
         'report/product_packaging.xml',
         'report/product_pricelist_report_templates.xml'
     ],
-    'qweb': ['static/src/xml/pricelist_report.xml'],
     'demo': [
         'data/product_demo.xml',
     ],
     'installable': True,
     'auto_install': False,
+    'assets': {
+        'web.assets_backend': [
+            'product/static/src/js/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'product/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'product/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/product/views/product_templates.xml b/addons/product/views/product_templates.xml
deleted file mode 100644
index 5c33cfc280c..00000000000
--- a/addons/product/views/product_templates.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets_backend" name="Product assets backend" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/product/static/src/js/product_pricelist_report.js"></script>
-        </xpath>
-   </template>
-    <template id="qunit_suite" name="Product pricelist report tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/product/static/tests/product_pricelist_report_test.js"></script>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/addons/product_matrix/__manifest__.py b/addons/product_matrix/__manifest__.py
index ae4d3cdefb3..09c6607d941 100644
--- a/addons/product_matrix/__manifest__.py
+++ b/addons/product_matrix/__manifest__.py
@@ -12,14 +12,19 @@ Please refer to Sale Matrix or Purchase Matrix for the use of this module.
     'version': '1.0',
     'depends': ['account'],
     # Account dependency for section_and_note widget.
-    'qweb': [
-        "static/src/xml/product_matrix.xml",
-    ],
     'data': [
-        'views/assets.xml',
         'views/matrix_templates.xml',
     ],
     'demo': [
         'data/product_matrix_demo.xml',
-    ]
+    ],
+    'assets': {
+        'web.assets_backend': [
+            'product_matrix/static/src/js/section_and_note_widget.js',
+            'product_matrix/static/src/scss/product_matrix.scss',
+        ],
+        'web.assets_qweb': [
+            'product_matrix/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/product_matrix/views/assets.xml b/addons/product_matrix/views/assets.xml
deleted file mode 100644
index 7f0793f8904..00000000000
--- a/addons/product_matrix/views/assets.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend_inherit_sale" inherit_id="web.assets_backend" name="Sale Grid assets">
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/product_matrix/static/src/js/section_and_note_widget.js"/>
-            <link rel="stylesheet" type="text/scss" href="/product_matrix/static/src/scss/product_matrix.scss"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/project/__manifest__.py b/addons/project/__manifest__.py
index b3afb241fbb..d4bbb912543 100644
--- a/addons/project/__manifest__.py
+++ b/addons/project/__manifest__.py
@@ -32,7 +32,6 @@
         'views/res_partner_views.xml',
         'views/res_config_settings_views.xml',
         'views/mail_activity_views.xml',
-        'views/project_assets.xml',
         'views/project_portal_templates.xml',
         'data/ir_cron_data.xml',
         'data/mail_data.xml',
@@ -41,10 +40,31 @@
         'wizard/project_task_type_delete_views.xml',
     ],
     'demo': ['data/project_demo.xml'],
-    'qweb': ['static/src/xml/project_templates.xml'],
     'test': [
     ],
     'installable': True,
     'auto_install': False,
     'application': True,
+    'assets': {
+        'web.assets_backend': [
+            'project/static/src/css/project.css',
+            'project/static/src/js/project_form.js',
+            'project/static/src/js/project_kanban.js',
+            'project/static/src/js/project_list.js',
+            'project/static/src/js/project_rating_reporting.js',
+            'project/static/src/js/project_name_with_subtask_count_widget.js',
+            'project/static/src/js/project_task_kanban_examples.js',
+            'project/static/src/js/tours/project.js',
+            'project/static/src/js/project_calendar.js',
+            'project/static/src/scss/project_dashboard.scss',
+            'project/static/src/scss/project_form.scss',
+        ],
+        'web.assets_frontend': [
+            'project/static/src/scss/portal_rating.scss',
+            'project/static/src/js/portal_rating.js',
+        ],
+        'web.assets_qweb': [
+            'project/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/project/views/project_assets.xml b/addons/project/views/project_assets.xml
deleted file mode 100644
index 762bc909bfa..00000000000
--- a/addons/project/views/project_assets.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-        <template id="assets_backend" name="project assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" href="/project/static/src/css/project.css"/>
-                <script type="text/javascript" src="/project/static/src/js/project_form.js"></script>
-                <script type="text/javascript" src="/project/static/src/js/project_kanban.js"></script>
-                <script type="text/javascript" src="/project/static/src/js/project_list.js"></script>
-                <script type="text/javascript" src="/project/static/src/js/project_rating_reporting.js"></script>
-                <script type="text/javascript" src="/project/static/src/js/project_name_with_subtask_count_widget.js"></script>
-                <script type="text/javascript" src="/project/static/src/js/project_task_kanban_examples.js"></script>
-                <script type="text/javascript" src="/project/static/src/js/tours/project.js"></script>
-                <script type="text/javascript" src="/project/static/src/js/project_calendar.js"></script>
-                <link rel="stylesheet" type="text/scss" href="/project/static/src/scss/project_dashboard.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/project/static/src/scss/project_form.scss"/>
-            </xpath>
-        </template>
-
-        <template id="assets_frontend" inherit_id="web.assets_frontend" name="Rating Project Assets">
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" type="text/scss" href="/project/static/src/scss/portal_rating.scss"/>
-                <script type="text/javascript" src="/project/static/src/js/portal_rating.js"/>
-            </xpath>
-        </template>
-</odoo>
diff --git a/addons/purchase/__manifest__.py b/addons/purchase/__manifest__.py
index 17de9933217..2375def6c3e 100644
--- a/addons/purchase/__manifest__.py
+++ b/addons/purchase/__manifest__.py
@@ -14,7 +14,6 @@
         'security/purchase_security.xml',
         'security/ir.model.access.csv',
         'data/digest_data.xml',
-        'views/assets.xml',
         'views/account_move_views.xml',
         'data/purchase_data.xml',
         'data/ir_cron_data.xml',
@@ -31,14 +30,24 @@
         'report/purchase_order_templates.xml',
         'report/purchase_quotation_templates.xml',
     ],
-    'qweb': [
-        "static/src/xml/purchase_dashboard.xml",
-        "static/src/xml/purchase_toaster_button.xml",
-    ],
     'demo': [
         'data/purchase_demo.xml',
     ],
     'installable': True,
     'auto_install': False,
     'application': True,
+    'assets': {
+        'web.assets_backend': [
+            'purchase/static/src/scss/purchase.scss',
+            'purchase/static/src/js/purchase_dashboard.js',
+            'purchase/static/src/js/purchase_toaster_button.js',
+            'purchase/static/src/js/tours/purchase.js',
+        ],
+        'web.assets_frontend': [
+            'purchase/static/src/js/purchase_datetimepicker.js',
+        ],
+        'web.assets_qweb': [
+            'purchase/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/purchase/views/assets.xml b/addons/purchase/views/assets.xml
deleted file mode 100644
index 1fc46b114e4..00000000000
--- a/addons/purchase/views/assets.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <template id="assets_backend" name="purchase assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/purchase/static/src/scss/purchase.scss"/>
-            <script type="text/javascript" src="/purchase/static/src/js/purchase_dashboard.js"></script>
-            <script type="text/javascript" src="/purchase/static/src/js/purchase_toaster_button.js"></script>
-        </xpath>
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/purchase/static/src/js/tours/purchase.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_frontend" name="purchase assets" inherit_id="web.assets_frontend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/purchase/static/src/js/purchase_datetimepicker.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/purchase_product_matrix/__manifest__.py b/addons/purchase_product_matrix/__manifest__.py
index 45c42db834a..ef135b1d793 100644
--- a/addons/purchase_product_matrix/__manifest__.py
+++ b/addons/purchase_product_matrix/__manifest__.py
@@ -13,9 +13,19 @@
     'version': '1.0',
     'depends': ['purchase', 'product_matrix'],
     'data': [
-        'views/assets.xml',
         'views/purchase_views.xml',
         'report/purchase_quotation_templates.xml',
         'report/purchase_order_templates.xml',
     ],
+    'assets': {
+        'web.assets_backend': [
+            'purchase_product_matrix/static/src/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'purchase_product_matrix/static/tests/section_and_note_widget_tests.js',
+        ],
+        'web.assets_tests': [
+            'purchase_product_matrix/static/tests/tours/**/*',
+        ],
+    }
 }
diff --git a/addons/purchase_product_matrix/views/assets.xml b/addons/purchase_product_matrix/views/assets.xml
deleted file mode 100644
index fc356b012bc..00000000000
--- a/addons/purchase_product_matrix/views/assets.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-
-  <template id="assets_backend_inherit_purchase" inherit_id="web.assets_backend" name="Purchase Grid assets">
-      <xpath expr="script[last()]" position="after">
-          <script type="text/javascript" src="/purchase_product_matrix/static/src/js/product_matrix_configurator.js"/>
-      </xpath>
-  </template>
-
-  <template id="qunit_suite" name="purchase_product_matrix tests" inherit_id="web.qunit_suite_tests">
-      <xpath expr="." position="inside">
-          <script type="text/javascript" src="/purchase_product_matrix/static/tests/section_and_note_widget_tests.js"></script>
-      </xpath>
-  </template>
-
-  <template id="assets_tests" name="Purchase Product Matrix Assets Tests" inherit_id="web.assets_tests">
-      <xpath expr="." position="inside">
-          <script type="text/javascript" src="/purchase_product_matrix/static/tests/tours/purchase_product_matrix_tour.js"/>
-      </xpath>
-  </template>
-</odoo>
diff --git a/addons/purchase_stock/__manifest__.py b/addons/purchase_stock/__manifest__.py
index 1b87fe2cc40..b3e884348d1 100644
--- a/addons/purchase_stock/__manifest__.py
+++ b/addons/purchase_stock/__manifest__.py
@@ -13,7 +13,6 @@
         'security/ir.model.access.csv',
         'data/purchase_stock_data.xml',
         'data/mail_templates.xml',
-        'views/assets.xml',
         'report/vendor_delay_report.xml',
         'views/purchase_views.xml',
         'views/stock_views.xml',
@@ -33,4 +32,9 @@
     'installable': True,
     'auto_install': True,
     'post_init_hook': '_create_buy_rules',
+    'assets': {
+        'web.assets_backend': [
+            'purchase_stock/static/**/*',
+        ],
+    }
 }
diff --git a/addons/purchase_stock/views/assets.xml b/addons/purchase_stock/views/assets.xml
deleted file mode 100644
index 8724db5b521..00000000000
--- a/addons/purchase_stock/views/assets.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <template id="assets_backend" name="purchase stock assets" inherit_id="web.assets_backend">
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/purchase_stock/static/src/js/tours/purchase_stock.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/rating/__manifest__.py b/addons/rating/__manifest__.py
index 6f05e8fd972..3fcd3a9dc0e 100644
--- a/addons/rating/__manifest__.py
+++ b/addons/rating/__manifest__.py
@@ -13,9 +13,13 @@ This module allows a customer to give rating.
         'views/rating_rating_views.xml',
         'views/rating_template.xml',
         'views/mail_message_views.xml',
-        'views/assets.xml',
         'security/ir.model.access.csv'
     ],
     'installable': True,
     'auto_install': False,
+    'assets': {
+        'web.assets_frontend': [
+            'rating/static/src/scss/**/*',
+        ],
+    }
 }
diff --git a/addons/rating/views/assets.xml b/addons/rating/views/assets.xml
deleted file mode 100644
index baacbe9a54a..00000000000
--- a/addons/rating/views/assets.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets_frontend" inherit_id="web.assets_frontend" name="Rating: Frontend Assets">
-        <xpath expr="link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/rating/static/src/scss/rating.scss"/>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/addons/resource/__manifest__.py b/addons/resource/__manifest__.py
index eed805130ec..0bb956374b6 100644
--- a/addons/resource/__manifest__.py
+++ b/addons/resource/__manifest__.py
@@ -19,8 +19,12 @@ associated to every resource. It also manages the leaves of every resource.
         'security/ir.model.access.csv',
         'security/resource_security.xml',
         'views/resource_views.xml',
-        'views/resource.xml',
-    ],
+        ],
     'demo': [
     ],
+    'assets': {
+        'web.assets_backend': [
+            'resource/static/**/*',
+        ],
+    }
 }
diff --git a/addons/resource/views/resource.xml b/addons/resource/views/resource.xml
deleted file mode 100644
index 64e96a4766b..00000000000
--- a/addons/resource/views/resource.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="resource assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" href="/resource/static/src/scss/section_backend.scss"/>
-            <script type="text/javascript" src="/resource/static/src/js/section_fields_backend.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/sale/__manifest__.py b/addons/sale/__manifest__.py
index ace5cc84798..80fd97553b1 100644
--- a/addons/sale/__manifest__.py
+++ b/addons/sale/__manifest__.py
@@ -29,7 +29,6 @@ This module contains all the common features of Sales Management and eCommerce.
         'views/sales_team_views.xml',
         'views/res_partner_views.xml',
         'views/mail_activity_views.xml',
-        'views/assets.xml',
         'views/variant_templates.xml',
         'views/sale_portal_templates.xml',
         'views/sale_onboarding_views.xml',
@@ -46,5 +45,31 @@ This module contains all the common features of Sales Management and eCommerce.
         'data/sale_demo.xml',
     ],
     'installable': True,
-    'auto_install': False
+    'auto_install': False,
+    'assets': {
+        'web.assets_backend': [
+            'sale/static/src/scss/sale_onboarding.scss',
+            'sale/static/src/scss/product_configurator.scss',
+            'sale/static/src/js/sale.js',
+            'sale/static/src/js/tours/sale.js',
+            'sale/static/src/js/product_configurator_widget.js',
+            'sale/static/src/js/sale_order_view.js',
+            'sale/static/src/js/product_discount_widget.js',
+        ],
+        'web.report_assets_common': [
+            'sale/static/src/scss/sale_report.scss',
+        ],
+        'web.assets_frontend': [
+            'sale/static/src/scss/sale_portal.scss',
+            'sale/static/src/js/sale_portal_sidebar.js',
+            'sale/static/src/js/payment_form.js',
+        ],
+        'web.assets_tests': [
+            'sale/static/tests/tours/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'sale/static/tests/product_configurator_tests.js',
+            'sale/static/tests/sales_team_dashboard_tests.js',
+        ],
+    }
 }
diff --git a/addons/sale/views/assets.xml b/addons/sale/views/assets.xml
deleted file mode 100644
index 479280a62e6..00000000000
--- a/addons/sale/views/assets.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend_inherit_sale" inherit_id="web.assets_backend" name="Sale backend assets">
-        <xpath expr="link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/sale/static/src/scss/sale_onboarding.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/sale/static/src/scss/product_configurator.scss"/>
-        </xpath>
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/sale/static/src/js/sale.js"></script>
-            <script type="text/javascript" src="/sale/static/src/js/tours/sale.js"></script>
-            <script type="text/javascript" src="/sale/static/src/js/product_configurator_widget.js"/>
-            <script type="text/javascript" src="/sale/static/src/js/sale_order_view.js"/>
-            <script type="text/javascript" src="/sale/static/src/js/product_discount_widget.js"/>
-        </xpath>
-    </template>
-     <template id="report_assets_common_inherit_sale" inherit_id="web.report_assets_common" name="Sale report common assets">
-        <xpath expr="link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/sale/static/src/scss/sale_report.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_frontend_inherit_sale" inherit_id="web.assets_frontend" name="Sale frontend assets">
-        <xpath expr="link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/sale/static/src/scss/sale_portal.scss"/>
-        </xpath>
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/sale/static/src/js/sale_portal_sidebar.js"></script>
-            <script type="text/javascript" src="/sale/static/src/js/payment_form.js"/>
-        </xpath>
-    </template>
-    <template id="assets_tests" name="Sale Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/sale/static/tests/tours/sale_signature.js"></script>
-        </xpath>
-    </template>
-    <template id="qunit_suite" name="sale_tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/sale/static/tests/product_configurator_tests.js"></script>
-            <script type="text/javascript" src="/sale/static/tests/sales_team_dashboard_tests.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/sale_expense/__manifest__.py b/addons/sale_expense/__manifest__.py
index 3c78377b669..43f097f2e6c 100644
--- a/addons/sale_expense/__manifest__.py
+++ b/addons/sale_expense/__manifest__.py
@@ -15,7 +15,6 @@ This module allow to reinvoice employee expense, by setting the SO directly on t
 """,
     'depends': ['sale_management', 'hr_expense'],
     'data': [
-        'views/assets.xml',
         'views/product_view.xml',
         'views/hr_expense_views.xml',
         'views/sale_order_views.xml',
@@ -24,4 +23,12 @@ This module allow to reinvoice employee expense, by setting the SO directly on t
     'test': [],
     'installable': True,
     'auto_install': True,
+    'assets': {
+        'web.assets_backend': [
+            'sale_expense/static/src/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'sale_expense/static/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/sale_expense/views/assets.xml b/addons/sale_expense/views/assets.xml
deleted file mode 100644
index 7f065c3a94b..00000000000
--- a/addons/sale_expense/views/assets.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/sale_expense/static/src/js/sale_order_many2one.js"/>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" inherit_id="web.qunit_suite_tests">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/sale_expense/static/tests/sale_order_many2one_tests.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/sale_management/__manifest__.py b/addons/sale_management/__manifest__.py
index 590924ffa6f..f83ca900e95 100644
--- a/addons/sale_management/__manifest__.py
+++ b/addons/sale_management/__manifest__.py
@@ -56,4 +56,9 @@ The Dashboard for the Sales Manager will include
     'application': True,
     'uninstall_hook': 'uninstall_hook',
     'post_init_hook': 'post_init_hook',
+    'assets': {
+        'web.assets_frontend': [
+            'sale_management/static/src/js/**/*',
+        ],
+    }
 }
diff --git a/addons/sale_management/views/sale_portal_templates.xml b/addons/sale_management/views/sale_portal_templates.xml
index d5e9ea4f157..257127eb64b 100644
--- a/addons/sale_management/views/sale_portal_templates.xml
+++ b/addons/sale_management/views/sale_portal_templates.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <template id="assets_frontend" inherit_id="web.assets_frontend" name="Website Quote frontend assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/sale_management/static/src/js/sale_management.js"></script>
-        </xpath>
-    </template>
-
     <template id="sale_order_portal_content_inherit_sale_management" name="Order Options" inherit_id="sale.sale_order_portal_content">
 
         <xpath expr="//section[@id='details']//t[@t-set='display_discount']" position="after">
diff --git a/addons/sale_product_configurator/__manifest__.py b/addons/sale_product_configurator/__manifest__.py
index c24fa65c12a..4b619ee2212 100644
--- a/addons/sale_product_configurator/__manifest__.py
+++ b/addons/sale_product_configurator/__manifest__.py
@@ -16,7 +16,6 @@ It also enables the "optional products" feature.
     'depends': ['sale'],
     'data': [
         'security/ir.model.access.csv',
-        'views/assets.xml',
         'views/templates.xml',
         'views/sale_views.xml',
         'wizard/sale_product_configurator_views.xml',
@@ -24,4 +23,20 @@ It also enables the "optional products" feature.
     'demo': [
         'data/sale_demo.xml',
     ],
+    'assets': {
+        'web.assets_backend': [
+            'sale/static/src/js/variant_mixin.js',
+            'sale_product_configurator/static/src/js/product_configurator_renderer.js',
+            'sale_product_configurator/static/src/js/product_configurator_controller.js',
+            'sale_product_configurator/static/src/js/product_configurator_view.js',
+            'sale_product_configurator/static/src/js/product_configurator_widget.js',
+            'sale_product_configurator/static/src/js/product_configurator_modal.js',
+        ],
+        'web.assets_tests': [
+            'sale_product_configurator/static/tests/tours/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'sale_product_configurator/static/tests/product_configurator.test.js',
+        ],
+    }
 }
diff --git a/addons/sale_product_configurator/views/assets.xml b/addons/sale_product_configurator/views/assets.xml
deleted file mode 100644
index 5665e7ddb2b..00000000000
--- a/addons/sale_product_configurator/views/assets.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" inherit_id="web.assets_backend" name="sale_product_configurator assets backend">
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/sale/static/src/js/variant_mixin.js"></script>
-            <script type="text/javascript" src="/sale_product_configurator/static/src/js/product_configurator_renderer.js"></script>
-            <script type="text/javascript" src="/sale_product_configurator/static/src/js/product_configurator_controller.js"></script>
-            <script type="text/javascript" src="/sale_product_configurator/static/src/js/product_configurator_view.js"></script>
-            <script type="text/javascript" src="/sale_product_configurator/static/src/js/product_configurator_widget.js"/>
-            <script type="text/javascript" src="/sale_product_configurator/static/src/js/product_configurator_modal.js"></script>
-        </xpath>
-    </template>
-    <template id="assets_tests" name="Sale Product Configurator Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/sale_product_configurator/static/tests/tours/product_configurator_ui.js"/>
-            <script type="text/javascript" src="/sale_product_configurator/static/tests/tours/product_configurator_advanced_ui.js"/>
-            <script type="text/javascript" src="/sale_product_configurator/static/tests/tours/product_configurator_edition_ui.js"/>
-            <script type="text/javascript" src="/sale_product_configurator/static/tests/tours/product_configurator_single_custom_attribute_ui.js"/>
-            <script type="text/javascript" src="/sale_product_configurator/static/tests/tours/product_configurator_pricelist_ui.js"/>
-            <script type="text/javascript" src="/sale_product_configurator/static/tests/tours/product_configurator_optional_products_ui.js"/>
-        </xpath>
-    </template>
-    <template id="qunit_suite" inherit_id="web.qunit_suite_tests" name="sale_product_configurator_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/sale_product_configurator/static/tests/product_configurator.test.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/sale_product_matrix/__manifest__.py b/addons/sale_product_matrix/__manifest__.py
index 0b3e5564694..d796d08002e 100644
--- a/addons/sale_product_matrix/__manifest__.py
+++ b/addons/sale_product_matrix/__manifest__.py
@@ -11,12 +11,22 @@
     'version': '1.0',
     'depends': ['sale', 'product_matrix', 'sale_product_configurator'],
     'data': [
-        'views/assets.xml',
         'views/product_template_views.xml',
         'views/sale_views.xml',
         'report/sale_report_templates.xml',
     ],
     'demo': [
         'data/product_matrix_demo.xml'
-    ]
+    ],
+    'assets': {
+        'web.assets_backend': [
+            'sale_product_matrix/static/src/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'sale_product_matrix/static/tests/section_and_note_widget_tests.js',
+        ],
+        'web.assets_tests': [
+            'sale_product_matrix/static/tests/tours/**/*',
+        ],
+    }
 }
diff --git a/addons/sale_product_matrix/views/assets.xml b/addons/sale_product_matrix/views/assets.xml
deleted file mode 100644
index bd2c99987fc..00000000000
--- a/addons/sale_product_matrix/views/assets.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend_inherit_sale" inherit_id="web.assets_backend" name="Sale Grid assets">
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/sale_product_matrix/static/src/js/product_matrix_configurator.js"/>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" name="sale_product_matrix tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/sale_product_matrix/static/tests/section_and_note_widget_tests.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_tests" name="Sale Product Matrix Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/sale_product_matrix/static/tests/tours/sale_product_matrix_tour.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/sale_stock/__manifest__.py b/addons/sale_stock/__manifest__.py
index 681a14f0448..32d7a4debc8 100644
--- a/addons/sale_stock/__manifest__.py
+++ b/addons/sale_stock/__manifest__.py
@@ -38,7 +38,14 @@ Preferences
         'wizard/sale_order_cancel_views.xml',
     ],
     'demo': ['data/sale_order_demo.xml'],
-    'qweb': ['static/src/xml/sale_stock.xml'],
     'installable': True,
     'auto_install': True,
+    'assets': {
+        'web.assets_backend': [
+            'sale_stock/static/src/js/**/*',
+        ],
+        'web.assets_qweb': [
+            'sale_stock/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/sale_stock/views/sale_order_views.xml b/addons/sale_stock/views/sale_order_views.xml
index 11ad5e3945a..1b4f17e6f9f 100644
--- a/addons/sale_stock/views/sale_order_views.xml
+++ b/addons/sale_stock/views/sale_order_views.xml
@@ -126,10 +126,5 @@
             </field>
         </record>
 
-        <template id="sale_order_line_view_list" name="sale.order.line.view.list" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/sale_stock/static/src/js/qty_at_date_widget.js"></script>
-            </xpath>
-        </template>
-    </data>
+        </data>
 </odoo>
diff --git a/addons/sale_timesheet/__manifest__.py b/addons/sale_timesheet/__manifest__.py
index 00d5cdeef96..3e7f506f890 100644
--- a/addons/sale_timesheet/__manifest__.py
+++ b/addons/sale_timesheet/__manifest__.py
@@ -32,12 +32,25 @@ have real delivered quantities in sales orders.
         'wizard/project_create_invoice_views.xml',
         'wizard/sale_make_invoice_advance_views.xml',
     ],
-    'qweb': [
-        'static/src/xml/sale_project_templates.xml',
-    ],
     'demo': [
         'data/sale_service_demo.xml',
     ],
     'auto_install': True,
     'uninstall_hook': 'uninstall_hook',
+    'assets': {
+        'web.assets_frontend': [
+            'sale_timesheet/static/src/scss/sale_timesheet_portal.scss',
+        ],
+        'web.assets_backend': [
+            'sale_timesheet/static/src/scss/sale_timesheet.scss',
+            'sale_timesheet/static/src/js/project_overview.js',
+            'sale_timesheet/static/src/js/so_line_one2many.js',
+        ],
+        'web.assets_tests': [
+            'sale_timesheet/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'sale_timesheet/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/sale_timesheet/views/hr_timesheet_templates.xml b/addons/sale_timesheet/views/hr_timesheet_templates.xml
index 56c958ade69..4da13d0bdae 100644
--- a/addons/sale_timesheet/views/hr_timesheet_templates.xml
+++ b/addons/sale_timesheet/views/hr_timesheet_templates.xml
@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <template id="assets_backend" name="sale timesheet assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/sale_timesheet/static/src/scss/sale_timesheet.scss"/>
-                <script type="text/javascript" src="/sale_timesheet/static/src/js/project_overview.js"></script>
-            <script type="text/javascript" src="/sale_timesheet/static/src/js/so_line_one2many.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_tests" name="Sales Timesheet Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/sale_timesheet/static/tests/tours/sale_timesheet_tour.js"></script>
-        </xpath>
-    </template>
-
     <record id="timesheet_plan" model="ir.ui.view">
         <field name="name">Timesheet Plan</field>
         <field name="type">qweb</field>
diff --git a/addons/sale_timesheet/views/sale_timesheet_portal_templates.xml b/addons/sale_timesheet/views/sale_timesheet_portal_templates.xml
index 3dee2b704ba..b45011bedb1 100644
--- a/addons/sale_timesheet/views/sale_timesheet_portal_templates.xml
+++ b/addons/sale_timesheet/views/sale_timesheet_portal_templates.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <template id="assets_frontend" name="report timesheet assets" inherit_id="web.assets_frontend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/sale_timesheet/static/src/scss/sale_timesheet_portal.scss"/>
-        </xpath>
-    </template>
-
     <template id="sale_order_portal_content_inherit" inherit_id="sale.sale_order_portal_template">
         <xpath expr="//li[.//a[@id='print_invoice_report']]" position="after">
             <li t-if="sale_order.timesheet_count > 0 and sale_order.state in ('sale', 'done')" class="list-group-item flex-grow-1">
diff --git a/addons/sales_team/__manifest__.py b/addons/sales_team/__manifest__.py
index 4087b69a040..778fa16a2a0 100644
--- a/addons/sales_team/__manifest__.py
+++ b/addons/sales_team/__manifest__.py
@@ -16,7 +16,6 @@ Using this application you can manage Sales Teams with CRM and/or Sales
         'security/sales_team_security.xml',
         'security/ir.model.access.csv',
         'data/crm_team_data.xml',
-        'views/assets.xml',
         'views/crm_tag_views.xml',
         'views/crm_team_views.xml',
         'views/crm_team_member_views.xml',
@@ -29,4 +28,9 @@ Using this application you can manage Sales Teams with CRM and/or Sales
     ],
     'installable': True,
     'auto_install': False,
+    'assets': {
+        'web.assets_backend': [
+            'sales_team/static/**/*',
+        ],
+    }
 }
diff --git a/addons/sales_team/views/assets.xml b/addons/sales_team/views/assets.xml
deleted file mode 100644
index 34290b8bab7..00000000000
--- a/addons/sales_team/views/assets.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="SalesTeam: backend assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/sales_team/static/src/scss/crm_team_views.scss"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/sms/__manifest__.py b/addons/sms/__manifest__.py
index 5d16f4fc1f0..0bac9334468 100644
--- a/addons/sms/__manifest__.py
+++ b/addons/sms/__manifest__.py
@@ -28,7 +28,6 @@ The service is provided by the In App Purchase Odoo platform.
         'views/mail_notification_views.xml',
         'views/res_config_settings_views.xml',
         'views/res_partner_views.xml',
-        'views/assets.xml',
         'views/sms_sms_views.xml',
         'views/sms_template_views.xml',
         'security/ir.model.access.csv',
@@ -38,11 +37,28 @@ The service is provided by the In App Purchase Odoo platform.
         'data/sms_demo.xml',
         'data/mail_demo.xml',
     ],
-    'qweb': [
-        'static/src/bugfix/bugfix.xml',
-        'static/src/components/notification_group/notification_group.xml',
-        'static/src/components/message/message.xml',
-    ],
     'installable': True,
     'auto_install': True,
+    'assets': {
+        'web.assets_backend': [
+            'sms/static/src/js/fields_phone_widget.js',
+            'sms/static/src/js/fields_sms_widget.js',
+            'sms/static/src/bugfix/bugfix.js',
+            'sms/static/src/components/notification_group/notification_group.js',
+            'sms/static/src/models/message/message.js',
+            'sms/static/src/models/notification_group/notification_group.js',
+            'sms/static/src/bugfix/bugfix.scss',
+        ],
+        'web.qunit_suite_tests': [
+            'sms/static/tests/sms_widget_test.js',
+            'sms/static/src/bugfix/bugfix_tests.js',
+            'sms/static/src/components/message/message_tests.js',
+            'sms/static/src/components/notification_list/notification_list_notification_group_tests.js',
+        ],
+        'web.assets_qweb': [
+            'sms/static/src/bugfix/bugfix.xml',
+            'sms/static/src/components/notification_group/notification_group.xml',
+            'sms/static/src/components/message/message.xml',
+        ],
+    }
 }
diff --git a/addons/sms/views/assets.xml b/addons/sms/views/assets.xml
deleted file mode 100644
index aa255324968..00000000000
--- a/addons/sms/views/assets.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <template id="assets_backend" name="sms_assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/sms/static/src/js/fields_phone_widget.js"></script>
-                <script type="text/javascript" src="/sms/static/src/js/fields_sms_widget.js"></script>
-
-                <script type="text/javascript" src="/sms/static/src/bugfix/bugfix.js"/>
-                <script type="text/javascript" src="/sms/static/src/components/notification_group/notification_group.js"/>
-                <script type="text/javascript" src="/sms/static/src/models/message/message.js"/>
-                <script type="text/javascript" src="/sms/static/src/models/notification_group/notification_group.js"/>
-
-                <link rel="stylesheet" type="text/scss" href="/sms/static/src/bugfix/bugfix.scss"/>
-            </xpath>
-        </template>
-
-        <template id="qunit_suite" name="sms_widget_tests" inherit_id="web.qunit_suite_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/sms/static/tests/sms_widget_test.js"></script>
-
-                <script type="text/javascript" src="/sms/static/src/bugfix/bugfix_tests.js"/>
-                <script type="text/javascript" src="/sms/static/src/components/message/message_tests.js"/>
-                <script type="text/javascript" src="/sms/static/src/components/notification_list/notification_list_notification_group_tests.js"/>
-            </xpath>
-        </template>
-    </data>
-</odoo>
diff --git a/addons/snailmail/__manifest__.py b/addons/snailmail/__manifest__.py
index dd86463f0ff..aa1949df840 100644
--- a/addons/snailmail/__manifest__.py
+++ b/addons/snailmail/__manifest__.py
@@ -15,19 +15,46 @@ Allows users to send documents by post
         'data/snailmail_data.xml',
         'views/report_assets.xml',
         'views/snailmail_views.xml',
-        'views/assets.xml',
         'wizard/snailmail_confirm_views.xml',
         'wizard/snailmail_letter_cancel_views.xml',
         'wizard/snailmail_letter_format_error_views.xml',
         'wizard/snailmail_letter_missing_required_fields_views.xml',
         'security/ir.model.access.csv',
     ],
-    'qweb': [
-        'static/src/bugfix/bugfix.xml',
-        'static/src/components/message/message.xml',
-        'static/src/components/notification_group/notification_group.xml',
-        'static/src/components/snailmail_error_dialog/snailmail_error_dialog.xml',
-        'static/src/components/snailmail_notification_popover/snailmail_notification_popover.xml',
-    ],
     'auto_install': True,
+    'assets': {
+        'snailmail.report_assets_snailmail': [
+            ('include', 'web._assets_helpers'),
+            'web/static/lib/bootstrap/scss/_variables.scss',
+            'snailmail/static/src/scss/snailmail_external_layout_asset.scss',
+            'snailmail/static/src/js/snailmail_external_layout.js',
+        ],
+        'web.assets_backend': [
+            'snailmail/static/src/bugfix/bugfix.js',
+            'snailmail/static/src/components/message/message.js',
+            'snailmail/static/src/components/notification_group/notification_group.js',
+            'snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.js',
+            'snailmail/static/src/components/snailmail_notification_popover/snailmail_notification_popover.js',
+            'snailmail/static/src/models/message/message.js',
+            'snailmail/static/src/models/messaging/messaging.js',
+            'snailmail/static/src/models/notification_group/notification_group.js',
+            'snailmail/static/src/bugfix/bugfix.scss',
+            'snailmail/static/src/components/snailmail_notification_popover/snailmail_notification_popover.scss',
+        ],
+        'web.tests_assets': [
+            'snailmail/static/tests/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'snailmail/static/src/bugfix/bugfix_tests.js',
+            'snailmail/static/src/components/message/message_tests.js',
+            'snailmail/static/src/components/notification_list/notification_list_notification_group_tests.js',
+        ],
+        'web.assets_qweb': [
+            'snailmail/static/src/bugfix/bugfix.xml',
+            'snailmail/static/src/components/message/message.xml',
+            'snailmail/static/src/components/notification_group/notification_group.xml',
+            'snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.xml',
+            'snailmail/static/src/components/snailmail_notification_popover/snailmail_notification_popover.xml',
+        ],
+    }
 }
diff --git a/addons/snailmail/views/assets.xml b/addons/snailmail/views/assets.xml
deleted file mode 100644
index e7bd704d477..00000000000
--- a/addons/snailmail/views/assets.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="iap assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/snailmail/static/src/bugfix/bugfix.js"></script>
-            <script type="text/javascript" src="/snailmail/static/src/components/message/message.js"/>
-            <script type="text/javascript" src="/snailmail/static/src/components/notification_group/notification_group.js"/>
-            <script type="text/javascript" src="/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.js"/>
-            <script type="text/javascript" src="/snailmail/static/src/components/snailmail_notification_popover/snailmail_notification_popover.js"/>
-            <script type="text/javascript" src="/snailmail/static/src/models/message/message.js"/>
-            <script type="text/javascript" src="/snailmail/static/src/models/messaging/messaging.js"/>
-            <script type="text/javascript" src="/snailmail/static/src/models/notification_group/notification_group.js"/>
-
-            <link rel="stylesheet" type="text/scss" href="/snailmail/static/src/bugfix/bugfix.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/snailmail/static/src/components/snailmail_notification_popover/snailmail_notification_popover.scss"/>
-        </xpath>
-    </template>
-
-    <template id="tests_assets" name="snailmail tests assets" inherit_id="web.tests_assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/snailmail/static/tests/helpers/mock_models.js"/>
-            <script type="text/javascript" src="/snailmail/static/tests/helpers/mock_server.js"/>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" name="snailmail_tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/snailmail/static/src/bugfix/bugfix_tests.js"/>
-            <script type="text/javascript" src="/snailmail/static/src/components/message/message_tests.js"/>
-            <script type="text/javascript" src="/snailmail/static/src/components/notification_list/notification_list_notification_group_tests.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/snailmail/views/report_assets.xml b/addons/snailmail/views/report_assets.xml
index f5715abd2bf..c0ef237543e 100644
--- a/addons/snailmail/views/report_assets.xml
+++ b/addons/snailmail/views/report_assets.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="report_assets_snailmail">
-        <t t-call="web._assets_helpers"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/snailmail/static/src/scss/snailmail_external_layout_asset.scss"/>
-        <script type="text/javascript" src="/snailmail/static/src/js/snailmail_external_layout.js"/>
-    </template>
     <template id="report_layout" inherit_id="web.report_layout">
         <xpath expr="//head" position="inside">
             <t t-if="env and env.context.get('snailmail_layout')" t-call-assets="snailmail.report_assets_snailmail"/>
diff --git a/addons/snailmail_account/__manifest__.py b/addons/snailmail_account/__manifest__.py
index 758f2f15cf3..b76ee32c33d 100644
--- a/addons/snailmail_account/__manifest__.py
+++ b/addons/snailmail_account/__manifest__.py
@@ -10,9 +10,13 @@ Allows users to send invoices by post
     'depends': ['account', 'snailmail'],
     'data': [
         'views/res_config_settings_views.xml',
-        'views/assets.xml',
         'wizard/account_invoice_send_views.xml',
         'security/ir.model.access.csv',
     ],
     'auto_install': True,
+    'assets': {
+        'web.assets_backend': [
+            'snailmail_account/static/**/*',
+        ],
+    }
 }
diff --git a/addons/snailmail_account/views/assets.xml b/addons/snailmail_account/views/assets.xml
deleted file mode 100644
index 529d22849b1..00000000000
--- a/addons/snailmail_account/views/assets.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="iap assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/snailmail_account/static/src/js/snailmail_account_notification_manager.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/stock/__manifest__.py b/addons/stock/__manifest__.py
index f0accd06852..8509c651d04 100644
--- a/addons/stock/__manifest__.py
+++ b/addons/stock/__manifest__.py
@@ -80,18 +80,56 @@
         'views/stock_package_level_views.xml',
         'views/stock_package_type_view.xml',
     ],
-    'qweb': [
-        'static/src/xml/inventory_report.xml',
-        'static/src/xml/inventory_lines.xml',
-        'static/src/xml/popover_widget.xml',
-        'static/src/xml/forecast_widget.xml',
-        'static/src/xml/report_stock_forecasted.xml',
-        'static/src/xml/stock_orderpoint.xml',
-        'static/src/xml/stock_traceability_report_backend.xml',
-    ],
     'installable': True,
     'application': True,
     'auto_install': False,
     'pre_init_hook': 'pre_init_hook',
     'post_init_hook': '_assign_default_mail_template_picking_id',
+    'assets': {
+        'web.report_assets_common': [
+            'web/static/src/scss/views.scss',
+            'web/static/src/scss/graph_view.scss',
+            'stock/static/src/scss/report_stock_forecasted.scss',
+            'stock/static/src/scss/report_stock_rule.scss',
+        ],
+        'web.assets_common': [
+            'stock/static/src/scss/stock_traceability_report.scss',
+        ],
+        'web.assets_backend': [
+            'stock/static/src/js/inventory_report_list_controller.js',
+            'stock/static/src/js/inventory_report_list_view.js',
+            'stock/static/src/js/inventory_singleton_list_controller.js',
+            'stock/static/src/js/inventory_singleton_list_view.js',
+            'stock/static/src/js/inventory_validate_button_controller.js',
+            'stock/static/src/js/inventory_validate_button_view.js',
+            'stock/static/src/js/report_stock_forecasted.js',
+            'stock/static/src/js/stock_orderpoint_list_controller.js',
+            'stock/static/src/js/stock_orderpoint_list_model.js',
+            'stock/static/src/js/stock_orderpoint_list_view.js',
+            'stock/static/src/js/stock_traceability_report_backend.js',
+            'stock/static/src/js/stock_traceability_report_widgets.js',
+            'stock/static/src/js/popover_widget.js',
+            'stock/static/src/js/forecast_widget.js',
+            'stock/static/src/js/basic_model.js',
+            'stock/static/src/js/stock_rescheduling_popover.js',
+            'stock/static/tests/tours/stock_report_tests.js',
+            'stock/static/src/scss/forecast_widget.scss',
+            'stock/static/src/scss/stock_traceability_report.scss',
+            'stock/static/src/scss/stock_empty_screen.scss',
+        ],
+        'web.qunit_suite_tests': [
+            'stock/static/tests/singleton_list_tests.js',
+            'stock/static/tests/popover_widget_tests.js',
+            'stock/static/tests/stock_traceability_report_backend_tests.js',
+        ],
+        'web.assets_qweb': [
+            'stock/static/src/xml/inventory_report.xml',
+            'stock/static/src/xml/inventory_lines.xml',
+            'stock/static/src/xml/popover_widget.xml',
+            'stock/static/src/xml/forecast_widget.xml',
+            'stock/static/src/xml/report_stock_forecasted.xml',
+            'stock/static/src/xml/stock_orderpoint.xml',
+            'stock/static/src/xml/stock_traceability_report_backend.xml',
+        ],
+    }
 }
diff --git a/addons/stock/report/report_stock_forecasted.xml b/addons/stock/report/report_stock_forecasted.xml
index ecd9ea6ecaf..eb1bbc37ef9 100644
--- a/addons/stock/report/report_stock_forecasted.xml
+++ b/addons/stock/report/report_stock_forecasted.xml
@@ -21,14 +21,6 @@
     </record>
 
 <!-- Templates -->
-    <template id="assets_common_replenishment_report" name="Forecasted Inventory CSS" inherit_id="web.report_assets_common">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/views.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/graph_view.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/stock/static/src/scss/report_stock_forecasted.scss"/>
-        </xpath>
-    </template>
-
     <template id="report_replenishment_header">
         <div class="d-flex flex-wrap justify-content-between">
             <div class="o_product_name">
diff --git a/addons/stock/report/report_stock_rule.xml b/addons/stock/report/report_stock_rule.xml
index 21cd39aefa3..93a68ced7a8 100644
--- a/addons/stock/report/report_stock_rule.xml
+++ b/addons/stock/report/report_stock_rule.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <template id="assets_common" name="report_stock_rule assets" inherit_id="web.report_assets_common">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/stock/static/src/scss/report_stock_rule.scss"/>
-        </xpath>
-    </template>
-
     <template id="report_stock_rule">
         <t t-set="data_report_landscape" t-value="True"/>
         <t t-set="full_width" t-value="True"/>
diff --git a/addons/stock/views/report_stock_traceability.xml b/addons/stock/views/report_stock_traceability.xml
index f6181bcf6e7..7b4513a1acf 100644
--- a/addons/stock/views/report_stock_traceability.xml
+++ b/addons/stock/views/report_stock_traceability.xml
@@ -75,12 +75,6 @@
         </div>
     </template>
 
-    <template id="assets_stock_print_report" inherit_id="web.assets_common">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/stock/static/src/scss/stock_traceability_report.scss"/>
-        </xpath>
-    </template>
-
     <template id="report_stock_inventory_print">
         <t t-raw="'&lt;base href=%s&gt;' % base_url"/>
         <t t-call="web.html_container">
diff --git a/addons/stock/views/stock_template.xml b/addons/stock/views/stock_template.xml
index 96c312f7527..e2655efd100 100644
--- a/addons/stock/views/stock_template.xml
+++ b/addons/stock/views/stock_template.xml
@@ -1,40 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <template id="stock_assets_backend" name="mrp_workorder assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/stock/static/src/js/inventory_report_list_controller.js"></script>
-            <script type="text/javascript" src="/stock/static/src/js/inventory_report_list_view.js"></script>
-            <script type="text/javascript" src="/stock/static/src/js/inventory_singleton_list_controller.js"></script>
-            <script type="text/javascript" src="/stock/static/src/js/inventory_singleton_list_view.js"></script>
-            <script type="text/javascript" src="/stock/static/src/js/inventory_validate_button_controller.js"></script>
-            <script type="text/javascript" src="/stock/static/src/js/inventory_validate_button_view.js"></script>
-            <script type="text/javascript" src="/stock/static/src/js/report_stock_forecasted.js"/>
-            <script type="text/javascript" src="/stock/static/src/js/stock_orderpoint_list_controller.js"></script>
-            <script type="text/javascript" src="/stock/static/src/js/stock_orderpoint_list_model.js"></script>
-            <script type="text/javascript" src="/stock/static/src/js/stock_orderpoint_list_view.js"></script>
-            <script type="text/javascript" src="/stock/static/src/js/stock_traceability_report_backend.js"></script>
-            <script type="text/javascript" src="/stock/static/src/js/stock_traceability_report_widgets.js"></script>
-            <script type="text/javascript" src="/stock/static/src/js/popover_widget.js"></script>
-            <script type="text/javascript" src="/stock/static/src/js/forecast_widget.js"></script>
-            <script type="text/javascript" src="/stock/static/src/js/basic_model.js"></script>
-            <script type="text/javascript" src="/stock/static/src/js/stock_rescheduling_popover.js"></script>
-            <script type="text/javascript" src="/stock/static/tests/tours/stock_report_tests.js"></script>
-            <link rel="stylesheet" type="text/scss" href="/stock/static/src/scss/forecast_widget.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/stock/static/src/scss/stock_traceability_report.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/stock/static/src/scss/stock_empty_screen.scss"/>
-        </xpath>
-   </template>
-
-    <template id="qunit_suite" name="stock tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/stock/static/tests/singleton_list_tests.js"/>
-            <script type="text/javascript" src="/stock/static/tests/popover_widget_tests.js"/>
-            <script type="text/javascript" src="/stock/static/tests/stock_traceability_report_backend_tests.js"/>
-        </xpath>
-    </template>
-
-   <template id="message_head">
+    <template id="message_head">
         <t t-if="move.state != 'done'">
             <strong>The initial demand has been updated.</strong>
         </t>
diff --git a/addons/survey/__manifest__.py b/addons/survey/__manifest__.py
index fa0129ffd4b..12ec1e16e53 100644
--- a/addons/survey/__manifest__.py
+++ b/addons/survey/__manifest__.py
@@ -29,7 +29,6 @@ sent mails with personal token for the invitation of the survey.
         'data/ir_actions_data.xml',
         'security/survey_security.xml',
         'security/ir.model.access.csv',
-        'views/assets.xml',
         'views/survey_menus.xml',
         'views/survey_survey_views.xml',
         'views/survey_user_views.xml',
@@ -56,4 +55,42 @@ sent mails with personal token for the invitation of the survey.
     'auto_install': False,
     'application': True,
     'sequence': 220,
+    'assets': {
+        'survey.survey_assets': [
+            'web/static/lib/Chart/Chart.js',
+            'web/static/src/js/fields/field_utils.js',
+            'survey/static/src/js/survey_quick_access.js',
+            'survey/static/src/js/survey_timer.js',
+            'survey/static/src/js/survey_breadcrumb.js',
+            'survey/static/src/js/survey_form.js',
+            'survey/static/src/js/survey_print.js',
+            'survey/static/src/js/survey_result.js',
+            ('include', 'web._assets_helpers'),
+            ('include', 'web._assets_frontend_helpers'),
+            'web/static/lib/bootstrap/scss/_variables.scss',
+            'survey/static/src/css/survey_print.css',
+            'survey/static/src/css/survey_result.css',
+            'survey/static/src/scss/survey_form.scss',
+        ],
+        'survey.survey_user_input_session_assets': [
+            'survey/static/src/js/libs/chartjs-plugin-datalabels.min.js',
+            'survey/static/src/js/survey_session_colors.js',
+            'survey/static/src/js/survey_session_chart.js',
+            'survey/static/src/js/survey_session_text_answers.js',
+            'survey/static/src/js/survey_session_leaderboard.js',
+            'survey/static/src/js/survey_session_manage.js',
+        ],
+        'web.report_assets_pdf': [
+            'survey/static/src/scss/survey_reports.scss',
+        ],
+        'web.assets_backend': [
+            'survey/static/src/css/survey_result.css',
+            'survey/static/src/js/fields_section_one2many.js',
+            'survey/static/src/js/fields_form_page_description.js',
+            'survey/static/src/scss/survey_views.scss',
+        ],
+        'web.assets_tests': [
+            'survey/static/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/survey/views/assets.xml b/addons/survey/views/assets.xml
deleted file mode 100644
index 664fa801b57..00000000000
--- a/addons/survey/views/assets.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-<data>
-    <!-- survey assets  -->
-    <template id="survey_assets" name="Survey Results assets">
-        <script src="/web/static/lib/Chart/Chart.js"></script>
-
-        <script type="text/javascript" src="/web/static/src/js/fields/field_utils.js"></script>
-
-        <script type="text/javascript" src="/survey/static/src/js/survey_quick_access.js" />
-        <script type="text/javascript" src="/survey/static/src/js/survey_timer.js" />
-        <script type="text/javascript" src="/survey/static/src/js/survey_breadcrumb.js" />
-        <script type="text/javascript" src="/survey/static/src/js/survey_form.js" />
-        <script type="text/javascript" src="/survey/static/src/js/survey_print.js" />
-        <script type="text/javascript" src="/survey/static/src/js/survey_result.js" />
-
-        <t t-call="web._assets_helpers"/>
-        <t t-call="web._assets_frontend_helpers"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
-        <link href="/survey/static/src/css/survey_print.css" rel="stylesheet" type="text/css"/>
-        <link href="/survey/static/src/css/survey_result.css" rel="stylesheet" type="text/css"></link>
-        <link rel="stylesheet" type="text/scss" href="/survey/static/src/scss/survey_form.scss"/>
-    </template>
-
-    <!-- survey user input session assets  -->
-    <template id="survey_user_input_session_assets" name="Survey User Input Session Assets">
-        <script type="text/javascript" src="/survey/static/src/js/libs/chartjs-plugin-datalabels.min.js" />
-        <script type="text/javascript" src="/survey/static/src/js/survey_session_colors.js" />
-        <script type="text/javascript" src="/survey/static/src/js/survey_session_chart.js" />
-        <script type="text/javascript" src="/survey/static/src/js/survey_session_text_answers.js" />
-        <script type="text/javascript" src="/survey/static/src/js/survey_session_leaderboard.js" />
-        <script type="text/javascript" src="/survey/static/src/js/survey_session_manage.js" />
-    </template>
-
-    <template id="survey_report_assets_pdf" inherit_id="web.report_assets_pdf">
-        <xpath expr="link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/survey/static/src/scss/survey_reports.scss"/>
-        </xpath>
-    </template>
-
-    <template id="assets_backend" name="survey assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" href="/survey/static/src/css/survey_result.css"/>
-            <script type="text/javascript" src="/survey/static/src/js/fields_section_one2many.js"/>
-            <script type="text/javascript" src="/survey/static/src/js/fields_form_page_description.js"/>
-        </xpath>
-    </template>
-
-    <template id="assets_backend_inherit_survey" inherit_id="web.assets_backend" name="Survey backend assets">
-        <xpath expr="link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/survey/static/src/scss/survey_views.scss"/>
-        </xpath>
-    </template>
-
-    <template id="assets_tests" name="Survey Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/survey/static/tests/tours/certification_failure.js"></script>
-            <script type="text/javascript" src="/survey/static/tests/tours/certification_success.js"></script>
-            <script type="text/javascript" src="/survey/static/tests/tours/survey.js"></script>
-            <script type="text/javascript" src="/survey/static/tests/tours/survey_prefill.js"></script>
-            <script type="text/javascript" src="/survey/static/tests/tours/survey_tour_session_tools.js"></script>
-            <script type="text/javascript" src="/survey/static/tests/tours/survey_tour_session_create.js"></script>
-            <script type="text/javascript" src="/survey/static/tests/tours/survey_tour_session_start.js"></script>
-            <script type="text/javascript" src="/survey/static/tests/tours/survey_tour_session_manage.js"></script>
-            <script type="text/javascript" src="/survey/static/tests/tours/survey_session_manage_test.js"></script>
-        </xpath>
-    </template>
-</data>
-</odoo>
diff --git a/addons/test_event_full/__manifest__.py b/addons/test_event_full/__manifest__.py
index 19f6c5c2473..c4e9e72d501 100644
--- a/addons/test_event_full/__manifest__.py
+++ b/addons/test_event_full/__manifest__.py
@@ -25,10 +25,10 @@ automatic lead generation, full Online support, ...
         'website_event_track_live',
         'website_event_track_quiz',
     ],
-    'data': [
-        'views/assets.xml',
-    ],
-    'demo': [
-    ],
     'installable': True,
+    'assets': {
+        'web.assets_tests': [
+            'test_event_full/static/**/*',
+        ],
+    }
 }
diff --git a/addons/test_event_full/views/assets.xml b/addons/test_event_full/views/assets.xml
deleted file mode 100644
index 0b20fc8de0e..00000000000
--- a/addons/test_event_full/views/assets.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" ?>
-<odoo><data>
-    <template id="assets_tests" inherit_id="web.assets_tests" name="Full Event Tests Assets">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/test_event_full/static/src/js/tours/wevent_register_tour.js"/>
-        </xpath>
-    </template>
-</data></odoo>
diff --git a/addons/test_website/__manifest__.py b/addons/test_website/__manifest__.py
index f4a0f2d0f9a..9b2a635225e 100644
--- a/addons/test_website/__manifest__.py
+++ b/addons/test_website/__manifest__.py
@@ -22,4 +22,12 @@ models which only purpose is to run tests.""",
     ],
     'installable': True,
     'application': False,
+    'assets': {
+        'web.assets_frontend': [
+            'test_website/static/src/**/*',
+        ],
+        'web.assets_tests': [
+            'test_website/static/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/test_website/views/templates.xml b/addons/test_website/views/templates.xml
index 2bbee7e9714..730c1dae14f 100644
--- a/addons/test_website/views/templates.xml
+++ b/addons/test_website/views/templates.xml
@@ -1,20 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="assets_frontend" inherit_id="website.assets_frontend">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/test_website/static/src/js/test_error.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_tests" name="Test Website Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/test_website/static/tests/tours/reset_views.js"></script>
-            <script type="text/javascript" src="/test_website/static/tests/tours/error_views.js"></script>
-            <script type="text/javascript" src="/test_website/static/tests/tours/json_auth.js"></script>
-            <script type="text/javascript" src="/test_website/static/tests/tours/custom_snippets.js"></script>
-        </xpath>
-    </template>
-
     <record id="multi_url" model="website.page">
         <field name="name">Multi URL test</field>
         <field name="url">/multi_url</field>
diff --git a/addons/test_website_slides_full/__manifest__.py b/addons/test_website_slides_full/__manifest__.py
index 03beae363c1..85fe0edffeb 100644
--- a/addons/test_website_slides_full/__manifest__.py
+++ b/addons/test_website_slides_full/__manifest__.py
@@ -19,8 +19,10 @@ certification flow including purchase, certification, failure and success.
     'demo': [
         'data/product_demo.xml',
     ],
-    'data': [
-        'views/assets.xml',
-    ],
     'installable': True,
+    'assets': {
+        'web.assets_tests': [
+            'test_website_slides_full/tests/tours/**/*',
+        ],
+    }
 }
diff --git a/addons/test_website_slides_full/views/assets.xml b/addons/test_website_slides_full/views/assets.xml
deleted file mode 100644
index f73482d3934..00000000000
--- a/addons/test_website_slides_full/views/assets.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" ?>
-<odoo><data>
-    <template id="assets_tests" inherit_id="web.assets_tests" name="Full Slides Tests Assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/test_website_slides_full/tests/tours/slides_certification_member.js"/>
-        </xpath>
-    </template>
-</data></odoo>
diff --git a/addons/utm/__manifest__.py b/addons/utm/__manifest__.py
index fb0eaf4603e..1f7b6e4585e 100644
--- a/addons/utm/__manifest__.py
+++ b/addons/utm/__manifest__.py
@@ -11,7 +11,6 @@ Enable management of UTM trackers: campaign, medium, source.
     'depends': ['base', 'web'],
     'data': [
         'data/utm_data.xml',
-        'views/assets.xml',
         'views/utm_campaign_views.xml',
         'views/utm_views.xml',
         'security/ir.model.access.csv',
@@ -20,4 +19,9 @@ Enable management of UTM trackers: campaign, medium, source.
         'data/utm_demo.xml',
     ],
     'auto_install': False,
+    'assets': {
+        'web.assets_backend': [
+            'utm/static/src/**/*',
+        ],
+    }
 }
diff --git a/addons/utm/views/assets.xml b/addons/utm/views/assets.xml
deleted file mode 100644
index 0195faae527..00000000000
--- a/addons/utm/views/assets.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_backend" name="utm assets" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/utm/static/src/js/utm_campaign_kanban_examples.js"></script>
-        </xpath>
-        <xpath expr="link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/utm/static/src/scss/utm_views.scss"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py
index 986e5835b8b..d375d6ff965 100644
--- a/addons/web/__manifest__.py
+++ b/addons/web/__manifest__.py
@@ -5,13 +5,12 @@
     'name': 'Web',
     'category': 'Hidden',
     'version': '1.0',
-    'description':
-        """
+    'description': """
 Odoo Web core module.
 ========================
 
 This module provides the core of the Odoo Web Client.
-        """,
+""",
     'depends': ['base'],
     'auto_install': True,
     'data': [
@@ -21,22 +20,505 @@ This module provides the core of the Odoo Web Client.
         'views/base_document_layout_views.xml',
         'data/report_layout.xml',
     ],
-    'qweb': [
-        "static/src/xml/base.xml",
-        "static/src/xml/chart.xml",
-        "static/src/xml/fields.xml",
-        "static/src/xml/file_upload_progress_bar.xml",
-        "static/src/xml/file_upload_progress_card.xml",
-        "static/src/xml/kanban.xml",
-        "static/src/xml/menu.xml",
-        "static/src/xml/notification.xml",
-        "static/src/xml/pivot.xml",
-        "static/src/xml/rainbow_man.xml",
-        "static/src/xml/report.xml",
-        "static/src/xml/search_panel.xml",
-        "static/src/xml/web_calendar.xml",
-        "static/src/xml/graph.xml",
-        "static/src/xml/week_days.xml",
-    ],
+    'assets': {
+        # ---------------------------------------------------------------------
+        # MAIN BUNDLES
+        # ---------------------------------------------------------------------
+        # These are the bundles meant to be called via "t-call-assets" in
+        # regular XML templates.
+        #
+        # The convention to name bundles is as following:
+        # 1) the name of the first module defining the bundle
+        # 2) the prefix "assets_"
+        # 3) an arbitrary name, relevant to the content of the bundle.
+        #
+        # Exemples:
+        #   > web.assets_common = assets common to both frontend and backend clients.
+        #   > web_editor.assets_wysiwyg = assets needed by components defined in the "web_editor" module.
+
+        'web.assets_qweb': [
+            'web/static/src/xml/base.xml',
+            'web/static/src/xml/chart.xml',
+            'web/static/src/xml/fields.xml',
+            'web/static/src/xml/file_upload_progress_bar.xml',
+            'web/static/src/xml/file_upload_progress_card.xml',
+            'web/static/src/xml/kanban.xml',
+            'web/static/src/xml/menu.xml',
+            'web/static/src/xml/notification.xml',
+            'web/static/src/xml/pivot.xml',
+            'web/static/src/xml/rainbow_man.xml',
+            'web/static/src/xml/report.xml',
+            'web/static/src/xml/search_panel.xml',
+            'web/static/src/xml/web_calendar.xml',
+            'web/static/src/xml/graph.xml',
+            'web/static/src/xml/week_days.xml',
+        ],
+        'web.assets_common_minimal': [
+            'web/static/lib/es6-promise/es6-promise-polyfill.js',
+            'web/static/src/js/promise_extension.js',
+            'web/static/src/js/boot.js',
+        ],
+        'web.assets_common': [
+            ('include', 'web._assets_helpers'),
+
+            'web/static/lib/bootstrap/scss/_variables.scss',
+
+            ('include', 'web._assets_common_styles'),
+            ('include', 'web.assets_common_minimal'),
+            ('include', 'web._assets_common_scripts'),
+        ],
+        'web.assets_common_lazy': [
+            ('include', 'web.assets_common'),
+            # Remove assets_common_minimal
+            ('remove', 'web/static/lib/es6-promise/es6-promise-polyfill.js'),
+            ('remove', 'web/static/src/js/promise_extension.js'),
+            ('remove', 'web/static/src/js/boot.js'),
+        ],
+        'web.assets_backend': [
+            ('include', 'web._assets_helpers'),
+            ('include', 'web._assets_backend_helpers'),
+
+            'web/static/lib/bootstrap/scss/_variables.scss',
+
+            ('include', 'web._assets_bootstrap'),
+
+            'base/static/src/css/modules.css',
+
+            'web/static/src/scss/webclient_extra.scss',
+            'web/static/src/scss/webclient_layout.scss',
+
+            'web/static/src/scss/webclient.scss',
+            'web/static/src/scss/domain_selector.scss',
+            'web/static/src/scss/model_field_selector.scss',
+            'web/static/src/scss/progress_bar.scss',
+            'web/static/src/scss/dropdown.scss',
+            'web/static/src/scss/tooltip.scss',
+            'web/static/src/scss/switch_company_menu.scss',
+            'web/static/src/scss/debug_manager.scss',
+            'web/static/src/scss/control_panel.scss',
+            'web/static/src/scss/fields.scss',
+            'web/static/src/scss/file_upload.scss',
+            'web/static/src/scss/views.scss',
+            'web/static/src/scss/pivot_view.scss',
+            'web/static/src/scss/graph_view.scss',
+            'web/static/src/scss/form_view.scss',
+            'web/static/src/scss/list_view.scss',
+            'web/static/src/scss/kanban_dashboard.scss',
+            'web/static/src/scss/kanban_examples_dialog.scss',
+            'web/static/src/scss/kanban_column_progressbar.scss',
+            'web/static/src/scss/kanban_view.scss',
+            'web/static/src/scss/web_calendar.scss',
+            'web/static/src/scss/search_view.scss',
+            'web/static/src/scss/search_panel.scss',
+            'web/static/src/scss/dropdown_menu.scss',
+            'web/static/src/scss/data_export.scss',
+            'base/static/src/scss/onboarding.scss',
+            'web/static/src/scss/attachment_preview.scss',
+            'web/static/src/scss/notification.scss',
+            'web/static/src/scss/base_document_layout.scss',
+            'web/static/src/scss/special_fields.scss',
+            'web/static/src/scss/ribbon.scss',
+            'web/static/src/scss/base_settings.scss',
+            'web/static/src/scss/report_backend.scss',
+            'web/static/src/scss/dropdown_extra.scss',
+            'web/static/src/scss/fields_extra.scss',
+            'web/static/src/scss/form_view_extra.scss',
+            'web/static/src/scss/list_view_extra.scss',
+            'web/static/src/scss/search_view_extra.scss',
+
+            'base/static/src/js/res_config_settings.js',
+            'web/static/lib/jquery.scrollTo/jquery.scrollTo.js',
+            'web/static/lib/fuzzy-master/fuzzy.js',
+            'web/static/lib/py.js/lib/py.js',
+            'web/static/lib/py.js/lib/py_extras.js',
+            'web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js',
+
+            'web/static/src/js/_deprecated/*',
+            'web/static/src/js/chrome/abstract_action.js',
+            'web/static/src/js/chrome/abstract_web_client.js',
+            'web/static/src/js/chrome/action_manager_act_window.js',
+            'web/static/src/js/chrome/action_manager_report.js',
+            'web/static/src/js/chrome/action_manager.js',
+            'web/static/src/js/chrome/action_mixin.js',
+            'web/static/src/js/chrome/apps_menu.js',
+            'web/static/src/js/chrome/loading.js',
+            'web/static/src/js/chrome/menu.js',
+            'web/static/src/js/chrome/root_widget.js',
+            'web/static/src/js/chrome/systray_menu.js',
+            'web/static/src/js/chrome/user_menu.js',
+            'web/static/src/js/chrome/web_client.js',
+            'web/static/src/js/components/*',
+            'web/static/src/js/control_panel/*',
+            'web/static/src/js/core/domain.js',
+            'web/static/src/js/core/mvc.js',
+            'web/static/src/js/core/py_utils.js',
+            'web/static/src/js/core/context.js',
+            'web/static/src/js/core/data_comparison_utils.js',
+            'web/static/src/js/core/math_utils.js',
+            'web/static/src/js/core/misc.js',
+            'web/static/src/js/fields/*',
+            'web/static/src/js/report/utils.js',
+            'web/static/src/js/report/client_action.js',
+            'web/static/src/js/services/crash_manager_service.js',
+            'web/static/src/js/services/data_manager.js',
+            'web/static/src/js/services/report_service.js',
+            'web/static/src/js/services/session.js',
+            'web/static/src/js/tools/test_menus_loader.js',
+            'web/static/src/js/tools/debug_manager_backend.js',
+            'web/static/src/js/tools/tools.js',
+            'web/static/src/js/views/abstract_view.js',
+            'web/static/src/js/views/abstract_renderer.js',
+            'web/static/src/js/views/abstract_renderer_owl.js',
+            'web/static/src/js/views/abstract_model.js',
+            'web/static/src/js/views/abstract_controller.js',
+            'web/static/src/js/views/renderer_wrapper.js',
+            'web/static/src/js/views/search_panel_model_extension.js',
+            'web/static/src/js/views/search_panel.js',
+            'web/static/src/js/views/action_model.js',
+            'web/static/src/js/views/field_manager_mixin.js',
+            'web/static/src/js/views/file_upload_mixin.js',
+            'web/static/src/js/views/file_upload_progress_bar.js',
+            'web/static/src/js/views/file_upload_progress_card.js',
+            'web/static/src/js/views/sample_server.js',
+            'web/static/src/js/views/select_create_controllers_registry.js',
+            'web/static/src/js/views/signature_dialog.js',
+            'web/static/src/js/views/standalone_field_manager_mixin.js',
+            'web/static/src/js/views/view_registry.js',
+            'web/static/src/js/views/view_dialogs.js',
+            'web/static/src/js/views/view_utils.js',
+            'web/static/src/js/views/basic/*',
+            'web/static/src/js/views/calendar/*',
+            'web/static/src/js/views/form/*',
+            'web/static/src/js/views/graph/*',
+            'web/static/src/js/views/kanban/*',
+            'web/static/src/js/views/list/*',
+            'web/static/src/js/views/pivot/*',
+            'web/static/src/js/views/qweb/*',
+            'web/static/src/js/widgets/change_password.js',
+            'web/static/src/js/widgets/data_export.js',
+            'web/static/src/js/widgets/date_picker.js',
+            'web/static/src/js/widgets/domain_selector_dialog.js',
+            'web/static/src/js/widgets/domain_selector.js',
+            'web/static/src/js/widgets/iframe_widget.js',
+            'web/static/src/js/widgets/model_field_selector.js',
+            'web/static/src/js/widgets/switch_company_menu.js',
+            'web/static/src/js/widgets/pie_chart.js',
+            'web/static/src/js/widgets/ribbon.js',
+            'web/static/src/js/widgets/week_days.js',
+            'web/static/src/js/widgets/signature.js',
+            'web/static/src/js/widgets/attach_document.js',
+            'web/static/src/js/apps.js',
+            'web/static/src/js/env.js',
+            'web/static/src/js/model.js',
+            'web/static/src/js/owl_compatibility.js',
+        ],
+        'web.assets_frontend_minimal': [
+            'web/static/src/js/public/lazyloader.js',
+        ],
+        'web.assets_frontend': [
+            ('include', 'web._assets_helpers'),
+            ('include', 'web._assets_frontend_helpers'),
+
+            'web/static/lib/bootstrap/scss/_variables.scss',
+
+            ('include', 'web._assets_bootstrap'),
+
+            'web/static/src/scss/base_frontend.scss',
+            'web/static/src/scss/lazyloader.scss',
+            'web/static/src/scss/navbar_mobile.scss',
+            'web/static/src/scss/notification.scss',
+
+            ('include', 'web.assets_frontend_minimal'),
+
+            'web/static/src/js/services/session.js',
+            'web/static/src/js/public/public_env.js',
+            'web/static/src/js/public/public_crash_manager.js',
+            'web/static/src/js/public/public_notification.js',
+            'web/static/src/js/public/public_root.js',
+            'web/static/src/js/public/public_root_instance.js',
+            'web/static/src/js/public/public_widget.js',
+        ],
+        'web.assets_frontend_lazy': [
+            ('include', 'web.assets_frontend'),
+            # Remove assets_frontend_minimal
+            ('remove', 'web/static/src/js/public/lazyloader.js')
+        ],
+        'web.assets_backend_prod_only': [
+            'web/static/src/js/main.js',
+        ],
+        # Optional Bundle for PDFJS lib
+        # Since PDFJS is quite huge (80000≈ lines), please only load it when it is necessary.
+        # For now, it is only use to display the PDF slide Viewer during an embed.
+        # Bundlized, the size is reduced to 5300≈ lines.
+        'web.pdf_js_lib': [
+            'web/static/lib/pdfjs/build/pdf.js',
+            'web/static/lib/pdfjs/build/pdf.worker.js',
+        ],
+        'web.report_assets_common': [
+            ('include', 'web._assets_helpers'),
+
+            'web/static/src/scss/bootstrap_overridden_report.scss',
+            'web/static/lib/bootstrap/scss/_variables.scss',
+
+            ('include', 'web._assets_bootstrap'),
+
+            'base/static/src/css/description.css',
+            'web/static/lib/fontawesome/css/font-awesome.css',
+            'web/static/src/scss/fonts.scss',
+            'web/static/src/scss/report.scss',
+            'web/static/src/scss/layout_standard.scss',
+            'web/static/src/scss/layout_background.scss',
+            'web/static/src/scss/layout_boxed.scss',
+            'web/static/src/scss/layout_clean.scss',
+            '/web/static/src/scss/asset_styles_company_report.scss',
+            'web/static/src/js/services/session.js',
+            'web/static/src/js/public/public_root.js',
+            'web/static/src/js/public/public_root_instance.js',
+            'web/static/src/js/public/public_widget.js',
+            'web/static/src/js/report/utils.js',
+            'web/static/src/js/report/report.js',
+        ],
+        'web.report_assets_pdf': [
+            'web/static/src/css/reset.min.css',
+        ],
+
+        # ---------------------------------------------------------------------
+        # SUB BUNDLES
+        # ---------------------------------------------------------------------
+        # These bundles can be used by main bundles but are not supposed to be
+        # called directly from XML templates.
+        #
+        # Their naming conventions are similar to those of the main bundles,
+        # with the addition of a prefixed underscore to reflect the "private"
+        # aspect.
+        #
+        # Exemples:
+        #   > web._assets_helpers = define assets needed in most main bundles
+
+        'web._assets_primary_variables': [
+            'web/static/src/scss/primary_variables.scss',
+        ],
+        'web._assets_secondary_variables': [
+            'web/static/src/scss/secondary_variables.scss',
+        ],
+        'web._assets_helpers': [
+            'web/static/lib/bootstrap/scss/_functions.scss',
+            'web/static/lib/bootstrap/scss/_mixins.scss',
+            'web/static/src/scss/bs_mixins_overrides.scss',
+            'web/static/src/scss/utils.scss',
+
+            ('include', 'web._assets_primary_variables'),
+            ('include', 'web._assets_secondary_variables'),
+        ],
+        'web._assets_bootstrap': [
+            'web/static/src/scss/import_bootstrap.scss',
+            'web/static/src/scss/bootstrap_review.scss',
+        ],
+        'web._assets_backend_helpers': [
+            'web/static/src/scss/bootstrap_overridden.scss',
+        ],
+        'web._assets_frontend_helpers': [
+            'web/static/src/scss/bootstrap_overridden_frontend.scss',
+        ],
+        'web._assets_common_styles': [
+            'web/static/lib/jquery.ui/jquery-ui.css',
+            'web/static/lib/fontawesome/css/font-awesome.css',
+            'web/static/lib/select2/select2.css',
+            'web/static/lib/select2-bootstrap-css/select2-bootstrap.css',
+            'web/static/lib/tempusdominus/tempusdominus.scss',
+            'web/static/src/scss/fonts.scss',
+            'web/static/src/scss/ui.scss',
+            'web/static/src/scss/ui_extra.scss',
+            'web/static/src/scss/navbar.scss',
+            'web/static/src/scss/mimetypes.scss',
+            'web/static/src/scss/modal.scss',
+            'web/static/src/scss/animation.scss',
+            'web/static/src/scss/rainbow.scss',
+            'web/static/src/scss/datepicker.scss',
+            'web/static/src/scss/daterangepicker.scss',
+            'web/static/src/scss/banner.scss',
+            'web/static/src/scss/colorpicker.scss',
+            'web/static/src/scss/popover.scss',
+            'web/static/src/scss/translation_dialog.scss',
+            'web/static/src/scss/keyboard.scss',
+            'web/static/src/scss/name_and_signature.scss',
+            'web/static/src/scss/web.zoomodoo.scss',
+            'web/static/src/scss/color_picker.scss',
+            'web/static/src/scss/fontawesome_overridden.scss',
+        ],
+        'web._assets_common_scripts': [
+            'web/static/lib/underscore/underscore.js',
+            'web/static/lib/underscore.string/lib/underscore.string.js',
+            'web/static/lib/moment/moment.js',
+            'web/static/lib/owl/owl.js',
+            'web/static/src/js/component_extension.js',
+            'web/static/lib/jquery/jquery.js',
+            'web/static/lib/jquery.ui/jquery-ui.js',
+            'web/static/lib/jquery/jquery.browser.js',
+            'web/static/lib/jquery.blockUI/jquery.blockUI.js',
+            'web/static/lib/jquery.hotkeys/jquery.hotkeys.js',
+            'web/static/lib/jquery.placeholder/jquery.placeholder.js',
+            'web/static/lib/jquery.form/jquery.form.js',
+            'web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js',
+            'web/static/lib/jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js',
+            'web/static/lib/popper/popper.js',
+            'web/static/lib/bootstrap/js/index.js',
+            'web/static/lib/bootstrap/js/util.js',
+            'web/static/lib/bootstrap/js/alert.js',
+            'web/static/lib/bootstrap/js/button.js',
+            'web/static/lib/bootstrap/js/carousel.js',
+            'web/static/lib/bootstrap/js/collapse.js',
+            'web/static/lib/bootstrap/js/dropdown.js',
+            'web/static/lib/bootstrap/js/modal.js',
+            'web/static/lib/bootstrap/js/tooltip.js',
+            'web/static/lib/bootstrap/js/popover.js',
+            'web/static/lib/bootstrap/js/scrollspy.js',
+            'web/static/lib/bootstrap/js/tab.js',
+            'web/static/lib/bootstrap/js/toast.js',
+            'web/static/lib/tempusdominus/tempusdominus.js',
+            'web/static/lib/select2/select2.js',
+            'web/static/lib/clipboard/clipboard.js',
+            'web/static/lib/jSignature/jSignatureCustom.js',
+            'web/static/lib/qweb/qweb2.js',
+            'web/static/src/js/libs/autocomplete.js',
+            'web/static/src/js/libs/bootstrap.js',
+            'web/static/src/js/libs/content-disposition.js',
+            'web/static/src/js/libs/download.js',
+            'web/static/src/js/libs/fullcalendar.js',
+            'web/static/src/js/libs/jquery.js',
+            'web/static/src/js/libs/underscore.js',
+            'web/static/src/js/libs/popper.js',
+            'web/static/src/js/libs/zoomodoo.js',
+            'web/static/src/js/chrome/keyboard_navigation_mixin.js',
+            'web/static/src/js/core/abstract_service.js',
+            'web/static/src/js/core/abstract_storage_service.js',
+            'web/static/src/js/core/ajax.js',
+            'web/static/src/js/core/browser_detection.js',
+            'web/static/src/js/core/bus.js',
+            'web/static/src/js/core/custom_hooks.js',
+            'web/static/src/js/core/class.js',
+            'web/static/src/js/core/collections.js',
+            'web/static/src/js/core/concurrency.js',
+            'web/static/src/js/core/dialog.js',
+            'web/static/src/js/core/owl_dialog.js',
+            'web/static/src/js/core/popover.js',
+            'web/static/src/js/core/dom.js',
+            'web/static/src/js/core/local_storage.js',
+            'web/static/src/js/core/mixins.js',
+            'web/static/src/js/core/qweb.js',
+            'web/static/src/js/core/ram_storage.js',
+            'web/static/src/js/core/registry.js',
+            'web/static/src/js/core/rpc.js',
+            'web/static/src/js/core/service_mixins.js',
+            'web/static/src/js/core/session.js',
+            'web/static/src/js/core/session_storage.js',
+            'web/static/src/js/core/time.js',
+            'web/static/src/js/core/translation.js',
+            'web/static/src/js/core/utils.js',
+            'web/static/src/js/core/widget.js',
+            'web/static/src/js/services/ajax_service.js',
+            'web/static/src/js/services/config.js',
+            'web/static/src/js/services/core.js',
+            'web/static/src/js/services/local_storage_service.js',
+            'web/static/src/js/services/notification_service.js',
+            'web/static/src/js/services/crash_manager.js',
+            'web/static/src/js/core/error_utils.js',
+            'web/static/src/js/services/session_storage_service.js',
+            'web/static/src/js/tools/debug_manager.js',
+            'web/static/src/js/common_env.js',
+            'web/static/src/js/widgets/name_and_signature.js',
+            'web/static/src/js/widgets/notification.js',
+            'web/static/src/js/widgets/rainbow_man.js',
+            'web/static/src/js/core/smooth_scroll_on_drag.js',
+            'web/static/src/js/widgets/colorpicker.js',
+            'web/static/src/js/widgets/translation_dialog.js',
+        ],
+
+        # ---------------------------------------------------------------------
+        # TESTS BUNDLES
+        # ---------------------------------------------------------------------
+
+        'web.assets_tests': [
+            # No tours are defined in web, but the bundle "assets_tests" is
+            # first called in web.
+            'web/static/tests/helpers/test_utils_file.js'
+        ],
+        'web.tests_assets': [
+            'web/static/lib/daterangepicker/daterangepicker.css',
+            'web/static/lib/qunit/qunit-2.9.1.css',
+            'web/static/lib/qunit/qunit-2.9.1.js',
+            'web/static/tests/helpers/**/*',
+
+            'web/static/lib/fullcalendar/core/main.css',
+            'web/static/lib/fullcalendar/daygrid/main.css',
+            'web/static/lib/fullcalendar/timegrid/main.css',
+            'web/static/lib/fullcalendar/list/main.css',
+            'web/static/lib/fullcalendar/core/main.js',
+            'web/static/lib/fullcalendar/moment/main.js',
+            'web/static/lib/fullcalendar/interaction/main.js',
+            'web/static/lib/fullcalendar/daygrid/main.js',
+            'web/static/lib/fullcalendar/timegrid/main.js',
+            'web/static/lib/fullcalendar/list/main.js',
+            'web/static/lib/ace/ace.js',
+            'web/static/lib/ace/javascript_highlight_rules.js',
+            'web/static/lib/ace/mode-python.js',
+            'web/static/lib/ace/mode-xml.js',
+            'web/static/lib/ace/mode-js.js',
+            'web/static/lib/Chart/Chart.js',
+            'web/static/lib/nearest/jquery.nearest.js',
+            'web/static/lib/daterangepicker/daterangepicker.js',
+            'web/static/lib/stacktracejs/stacktrace.js',
+            'web/static/tests/main_tests.js',
+        ],
+        'web.qunit_suite_tests': [
+            'base/static/tests/base_settings_tests.js',
+            'web/static/tests/chrome/**/*.js',
+            'web/static/tests/components/action_menus_tests.js',
+            'web/static/tests/components/custom_checkbox_tests.js',
+            'web/static/tests/components/custom_file_input_tests.js',
+            'web/static/tests/components/datepicker_tests.js',
+            'web/static/tests/components/dropdown_menu_tests.js',
+            'web/static/tests/components/pager_tests.js',
+            'web/static/tests/control_panel/**/*.js',
+            'web/static/tests/core/**/*.js',
+            'web/static/tests/fields/relational_fields/**/*.js',
+            'web/static/tests/fields/basic_fields_tests.js',
+            'web/static/tests/fields/field_utils_tests.js',
+            'web/static/tests/fields/relational_fields_tests.js',
+            'web/static/tests/fields/signature_tests.js',
+            'web/static/tests/fields/special_fields_tests.js',
+            'web/static/tests/fields/upgrade_fields_tests.js',
+            'web/static/tests/services/**/*.js',
+            'web/static/tests/tools/**/*.js',
+            'web/static/tests/views/abstract_controller_tests.js',
+            'web/static/tests/views/abstract_model_tests.js',
+            'web/static/tests/views/abstract_view_banner_tests.js',
+            'web/static/tests/views/abstract_view_tests.js',
+            'web/static/tests/views/basic_model_tests.js',
+            'web/static/tests/views/calendar_tests.js',
+            'web/static/tests/views/form_tests.js',
+            'web/static/tests/views/graph_tests.js',
+            'web/static/tests/views/kanban_model_tests.js',
+            'web/static/tests/views/kanban_tests.js',
+            'web/static/tests/views/list_tests.js',
+            'web/static/tests/views/pivot_tests.js',
+            'web/static/tests/views/qweb_tests.js',
+            'web/static/tests/views/sample_server_tests.js',
+            'web/static/tests/views/search_panel_tests.js',
+            'web/static/tests/views/view_dialogs_tests.js',
+            'web/static/tests/widgets/**/*.js',
+            'web/static/tests/report/**/*.js',
+            'web/static/tests/component_extension_tests.js',
+            'web/static/tests/mockserver_tests.js',
+            'web/static/tests/owl_compatibility_tests.js',
+            'web/static/tests/qweb_tests.js',
+        ],
+        'web.qunit_mobile_suite_tests': [
+            'web/static/lib/jquery.touchSwipe/jquery.touchSwipe.js',
+            'web/static/tests/fields/basic_fields_mobile_tests.js',
+            'web/static/tests/fields/relational_fields_mobile_tests.js',
+            'web/static/tests/components/dropdown_menu_mobile_tests.js',
+        ],
+    },
     'bootstrap': True,  # load translations for login screen
 }
diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml
index 6acca5561a5..583d1628eda 100644
--- a/addons/web/views/report_templates.xml
+++ b/addons/web/views/report_templates.xml
@@ -1,38 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <!-- Assets for reports -->
-
-    <template id="report_assets_common">
-        <t t-call="web._assets_helpers"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/bootstrap_overridden_report.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
-
-        <t t-call="web._assets_bootstrap"/>
-
-        <link href="/base/static/src/css/description.css" rel="stylesheet" type="text/css"/>
-
-        <link href="/web/static/lib/fontawesome/css/font-awesome.css" rel="stylesheet" type="text/css"/>
-
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/fonts.scss"/>
-
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/report.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/layout_standard.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/layout_background.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/layout_boxed.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/layout_clean.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/asset_styles_company_report.scss"/>
-
-        <script type="text/javascript" src="/web/static/src/js/services/session.js"/>
-        <script type="text/javascript" src="/web/static/src/js/public/public_root.js"/>
-        <script type="text/javascript" src="/web/static/src/js/public/public_root_instance.js"/>
-        <script type="text/javascript" src="/web/static/src/js/public/public_widget.js"/>
-        <script type="text/javascript" src="/web/static/src/js/report/utils.js"/>
-        <script type="text/javascript" src='/web/static/src/js/report/report.js' />
-    </template>
-
-    <template id="report_assets_pdf">
-        <link href="/web/static/src/css/reset.min.css" rel="stylesheet"/>
-    </template>
 
     <!-- Private templates used internally by reports -->
 
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index ba9a28de7b2..0c91694e2ec 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -1,440 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="_assets_utils">
-        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_functions.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_mixins.scss"/>
-
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/bs_mixins_overrides.scss"/>
-
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/utils.scss"/>
-    </template>
-
-    <template id="_assets_primary_variables">
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/primary_variables.scss"/>
-    </template>
-
-    <template id="_assets_secondary_variables">
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/secondary_variables.scss"/>
-    </template>
-
-    <template id="_assets_helpers">
-        <t t-call="web._assets_utils"/>
-        <t t-call="web._assets_primary_variables"/>
-        <t t-call="web._assets_secondary_variables"/>
-    </template>
-
-    <template id="_assets_backend_helpers">
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/bootstrap_overridden.scss"/>
-    </template>
-
-    <template id="_assets_frontend_helpers">
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/bootstrap_overridden_frontend.scss"/>
-    </template>
-
-    <template id="_assets_bootstrap">
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/import_bootstrap.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/bootstrap_review.scss"/>
-    </template>
-
-    <!-- The assets common minimal code should not require any library to work. -->
-    <!-- An exception is made for the promises polyfill and extensions that the -->
-    <!-- boot.js script needs to work -->
-    <template id="_assets_common_minimal_js">
-        <script type="text/javascript" src="/web/static/lib/es6-promise/es6-promise-polyfill.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/promise_extension.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/boot.js"></script>
-    </template>
-
-    <template id="assets_common_minimal_js">
-        <t t-call="web._assets_common_minimal_js"/>
-    </template>
-
-    <template id="assets_common" name="Common Assets (used in backend interface and website)">
-        <t t-call="web._assets_helpers"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
-
-        <link rel="stylesheet" type="text/css" href="/web/static/lib/jquery.ui/jquery-ui.css"/>
-        <link rel="stylesheet" type="text/css" href="/web/static/lib/fontawesome/css/font-awesome.css"/>
-        <link rel="stylesheet" type="text/css" href="/web/static/lib/select2/select2.css"/>
-        <link rel="stylesheet" type="text/css" href="/web/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/lib/tempusdominus/tempusdominus.scss"/>
-
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/fonts.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/ui.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/ui_extra.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/navbar.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/mimetypes.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/modal.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/animation.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/rainbow.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/datepicker.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/daterangepicker.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/banner.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/colorpicker.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/popover.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/translation_dialog.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/keyboard.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/name_and_signature.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/web.zoomodoo.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/color_picker.scss"/>
-
-        <link rel="stylesheet" type="text/less" href="/web/static/src/scss/fontawesome_overridden.scss"/>
-
-        <t t-call="web._assets_common_minimal_js"/>
-
-        <script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>
-        <script type="text/javascript" src="/web/static/lib/underscore.string/lib/underscore.string.js"></script>
-        <script type="text/javascript" src="/web/static/lib/moment/moment.js"></script>
-        <script type="text/javascript" src="/web/static/lib/owl/owl.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/component_extension.js"></script>
-
-        <script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
-        <script type="text/javascript" src="/web/static/lib/jquery.ui/jquery-ui.js"></script>
-        <script type="text/javascript" src="/web/static/lib/jquery/jquery.browser.js"></script>
-        <script type="text/javascript" src="/web/static/lib/jquery.blockUI/jquery.blockUI.js"></script>
-        <script type="text/javascript" src="/web/static/lib/jquery.hotkeys/jquery.hotkeys.js"></script>
-        <script type="text/javascript" src="/web/static/lib/jquery.placeholder/jquery.placeholder.js"></script>
-        <script type="text/javascript" src="/web/static/lib/jquery.form/jquery.form.js"></script>
-        <script type="text/javascript" src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
-        <script type="text/javascript" src="/web/static/lib/jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script>
-
-        <script type="text/javascript" src="/web/static/lib/popper/popper.js"></script>
-
-        <script type="text/javascript" src="/web/static/lib/bootstrap/js/index.js"></script>
-        <script type="text/javascript" src="/web/static/lib/bootstrap/js/util.js"></script>
-        <script type="text/javascript" src="/web/static/lib/bootstrap/js/alert.js"></script>
-        <script type="text/javascript" src="/web/static/lib/bootstrap/js/button.js"></script>
-        <script type="text/javascript" src="/web/static/lib/bootstrap/js/carousel.js"></script>
-        <script type="text/javascript" src="/web/static/lib/bootstrap/js/collapse.js"></script>
-        <script type="text/javascript" src="/web/static/lib/bootstrap/js/dropdown.js"></script>
-        <script type="text/javascript" src="/web/static/lib/bootstrap/js/modal.js"></script>
-        <script type="text/javascript" src="/web/static/lib/bootstrap/js/tooltip.js"></script>
-        <script type="text/javascript" src="/web/static/lib/bootstrap/js/popover.js"></script>
-        <script type="text/javascript" src="/web/static/lib/bootstrap/js/scrollspy.js"></script>
-        <script type="text/javascript" src="/web/static/lib/bootstrap/js/tab.js"></script>
-        <script type="text/javascript" src="/web/static/lib/bootstrap/js/toast.js"></script>
-
-        <script type="text/javascript" src="/web/static/lib/tempusdominus/tempusdominus.js"/>
-        <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
-        <script type="text/javascript" src="/web/static/lib/clipboard/clipboard.js"></script>
-        <script type="text/javascript" src="/web/static/lib/jSignature/jSignatureCustom.js"></script>
-
-        <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/libs/autocomplete.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/libs/bootstrap.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/libs/jquery.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/libs/download.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/libs/content-disposition.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/libs/underscore.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/libs/popper.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/libs/fullcalendar.js"></script>
-
-        <script type="text/javascript" src="/web/static/src/js/chrome/keyboard_navigation_mixin.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/abstract_service.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/abstract_storage_service.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/ajax.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/browser_detection.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/bus.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/custom_hooks.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/class.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/collections.js"/>
-        <script type="text/javascript" src="/web/static/src/js/core/concurrency.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/dialog.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/owl_dialog.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/popover.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/dom.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/local_storage.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/mixins.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/qweb.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/ram_storage.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/registry.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/rpc.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/service_mixins.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/session.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/session_storage.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/time.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/translation.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/utils.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/widget.js"></script>
-
-        <script type="text/javascript" src="/web/static/src/js/services/ajax_service.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/services/config.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/services/core.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/services/local_storage_service.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/services/notification_service.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/services/crash_manager.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/error_utils.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/services/session_storage_service.js"></script>
-
-        <script type="text/javascript" src="/web/static/src/js/tools/debug_manager.js"></script>
-
-        <script type="text/javascript" src="/web/static/src/js/common_env.js"></script>
-
-        <script type="text/javascript" src="/web/static/src/js/widgets/name_and_signature.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/widgets/notification.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/widgets/rainbow_man.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/smooth_scroll_on_drag.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/widgets/colorpicker.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/widgets/translation_dialog.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/libs/zoomodoo.js"></script>
-    </template>
-
-    <template id="assets_common_lazy" inherit_id="web.assets_common" primary="True">
-        <xpath expr="//t[@t-call='web._assets_common_minimal_js']" position="replace"/>
-    </template>
-
-    <template id="assets_backend" name="Backend Assets (used in backend interface)">
-        <t t-call="web._assets_helpers"/>
-        <t t-call="web._assets_backend_helpers"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
-
-        <t t-call="web._assets_bootstrap"/>
-
-        <link rel="stylesheet" type="text/css" href="/base/static/src/css/modules.css"/>
-
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/webclient_extra.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/webclient_layout.scss"/>
-
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/webclient.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/domain_selector.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/model_field_selector.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/progress_bar.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/dropdown.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/dropdown_extra.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/tooltip.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/switch_company_menu.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/debug_manager.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/control_panel.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/fields.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/fields_extra.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/file_upload.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/views.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/pivot_view.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/graph_view.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/form_view.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/form_view_extra.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/list_view.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/list_view_extra.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/kanban_dashboard.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/kanban_examples_dialog.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/kanban_column_progressbar.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/kanban_view.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/web_calendar.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/search_view.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/search_panel.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/dropdown_menu.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/search_view_extra.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/data_export.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/base/static/src/scss/onboarding.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/attachment_preview.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/notification.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/base_document_layout.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/special_fields.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/ribbon.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/base_settings.scss"/>
-        <script type="text/javascript" src="/base/static/src/js/res_config_settings.js"></script>
-
-        <script type="text/javascript" src="/web/static/lib/jquery.scrollTo/jquery.scrollTo.js"></script>
-        <script type="text/javascript" src="/web/static/lib/fuzzy-master/fuzzy.js"></script>
-
-        <script type="text/javascript" charset="utf-8">
-            odoo._modules = <t t-raw="get_modules_order()"/>;
-        </script>
-
-        <script type="text/javascript" src="/web/static/lib/py.js/lib/py.js"></script>
-        <script type="text/javascript" src="/web/static/lib/py.js/lib/py_extras.js"></script>
-        <!-- Special case: core.js declares $.browser needed by ba-bbq -->
-        <script type="text/javascript" src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
-
-        <script type="text/javascript" src="/web/static/src/js/core/domain.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/mvc.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/py_utils.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/chrome/abstract_action.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/chrome/action_manager.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/chrome/action_manager_act_window.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/chrome/action_manager_report.js"/>
-        <script type="text/javascript" src="/web/static/src/js/chrome/action_mixin.js"/>
-        <script type="text/javascript" src="/web/static/src/js/chrome/abstract_web_client.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/chrome/web_client.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/chrome/root_widget.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/_deprecated/data.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/context.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/data_comparison_utils.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/math_utils.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/core/misc.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/services/crash_manager_service.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/services/data_manager.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/services/report_service.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/services/session.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/widgets/change_password.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/tools/test_menus_loader.js"/>
-        <script type="text/javascript" src="/web/static/src/js/tools/debug_manager_backend.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/tools/tools.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/env.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/widgets/data_export.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/widgets/date_picker.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/widgets/domain_selector_dialog.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/widgets/domain_selector.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/widgets/iframe_widget.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/chrome/loading.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/widgets/model_field_selector.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/chrome/systray_menu.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/widgets/switch_company_menu.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/chrome/user_menu.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/chrome/menu.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/chrome/apps_menu.js"></script>
-
-        <script type="text/javascript" src="/web/static/src/js/widgets/pie_chart.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/widgets/ribbon.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/widgets/week_days.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/widgets/signature.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/components/action_menus.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/components/dropdown_menu.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/components/dropdown_menu_item.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/components/custom_checkbox.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/components/custom_file_input.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/components/datepicker.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/components/pager.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/apps.js"></script>
-
-        <script type="text/javascript" src="/web/static/src/js/_deprecated/basic_fields.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/fields/abstract_field.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/fields/basic_fields.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/fields/field_registry.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/fields/field_registry_owl.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/basic/widget_registry.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/basic/widget_registry_owl.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/basic/widget_wrapper.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/fields/field_utils.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/fields/relational_fields.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/fields/special_fields.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/fields/upgrade_fields.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/fields/field_wrapper.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/fields/abstract_field_owl.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/fields/basic_fields_owl.js"></script>
-
-        <script type="text/javascript" src="/web/static/src/js/views/abstract_view.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/abstract_renderer.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/abstract_renderer_owl.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/abstract_model.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/model.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/abstract_controller.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/renderer_wrapper.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/basic/basic_model.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/basic/basic_view.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/basic/basic_controller.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/basic/basic_renderer.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/control_panel/comparison_menu.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/control_panel/control_panel.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/control_panel/control_panel_model_extension.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/control_panel/control_panel_x2many.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/control_panel/custom_favorite_item.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/control_panel/favorite_menu.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/control_panel/custom_filter_item.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/control_panel/filter_menu.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/control_panel/groupby_menu.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/control_panel/custom_group_by_item.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/control_panel/search_bar.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/control_panel/search_utils.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/search_panel_model_extension.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/search_panel.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/action_model.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/field_manager_mixin.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/file_upload_mixin.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/file_upload_progress_bar.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/file_upload_progress_card.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/sample_server.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/select_create_controllers_registry.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/signature_dialog.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/standalone_field_manager_mixin.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/view_registry.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/view_dialogs.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/view_utils.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/form/form_renderer.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/form/form_controller.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/form/form_view.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/graph/graph_model.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/graph/graph_controller.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/graph/graph_renderer.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/graph/graph_view.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/kanban/kanban_column.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/kanban/kanban_column_progressbar.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/kanban/kanban_column_quick_create.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/kanban/kanban_model.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/kanban/kanban_controller.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/kanban/kanban_examples_registry.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/kanban/kanban_record.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/kanban/kanban_record_quick_create.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/kanban/kanban_renderer.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/kanban/kanban_view.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/kanban/quick_create_form_view.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/list/list_editable_renderer.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/list/list_model.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/list/list_renderer.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/list/list_view.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/list/list_controller.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/list/list_confirm_dialog.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/pivot/pivot_model.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/pivot/pivot_controller.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/pivot/pivot_renderer.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/pivot/pivot_view.js"></script>
-
-        <script type="text/javascript" src="/web/static/src/js/views/calendar/calendar_controller.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/calendar/calendar_model.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/calendar/calendar_popover.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/calendar/calendar_quick_create.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/calendar/calendar_renderer.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/calendar/calendar_view.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/views/qweb/qweb_view.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/widgets/attach_document.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/fields/signature.js"></script>
-
-        <script type="text/javascript" src="/web/static/src/js/owl_compatibility.js"></script>
-
-        <script type="text/javascript" src="/web/static/src/js/report/utils.js"/>
-        <script type="text/javascript" src="/web/static/src/js/report/client_action.js"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/report_backend.scss"/>
-    </template>
-
-    <template id="_assets_frontend_minimal_js">
-        <script type="text/javascript" src="/web/static/src/js/public/lazyloader.js"/>
-    </template>
-
-    <template id="assets_frontend_minimal_js">
-        <t t-call="web._assets_frontend_minimal_js"/>
-    </template>
-
-    <template id="assets_frontend" name="Website Assets">
-        <t t-call="web._assets_helpers"/>
-        <t t-call="web._assets_frontend_helpers"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
-
-        <t t-call="web._assets_bootstrap"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/base_frontend.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/lazyloader.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/navbar_mobile.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/notification.scss"/>
-
-        <t t-call="web._assets_frontend_minimal_js"/>
-
-        <script type="text/javascript" src="/web/static/src/js/services/session.js"/>
-        <script type="text/javascript" src="/web/static/src/js/public/public_env.js"/>
-        <script type="text/javascript" src="/web/static/src/js/public/public_crash_manager.js"/>
-        <script type="text/javascript" src="/web/static/src/js/public/public_notification.js"/>
-        <script type="text/javascript" src="/web/static/src/js/public/public_root.js"/>
-        <script type="text/javascript" src="/web/static/src/js/public/public_root_instance.js"/>
-        <script type="text/javascript" src="/web/static/src/js/public/public_widget.js"/>
-    </template>
-
-    <template id="assets_frontend_lazy" inherit_id="web.assets_frontend" primary="True">
-        <xpath expr="//t[@t-call='web._assets_frontend_minimal_js']" position="replace"/>
-    </template>
-
-    <!-- Do not direcly call this template, call 'conditional_assets_tests' instead -->
-    <template id="assets_tests" name="Tests Assets">
-        <script type="text/javascript" src="/web/static/tests/helpers/test_utils_file.js"/>
-    </template>
 
+    <!-- Call this template instead of "web.assets_tests" to have the proper conditional check -->
     <template id="conditional_assets_tests" name="Tests Assets Bundle">
         <t t-call-assets="web.assets_tests" t-if="'tests' in debug or test_mode_enabled" defer_load="True" />
     </template>
@@ -480,8 +47,8 @@
                     document.cookie = `tz=${userTZ}; path=/`;
                 }
             </script>
-            <t t-call-assets="web.assets_common_minimal_js" t-css="false" defer_load="True"/>
-            <t t-call-assets="web.assets_frontend_minimal_js" t-css="false" defer_load="True"/>
+            <t t-call-assets="web.assets_common_minimal" t-css="false" defer_load="True"/>
+            <t t-call-assets="web.assets_frontend_minimal" t-css="false" defer_load="True"/>
             <t t-call="web.conditional_assets_tests"/>
             <t t-call-assets="web.assets_common_lazy" t-css="false" lazy_load="True"/>
             <t t-call-assets="web.assets_frontend_lazy" t-css="false" lazy_load="True"/>
@@ -609,37 +176,8 @@
         </t>
     </template>
 
-    <template id="web.tests_assets">
-        <link type="text/css" rel="stylesheet" href="/web/static/lib/daterangepicker/daterangepicker.css"/>
-        <link type="text/css" rel="stylesheet" href="/web/static/lib/qunit/qunit-2.9.1.css"/>
-        <script type="text/javascript" src="/web/static/lib/qunit/qunit-2.9.1.js"></script>
-        <script type="text/javascript" src="/web/static/tests/helpers/qunit_config.js"></script>
-        <script type="text/javascript" src="/web/static/tests/helpers/qunit_asserts.js"></script>
-
-        <!-- add lazy-loaded libs to make tests synchronous -->
-        <link rel="stylesheet" href="/web/static/lib/fullcalendar/core/main.css"/>
-        <link rel="stylesheet" href="/web/static/lib/fullcalendar/daygrid/main.css"/>
-        <link rel="stylesheet" href="/web/static/lib/fullcalendar/timegrid/main.css"/>
-        <link rel="stylesheet" href="/web/static/lib/fullcalendar/list/main.css"/>
-        <script type="text/javascript" src="/web/static/lib/fullcalendar/core/main.js"></script>
-        <script type="text/javascript" src="/web/static/lib/fullcalendar/moment/main.js"></script>
-        <script type="text/javascript" src="/web/static/lib/fullcalendar/interaction/main.js"></script>
-        <script type="text/javascript" src="/web/static/lib/fullcalendar/daygrid/main.js"></script>
-        <script type="text/javascript" src="/web/static/lib/fullcalendar/timegrid/main.js"></script>
-        <script type="text/javascript" src="/web/static/lib/fullcalendar/list/main.js"></script>
-
-        <script type="text/javascript" src="/web/static/lib/ace/ace.js"></script>
-        <script type="text/javascript" src="/web/static/lib/ace/javascript_highlight_rules.js"></script>
-        <script type="text/javascript" src="/web/static/lib/ace/mode-python.js"></script>
-        <script type="text/javascript" src="/web/static/lib/ace/mode-xml.js"></script>
-        <script type="text/javascript" src="/web/static/lib/ace/mode-js.js"></script>
-        <script type="text/javascript" src="/web/static/lib/Chart/Chart.js"></script>
-        <script type="text/javascript" src="/web/static/lib/nearest/jquery.nearest.js"/>
-        <script type="text/javascript" src="/web/static/lib/daterangepicker/daterangepicker.js"></script>
-        <script type="text/javascript" src="/web/static/lib/stacktracejs/stacktrace.js"></script>
-
-        <script type="text/javascript" src="/web/static/tests/main_tests.js"></script>
-
+    <template id="web.test_helpers">
+        <t t-call-assets="web.tests_assets" t-js="False"/>
         <style>
             body {
                 position: relative; // bootstrap-datepicker needs this
@@ -656,21 +194,7 @@
                 display: inherit;
             }
         </style>
-
-        <script type="text/javascript" src="/web/static/tests/helpers/test_utils_create.js"></script>
-        <script type="text/javascript" src="/web/static/tests/helpers/test_utils_control_panel.js"></script>
-        <script type="text/javascript" src="/web/static/tests/helpers/test_utils_dom.js"></script>
-        <script type="text/javascript" src="/web/static/tests/helpers/test_utils_fields.js"></script>
-        <script type="text/javascript" src="/web/static/tests/helpers/test_utils_file.js"></script>
-        <script type="text/javascript" src="/web/static/tests/helpers/test_utils_form.js"></script>
-        <script type="text/javascript" src="/web/static/tests/helpers/test_utils_graph.js"></script>
-        <script type="text/javascript" src="/web/static/tests/helpers/test_utils_kanban.js"></script>
-        <script type="text/javascript" src="/web/static/tests/helpers/test_utils_mock.js"></script>
-        <script type="text/javascript" src="/web/static/tests/helpers/test_utils_modal.js"></script>
-        <script type="text/javascript" src="/web/static/tests/helpers/test_utils_pivot.js"></script>
-        <script type="text/javascript" src="/web/static/tests/helpers/test_utils.js"></script>
-        <script type="text/javascript" src="/web/static/tests/helpers/mock_server.js"></script>
-        <script type="text/javascript" src="/web/static/tests/helpers/test_env.js"></script>
+        <t t-call-assets="web.tests_assets" t-css="False"/>
     </template>
 
     <template id="web.qunit_suite">
@@ -683,8 +207,8 @@
                 <t t-call-assets="web.assets_common" t-css="false"/>
                 <t t-call-assets="web.assets_backend" t-css="false"/>
 
-                <t t-call-assets="web.tests_assets" t-js="false"/>
-                <t t-call-assets="web.tests_assets" t-css="false"/>
+                <t t-call="web.test_helpers"/>
+
                 <t t-call-assets="web.qunit_suite_tests" t-js="false"/>
                 <t t-call-assets="web.qunit_suite_tests" t-css="false"/>
             </t>
@@ -693,103 +217,6 @@
         </t>
     </template>
 
-    <template id="web.qunit_suite_tests">
-        <script type="text/javascript" src="/base/static/tests/base_settings_tests.js"></script>
-
-        <script type="text/javascript" src="/web/static/tests/qweb_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/mockserver_tests.js"></script>
-
-        <script type="text/javascript" src="/web/static/tests/services/crash_manager_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/services/data_manager_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/services/notification_service_tests.js"></script>
-
-        <script type="text/javascript" src="/web/static/tests/fields/basic_fields_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/fields/field_utils_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/fields/relational_fields_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/fields/relational_fields/field_many2many_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/fields/relational_fields/field_many2one_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/fields/relational_fields/field_one2many_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/fields/signature_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/fields/special_fields_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/fields/upgrade_fields_tests.js"></script>
-
-        <script type="text/javascript" src="/web/static/tests/views/sample_server_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/views/abstract_controller_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/views/abstract_view_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/views/basic_view_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/views/form_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/views/graph_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/views/list_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/views/pivot_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/views/kanban_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/views/calendar_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/views/qweb_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/views/abstract_model_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/views/basic_model_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/views/abstract_view_banner_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/views/kanban_model_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/views/view_dialogs_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/views/search_panel_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/ajax_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/registry_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/py_utils_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/class_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/rpc_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/domain_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/data_comparison_utils_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/math_utils_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/mixins_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/patch_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/time_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/concurrency_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/util_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/widget_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/dialog_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/owl_dialog_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/popover_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/core/dom_tests.js"></script>
-
-        <script type="text/javascript" src="/web/static/tests/chrome/action_manager_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/chrome/keyboard_navigation_mixin_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/chrome/menu_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/chrome/user_menu_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/chrome/systray_tests.js"></script>
-
-        <script type="text/javascript" src="/web/static/tests/components/custom_checkbox_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/components/custom_file_input_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/components/datepicker_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/components/pager_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/components/action_menus_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/components/dropdown_menu_tests.js"></script>
-
-        <script type="text/javascript" src="/web/static/tests/control_panel/control_panel_model_extension_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/control_panel/control_panel_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/control_panel/comparison_menu_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/control_panel/favorite_menu_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/control_panel/custom_filter_item_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/control_panel/filter_menu_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/control_panel/custom_group_by_item_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/control_panel/groupby_menu_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/control_panel/search_bar_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/control_panel/search_utils_tests.js"></script>
-
-        <script type="text/javascript" src="/web/static/tests/widgets/company_switcher_tests.js"/>
-        <script type="text/javascript" src="/web/static/tests/widgets/data_export_tests.js"/>
-        <script type="text/javascript" src="/web/static/tests/widgets/domain_selector_tests.js"/>
-        <script type="text/javascript" src="/web/static/tests/widgets/model_field_selector_tests.js"/>
-        <script type="text/javascript" src="/web/static/tests/widgets/rainbow_man_tests.js"/>
-        <script type="text/javascript" src="/web/static/tests/widgets/week_days_tests.js"/>
-
-        <script type="text/javascript" src="/web/static/tests/report/client_action_tests.js"/>
-
-        <script type="text/javascript" src="/web/static/tests/tools/debug_manager_tests.js"/>
-
-        <script type="text/javascript" src="/web/static/tests/helpers/test_utils_tests.js"></script>
-
-        <script type="text/javascript" src="/web/static/tests/owl_compatibility_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/component_extension_tests.js"></script>
-    </template>
-
     <template id="web.qunit_mobile_suite">
         <t t-call="web.layout">
             <t t-set="html_data" t-value="{'style': 'height: 100%;'}"/>
@@ -801,8 +228,8 @@
                 <t t-call-assets="web.assets_common" t-css="false"/>
                 <t t-call-assets="web.assets_backend" t-css="false"/>
 
-                <t t-call-assets="web.tests_assets" t-js="false"/>
-                <t t-call-assets="web.tests_assets" t-css="false"/>
+                <t t-call="web.test_helpers"/>
+
                 <t t-call-assets="web.qunit_mobile_suite_tests" t-js="false"/>
                 <t t-call-assets="web.qunit_mobile_suite_tests" t-css="false"/>
             </t>
@@ -811,13 +238,6 @@
         </t>
     </template>
 
-    <template id="web.qunit_mobile_suite_tests">
-        <script type="text/javascript" src="/web/static/lib/jquery.touchSwipe/jquery.touchSwipe.js"></script>
-        <script type="text/javascript" src="/web/static/tests/fields/basic_fields_mobile_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/fields/relational_fields_mobile_tests.js"></script>
-        <script type="text/javascript" src="/web/static/tests/components/dropdown_menu_mobile_tests.js"></script>
-    </template>
-
     <template id="web.benchmark_suite">
         <t t-call="web.layout">
             <t t-set="html_data" t-value="{'style': 'height: 100%;'}"/>
@@ -830,8 +250,8 @@
                 <t t-call-assets="web.assets_backend" t-js="false"/>
                 <t t-call-assets="web.assets_common" t-css="false"/>
                 <t t-call-assets="web.assets_backend" t-css="false"/>
-                <t t-call-assets="web.tests_assets" t-js="false"/>
-                <t t-call-assets="web.tests_assets" t-css="false"/>
+
+                <t t-call="web.test_helpers"/>
 
                 <script type="text/javascript">
                     QUnit.config.hidepassed = false;
@@ -854,6 +274,7 @@
                 <script type="text/javascript" src="/web/static/tests/views/list_benchmarks.js"></script>
                 <script type="text/javascript" src="/web/static/tests/views/kanban_benchmarks.js"></script>
                 <script type="text/javascript" src="/web/static/tests/views/form_benchmarks.js"></script>
+
             </t>
 
             <div id="qunit"/>
@@ -861,10 +282,6 @@
         </t>
     </template>
 
-    <template id="web.assets_backend_prod_only">
-        <script type="text/javascript" src="/web/static/src/js/main.js"></script>
-    </template>
-
     <template id="web.webclient_bootstrap">
         <t t-call="web.layout">
             <t t-set="head_web">
@@ -893,14 +310,4 @@
         </t>
     </template>
 
-    <!--
-        Optional Bundle for PDFJS lib
-        Since PDFJS is quite huge (80000≈ lines), please only load it when it is necessary.
-        For now, it is only use to display the PDF slide Viewer during an embed.
-        Bundlized, the size is reduced to 5300≈ lines.
-    -->
-    <template id="pdf_js_lib" name="PDF JS Library">
-        <script type="text/javascript" src="/web/static/lib/pdfjs/build/pdf.js"></script>
-        <script type="text/javascript" src="/web/static/lib/pdfjs/build/pdf.worker.js"></script>
-    </template>
 </odoo>
diff --git a/addons/web_editor/__manifest__.py b/addons/web_editor/__manifest__.py
index 9a81fa20227..da793f5ea9f 100644
--- a/addons/web_editor/__manifest__.py
+++ b/addons/web_editor/__manifest__.py
@@ -12,11 +12,145 @@ Odoo Web Editor widget.
     'depends': ['web'],
     'data': [
         'security/ir.model.access.csv',
+        'data/editor_assets.xml',
         'views/editor.xml',
         'views/snippets.xml',
     ],
-    'qweb': [
-        'static/src/xml/*.xml',
-    ],
+    'assets': {
+
+        #----------------------------------------------------------------------
+        # MAIN BUNDLES
+        #----------------------------------------------------------------------
+
+        'web.assets_qweb': [
+            'web_editor/static/src/xml/*.xml',
+        ],
+        'web_editor.assets_wysiwyg': [
+            ('include', 'web_editor.assets_summernote'),
+
+            # lib
+            'web_editor/static/lib/cropperjs/cropper.css',
+            'web_editor/static/lib/cropperjs/cropper.js',
+            'web_editor/static/lib/jquery-cropper/jquery-cropper.js',
+            'web_editor/static/lib/jQuery.transfo.js',
+            'web/static/lib/nearest/jquery.nearest.js',
+            'web_editor/static/lib/webgl-image-filter/webgl-image-filter.js',
+
+            # odoo utils
+            ('include', 'web._assets_helpers'),
+
+            'web_editor/static/src/scss/bootstrap_overridden.scss',
+            'web/static/lib/bootstrap/scss/_variables.scss',
+
+            # integration
+            'web_editor/static/src/scss/wysiwyg.scss',
+            'web_editor/static/src/scss/wysiwyg_iframe.scss',
+            'web_editor/static/src/scss/wysiwyg_snippets.scss',
+
+            'web_editor/static/src/js/wysiwyg/fonts.js',
+            'web_editor/static/src/js/base.js',
+            'web_editor/static/src/js/editor/editor.js',
+            'web_editor/static/src/js/editor/rte.js',
+            'web_editor/static/src/js/editor/rte.summernote.js',
+            'web_editor/static/src/js/editor/image_processing.js',
+
+            # widgets & plugins
+            'web_editor/static/src/js/wysiwyg/widgets/**/*',
+            'web_editor/static/src/js/editor/snippets.editor.js',
+            'web_editor/static/src/js/editor/snippets.options.js',
+
+            # Launcher
+            'web_editor/static/src/js/wysiwyg/wysiwyg.js',
+            'web_editor/static/src/js/wysiwyg/wysiwyg_snippets.js',
+            'web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js',
+        ],
+        'web_editor.assets_summernote': [
+            'web_editor/static/src/js/editor/summernote_import_start.js',
+
+            'web_editor/static/lib/summernote/src/css/**/*',
+            'web_editor/static/lib/summernote/src/js/core/async.js',
+            'web_editor/static/lib/summernote/src/js/core/func.js',
+            'web_editor/static/lib/summernote/src/js/core/agent.js',
+            'web_editor/static/lib/summernote/src/js/core/list.js',
+            'web_editor/static/lib/summernote/src/js/core/dom.js',
+            'web_editor/static/lib/summernote/src/js/core/key.js',
+            'web_editor/static/lib/summernote/src/js/core/range.js',
+            'web_editor/static/lib/summernote/src/js/editing/Bullet.js',
+            'web_editor/static/lib/summernote/src/js/editing/History.js',
+            'web_editor/static/lib/summernote/src/js/editing/Style.js',
+            'web_editor/static/lib/summernote/src/js/editing/Table.js',
+            'web_editor/static/lib/summernote/src/js/editing/Typing.js',
+            'web_editor/static/lib/summernote/src/js/module/Editor.js',
+            'web_editor/static/lib/summernote/src/js/module/Button.js',
+            'web_editor/static/lib/summernote/src/js/module/Clipboard.js',
+            'web_editor/static/lib/summernote/src/js/module/Codeview.js',
+            'web_editor/static/lib/summernote/src/js/module/DragAndDrop.js',
+            'web_editor/static/lib/summernote/src/js/module/Fullscreen.js',
+            'web_editor/static/lib/summernote/src/js/module/Handle.js',
+            'web_editor/static/lib/summernote/src/js/module/HelpDialog.js',
+            'web_editor/static/lib/summernote/src/js/module/ImageDialog.js',
+            'web_editor/static/lib/summernote/src/js/module/LinkDialog.js',
+            'web_editor/static/lib/summernote/src/js/module/Popover.js',
+            'web_editor/static/lib/summernote/src/js/module/Statusbar.js',
+            'web_editor/static/lib/summernote/src/js/module/Toolbar.js',
+            'web_editor/static/lib/summernote/src/js/Renderer.js',
+            'web_editor/static/lib/summernote/src/js/EventHandler.js',
+            'web_editor/static/lib/summernote/src/js/defaults.js',
+            'web_editor/static/lib/summernote/src/js/summernote.js',
+
+            'web_editor/static/src/js/editor/summernote_import_end.js',
+            'web_editor/static/src/js/editor/summernote.js',
+        ],
+        'web.assets_common': [
+            'web_editor/static/lib/vkbeautify/**/*',
+            'web_editor/static/src/js/common/**/*',
+            'web_editor/static/src/js/wysiwyg/root.js',
+        ],
+        'web.assets_backend': [
+            'web_editor/static/src/scss/web_editor.common.scss',
+            'web_editor/static/src/scss/web_editor.backend.scss',
+
+            'web_editor/static/src/js/backend/**/*',
+        ],
+        'web.assets_frontend_minimal': [
+            'web_editor/static/src/js/frontend/loader_loading.js',
+        ],
+        'web.assets_frontend': [
+            'web_editor/static/src/scss/web_editor.common.scss',
+            'web_editor/static/src/scss/web_editor.frontend.scss',
+
+            'web_editor/static/src/js/frontend/loader.js',
+        ],
+
+        #----------------------------------------------------------------------
+        # SUB BUNDLES
+        #----------------------------------------------------------------------
+
+        'web._assets_primary_variables': [
+            'web_editor/static/src/scss/web_editor.variables.scss',
+        ],
+        'web._assets_secondary_variables': [
+            'web_editor/static/src/scss/secondary_variables.scss',
+        ],
+        'web._assets_backend_helpers': [
+            'web_editor/static/src/scss/bootstrap_overridden_backend.scss',
+            'web_editor/static/src/scss/bootstrap_overridden.scss',
+        ],
+        'web._assets_frontend_helpers': [
+            ('prepend', 'web_editor/static/src/scss/bootstrap_overridden.scss'),
+        ],
+
+        # ----------------------------------------------------------------------
+        # TESTS BUNDLES
+        # ----------------------------------------------------------------------
+
+        'web.qunit_suite_tests': [
+            'web_editor/static/src/js/wysiwyg/test_root.js',
+
+            ('include', 'web_editor.assets_wysiwyg'),
+
+            'web_editor/static/tests/**/*',
+        ],
+    },
     'auto_install': True
 }
diff --git a/addons/web_editor/data/editor_assets.xml b/addons/web_editor/data/editor_assets.xml
new file mode 100644
index 00000000000..e22eff594ea
--- /dev/null
+++ b/addons/web_editor/data/editor_assets.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="web_editor.13_0_color_system_support_primary_variables_scss" model="ir.asset">
+            <field name="name">13 0 color system support primary variables SCSS</field>
+            <field name="bundle">web._assets_primary_variables</field>
+            <field name="glob">web_editor/static/src/scss/13_0_color_system_support_primary_variables.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/web_editor/views/editor.xml b/addons/web_editor/views/editor.xml
index 44db0166365..56c869b41ac 100644
--- a/addons/web_editor/views/editor.xml
+++ b/addons/web_editor/views/editor.xml
@@ -11,175 +11,6 @@
     <t t-call-assets="web_editor.assets_wysiwyg"/>
 </template>
 
-<template id="assets_wysiwyg" name="Wysiwyg Editor Assets">
-    <!-- lib -->
-
-    <t t-call-assets="web_editor.assets_summernote"/>
-
-    <link rel="stylesheet" type="text/css" href="/web_editor/static/lib/cropperjs/cropper.css"/>
-    <script type="text/javascript" src="/web_editor/static/lib/cropperjs/cropper.js"/>
-    <script type="text/javascript" src="/web_editor/static/lib/jquery-cropper/jquery-cropper.js"/>
-    <script type="text/javascript" src="/web_editor/static/lib/jQuery.transfo.js"/>
-    <script type="text/javascript" src="/web/static/lib/nearest/jquery.nearest.js"/>
-    <script type="text/javascript" src="/web_editor/static/lib/webgl-image-filter/webgl-image-filter.js"/>
-
-    <!-- odoo utils -->
-
-    <t t-call="web._assets_helpers"/>
-    <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/bootstrap_overridden.scss"/>
-    <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
-
-    <!-- integration -->
-
-    <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/wysiwyg.scss"/>
-    <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/wysiwyg_iframe.scss"/>
-    <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/wysiwyg_snippets.scss"/>
-
-    <script type="text/javascript" src="/web_editor/static/src/js/wysiwyg/fonts.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/base.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/editor/editor.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/editor/rte.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/editor/rte.summernote.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/editor/image_processing.js"/>
-
-    <!-- widgets & plugins -->
-
-    <script type="text/javascript" src="/web_editor/static/src/js/wysiwyg/widgets/media.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/wysiwyg/widgets/dialog.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/wysiwyg/widgets/alt_dialog.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/wysiwyg/widgets/color_palette.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/wysiwyg/widgets/image_crop_widget.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/wysiwyg/widgets/link_dialog.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/wysiwyg/widgets/media_dialog.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/wysiwyg/widgets/widgets.js"/>
-
-    <script type="text/javascript" src="/web_editor/static/src/js/editor/snippets.editor.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/editor/snippets.options.js"/>
-
-    <!-- Launcher -->
-
-    <script type="text/javascript" src="/web_editor/static/src/js/wysiwyg/wysiwyg.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/wysiwyg/wysiwyg_snippets.js"/>
-    <script type="text/javascript" src="/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js"/>
-</template>
-
-<template id="assets_summernote" name="Summernote">
-    <script type="text/javascript" src="/web_editor/static/src/js/editor/summernote_import_start.js"/>
-
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/core/async.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/core/func.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/core/agent.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/core/list.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/core/dom.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/core/key.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/core/range.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/editing/Bullet.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/editing/History.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/editing/Style.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/editing/Table.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/editing/Typing.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/module/Editor.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/module/Button.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/module/Clipboard.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/module/Codeview.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/module/DragAndDrop.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/module/Fullscreen.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/module/Handle.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/module/HelpDialog.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/module/ImageDialog.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/module/LinkDialog.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/module/Popover.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/module/Statusbar.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/module/Toolbar.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/Renderer.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/EventHandler.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/defaults.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/summernote.js"/>
-    <script type="text/javascript" t-attf-src="/web_editor/static/lib/summernote/src/js/.js"/>
-
-    <script type="text/javascript" src="/web_editor/static/src/js/editor/summernote.js" />
-    <script type="text/javascript" src="/web_editor/static/src/js/editor/summernote_import_end.js"/>
-    <link rel="stylesheet" type="text/css" href="/web_editor/static/lib/summernote/src/css/summernote.css"/>
-</template>
-
-<template id="_assets_primary_variables" inherit_id="web._assets_primary_variables">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/web_editor.variables.scss"/>
-    </xpath>
-</template>
-
-<template id="_assets_13_0_color_system_support_primary_variables" inherit_id="web_editor._assets_primary_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/13_0_color_system_support_primary_variables.scss"/>
-    </xpath>
-</template>
-
-<template id="_assets_secondary_variables" inherit_id="web._assets_secondary_variables">
-    <xpath expr="//link" position="before">
-        <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/secondary_variables.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_common" inherit_id="web.assets_common" name="Web Editor Common Assets (used in backend interface and website)">
-    <xpath expr="script[last()]" position="after">
-        <script type="text/javascript" src="/web_editor/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"/>
-        <script type="text/javascript" src="/web_editor/static/src/js/common/ace.js"/>
-        <script type="text/javascript" src="/web_editor/static/src/js/common/utils.js"/>
-        <script type="text/javascript" src="/web_editor/static/src/js/wysiwyg/root.js"/>
-    </xpath>
-</template>
-
-<template id="_assets_backend_helpers" inherit_id="web._assets_backend_helpers">
-    <xpath expr="//link" position="before">
-        <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/bootstrap_overridden_backend.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/bootstrap_overridden.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_backend" inherit_id="web.assets_backend" name="Web Editor Backend Assets (used in backend interface)">
-    <xpath expr="link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/web_editor.common.scss"/> <!-- not in common because compiled differently with context -->
-        <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/web_editor.backend.scss"/>
-    </xpath>
-    <xpath expr="script[last()]" position="after">
-        <script type="text/javascript" src="/web_editor/static/src/js/backend/field_html.js" />
-        <script type="text/javascript" src="/web_editor/static/src/js/backend/convert_inline.js" />
-    </xpath>
-</template>
-
-<template id="_assets_frontend_helpers" inherit_id="web._assets_frontend_helpers">
-    <xpath expr="//link" position="before">
-        <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/bootstrap_overridden.scss"/>
-    </xpath>
-</template>
-
-<template id="_assets_frontend_minimal_js" inherit_id="web._assets_frontend_minimal_js">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/web_editor/static/src/js/frontend/loader_loading.js"/>
-    </xpath>
-</template>
-
-<template id="assets_frontend" inherit_id="web.assets_frontend" name="Web Editor Frontend Assets (used in public odoo)" priority="15">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/web_editor.common.scss"/> <!-- not in common because compiled differently with context -->
-        <link rel="stylesheet" type ="text/scss" href="/web_editor/static/src/scss/web_editor.frontend.scss"/>
-    </xpath>
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/web_editor/static/src/js/frontend/loader.js"/>
-    </xpath>
-</template>
-
-<template id="qunit_suite" inherit_id="web.qunit_suite_tests">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/web_editor/static/src/js/wysiwyg/test_root.js"/>
-
-        <t t-call="web_editor.compiled_assets_wysiwyg"/>
-
-        <script type="text/javascript" src="/web_editor/static/tests/test_utils.js"/>
-        <script type="text/javascript" src="/web_editor/static/tests/field_html_tests.js"/>
-    </xpath>
-</template>
-
 <!--
     The web_editor.colorpicker template regroups section of colorpicker menu for website customization
     (text foreground/background but also snippet background color option).
diff --git a/addons/web_kanban_gauge/__manifest__.py b/addons/web_kanban_gauge/__manifest__.py
index 2b641a95b53..28ee9268311 100644
--- a/addons/web_kanban_gauge/__manifest__.py
+++ b/addons/web_kanban_gauge/__manifest__.py
@@ -9,10 +9,13 @@ This widget allows to display gauges using d3 library.
 """,
     'version': '1.0',
     'depends': ['web'],
-    'data' : [
-        'views/web_kanban_gauge_templates.xml',
-    ],
-    'qweb': [
-    ],
+    'assets' : {
+        'web.assets_backend': [
+            'web_kanban_gauge/static/src/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'web_kanban_gauge/static/tests/**/*',
+        ],
+    },
     'auto_install': True,
 }
diff --git a/addons/web_kanban_gauge/views/web_kanban_gauge_templates.xml b/addons/web_kanban_gauge/views/web_kanban_gauge_templates.xml
deleted file mode 100644
index 673f6cae119..00000000000
--- a/addons/web_kanban_gauge/views/web_kanban_gauge_templates.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-        <template id="assets_backend" name="web_kanban_gauge assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/web_kanban_gauge/static/src/js/kanban_gauge.js"></script>
-            </xpath>
-        </template>
-
-        <template id="qunit_suite" name="gauge_tests" inherit_id="web.qunit_suite_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/web_kanban_gauge/static/tests/gauge_tests.js"></script>
-            </xpath>
-        </template>
-</odoo>
diff --git a/addons/web_tour/__manifest__.py b/addons/web_tour/__manifest__.py
index 5ff9710e855..2055418fa67 100644
--- a/addons/web_tour/__manifest__.py
+++ b/addons/web_tour/__manifest__.py
@@ -14,14 +14,30 @@ Odoo Web tours.
     'data': [
         'security/ir.model.access.csv',
         'security/ir.rule.csv',
-        'views/tour_templates.xml',
         'views/tour_views.xml'
     ],
-    'demo': [
-        'data/web_tour_demo.xml',
-    ],
-    'qweb': [
-        "static/src/xml/debug_manager.xml",
-    ],
+    'assets': {
+        'web.assets_qweb': [
+            'web_tour/static/src/xml/debug_manager.xml',
+        ],
+        'web.assets_common': [
+            'web_tour/static/src/scss/**/*',
+            'web_tour/static/src/js/running_tour_action_helper.js',
+            'web_tour/static/src/js/tip.js',
+            'web_tour/static/src/js/tour_manager.js',
+            'web_tour/static/src/js/tour_service.js',
+            'web_tour/static/src/js/tour_step_utils.js',
+            'web_tour/static/src/js/tour_utils.js',
+        ],
+        'web.assets_backend': [
+            'web_tour/static/src/js/debug_manager.js',
+        ],
+        'web.assets_frontend': [
+            'web_tour/static/src/js/public/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'web_tour/static/tests/**/*',
+        ],
+    },
     'auto_install': True
 }
diff --git a/addons/web_tour/views/tour_templates.xml b/addons/web_tour/views/tour_templates.xml
deleted file mode 100644
index 0fbf1125683..00000000000
--- a/addons/web_tour/views/tour_templates.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <template id="assets_common" name="tours assets" inherit_id="web.assets_common">
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" type="text/scss" href="/web_tour/static/src/scss/tip.scss"/>
-                <script type="text/javascript" src="/web_tour/static/src/js/tip.js"></script>
-                <script type="text/javascript" src="/web_tour/static/src/js/tour_utils.js"></script>
-                <script type="text/javascript" src="/web_tour/static/src/js/running_tour_action_helper.js"></script>
-                <script type="text/javascript" src="/web_tour/static/src/js/tour_manager.js"></script>
-                <script type="text/javascript" src="/web_tour/static/src/js/tour_service.js"></script>
-                <script type="text/javascript" src="/web_tour/static/src/js/tour_step_utils.js"></script>
-            </xpath>
-        </template>
-
-        <template id="assets_backend" name="tours backend assets" inherit_id="web.assets_backend">
-            <xpath expr="//script[last()]" position="after">
-                <script type="text/javascript" src="/web_tour/static/src/js/debug_manager.js"></script>
-            </xpath>
-        </template>
-
-        <template id="assets_frontend" inherit_id="web.assets_frontend">
-            <xpath expr="//script[last()]" position="after">
-                <script type="text/javascript" src="/web_tour/static/src/js/public/tour_manager.js"/>
-            </xpath>
-        </template>
-
-        <template id="web_tour.qunit_suite" name="tour tests" inherit_id="web.qunit_suite_tests">
-            <xpath expr="//script[last()]" position="after">
-                <script type="text/javascript" src="/web_tour/static/tests/tour_manager_tests.js"/>
-            </xpath>
-        </template>
-    </data>
-</odoo>
diff --git a/addons/web_unsplash/__manifest__.py b/addons/web_unsplash/__manifest__.py
index 711b62086e8..eeb0670045a 100644
--- a/addons/web_unsplash/__manifest__.py
+++ b/addons/web_unsplash/__manifest__.py
@@ -9,7 +9,15 @@
     'depends': ['base_setup', 'web_editor'],
     'data': [
         'views/res_config_settings_view.xml',
-        'views/web_unsplash_templates.xml',
-    ],
+        ],
     'auto_install': True,
+    'assets': {
+        'web_editor.assets_wysiwyg': [
+            'web_unsplash/static/src/js/unsplashapi.js',
+            'web_unsplash/static/src/js/unsplash_image_widget.js',
+        ],
+        'web.assets_frontend': [
+            'web_unsplash/static/src/js/unsplash_beacon.js',
+        ],
+    }
 }
diff --git a/addons/web_unsplash/views/web_unsplash_templates.xml b/addons/web_unsplash/views/web_unsplash_templates.xml
deleted file mode 100644
index aa2001f82d6..00000000000
--- a/addons/web_unsplash/views/web_unsplash_templates.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="web_unsplash_assets" inherit_id="web_editor.assets_wysiwyg" name="Unsplash Images Editor Assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/web_unsplash/static/src/js/unsplashapi.js"></script>
-            <script type="text/javascript" src="/web_unsplash/static/src/js/unsplash_image_widget.js"></script>
-        </xpath>
-    </template>
-    <template id="assets_frontend" inherit_id="web.assets_frontend" name="Unsplash Images Assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/web_unsplash/static/src/js/unsplash_beacon.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py
index bf137ae5f03..5f411f50dd4 100644
--- a/addons/website/__manifest__.py
+++ b/addons/website/__manifest__.py
@@ -20,6 +20,7 @@
     ],
     'installable': True,
     'data': [
+        'data/ir_asset.xml',
         'data/website_data.xml',
         'data/website_visitor_cron.xml',
         'security/website_security.xml',
@@ -90,17 +91,128 @@
         'wizard/website_robots.xml',
 
         # Old snippets
-        'views/snippets/s_btn.xml',
-    ],
+        ],
     'demo': [
         'data/website_demo.xml',
     ],
-    'qweb': [
-        'static/src/xml/website.backend.xml',
-        'static/src/xml/website_widget.xml',
-        'static/src/xml/theme_preview.xml',
-    ],
     'application': True,
     'post_init_hook': 'post_init_hook',
     'uninstall_hook': 'uninstall_hook',
+    'assets': {
+        'web.assets_frontend': [
+            ('replace', 'web/static/src/js/public/public_root_instance.js', 'website/static/src/js/content/website_root_instance.js'),
+            'website/static/src/scss/website.scss',
+            'website/static/src/scss/website.ui.scss',
+            'website/static/src/js/set_view_track.js',
+            'website/static/src/js/utils.js',
+            'website/static/src/js/content/website_root.js',
+            'website/static/src/js/widgets/fullscreen_indication.js',
+            'website/static/src/js/content/compatibility.js',
+            'website/static/src/js/content/menu.js',
+            'website/static/src/js/content/snippets.animation.js',
+            'website/static/src/js/menu/navbar.js',
+            'website/static/src/js/show_password.js',
+            'website/static/src/js/post_link.js',
+            'website/static/src/js/user_custom_javascript.js',
+        ],
+        'web._assets_primary_variables': [
+            'website/static/src/scss/primary_variables.scss',
+            'website/static/src/scss/options/user_values.scss',
+            'website/static/src/scss/options/colors/user_color_palette.scss',
+            'website/static/src/scss/options/colors/user_gray_color_palette.scss',
+            'website/static/src/scss/options/colors/user_theme_color_palette.scss',
+        ],
+        'web._assets_secondary_variables': [
+            ('prepend', 'website/static/src/scss/secondary_variables.scss'),
+        ],
+        'web.assets_tests': [
+            'website/static/tests/tours/**/*',
+        ],
+        'web.assets_backend': [
+            'website/static/src/scss/view_hierarchy.scss',
+            'website/static/src/scss/website.backend.scss',
+            'website/static/src/scss/website_visitor_views.scss',
+            'website/static/src/scss/website.theme_install.scss',
+            'website/static/src/js/backend/button.js',
+            'website/static/src/js/backend/dashboard.js',
+            'website/static/src/js/backend/res_config_settings.js',
+            'website/static/src/js/backend/view_hierarchy.js',
+            'website/static/src/js/widget_iframe.js',
+            'website/static/src/js/theme_preview_kanban.js',
+            'website/static/src/js/theme_preview_form.js',
+        ],
+        'web.qunit_suite_tests': [
+            'website/static/tests/dashboard_tests.js',
+            'website/static/tests/website_tests.js',
+        ],
+        'web._assets_frontend_helpers': [
+            ('prepend', 'website/static/src/scss/bootstrap_overridden.scss'),
+        ],
+        'website.assets_wysiwyg': [
+            ('include', 'web._assets_helpers'),
+            'web_editor/static/src/scss/bootstrap_overridden.scss',
+            'web/static/lib/bootstrap/scss/_variables.scss',
+            'website/static/src/scss/website.wysiwyg.scss',
+            'website/static/src/scss/website.edit_mode.scss',
+            'website/static/src/js/editor/editor.js',
+            'website/static/src/js/editor/snippets.editor.js',
+            'website/static/src/js/editor/rte.summernote.js',
+            'website/static/src/js/editor/snippets.options.js',
+            'website/static/src/snippets/s_facebook_page/options.js',
+            'website/static/src/snippets/s_image_gallery/options.js',
+            'website/static/src/snippets/s_countdown/options.js',
+            'website/static/src/snippets/s_popup/options.js',
+            'website/static/src/snippets/s_product_catalog/options.js',
+            'website/static/src/snippets/s_chart/options.js',
+            'website/static/src/snippets/s_rating/options.js',
+            'website/static/src/snippets/s_tabs/options.js',
+            'website/static/src/snippets/s_progress_bar/options.js',
+            'website/static/src/snippets/s_blockquote/options.js',
+            'website/static/src/snippets/s_showcase/options.js',
+            'website/static/src/snippets/s_table_of_content/options.js',
+            'website/static/src/snippets/s_timeline/options.js',
+            'website/static/src/snippets/s_media_list/options.js',
+            'website/static/src/snippets/s_google_map/options.js',
+            'website/static/src/snippets/s_map/options.js',
+            'website/static/src/snippets/s_dynamic_snippet/options.js',
+            'website/static/src/snippets/s_dynamic_snippet_carousel/options.js',
+            'website/static/src/js/editor/wysiwyg_multizone.js',
+            'website/static/src/js/editor/wysiwyg_multizone_translate.js',
+            'website/static/src/js/editor/widget_link.js',
+            'website/static/src/js/widgets/media.js',
+        ],
+        'website.assets_editor': [
+            ('include', 'web._assets_helpers'),
+            'web/static/lib/bootstrap/scss/_variables.scss',
+            'website/static/src/scss/website.editor.ui.scss',
+            'website/static/src/scss/website.theme_install.scss',
+            'website/static/src/js/editor/editor_menu.js',
+            'website/static/src/js/editor/editor_menu_translate.js',
+            'website/static/src/js/menu/content.js',
+            'website/static/src/js/menu/customize.js',
+            'website/static/src/js/menu/debug_manager.js',
+            'website/static/src/js/menu/edit.js',
+            'website/static/src/js/menu/mobile_view.js',
+            'website/static/src/js/menu/new_content.js',
+            'website/static/src/js/menu/seo.js',
+            'website/static/src/js/menu/translate.js',
+            'website/static/src/js/tours/homepage.js',
+            'website/static/src/js/tours/tour_utils.js',
+            'website/static/src/js/widgets/ace.js',
+        ],
+        'web.assets_qweb': [
+            'website/static/src/xml/website.backend.xml',
+            'website/static/src/xml/website_widget.xml',
+            'website/static/src/xml/theme_preview.xml',
+        ],
+        'website.test_bundle': [
+            '/web/static/lib/qweb/qweb2.js',
+            'http://test.external.link/javascript1.js',
+            '/web/static/lib/jquery.ui/jquery-ui.css',
+            'http://test.external.link/style1.css',
+            '/web/static/src/js/boot.js',
+            'http://test.external.link/javascript2.js',
+            'http://test.external.link/style2.css',
+        ],
+    }
 }
diff --git a/addons/website/data/ir_asset.xml b/addons/website/data/ir_asset.xml
new file mode 100644
index 00000000000..67e07c1cea5
--- /dev/null
+++ b/addons/website/data/ir_asset.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="website.user_custom_bootstrap_overridden_scss" model="ir.asset">
+            <field name="name">User custom bootstrap overridden SCSS</field>
+            <field name="bundle">web._assets_frontend_helpers</field>
+            <field name="directive">prepend</field>
+            <field name="glob">website/static/src/scss/user_custom_bootstrap_overridden.scss</field>
+            <field name="sequence" eval="99"/>
+        </record>
+
+        <record id="website.user_custom_rules_scss" model="ir.asset">
+            <field name="name">User custom rules SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">website/static/src/scss/user_custom_rules.scss</field>
+            <field name="sequence" eval="99"/>
+        </record>
+
+        <record id="website.bs3_for_12_0_scss" model="ir.asset">
+            <field name="name">Bs3 for 12 0 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">website/static/src/scss/compatibility/bs3_for_12_0.scss</field>
+            <field name="active" eval="False"/>
+            </record>
+
+    </data>
+</odoo>
diff --git a/addons/website/tests/template_qweb_test.xml b/addons/website/tests/template_qweb_test.xml
index ac7dd4e390f..642e503de69 100644
--- a/addons/website/tests/template_qweb_test.xml
+++ b/addons/website/tests/template_qweb_test.xml
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="website.test_bundle">
-        <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
-        <script type="text/javascript" src="http://test.external.link/javascript1.js"></script>
-
-        <link rel="stylesheet" type="text/css" href="/web/static/lib/jquery.ui/jquery-ui.css"/>
-        <link rel="stylesheet" href="http://test.external.link/style1.css"/>
-
-        <script type="text/javascript" src="/web/static/src/js/boot.js"></script>
-        <script type="text/javascript" src="http://test.external.link/javascript2.js"></script>
-
-        <link rel="stylesheet" href="http://test.external.link/style2.css"/>
-    </template>
 
     <template id="website.test_template" name="test template 2">
 &lt;!DOCTYPE html&gt;
diff --git a/addons/website/views/assets.xml b/addons/website/views/assets.xml
index 48925966575..a77d75ffda1 100644
--- a/addons/website/views/assets.xml
+++ b/addons/website/views/assets.xml
@@ -1,180 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="_assets_primary_variables" inherit_id="portal._assets_primary_variables">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/primary_variables.scss"/>
-
-        <!-- Those files will be automatically edited by users -->
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/options/user_values.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/options/colors/user_color_palette.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/options/colors/user_gray_color_palette.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/options/colors/user_theme_color_palette.scss"/>
-    </xpath>
-</template>
-<template id="_assets_secondary_variables" inherit_id="web_editor._assets_secondary_variables">
-    <xpath expr="//link" position="before">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/secondary_variables.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_tests" name="Website Assets Tests" inherit_id="web.assets_tests">
-    <xpath expr="." position="inside">
-        <script type="text/javascript" src="/website/static/tests/tours/reset_password.js"></script>
-        <script type="text/javascript" src="/website/static/tests/tours/rte.js"/>
-        <script type="text/javascript" src="/website/static/tests/tours/html_editor.js"/>
-        <script type="text/javascript" src="/website/static/tests/tours/restricted_editor.js"/>
-        <script type="text/javascript" src="/website/static/tests/tours/dashboard_tour.js"/>
-        <script type="text/javascript" src="/website/static/tests/tours/specific_website_editor.js"/>
-        <script type="text/javascript" src="/website/static/tests/tours/public_user_editor.js"/>
-        <script type="text/javascript" src="/website/static/tests/tours/website_navbar_menu.js"/>
-        <script type="text/javascript" src="/website/static/tests/tours/snippet_version.js"/>
-        <script type="text/javascript" src="/website/static/tests/tours/website_style_edition.js"/>
-        <script type="text/javascript" src="/website/static/tests/tours/snippet_empty_parent_autoremove.js"/>
-    </xpath>
-</template>
-
-<template id="assets_backend" inherit_id="web.assets_backend" name="Website Backend Assets (used in backend interface)">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/view_hierarchy.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/website.backend.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/website_visitor_views.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/website.theme_install.scss"/>
-    </xpath>
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website/static/src/js/backend/button.js"/>
-        <script type="text/javascript" src="/website/static/src/js/backend/dashboard.js"/>
-        <script type="text/javascript" src="/website/static/src/js/backend/res_config_settings.js"/>
-        <script type="text/javascript" src="/website/static/src/js/backend/view_hierarchy.js"/>
-        <script type="text/javascript" src="/website/static/src/js/widget_iframe.js"/>
-        <script type="text/javascript" src="/website/static/src/js/theme_preview_kanban.js"/>
-        <script type="text/javascript" src="/website/static/src/js/theme_preview_form.js"/>
-    </xpath>
-</template>
-
-<template id="qunit_suite" inherit_id="web.qunit_suite_tests">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website/static/tests/dashboard_tests.js"/>
-        <script type="text/javascript" src="/website/static/tests/website_tests.js"/>
-    </xpath>
-</template>
-
-<template id="_assets_frontend_helpers" inherit_id="portal._assets_frontend_helpers">
-    <xpath expr="//link" position="before">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/bootstrap_overridden.scss"/>
-    </xpath>
-</template>
-
-<template id="_assets_frontend_helpers_user_custom" inherit_id="web._assets_frontend_helpers" priority="99">
-    <xpath expr="//link" position="before">
-        <!-- Custom empty file for user custom bootstrap override -->
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/user_custom_bootstrap_overridden.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_frontend" inherit_id="portal.assets_frontend" name="Website Assets">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/website.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/website.ui.scss"/>
-    </xpath>
-    <xpath expr="//script[@src='/web/static/src/js/public/public_root_instance.js']" position="replace">
-        <script type="text/javascript" src="/website/static/src/js/content/website_root_instance.js"/>
-    </xpath>
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website/static/src/js/set_view_track.js"/>
-        <script type="text/javascript" src="/website/static/src/js/utils.js"/>
-
-        <script type="text/javascript" src="/website/static/src/js/content/website_root.js"/>
-        <script type="text/javascript" src="/website/static/src/js/widgets/fullscreen_indication.js"/>
-        <script type="text/javascript" src="/website/static/src/js/content/compatibility.js"/>
-        <script type="text/javascript" src="/website/static/src/js/content/menu.js"/>
-        <script type="text/javascript" src="/website/static/src/js/content/snippets.animation.js"/>
-
-        <script type="text/javascript" src="/website/static/src/js/menu/navbar.js"/>
-
-        <script type="text/javascript" src="/website/static/src/js/show_password.js"/>
-        <script type="text/javascript" src="/website/static/src/js/post_link.js"/>
-        <!-- Custom empty file for user javascript -->
-        <script type="text/javascript" src="/website/static/src/js/user_custom_javascript.js"/>
-    </xpath>
-</template>
-
-<template id="assets_frontend_user_custom" inherit_id="web.assets_frontend" name="Website Assets user custom" priority="99">
-    <xpath expr="//link[last()]" position="after">
-        <!-- Custom empty file for user custom rules -->
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/user_custom_rules.scss"/>
-    </xpath>
-</template>
-
-<template id="assets_frontend_compatibility_for_12_0" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/compatibility/bs3_for_12_0.scss"/>
-    </xpath>
-</template>
-
 <template id="website.compiled_assets_wysiwyg" name="Website Editor Assets (used in website editor)" groups="website.group_website_publisher">
     <t t-call-assets="website.assets_wysiwyg"/>
 </template>
 
-<template id="website.assets_wysiwyg" name="Website Editor Assets (used in website editor)">
-    <t t-call="web._assets_helpers"/>
-    <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/bootstrap_overridden.scss"/>
-    <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
-    <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/website.wysiwyg.scss"/>
-    <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/website.edit_mode.scss"/>
-
-    <script type="text/javascript" src="/website/static/src/js/editor/editor.js"/>
-    <script type="text/javascript" src="/website/static/src/js/editor/snippets.editor.js"/>
-    <script type="text/javascript" src="/website/static/src/js/editor/rte.summernote.js"/>
-    <script type="text/javascript" src="/website/static/src/js/editor/snippets.options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_facebook_page/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_image_gallery/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_countdown/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_popup/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_product_catalog/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_chart/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_rating/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_tabs/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_progress_bar/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_blockquote/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_showcase/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_table_of_content/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_timeline/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_media_list/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_google_map/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_map/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_dynamic_snippet/options.js"/>
-    <script type="text/javascript" src="/website/static/src/snippets/s_dynamic_snippet_carousel/options.js"/>
-
-    <script type="text/javascript" src="/website/static/src/js/editor/wysiwyg_multizone.js"/>
-    <script type="text/javascript" src="/website/static/src/js/editor/wysiwyg_multizone_translate.js"/>
-    <script type="text/javascript" src="/website/static/src/js/editor/widget_link.js"/>
-
-    <script type="text/javascript" src="/website/static/src/js/widgets/media.js"/>
-</template>
-
-<template id="website.assets_editor" name="Website Editor Assets (used in website editor)">
-    <t t-call="web._assets_helpers"/>
-    <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
-
-    <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/website.editor.ui.scss"/>
-    <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/website.theme_install.scss"/>
-
-    <script type="text/javascript" src="/website/static/src/js/editor/editor_menu.js"/>
-    <script type="text/javascript" src="/website/static/src/js/editor/editor_menu_translate.js"/>
-
-    <script type="text/javascript" src="/website/static/src/js/menu/content.js"/>
-    <script type="text/javascript" src="/website/static/src/js/menu/customize.js"/>
-    <script type="text/javascript" src="/website/static/src/js/menu/debug_manager.js"/>
-    <script type="text/javascript" src="/website/static/src/js/menu/edit.js"/>
-    <script type="text/javascript" src="/website/static/src/js/menu/mobile_view.js"/>
-    <script type="text/javascript" src="/website/static/src/js/menu/new_content.js"/>
-    <script type="text/javascript" src="/website/static/src/js/menu/seo.js"/>
-    <script type="text/javascript" src="/website/static/src/js/menu/translate.js"/>
-    <script type="text/javascript" src="/website/static/src/js/tours/homepage.js"/>
-    <script type="text/javascript" src="/website/static/src/js/tours/tour_utils.js"/>
-
-    <script type="text/javascript" src="/website/static/src/js/widgets/ace.js"/>
-</template>
-
 </odoo>
diff --git a/addons/website/views/snippets/s_alert.xml b/addons/website/views/snippets/s_alert.xml
index 43cbbc3109d..f94875e9d05 100644
--- a/addons/website/views/snippets/s_alert.xml
+++ b/addons/website/views/snippets/s_alert.xml
@@ -39,10 +39,10 @@
     </xpath>
 </template>
 
-<template id="assets_snippet_s_alert_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_alert/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_alert_000_scss" model="ir.asset">
+    <field name="name">Alert 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_alert/000.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_badge.xml b/addons/website/views/snippets/s_badge.xml
index d5f684e04dc..ed57ad994a4 100644
--- a/addons/website/views/snippets/s_badge.xml
+++ b/addons/website/views/snippets/s_badge.xml
@@ -18,15 +18,16 @@
     </xpath>
 </template>
 
-<template id="_assets_snippet_s_badge_css_000_variables" inherit_id="website._assets_primary_variables">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_badge/000_variables.scss"/>
-    </xpath>
-</template>
-<template id="assets_snippet_s_badge_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_badge/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_badge_000_variables_scss" model="ir.asset">
+    <field name="name">Badge 000 variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="glob">website/static/src/snippets/s_badge/000_variables.scss</field>
+</record>
+
+<record id="website.s_badge_000_scss" model="ir.asset">
+    <field name="name">Badge 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_badge/000.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_blockquote.xml b/addons/website/views/snippets/s_blockquote.xml
index deeef9ade78..dd5c02a4ab5 100644
--- a/addons/website/views/snippets/s_blockquote.xml
+++ b/addons/website/views/snippets/s_blockquote.xml
@@ -8,7 +8,7 @@
             <p>Write a quote here from one of your customers. Quotes are a great way to build confidence in your products or services.</p>
             <footer class="blockquote-footer">
                 <img src="/web/image/website.s_blockquote_default_image" class="s_blockquote_avatar img rounded-circle mr-2" alt=""/>
-                <span class="s_blockquote_author"><b>John DOE</b> • CEO of MyCompany</span>
+                <span class="s_blockquote_author"><b>John DOE</b> &#8226; CEO of MyCompany</span>
             </footer>
         </div>
     </blockquote>
@@ -50,10 +50,10 @@
     </xpath>
 </template>
 
-<template id="assets_snippet_s_blockquote_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_blockquote/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_blockquote_000_scss" model="ir.asset">
+    <field name="name">Blockquote 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_blockquote/000.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_btn.xml b/addons/website/views/snippets/s_btn.xml
index 23b7a902c35..1895899ffca 100644
--- a/addons/website/views/snippets/s_btn.xml
+++ b/addons/website/views/snippets/s_btn.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="assets_snippet_s_btn_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_btn/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_btn_000_scss" model="ir.asset">
+    <field name="name">Btn 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_btn/000.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_card.xml b/addons/website/views/snippets/s_card.xml
index b809d8a2ad7..cdccfc9b09e 100644
--- a/addons/website/views/snippets/s_card.xml
+++ b/addons/website/views/snippets/s_card.xml
@@ -13,10 +13,11 @@
     </div>
 </template>
 
-<template id="assets_snippet_s_card_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_card/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_card_000_scss" model="ir.asset">
+    <field name="name">Card 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_card/000.scss</field>
+</record>
+
 
 </odoo>
diff --git a/addons/website/views/snippets/s_chart.xml b/addons/website/views/snippets/s_chart.xml
index 822531bc38b..2078c2a9b27 100644
--- a/addons/website/views/snippets/s_chart.xml
+++ b/addons/website/views/snippets/s_chart.xml
@@ -21,8 +21,7 @@
 
 <template id="s_chart_options" inherit_id="website.snippet_options">
     <xpath expr="." position="inside">
-        <div data-js="InnerChart" string="Chart"
-            data-selector=".s_chart">
+        <div data-js="InnerChart" string="Chart" data-selector=".s_chart">
             <we-row string="Background">
                 <t t-call="web_editor.snippet_options_background_color_widget"/>
             </we-row>
@@ -34,8 +33,7 @@
                 <we-button data-select-data-attribute="doughnut">Doughnut</we-button>
                 <we-button data-select-data-attribute="radar">Radar</we-button>
             </we-select>
-            <we-checkbox string="Stacked" data-name="stacked_chart_opt" data-dependencies="bar_chart_opt, horizontal_bar_chart_opt"
-                        data-select-data-attribute="false|true" data-attribute-name="stacked" data-no-preview="true"/>
+            <we-checkbox string="Stacked" data-name="stacked_chart_opt" data-dependencies="bar_chart_opt, horizontal_bar_chart_opt" data-select-data-attribute="false|true" data-attribute-name="stacked" data-no-preview="true"/>
             <we-select string="Legend" data-attribute-name="legendPosition" data-attribute-default-value="top">
                 <we-button data-select-data-attribute="none">None</we-button>
                 <we-button data-select-data-attribute="top">Top</we-button>
@@ -68,10 +66,10 @@
     </xpath>
 </template>
 
-<template id="assets_snippet_s_chart_js_000" inherit_id="website.assets_frontend">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website/static/src/snippets/s_chart/000.js"/>
-    </xpath>
-</template>
+<record id="website.s_chart_000_js" model="ir.asset">
+    <field name="name">Chart 000 JS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_chart/000.js</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_color_blocks_2.xml b/addons/website/views/snippets/s_color_blocks_2.xml
index b48bddc8eb3..76ae8babbbf 100644
--- a/addons/website/views/snippets/s_color_blocks_2.xml
+++ b/addons/website/views/snippets/s_color_blocks_2.xml
@@ -22,10 +22,10 @@
     </section>
 </template>
 
-<template id="assets_snippet_s_color_blocks_2_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_color_blocks_2/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_color_blocks_2_000_scss" model="ir.asset">
+    <field name="name">Color blocks 2 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_color_blocks_2/000.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_company_team.xml b/addons/website/views/snippets/s_company_team.xml
index 20d12702ab8..6e8c7d9cd73 100644
--- a/addons/website/views/snippets/s_company_team.xml
+++ b/addons/website/views/snippets/s_company_team.xml
@@ -58,10 +58,10 @@
     </section>
 </template>
 
-<template id="assets_snippet_s_company_team_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_company_team/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_company_team_000_scss" model="ir.asset">
+    <field name="name">Company team 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_company_team/000.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_comparisons.xml b/addons/website/views/snippets/s_comparisons.xml
index 987eaca3ce5..0114f6160ab 100644
--- a/addons/website/views/snippets/s_comparisons.xml
+++ b/addons/website/views/snippets/s_comparisons.xml
@@ -79,10 +79,10 @@
     </section>
 </template>
 
-<template id="assets_snippet_s_comparisons_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_comparisons/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_comparisons_000_scss" model="ir.asset">
+    <field name="name">Comparisons 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_comparisons/000.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_countdown.xml b/addons/website/views/snippets/s_countdown.xml
index d94d97fe051..3c35d11763b 100644
--- a/addons/website/views/snippets/s_countdown.xml
+++ b/addons/website/views/snippets/s_countdown.xml
@@ -29,8 +29,7 @@
                     <i class="fa fa-fw fa-eye"/>
                 </we-button>
             </we-row>
-            <we-urlpicker string="URL" data-dependencies="redirect_end_action_opt"
-                        data-select-data-attribute="" placeholder="e.g. /my-awesome-page" data-attribute-name="redirectUrl"/>
+            <we-urlpicker string="URL" data-dependencies="redirect_end_action_opt" data-select-data-attribute="" placeholder="e.g. /my-awesome-page" data-attribute-name="redirectUrl"/>
             <we-select string="Size" data-attribute-name="size">
                 <we-button data-select-data-attribute="80">Small</we-button>
                 <we-button data-select-data-attribute="120">Medium</we-button>
@@ -53,8 +52,7 @@
                 <we-button data-select-data-attribute="plain">Plain</we-button>
                 <we-button data-select-data-attribute="none" data-name="no_background_layout_opt">None</we-button>
             </we-select>
-            <we-colorpicker string="Layout Background Color" data-dependencies="!no_background_layout_opt"
-                            data-attribute-name="layoutBackgroundColor" data-select-data-attribute=""/>
+            <we-colorpicker string="Layout Background Color" data-dependencies="!no_background_layout_opt" data-attribute-name="layoutBackgroundColor" data-select-data-attribute=""/>
             <we-select string="Progress Bar Style" data-attribute-name="progressBarStyle" data-dependencies="circle_layout_opt, boxes_layout_opt">
                 <we-button data-select-data-attribute="surrounded">Surrounded</we-button>
                 <we-button data-select-data-attribute="disappear">Disappearing</we-button>
@@ -64,16 +62,15 @@
                 <we-button data-select-data-attribute="thin">Thin</we-button>
                 <we-button data-select-data-attribute="thick">Thick</we-button>
             </we-select>
-            <we-colorpicker string="Progress Bar Color" data-dependencies="!no_progressbar_style_opt"
-                            data-attribute-name="progressBarColor" data-select-data-attribute=""/>
+            <we-colorpicker string="Progress Bar Color" data-dependencies="!no_progressbar_style_opt" data-attribute-name="progressBarColor" data-select-data-attribute=""/>
         </div>
     </xpath>
 </template>
 
-<template id="assets_snippet_s_countdown_js_000" inherit_id="website.assets_frontend">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website/static/src/snippets/s_countdown/000.js"/>
-    </xpath>
-</template>
+<record id="website.s_countdown_000_js" model="ir.asset">
+    <field name="name">Countdown 000 JS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_countdown/000.js</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_dynamic_snippet.xml b/addons/website/views/snippets/s_dynamic_snippet.xml
index 61d65a8f835..8919ae84621 100644
--- a/addons/website/views/snippets/s_dynamic_snippet.xml
+++ b/addons/website/views/snippets/s_dynamic_snippet.xml
@@ -51,14 +51,17 @@
             </t>
         </xpath>
     </template>
-    <template id="assets_snippet_s_dynamic_snippet_css_000" inherit_id="website.assets_frontend">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_dynamic_snippet/000.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_snippet_s_dynamic_snippet_js_000" inherit_id="website.assets_frontend">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website/static/src/snippets/s_dynamic_snippet/000.js"/>
-        </xpath>
-    </template>
+
+<record id="website.s_dynamic_snippet_000_scss" model="ir.asset">
+    <field name="name">Dynamic snippet 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_dynamic_snippet/000.scss</field>
+</record>
+
+<record id="website.s_dynamic_snippet_000_js" model="ir.asset">
+    <field name="name">Dynamic snippet 000 JS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_dynamic_snippet/000.js</field>
+</record>
+
 </odoo>
diff --git a/addons/website/views/snippets/s_dynamic_snippet_carousel.xml b/addons/website/views/snippets/s_dynamic_snippet_carousel.xml
index a1b32247b12..b9e5ad0f8d6 100644
--- a/addons/website/views/snippets/s_dynamic_snippet_carousel.xml
+++ b/addons/website/views/snippets/s_dynamic_snippet_carousel.xml
@@ -16,7 +16,7 @@
             <t t-raw="0"/>
         </t>
     </template>
-    <template id="s_dynamic_snippet_carousel_options"  inherit_id="website.snippet_options">
+    <template id="s_dynamic_snippet_carousel_options" inherit_id="website.snippet_options">
         <xpath expr="." position="inside">
             <t t-call="website.dynamic_snippet_carousel_options_template">
                 <t t-set="snippet_name" t-value="'dynamic_snippet_carousel'"/>
@@ -24,14 +24,17 @@
             </t>
         </xpath>
     </template>
-    <template id="assets_snippet_s_dynamic_snippet_carousel_css_000" inherit_id="website.assets_snippet_s_dynamic_snippet_css_000">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_dynamic_snippet_carousel/000.scss"/>
-        </xpath>
-    </template>
-    <template id="assets_snippet_s_dynamic_snippet_carousel_js_000" inherit_id="website.assets_snippet_s_dynamic_snippet_js_000">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website/static/src/snippets/s_dynamic_snippet_carousel/000.js"/>
-        </xpath>
-    </template>
+
+<record id="website.s_dynamic_snippet_carousel_000_scss" model="ir.asset">
+    <field name="name">Dynamic snippet carousel 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_dynamic_snippet_carousel/000.scss</field>
+</record>
+
+<record id="website.s_dynamic_snippet_carousel_000_js" model="ir.asset">
+    <field name="name">Dynamic snippet carousel 000 JS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_dynamic_snippet_carousel/000.js</field>
+</record>
+
 </odoo>
diff --git a/addons/website/views/snippets/s_facebook_page.xml b/addons/website/views/snippets/s_facebook_page.xml
index c7b772de867..30572e046b5 100644
--- a/addons/website/views/snippets/s_facebook_page.xml
+++ b/addons/website/views/snippets/s_facebook_page.xml
@@ -22,10 +22,10 @@
 </template>
 
 <!-- Snippet assets -->
-<template id="assets_snippet_s_facebook_page_js_000" inherit_id="website.assets_frontend">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website/static/src/snippets/s_facebook_page/000.js"/>
-    </xpath>
-</template>
+<record id="website.s_facebook_page_000_js" model="ir.asset">
+    <field name="name">Facebook page 000 JS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_facebook_page/000.js</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_faq_collapse.xml b/addons/website/views/snippets/s_faq_collapse.xml
index 2154b51b251..a742d34afab 100644
--- a/addons/website/views/snippets/s_faq_collapse.xml
+++ b/addons/website/views/snippets/s_faq_collapse.xml
@@ -35,10 +35,10 @@
     </section>
 </template>
 
-<template id="assets_snippet_s_faq_collapse_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_faq_collapse/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_faq_collapse_000_scss" model="ir.asset">
+    <field name="name">Faq collapse 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_faq_collapse/000.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_features_grid.xml b/addons/website/views/snippets/s_features_grid.xml
index ecb45fab011..cebd940323a 100644
--- a/addons/website/views/snippets/s_features_grid.xml
+++ b/addons/website/views/snippets/s_features_grid.xml
@@ -68,10 +68,10 @@
     </section>
 </template>
 
-<template id="assets_snippet_s_features_grid_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_features_grid/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_features_grid_000_scss" model="ir.asset">
+    <field name="name">Features grid 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_features_grid/000.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_google_map.xml b/addons/website/views/snippets/s_google_map.xml
index 47f2e79562e..82c039ab5ce 100644
--- a/addons/website/views/snippets/s_google_map.xml
+++ b/addons/website/views/snippets/s_google_map.xml
@@ -12,10 +12,10 @@
     <xpath expr="//div[@data-js='Box']" position="before">
         <div data-js="GoogleMap" data-selector=".s_google_map">
             <we-gpspicker string="Address"
-                          data-select-data-attribute="" data-attribute-name="mapGps"
-                          data-set-formatted-address=""
-                          placeholder="e.g. De Brouckere, Brussels, Belgium"
-                          data-no-preview="true"/>
+                data-select-data-attribute="" data-attribute-name="mapGps"
+                data-set-formatted-address=""
+                placeholder="e.g. De Brouckere, Brussels, Belgium"
+                data-no-preview="true"/>
             <we-select string="Marker style" data-attribute-name="pinStyle">
                 <we-button data-select-data-attribute="">Default</we-button>
                 <we-button data-select-data-attribute="flat">Flat</we-button>
@@ -26,27 +26,17 @@
                 <we-button data-select-data-attribute="SATELLITE">Satellite</we-button>
                 <we-button data-select-data-attribute="HYBRID">Hybrid</we-button>
             </we-select>
-            <we-select string="⌙ Style" data-dependencies="roadmap_opt" data-no-preview="true" data-attribute-name="mapColor">
-                <we-button data-select-data-attribute=""
-                           data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-default.jpg"/>
-                <we-button data-select-data-attribute="lightMonoMap"
-                           data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-lightMono.jpg"/>
-                <we-button data-select-data-attribute="cupertinoMap"
-                           data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-cupertino.jpg"/>
-                <we-button data-select-data-attribute="retroMap"
-                           data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-retro.jpg"/>
-                <we-button data-select-data-attribute="cobaltMap"
-                           data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-cobalt.jpg"/>
-                <we-button data-select-data-attribute="flatMap"
-                           data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-flat.jpg"/>
-                <we-button data-select-data-attribute="blueMap"
-                           data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-blue.jpg"/>
-                <we-button data-select-data-attribute="lillaMap"
-                           data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-lilla.jpg"/>
-                <we-button data-select-data-attribute="carMap"
-                           data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-caramello.jpg"/>
-                <we-button data-select-data-attribute="bwMap"
-                           data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-bw.jpg"/>
+            <we-select string="&#8985; Style" data-dependencies="roadmap_opt" data-no-preview="true" data-attribute-name="mapColor">
+                <we-button data-select-data-attribute="" data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-default.jpg"/>
+                <we-button data-select-data-attribute="lightMonoMap" data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-lightMono.jpg"/>
+                <we-button data-select-data-attribute="cupertinoMap" data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-cupertino.jpg"/>
+                <we-button data-select-data-attribute="retroMap" data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-retro.jpg"/>
+                <we-button data-select-data-attribute="cobaltMap" data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-cobalt.jpg"/>
+                <we-button data-select-data-attribute="flatMap" data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-flat.jpg"/>
+                <we-button data-select-data-attribute="blueMap" data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-blue.jpg"/>
+                <we-button data-select-data-attribute="lillaMap" data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-lilla.jpg"/>
+                <we-button data-select-data-attribute="carMap" data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-caramello.jpg"/>
+                <we-button data-select-data-attribute="bwMap" data-img="/website/static/src/snippets/s_google_map/img/thumbs/map-bw.jpg"/>
             </we-select>
             <we-input string="Zoom" data-select-data-attribute="12" data-no-preview="true" data-attribute-name="mapZoom" data-step="1"/>
             <we-checkbox string="Description" data-no-preview="true" data-show-description="true"/>
@@ -54,16 +44,16 @@
     </xpath>
 </template>
 
-<template id="assets_snippet_s_google_map_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_google_map/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_google_map_000_scss" model="ir.asset">
+    <field name="name">Google map 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_google_map/000.scss</field>
+</record>
 
-<template id="assets_snippet_s_google_map_js_000" inherit_id="website.assets_frontend">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website/static/src/snippets/s_google_map/000.js"/>
-    </xpath>
-</template>
+<record id="website.s_google_map_000_js" model="ir.asset">
+    <field name="name">Google map 000 JS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_google_map/000.js</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_hr.xml b/addons/website/views/snippets/s_hr.xml
index 9e5cb555aa0..8a0ba36e1d2 100644
--- a/addons/website/views/snippets/s_hr.xml
+++ b/addons/website/views/snippets/s_hr.xml
@@ -29,10 +29,10 @@
     </xpath>
 </template>
 
-<template id="assets_snippet_s_hr_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_hr/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_hr_000_scss" model="ir.asset">
+    <field name="name">Hr 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_hr/000.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_image_gallery.xml b/addons/website/views/snippets/s_image_gallery.xml
index 43b1d1da37f..5ecb513350b 100644
--- a/addons/website/views/snippets/s_image_gallery.xml
+++ b/addons/website/views/snippets/s_image_gallery.xml
@@ -2,9 +2,7 @@
 <odoo>
 
 <template id="s_image_gallery" name="Image Gallery">
-    <section class="s_image_gallery o_slideshow s_image_gallery_show_indicators s_image_gallery_indicators_rounded pt24"
-             data-vcss="001"
-             data-columns="3" style="height: 500px; overflow: hidden;">
+    <section class="s_image_gallery o_slideshow s_image_gallery_show_indicators s_image_gallery_indicators_rounded pt24" data-vcss="001" data-columns="3" style="height: 500px; overflow: hidden;">
         <div class="container">
             <div id="slideshow_sample" class="carousel slide" data-ride="carousel" data-interval="0" style="margin: 0 12px;">
                 <div class="carousel-inner" style="padding: 0;">
@@ -43,9 +41,7 @@
 </template>
 
 <template id="s_images_wall" name="Images Wall">
-    <section class="s_image_gallery o_spc-small o_masonry pt24 pb24"
-             data-vcss="001"
-             data-columns="3" style="overflow: hidden;">
+    <section class="s_image_gallery o_spc-small o_masonry pt24 pb24" data-vcss="001" data-columns="3" style="overflow: hidden;">
         <div class="container">
             <div class="row s_nb_column_fixed">
                 <div class="o_masonry_col o_snippet_not_selectable col-lg-4">
@@ -85,10 +81,10 @@
                 <we-button data-mode="slideshow" data-name="slideshow_mode_opt">Slideshow</we-button>
             </we-select>
             <we-input string="Speed"
-                  data-dependencies="slideshow_mode_opt"
-                  data-apply-to=".carousel:first"
-                  data-select-data-attribute="0s" data-attribute-name="interval"
-                  data-unit="s" data-save-unit="ms" data-step="0.1"/>
+                data-dependencies="slideshow_mode_opt"
+                data-apply-to=".carousel:first"
+                data-select-data-attribute="0s" data-attribute-name="interval"
+                data-unit="s" data-save-unit="ms" data-step="0.1"/>
             <we-select string="Columns" data-dependencies="masonry_mode_opt, grid_mode_opt">
                 <we-button data-columns="1">1</we-button>
                 <we-button data-columns="2">2</we-button>
@@ -134,22 +130,23 @@
     </xpath>
 </template>
 
-<template id="assets_snippet_s_image_gallery_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_image_gallery/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_image_gallery_000_js" model="ir.asset">
+    <field name="name">Image gallery 000 JS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_image_gallery/000.js</field>
+</record>
 
-<template id="assets_snippet_s_image_gallery_css_001" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_image_gallery/001.scss"/>
-    </xpath>
-</template>
+<record id="website.s_image_gallery_000_scss" model="ir.asset">
+    <field name="name">Image gallery 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_image_gallery/000.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-<template id="assets_snippet_s_image_gallery_js_000" inherit_id="website.assets_frontend">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website/static/src/snippets/s_image_gallery/000.js"/>
-    </xpath>
-</template>
+<record id="website.s_image_gallery_001_scss" model="ir.asset">
+    <field name="name">Image gallery 001 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_image_gallery/001.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_map.xml b/addons/website/views/snippets/s_map.xml
index 7ce0a6b40f8..8801e62d5c6 100644
--- a/addons/website/views/snippets/s_map.xml
+++ b/addons/website/views/snippets/s_map.xml
@@ -60,10 +60,10 @@
     </xpath>
 </template>
 
-<template id="assets_snippet_s_map_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_map/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_map_000_scss" model="ir.asset">
+    <field name="name">Map 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_map/000.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_masonry_block.xml b/addons/website/views/snippets/s_masonry_block.xml
index 96a1dd66f9a..b3835076af8 100644
--- a/addons/website/views/snippets/s_masonry_block.xml
+++ b/addons/website/views/snippets/s_masonry_block.xml
@@ -6,8 +6,7 @@
     <section class="s_masonry_block" data-vcss="001">
         <div class="container-fluid">
             <div class="row">
-                <div class="col-lg-6 oe_img_bg o_bg_img_center text-center pb224 pt224" data-name="Block"
-                     style="background-image: url(/web/image/website.s_masonry_block_default_image_1);">
+                <div class="col-lg-6 oe_img_bg o_bg_img_center text-center pb224 pt224" data-name="Block" style="background-image: url(/web/image/website.s_masonry_block_default_image_1);">
                     <p><br/></p>
                 </div>
                 <div class="col-lg-6">
@@ -36,21 +35,24 @@
 </template>
 
 <!-- Assets -->
-<template id="_assets_snippet_s_masonry_block_css_000_variables" inherit_id="website._assets_primary_variables" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_masonry_block/000_variables.scss"/>
-    </xpath>
-</template>
-<template id="assets_snippet_s_masonry_block_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_masonry_block/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_masonry_block_000_scss" model="ir.asset">
+    <field name="name">Masonry block 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_masonry_block/000.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-<template id="assets_snippet_s_masonry_block_css_001" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_masonry_block/001.scss"/>
-    </xpath>
-</template>
+<record id="website.s_masonry_block_001_scss" model="ir.asset">
+    <field name="name">Masonry block 001 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_masonry_block/001.scss</field>
+</record>
+
+<record id="website.s_masonry_block_000_variables_scss" model="ir.asset">
+    <field name="name">Masonry block 000 variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="glob">website/static/src/snippets/s_masonry_block/000_variables.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_media_list.xml b/addons/website/views/snippets/s_media_list.xml
index f1470e65d64..1671e83cf5f 100644
--- a/addons/website/views/snippets/s_media_list.xml
+++ b/addons/website/views/snippets/s_media_list.xml
@@ -49,90 +49,62 @@
     <xpath expr="." position="inside">
         <t t-call="web_editor.snippet_options_background_options">
             <t t-set="selector" t-value="'.s_media_list_item'"/>
-            <t t-set="target" t-value="'> .row'"/>
+            <t t-set="target" t-value="'&gt; .row'"/>
             <t t-set="with_colors" t-value="True"/>
             <t t-set="with_images" t-value="False"/>
             <t t-set="with_color_combinations" t-value="True"/>
         </t>
-        <div data-js="Box" data-selector=".s_media_list_item" data-target="> .row">
+        <div data-js="Box" data-selector=".s_media_list_item" data-target="&gt; .row">
             <t t-call="website.snippet_options_border_widgets"/>
             <t t-call="website.snippet_options_shadow_widgets"/>
         </div>
-        <div data-selector=".s_media_list_item" data-target="> .row">
+        <div data-selector=".s_media_list_item" data-target="&gt; .row">
             <we-button-group string="Layout">
-                <we-button title="Left"
-                           data-name="media_left_opt"
-                           data-select-class=""
-                           data-img="/website/static/src/img/snippets_options/image_left.svg"/>
-                <we-button title="Right"
-                           data-select-class="flex-row-reverse"
-                           data-img="/website/static/src/img/snippets_options/image_right.svg"/>
+                <we-button title="Left" data-name="media_left_opt" data-select-class="" data-img="/website/static/src/img/snippets_options/image_left.svg"/>
+                <we-button title="Right" data-select-class="flex-row-reverse" data-img="/website/static/src/img/snippets_options/image_right.svg"/>
             </we-button-group>
         </div>
         <div data-js="MediaItemLayout" data-selector=".s_media_list_item">
             <we-button-group string="Image Size" data-dependencies="media_left_opt">
-                <we-button data-layout="3"
-                           data-img="/website/static/src/img/snippets_options/media_layout_1_4.svg"
-                           title="1/4 - 3/4"/>
-                <we-button data-layout="4"
-                           data-img="/website/static/src/img/snippets_options/media_layout_1_3.svg"
-                           title="1/3 - 2/3"/>
-                <we-button data-layout="6"
-                           data-img="/website/static/src/img/snippets_options/media_layout_1_2.svg"
-                           title="1/2 - 1/2"/>
+                <we-button data-layout="3" data-img="/website/static/src/img/snippets_options/media_layout_1_4.svg" title="1/4 - 3/4"/>
+                <we-button data-layout="4" data-img="/website/static/src/img/snippets_options/media_layout_1_3.svg" title="1/3 - 2/3"/>
+                <we-button data-layout="6" data-img="/website/static/src/img/snippets_options/media_layout_1_2.svg" title="1/2 - 1/2"/>
             </we-button-group>
             <we-button-group string="Image Size" data-dependencies="!media_left_opt">
-                <we-button data-layout="3"
-                           data-img="/website/static/src/img/snippets_options/media_layout_1_4_right.svg"
-                           title="1/4 - 3/4"/>
-                <we-button data-layout="4"
-                           data-img="/website/static/src/img/snippets_options/media_layout_1_3_right.svg"
-                           title="1/3 - 2/3"/>
-                <we-button data-layout="6"
-                           data-img="/website/static/src/img/snippets_options/media_layout_1_2_right.svg"
-                           title="1/2 - 1/2"/>
+                <we-button data-layout="3" data-img="/website/static/src/img/snippets_options/media_layout_1_4_right.svg" title="1/4 - 3/4"/>
+                <we-button data-layout="4" data-img="/website/static/src/img/snippets_options/media_layout_1_3_right.svg" title="1/3 - 2/3"/>
+                <we-button data-layout="6" data-img="/website/static/src/img/snippets_options/media_layout_1_2_right.svg" title="1/2 - 1/2"/>
             </we-button-group>
         </div>
 
-        <div data-selector=".s_media_list_item" data-target="> .row">
+        <div data-selector=".s_media_list_item" data-target="&gt; .row">
             <!-- Don't use the standard Vert. Alignement option to not suggest
                  Equal Height, which is useless for this snippet. -->
             <we-button-group string="Text Position" title="Text Position" data-dependencies="media_left_opt">
-                <we-button title="Align Top"
-                           data-select-class="align-items-start"
-                           data-img="/website/static/src/img/snippets_options/align_top_right.svg"/>
-                <we-button title="Align Middle"
-                           data-select-class="align-items-center"
-                           data-img="/website/static/src/img/snippets_options/align_middle_right.svg"/>
-                <we-button title="Align Bottom"
-                           data-select-class="align-items-end"
-                           data-img="/website/static/src/img/snippets_options/align_bottom_right.svg"/>
+                <we-button title="Align Top" data-select-class="align-items-start" data-img="/website/static/src/img/snippets_options/align_top_right.svg"/>
+                <we-button title="Align Middle" data-select-class="align-items-center" data-img="/website/static/src/img/snippets_options/align_middle_right.svg"/>
+                <we-button title="Align Bottom" data-select-class="align-items-end" data-img="/website/static/src/img/snippets_options/align_bottom_right.svg"/>
             </we-button-group>
             <we-button-group string="Text Position" title="Text Position" data-dependencies="!media_left_opt">
-                <we-button title="Align Top"
-                           data-select-class="align-items-start"
-                           data-img="/website/static/src/img/snippets_options/align_top.svg"/>
-                <we-button title="Align Middle"
-                           data-select-class="align-items-center"
-                           data-img="/website/static/src/img/snippets_options/align_middle.svg"/>
-                <we-button title="Align Bottom"
-                           data-select-class="align-items-end"
-                           data-img="/website/static/src/img/snippets_options/align_bottom.svg"/>
+                <we-button title="Align Top" data-select-class="align-items-start" data-img="/website/static/src/img/snippets_options/align_top.svg"/>
+                <we-button title="Align Middle" data-select-class="align-items-center" data-img="/website/static/src/img/snippets_options/align_middle.svg"/>
+                <we-button title="Align Bottom" data-select-class="align-items-end" data-img="/website/static/src/img/snippets_options/align_bottom.svg"/>
             </we-button-group>
         </div>
     </xpath>
 </template>
 
-<template id="assets_snippet_s_media_list_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_media_list/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_media_list_000_scss" model="ir.asset">
+    <field name="name">Media list 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_media_list/000.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-<template id="assets_snippet_s_media_list_css_001" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_media_list/001.scss"/>
-    </xpath>
-</template>
+<record id="website.s_media_list_001_scss" model="ir.asset">
+    <field name="name">Media list 001 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_media_list/001.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_numbers.xml b/addons/website/views/snippets/s_numbers.xml
index 4e7c01de0e6..f3f6e959cbf 100644
--- a/addons/website/views/snippets/s_numbers.xml
+++ b/addons/website/views/snippets/s_numbers.xml
@@ -27,7 +27,4 @@
 </template>
 
 <!-- No associated CSS but there is some in theme overrides -->
-<template id="assets_snippet_s_numbers_css_000" inherit_id="website.assets_frontend">
-</template>
-
 </odoo>
diff --git a/addons/website/views/snippets/s_popup.xml b/addons/website/views/snippets/s_popup.xml
index 21c82309058..4c95af541a8 100644
--- a/addons/website/views/snippets/s_popup.xml
+++ b/addons/website/views/snippets/s_popup.xml
@@ -3,21 +3,11 @@
 
 <template id="s_popup" name="Popup">
     <div class="s_popup o_snippet_invisible" data-vcss="001">
-        <div class="modal fade s_popup_middle"
-             style="background-color: var(--black-50) !important;"
-             data-show-after="5000"
-             data-display="afterDelay"
-             data-consents-duration="7"
-             data-focus="false"
-             data-backdrop="false"
-             tabindex="-1"
-             role="dialog">
+        <div class="modal fade s_popup_middle" style="background-color: var(--black-50) !important;" data-show-after="5000" data-display="afterDelay" data-consents-duration="7" data-focus="false" data-backdrop="false" tabindex="-1" role="dialog">
             <div class="modal-dialog d-flex">
                 <div class="modal-content oe_structure">
-                    <div class="s_popup_close js_close_popup o_we_no_overlay o_not_editable" aria-label="Close">×</div>
-                    <section class="s_banner oe_img_bg o_bg_img_center pt96 pb96"
-                             data-snippet="s_banner"
-                             style="background-image: url('/web/image/website.s_popup_default_image');">
+                    <div class="s_popup_close js_close_popup o_we_no_overlay o_not_editable" aria-label="Close">&#215;</div>
+                    <section class="s_banner oe_img_bg o_bg_img_center pt96 pb96" data-snippet="s_banner" style="background-image: url('/web/image/website.s_popup_default_image');">
                         <div class="container">
                             <div class="row s_nb_column_fixed">
                                 <div class="col-lg-10 offset-lg-1 text-center o_cc o_cc1 jumbotron pt48 pb48">
@@ -50,33 +40,17 @@
                 <we-button data-select-class="s_popup_size_full" data-name="s_popup_size_full">Full</we-button>
             </we-select>
             <we-row string="Backdrop">
-                <we-checkbox data-name="popup_backdrop_opt"
-                             data-select-class="s_popup_no_backdrop|"
-                             data-set-backdrop="true"
-                             data-no-preview="true"/>
-                <we-colorpicker data-dependencies="popup_backdrop_opt"
-                                data-select-style="true"
-                                data-css-property="background-color"
-                                data-color-prefix="bg-"
-                                data-css-compatible="true"/>
+                <we-checkbox data-name="popup_backdrop_opt" data-select-class="s_popup_no_backdrop|" data-set-backdrop="true" data-no-preview="true"/>
+                <we-colorpicker data-dependencies="popup_backdrop_opt" data-select-style="true" data-css-property="background-color" data-color-prefix="bg-" data-css-compatible="true"/>
             </we-row>
         </t>
         <t t-set="extra_popup_options">
-            <we-colorpicker string="Close Button Color"
-                            data-select-style="true"
-                            data-css-property="color"
-                            data-color-prefix="text-"
-                            data-apply-to=".s_popup_close"/>
+            <we-colorpicker string="Close Button Color" data-select-style="true" data-css-property="color" data-color-prefix="text-" data-apply-to=".s_popup_close"/>
             <we-select string="Display" data-attribute-name="display" data-attribute-default-value="always">
                 <we-button data-select-data-attribute="afterDelay" data-name="show_delay">Delay</we-button>
                 <we-button data-select-data-attribute="mouseExit">On Exit</we-button>
             </we-select>
-            <we-input string="⌙ Delay"
-                      data-select-data-attribute=""
-                      data-attribute-name="showAfter"
-                      data-unit="s"
-                      data-save-unit="ms"
-                      data-dependencies="show_delay"/>
+            <we-input string="&#8985; Delay" data-select-data-attribute="" data-attribute-name="showAfter" data-unit="s" data-save-unit="ms" data-dependencies="show_delay"/>
             <t t-set="unit_popup_duration">days</t>
             <we-input string="Hide For" title="Once the user closes the popup, it won't be shown again for that period of time." t-attf-data-select-data-attribute="7#{unit_popup_duration}" data-attribute-name="consentsDuration" t-att-data-unit="unit_popup_duration"/>
             <we-select string="Show on" data-no-preview="true">
@@ -94,21 +68,23 @@
     </xpath>
 </template>
 
-<template id="assets_snippet_s_popup_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_popup/000.scss"/>
-    </xpath>
-</template>
-<template id="assets_snippet_s_popup_css_001" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_popup/001.scss"/>
-    </xpath>
-</template>
+<record id="website.s_popup_000_scss" model="ir.asset">
+    <field name="name">Popup 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_popup/000.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-<template id="assets_snippet_s_popup_js_000" inherit_id="website.assets_frontend">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website/static/src/snippets/s_popup/000.js"/>
-    </xpath>
-</template>
+<record id="website.s_popup_000_js" model="ir.asset">
+    <field name="name">Popup 000 JS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_popup/000.js</field>
+</record>
+
+<record id="website.s_popup_001_scss" model="ir.asset">
+    <field name="name">Popup 001 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_popup/001.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_process_steps.xml b/addons/website/views/snippets/s_process_steps.xml
index 62dee97be08..674f7937592 100644
--- a/addons/website/views/snippets/s_process_steps.xml
+++ b/addons/website/views/snippets/s_process_steps.xml
@@ -54,10 +54,10 @@
     </section>
 </template>
 
-<template id="assets_snippet_s_process_steps_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_process_steps/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_process_steps_000_scss" model="ir.asset">
+    <field name="name">Process steps 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_process_steps/000.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_product_catalog.xml b/addons/website/views/snippets/s_product_catalog.xml
index 9e2304697d1..8246427e290 100644
--- a/addons/website/views/snippets/s_product_catalog.xml
+++ b/addons/website/views/snippets/s_product_catalog.xml
@@ -2,9 +2,7 @@
 <odoo>
 
 <template id="s_product_catalog" name="Pricelist">
-    <section class="s_product_catalog oe_img_bg o_bg_img_center oe_custom_bg pt48 pb32"
-             style="background-image: url('/web/image/website.s_product_catalog_default_image');"
-             data-vcss="001">
+    <section class="s_product_catalog oe_img_bg o_bg_img_center oe_custom_bg pt48 pb32" style="background-image: url('/web/image/website.s_product_catalog_default_image');" data-vcss="001">
         <div class="container">
             <h2>Menu</h2>
             <p>Add a menu description.</p>
@@ -60,10 +58,9 @@
 <template id="s_product_catalog_options" inherit_id="website.snippet_options">
     <xpath expr="." position="inside">
         <div data-js="ProductCatalog" data-selector=".s_product_catalog">
-            <we-checkbox string="Descriptions" data-toggle-description="true"
-                         data-no-preview="true"/>
+            <we-checkbox string="Descriptions" data-toggle-description="true" data-no-preview="true"/>
             <t t-call="website.snippet_options_border_line_widgets">
-                <t t-set="label">⌙ Separator</t>
+                <t t-set="label">&#8985; Separator</t>
                 <t t-set="direction" t-value="'top'"/>
                 <t t-set="apply_to" t-value="'.s_product_catalog_dish_description'"/>
                 <!-- Note: no need of extra dependency thanks to the apply-to -->
@@ -77,10 +74,10 @@
     </xpath>
 </template>
 
-<template id="assets_snippet_s_product_catalog_css_001" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_product_catalog/001.scss"/>
-    </xpath>
-</template>
+<record id="website.s_product_catalog_001_scss" model="ir.asset">
+    <field name="name">Product catalog 001 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_product_catalog/001.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_product_list.xml b/addons/website/views/snippets/s_product_list.xml
index 3d451aa467e..e85a955c282 100644
--- a/addons/website/views/snippets/s_product_list.xml
+++ b/addons/website/views/snippets/s_product_list.xml
@@ -2,7 +2,7 @@
 <odoo>
 
 <template name="Items" id="s_product_list">
-    <section class="s_product_list" >
+    <section class="s_product_list">
         <div class="container-fluid">
             <div class="row">
                 <div class="col-lg-2 col-md-4 col-6">
@@ -58,15 +58,16 @@
     </section>
 </template>
 
-<template id="_assets_snippet_s_product_list_css_000_variables" inherit_id="website._assets_primary_variables">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_product_list/000_variables.scss"/>
-    </xpath>
-</template>
-<template id="assets_snippet_s_product_list_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_product_list/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_product_list_000_variables_scss" model="ir.asset">
+    <field name="name">Product list 000 variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="glob">website/static/src/snippets/s_product_list/000_variables.scss</field>
+</record>
+
+<record id="website.s_product_list_000_scss" model="ir.asset">
+    <field name="name">Product list 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_product_list/000.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_progress_bar.xml b/addons/website/views/snippets/s_progress_bar.xml
index a6fcaa73c08..c1be3107ec0 100644
--- a/addons/website/views/snippets/s_progress_bar.xml
+++ b/addons/website/views/snippets/s_progress_bar.xml
@@ -35,7 +35,4 @@
 </template>
 
 <!-- No related CSS but there is some in theme overrides -->
-<template id="assets_snippet_s_progress_bar_css_000" inherit_id="website.assets_frontend">
-</template>
-
 </odoo>
diff --git a/addons/website/views/snippets/s_quotes_carousel.xml b/addons/website/views/snippets/s_quotes_carousel.xml
index 9ad26434761..003c44ffffc 100644
--- a/addons/website/views/snippets/s_quotes_carousel.xml
+++ b/addons/website/views/snippets/s_quotes_carousel.xml
@@ -6,9 +6,9 @@
         <div id="myQuoteCarousel" class="s_quotes_carousel s_carousel_default carousel slide bg-200" data-interval="10000">
             <!-- Indicators -->
             <ol class="carousel-indicators">
-                <li data-target="#myQuoteCarousel" data-slide-to="0" class="active"></li>
-                <li data-target="#myQuoteCarousel" data-slide-to="1"></li>
-                <li data-target="#myQuoteCarousel" data-slide-to="2"></li>
+                <li data-target="#myQuoteCarousel" data-slide-to="0" class="active"/>
+                <li data-target="#myQuoteCarousel" data-slide-to="1"/>
+                <li data-target="#myQuoteCarousel" data-slide-to="2"/>
             </ol>
             <!-- Content -->
             <div class="carousel-inner">
@@ -21,7 +21,7 @@
                                 <p>Write a quote here from one of your customers. Quotes are a great way to build confidence in your products or services.</p>
                                 <footer class="blockquote-footer">
                                     <img src="/web/image/website.s_quotes_carousel_demo_image_3" class="s_blockquote_avatar img rounded-circle mr-2" alt=""/>
-                                    <span class="s_blockquote_author"><b>Jane DOE</b> • CEO of MyCompany</span>
+                                    <span class="s_blockquote_author"><b>Jane DOE</b> &#8226; CEO of MyCompany</span>
                                 </footer>
                             </div>
                         </blockquote>
@@ -36,7 +36,7 @@
                                 <p>Write a quote here from one of your customers. Quotes are a great way to build confidence in your products or services.</p>
                                 <footer class="blockquote-footer">
                                     <img src="/web/image/website.s_quotes_carousel_demo_image_4" class="s_blockquote_avatar img rounded-circle mr-2" alt=""/>
-                                    <span class="s_blockquote_author"><b>John DOE</b> • CEO of MyCompany</span>
+                                    <span class="s_blockquote_author"><b>John DOE</b> &#8226; CEO of MyCompany</span>
                                 </footer>
                             </div>
                         </blockquote>
@@ -51,7 +51,7 @@
                                 <p>Write a quote here from one of your customers. Quotes are a great way to build confidence in your products or services.</p>
                                 <footer class="blockquote-footer">
                                     <img src="/web/image/website.s_quotes_carousel_demo_image_5" class="s_blockquote_avatar img rounded-circle mr-2" alt=""/>
-                                    <span class="s_blockquote_author"><b>Iris DOE</b> • CEO of MyCompany</span>
+                                    <span class="s_blockquote_author"><b>Iris DOE</b> &#8226; CEO of MyCompany</span>
                                 </footer>
                             </div>
                         </blockquote>
@@ -71,15 +71,17 @@
     </section>
 </template>
 
-<template id="assets_snippet_s_quotes_carousel_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_quotes_carousel/000.scss"/>
-    </xpath>
-</template>
-<template id="assets_snippet_s_quotes_carousel_css_001" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_quotes_carousel/001.scss"/>
-    </xpath>
-</template>
+<record id="website.s_quotes_carousel_000_scss" model="ir.asset">
+    <field name="name">Quotes carousel 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_quotes_carousel/000.scss</field>
+    <field name="active" eval="False"/>
+</record>
+
+<record id="website.s_quotes_carousel_001_scss" model="ir.asset">
+    <field name="name">Quotes carousel 001 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_quotes_carousel/001.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_rating.xml b/addons/website/views/snippets/s_rating.xml
index 3a8d84e9d07..51621b558aa 100644
--- a/addons/website/views/snippets/s_rating.xml
+++ b/addons/website/views/snippets/s_rating.xml
@@ -29,22 +29,14 @@
                 <we-button data-set-icons="fa-heart"><i class="fa fa-fw fa-heart"/> Hearts</we-button>
                 <we-button data-set-icons="custom" class="d-none">Custom</we-button>
             </we-select>
-            <we-row string="⌙ Active">
-                <we-colorpicker
-                    data-select-style=""
-                    data-apply-to=".s_rating_active_icons"
-                    data-css-property="color"
-                    data-color-prefix="text-"/>
+            <we-row string="&#8985; Active">
+                <we-colorpicker data-select-style="" data-apply-to=".s_rating_active_icons" data-css-property="color" data-color-prefix="text-"/>
                 <we-button data-custom-icon="true" data-custom-active-icon="true" data-no-preview="true">
                     <i class="fa fa-fw fa-refresh mr-1"/> Replace Icon
                 </we-button>
             </we-row>
-            <we-row string="⌙ Inactive">
-                <we-colorpicker
-                    data-select-style=""
-                    data-apply-to=".s_rating_inactive_icons"
-                    data-css-property="color"
-                    data-color-prefix="text-"/>
+            <we-row string="&#8985; Inactive">
+                <we-colorpicker data-select-style="" data-apply-to=".s_rating_inactive_icons" data-css-property="color" data-color-prefix="text-"/>
                 <we-button data-custom-icon="true" data-custom-active-icon="false" data-no-preview="true">
                     <i class="fa fa-fw fa-refresh mr-1"/> Replace Icon
                 </we-button>
@@ -55,31 +47,26 @@
                 <we-input data-total-icons-number="true" data-step="1"/>
             </we-row>
             <we-button-group string="Size" data-apply-to=".s_rating_icons">
-                <we-button data-select-class=""
-                           title="Small"
-                           data-img="/website/static/src/img/snippets_options/size_small.svg"/>
-                <we-button data-select-class="fa-2x"
-                           title="Medium"
-                           data-img="/website/static/src/img/snippets_options/size_medium.svg"/>
-                <we-button data-select-class="fa-3x"
-                           title="Large"
-                           data-img="/website/static/src/img/snippets_options/size_large.svg"/>
+                <we-button data-select-class="" title="Small" data-img="/website/static/src/img/snippets_options/size_small.svg"/>
+                <we-button data-select-class="fa-2x" title="Medium" data-img="/website/static/src/img/snippets_options/size_medium.svg"/>
+                <we-button data-select-class="fa-3x" title="Large" data-img="/website/static/src/img/snippets_options/size_large.svg"/>
             </we-button-group>
             <we-checkbox string="Display Inline" data-select-class="s_rating_inline" data-no-preview="true"/>
         </div>
     </xpath>
 </template>
 
-<template id="assets_snippet_s_rating_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_rating/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_rating_000_scss" model="ir.asset">
+    <field name="name">Rating 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_rating/000.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-<template id="assets_snippet_s_rating_css_001" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_rating/001.scss"/>
-    </xpath>
-</template>
+<record id="website.s_rating_001_scss" model="ir.asset">
+    <field name="name">Rating 001 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_rating/001.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_references.xml b/addons/website/views/snippets/s_references.xml
index 9c70e43209a..22dcfadf000 100644
--- a/addons/website/views/snippets/s_references.xml
+++ b/addons/website/views/snippets/s_references.xml
@@ -30,10 +30,10 @@
     </section>
 </template>
 
-<template id="assets_snippet_s_references_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_references/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_references_000_scss" model="ir.asset">
+    <field name="name">References 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_references/000.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_share.xml b/addons/website/views/snippets/s_share.xml
index 1244da3ad2c..1517e296c01 100644
--- a/addons/website/views/snippets/s_share.xml
+++ b/addons/website/views/snippets/s_share.xml
@@ -50,16 +50,16 @@
     </xpath>
 </template>
 
-<template id="assets_snippet_s_share_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_share/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_share_000_scss" model="ir.asset">
+    <field name="name">Share 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_share/000.scss</field>
+</record>
 
-<template id="assets_snippet_s_share_js_000" inherit_id="website.assets_frontend">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website/static/src/snippets/s_share/000.js"/>
-    </xpath>
-</template>
+<record id="website.s_share_000_js" model="ir.asset">
+    <field name="name">Share 000 JS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_share/000.js</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_showcase.xml b/addons/website/views/snippets/s_showcase.xml
index 676d797a212..da5506ea23b 100644
--- a/addons/website/views/snippets/s_showcase.xml
+++ b/addons/website/views/snippets/s_showcase.xml
@@ -57,25 +57,29 @@
 <!-- Options -->
 <template id="s_showcase_options" inherit_id="website.snippet_options">
     <xpath expr="//div[@data-js='Box']" position="before">
-        <div data-js="Showcase" data-selector=".s_showcase .row > div:has(> .s_showcase_title)"/>
+        <div data-js="Showcase" data-selector=".s_showcase .row &gt; div:has(&gt; .s_showcase_title)"/>
     </xpath>
 </template>
 
 <!-- Assets -->
-<template id="assets_snippet_s_showcase_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_showcase/000.scss"/>
-    </xpath>
-</template>
-<template id="assets_snippet_s_showcase_css_001" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_showcase/001.scss"/>
-    </xpath>
-</template>
-<template id="assets_snippet_s_showcase_css_002" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_showcase/002.scss"/>
-    </xpath>
-</template>
+<record id="website.s_showcase_000_scss" model="ir.asset">
+    <field name="name">Showcase 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_showcase/000.scss</field>
+    <field name="active" eval="False"/>
+</record>
+
+<record id="website.s_showcase_001_scss" model="ir.asset">
+    <field name="name">Showcase 001 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_showcase/001.scss</field>
+    <field name="active" eval="False"/>
+</record>
+
+<record id="website.s_showcase_002_scss" model="ir.asset">
+    <field name="name">Showcase 002 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_showcase/002.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_table_of_content.xml b/addons/website/views/snippets/s_table_of_content.xml
index a0dfa8fc88b..356ff164f28 100644
--- a/addons/website/views/snippets/s_table_of_content.xml
+++ b/addons/website/views/snippets/s_table_of_content.xml
@@ -5,9 +5,7 @@
     <section class="s_table_of_content pt24 pb24 o_cc o_cc1">
         <div class="container">
             <div class="row s_nb_column_fixed">
-                <div class="col-lg-3 s_table_of_content_navbar_wrap s_table_of_content_navbar_sticky
-                        s_table_of_content_vertical_navbar d-print-none d-none d-lg-block o_not_editable o_cc o_cc1"
-                        data-name="Navbar">
+                <div class="col-lg-3 s_table_of_content_navbar_wrap s_table_of_content_navbar_sticky                         s_table_of_content_vertical_navbar d-print-none d-none d-lg-block o_not_editable o_cc o_cc1" data-name="Navbar">
                     <div class="s_table_of_content_navbar list-group"/>
                 </div>
                 <div class="col-lg-9 s_table_of_content_main oe_structure oe_empty" data-name="Content">
@@ -63,16 +61,16 @@
     </xpath>
 </template>
 
-<template id="assets_snippet_s_table_of_content_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_table_of_content/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_table_of_content_000_scss" model="ir.asset">
+    <field name="name">Table of content 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_table_of_content/000.scss</field>
+</record>
 
-<template id="assets_snippet_s_table_of_content_js_000" inherit_id="website.assets_frontend">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website/static/src/snippets/s_table_of_content/000.js"/>
-    </xpath>
-</template>
+<record id="website.s_table_of_content_000_js" model="ir.asset">
+    <field name="name">Table of content 000 JS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_table_of_content/000.js</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_tabs.xml b/addons/website/views/snippets/s_tabs.xml
index 9d428170ac1..1b094f054a8 100644
--- a/addons/website/views/snippets/s_tabs.xml
+++ b/addons/website/views/snippets/s_tabs.xml
@@ -8,51 +8,24 @@
                 <div class="s_tabs_nav mb-3">
                     <ul class="nav nav-pills justify-content-center" role="tablist">
                         <li class="nav-item">
-                            <a class="nav-link active"
-                                id="nav_tabs_link_1"
-                                data-toggle="tab"
-                                href="#nav_tabs_content_1"
-                                role="tab"
-                                aria-controls="nav_tabs_content_1"
-                                aria-selected="true">Home</a>
+                            <a class="nav-link active" id="nav_tabs_link_1" data-toggle="tab" href="#nav_tabs_content_1" role="tab" aria-controls="nav_tabs_content_1" aria-selected="true">Home</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link"
-                                id="nav_tabs_link_2"
-                                data-toggle="tab"
-                                href="#nav_tabs_content_2"
-                                role="tab"
-                                aria-controls="nav_tabs_content_2"
-                                aria-selected="false">Profile</a>
+                            <a class="nav-link" id="nav_tabs_link_2" data-toggle="tab" href="#nav_tabs_content_2" role="tab" aria-controls="nav_tabs_content_2" aria-selected="false">Profile</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link"
-                                id="nav_tabs_link_3"
-                                data-toggle="tab"
-                                href="#nav_tabs_content_3"
-                                role="tab"
-                                aria-controls="nav_tabs_content_3"
-                                aria-selected="false">Contact</a>
+                            <a class="nav-link" id="nav_tabs_link_3" data-toggle="tab" href="#nav_tabs_content_3" role="tab" aria-controls="nav_tabs_content_3" aria-selected="false">Contact</a>
                         </li>
                     </ul>
                 </div>
                 <div class="s_tabs_content tab-content">
-                    <div class="tab-pane fade show active"
-                        id="nav_tabs_content_1"
-                        role="tabpanel"
-                        aria-labelledby="nav_tabs_link_1">
+                    <div class="tab-pane fade show active" id="nav_tabs_content_1" role="tabpanel" aria-labelledby="nav_tabs_link_1">
                         <div class="oe_structure oe_empty"/>
                     </div>
-                    <div class="tab-pane fade"
-                        id="nav_tabs_content_2"
-                        role="tabpanel"
-                        aria-labelledby="nav_tabs_link_2">
+                    <div class="tab-pane fade" id="nav_tabs_content_2" role="tabpanel" aria-labelledby="nav_tabs_link_2">
                         <div class="oe_structure oe_empty"/>
                     </div>
-                    <div class="tab-pane fade"
-                        id="nav_tabs_content_3"
-                        role="tabpanel"
-                        aria-labelledby="nav_tabs_link_3">
+                    <div class="tab-pane fade" id="nav_tabs_content_3" role="tabpanel" aria-labelledby="nav_tabs_link_3">
                         <div class="oe_structure oe_empty"/>
                     </div>
                 </div>
@@ -64,19 +37,10 @@
 <template id="s_tabs_options" inherit_id="website.snippet_options">
     <xpath expr="." position="inside">
         <div data-js="NavTabs" data-selector="section.s_tabs">
-            <we-button data-add-tab=""
-                       data-no-preview="true"
-                       class="o_we_text_success ml-0"
-                       title="Add Tab"
-                       aria-label="Add Tab">
+            <we-button data-add-tab="" data-no-preview="true" class="o_we_text_success ml-0" title="Add Tab" aria-label="Add Tab">
                 <i class="fa fa-fw fa-plus"/>
             </we-button>
-            <we-button data-remove-tab=""
-                       data-name="remove_tab_opt"
-                       data-no-preview="true"
-                       class="o_we_text_danger mr-3"
-                       title="Remove Tab"
-                       aria-label="Remove Tab">
+            <we-button data-remove-tab="" data-name="remove_tab_opt" data-no-preview="true" class="o_we_text_danger mr-3" title="Remove Tab" aria-label="Remove Tab">
                 <i class="fa fa-fw fa-minus"/>
             </we-button>
         </div>
@@ -85,12 +49,7 @@
                 <we-button data-set-style="tabs" data-name="tabs_opt" data-trigger="horizontal_opt">Tabs</we-button>
                 <we-button data-set-style="pills" data-name="pills_opt" data-trigger="tabs_color_opt" data-trigger-value="">Buttons</we-button>
             </we-select>
-            <we-colorpicker string="Tabs color"
-                data-dependencies="tabs_opt"
-                data-name="tabs_color_opt"
-                data-select-style="true"
-                data-css-property="background-color"
-                data-color-prefix="bg-"/>
+            <we-colorpicker string="Tabs color" data-dependencies="tabs_opt" data-name="tabs_color_opt" data-select-style="true" data-css-property="background-color" data-color-prefix="bg-"/>
             <we-select string="Direction" data-dependencies="pills_opt">
                 <we-button data-set-direction="horizontal" data-name="horizontal_opt">Horizontal</we-button>
                 <we-button data-set-direction="vertical" data-trigger="left_alignment_opt">Vertical</we-button>
@@ -117,10 +76,10 @@
     </xpath>
 </template>
 
-<template id="assets_snippet_s_tabs_css_001" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_tabs/001.scss"/>
-    </xpath>
-</template>
+<record id="website.s_tabs_001_scss" model="ir.asset">
+    <field name="name">Tabs 001 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_tabs/001.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_text_highlight.xml b/addons/website/views/snippets/s_text_highlight.xml
index 3afd4f93bc1..37ace1a8520 100644
--- a/addons/website/views/snippets/s_text_highlight.xml
+++ b/addons/website/views/snippets/s_text_highlight.xml
@@ -10,10 +10,10 @@
     </div>
 </template>
 
-<template id="assets_snippet_s_text_highlight_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_text_highlight/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_text_highlight_000_scss" model="ir.asset">
+    <field name="name">Text highlight 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_text_highlight/000.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_three_columns.xml b/addons/website/views/snippets/s_three_columns.xml
index 01988d25821..040ae99a519 100644
--- a/addons/website/views/snippets/s_three_columns.xml
+++ b/addons/website/views/snippets/s_three_columns.xml
@@ -37,10 +37,11 @@
     </section>
 </template>
 
-<template id="assets_snippet_s_three_columns_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_three_columns/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_three_columns_000_scss" model="ir.asset">
+    <field name="name">Three columns 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_three_columns/000.scss</field>
+    <field name="active" eval="False"/>
+    </record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_timeline.xml b/addons/website/views/snippets/s_timeline.xml
index 52f531a702b..3c2cc737c66 100644
--- a/addons/website/views/snippets/s_timeline.xml
+++ b/addons/website/views/snippets/s_timeline.xml
@@ -64,10 +64,10 @@
     </xpath>
 </template>
 
-<template id="assets_snippet_s_timeline_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_timeline/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_timeline_000_scss" model="ir.asset">
+    <field name="name">Timeline 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_timeline/000.scss</field>
+</record>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_title.xml b/addons/website/views/snippets/s_title.xml
index 8e05240e9a9..4b02561003c 100644
--- a/addons/website/views/snippets/s_title.xml
+++ b/addons/website/views/snippets/s_title.xml
@@ -9,10 +9,11 @@
     </section>
 </template>
 
-<template id="assets_snippet_s_title_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/snippets/s_title/000.scss"/>
-    </xpath>
-</template>
+<record id="website.s_title_000_scss" model="ir.asset">
+    <field name="name">Title 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website/static/src/snippets/s_title/000.scss</field>
+    <field name="active" eval="False"/>
+    </record>
 
 </odoo>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index fcb9efb9a5f..ede833e4951 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -1965,14 +1965,19 @@
 </template>
 
 <!-- Effect options -->
-<template id="option_ripple_effect" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/options/ripple_effect.scss"/>
-    </xpath>
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website/static/src/js/content/ripple_effect.js"/>
-    </xpath>
-</template>
+<record id="website.ripple_effect_scss" model="ir.asset">
+    <field name="name">Ripple effect SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">/website/static/src/scss/options/ripple_effect.scss</field>
+    <field name="active" eval="False"/>
+</record>
+
+<record id="website.ripple_effect_js" model="ir.asset">
+    <field name="name">Ripple effect JS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">/website/static/src/js/content/ripple_effect.js</field>
+    <field name="active" eval="False"/>
+</record>
 
 <!-- Error and special pages -->
 <template id="website_info" name="Odoo Information">
diff --git a/addons/website_blog/__manifest__.py b/addons/website_blog/__manifest__.py
index 63a044aa098..207039df6b4 100644
--- a/addons/website_blog/__manifest__.py
+++ b/addons/website_blog/__manifest__.py
@@ -29,8 +29,20 @@
     ],
     'test': [
     ],
-    'qweb': [
-    ],
     'installable': True,
     'application': True,
+    'assets': {
+        'website.assets_wysiwyg': [
+            'website_blog/static/src/snippets/s_blog_posts/options.js',
+        ],
+        'website.assets_editor': [
+            'website_blog/static/src/js/website_blog.editor.js',
+            'website_blog/static/src/js/tours/website_blog.js',
+        ],
+        'web.assets_frontend': [
+            'website_blog/static/src/scss/website_blog.scss',
+            'website_blog/static/src/js/contentshare.js',
+            'website_blog/static/src/js/website_blog.js',
+        ],
+    }
 }
diff --git a/addons/website_blog/data/ir_asset.xml b/addons/website_blog/data/ir_asset.xml
new file mode 100644
index 00000000000..67e3aff1303
--- /dev/null
+++ b/addons/website_blog/data/ir_asset.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+    
+            <record id="website_blog.s_latest_posts_000_scss" model="ir.asset">
+                <field name="name">Latest posts 000 SCSS</field>
+                <field name="bundle">web.assets_frontend</field>
+                <field name="glob">website_blog/static/src/snippets/s_latest_posts/000.scss</field>
+                <field name="active" eval="False"/>
+                </record>
+
+    </data>
+</odoo>
diff --git a/addons/website_blog/views/snippets/s_blog_posts.xml b/addons/website_blog/views/snippets/s_blog_posts.xml
index 6372681beae..0722cfc8d06 100644
--- a/addons/website_blog/views/snippets/s_blog_posts.xml
+++ b/addons/website_blog/views/snippets/s_blog_posts.xml
@@ -132,16 +132,16 @@
 </template>
 
 <!-- Assets -->
-<template id="assets_snippet_s_blog_posts_css_000" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website_blog/static/src/snippets/s_blog_posts/000.scss"/>
-    </xpath>
-</template>
+<record id="website_blog.s_blog_posts_000_scss" model="ir.asset">
+    <field name="name">Blog posts 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website_blog/static/src/snippets/s_blog_posts/000.scss</field>
+</record>
 
-<template id="assets_snippet_s_blog_posts_js_000" inherit_id="website.assets_frontend">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website_blog/static/src/snippets/s_blog_posts/000.js"/>
-    </xpath>
-</template>
+<record id="website_blog.s_blog_posts_000_js" model="ir.asset">
+    <field name="name">Blog posts 000 JS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website_blog/static/src/snippets/s_blog_posts/000.js</field>
+</record>
 
 </odoo>
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index f496a1f4b73..95b4f4334ca 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -1,28 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="assets_wysiwyg" inherit_id="website.assets_wysiwyg" name="Blog posts snippet options">
-    <xpath expr="." position="inside">
-        <script type="text/javascript" src="/website_blog/static/src/snippets/s_blog_posts/options.js"/>
-    </xpath>
-</template>
-
-<template id="assets_editor" inherit_id="website.assets_editor" name="Blog Editor">
-    <xpath expr="." position="inside">
-        <script type="text/javascript" src="/website_blog/static/src/js/website_blog.editor.js"></script>
-        <script type="text/javascript" src="/website_blog/static/src/js/tours/website_blog.js"></script>
-    </xpath>
-</template>
-
-<template id="assets_frontend" inherit_id="website.assets_frontend" name="Blog Front-end assets">
-    <xpath expr="." position="inside">
-        <link rel="stylesheet" type="text/scss" href="/website_blog/static/src/scss/website_blog.scss"/>
-
-        <script type="text/javascript" src="/website_blog/static/src/js/contentshare.js"/>
-        <script type="text/javascript" src="/website_blog/static/src/js/website_blog.js"/>
-    </xpath>
-</template>
-
 <!-- ======   Overall pages layout   ===========================================
 ============================================================================ -->
 <template id="index" name="Blog Navigation">
diff --git a/addons/website_crm/__manifest__.py b/addons/website_crm/__manifest__.py
index e3d29851241..96b1a4cc51a 100644
--- a/addons/website_crm/__manifest__.py
+++ b/addons/website_crm/__manifest__.py
@@ -20,7 +20,14 @@ This module includes contact phone and mobile numbers validation.""",
         'views/res_config_settings_views.xml',
         'views/website_visitor_views.xml',
     ],
-    'qweb': ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': True,
+    'assets': {
+        'website.assets_editor': [
+            'website_crm/static/src/**/*',
+        ],
+        'web.assets_tests': [
+            'website_crm/static/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/website_crm/views/website_crm_templates.xml b/addons/website_crm/views/website_crm_templates.xml
index 5ec13993290..0394dcf3f96 100644
--- a/addons/website_crm/views/website_crm_templates.xml
+++ b/addons/website_crm/views/website_crm_templates.xml
@@ -93,16 +93,4 @@
 			</xpath>
 		</template>
 
-        <template id="assets_editor" name="Website CRM Assets Editor" inherit_id="website.assets_editor">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/website_crm/static/src/js/website_crm_editor.js"></script>
-            </xpath>
-        </template>
-
-        <template id="assets_tests" name="Website CRM Assets Tests" inherit_id="web.assets_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/website_crm/static/tests/tours/website_crm.js"></script>
-            </xpath>
-        </template>
-
-</odoo>
+        </odoo>
diff --git a/addons/website_crm_partner_assign/__manifest__.py b/addons/website_crm_partner_assign/__manifest__.py
index ee372dd110e..be6a1334b75 100644
--- a/addons/website_crm_partner_assign/__manifest__.py
+++ b/addons/website_crm_partner_assign/__manifest__.py
@@ -39,6 +39,10 @@ The automatic assignment is figured from the weight of partner levels and the ge
         'data/crm_lead_demo.xml',
         'data/res_partner_grade_demo.xml',
     ],
-    'qweb': ['static/src/xml/*.xml'],
     'installable': True,
+    'assets': {
+        'web.assets_frontend': [
+            'website_crm_partner_assign/static/src/**/*',
+        ],
+    }
 }
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
index 3285d5dc2e1..d3584f82e51 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
@@ -176,11 +176,6 @@
 </template>
 
 <!-- Portal -->
-    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Survey assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_crm_partner_assign/static/src/js/crm_partner_assign.js" />
-        </xpath>
-    </template>
     <template id="portal_my_home_menu_lead" name="Portal layout : lead menu entry" inherit_id="portal.portal_breadcrumbs" priority="15">
         <xpath expr="//ol[hasclass('o_portal_submenu')]" position="inside">
             <li t-if="page_name == 'lead' or lead" t-attf-class="breadcrumb-item #{'active ' if not lead else ''}">
diff --git a/addons/website_event/__manifest__.py b/addons/website_event/__manifest__.py
index be1ad62a80a..1d09abf4155 100644
--- a/addons/website_event/__manifest__.py
+++ b/addons/website_event/__manifest__.py
@@ -17,7 +17,6 @@
     ],
     'data': [
         'data/event_data.xml',
-        'views/assets.xml',
         'views/res_config_settings_views.xml',
         'views/event_snippets.xml',
         'views/event_templates_list.xml',
@@ -43,4 +42,26 @@
         'data/event_registration_demo.xml',
     ],
     'application': True,
+    'assets': {
+        'web.assets_common': [
+            'website_event/static/src/js/tours/**/*',
+        ],
+        'web.assets_tests': [
+            'website_event/static/tests/**/*',
+        ],
+        'web.assets_frontend': [
+            'website_event/static/src/scss/event_templates_common.scss',
+            'website_event/static/src/scss/event_templates_list.scss',
+            'website_event/static/src/scss/event_templates_page.scss',
+            'website_event/static/src/js/display_timer_widget.js',
+            'website_event/static/src/js/register_toaster_widget.js',
+            'website_event/static/src/js/website_geolocation.js',
+            'website_event/static/src/js/website_event.js',
+            'website_event/static/src/js/website_event_ticket_details.js',
+            'website_event/static/src/js/website_event_set_customize_options.js',
+        ],
+        'website.assets_editor': [
+            'website_event/static/src/js/website_event.editor.js',
+        ],
+    }
 }
diff --git a/addons/website_event/views/assets.xml b/addons/website_event/views/assets.xml
deleted file mode 100644
index a083aef8c84..00000000000
--- a/addons/website_event/views/assets.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets_common" inherit_id="web.assets_common" name="Event Assets Common">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website_event/static/src/js/tours/event_tour.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_tests" name="Event Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_event/static/tests/tours/website_event.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Assets Frontend">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/website_event/static/src/scss/event_templates_common.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/website_event/static/src/scss/event_templates_list.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/website_event/static/src/scss/event_templates_page.scss"/>
-        </xpath>
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website_event/static/src/js/display_timer_widget.js"></script>
-            <script type="text/javascript" src="/website_event/static/src/js/register_toaster_widget.js"></script>
-            <script type="text/javascript" src="/website_event/static/src/js/website_geolocation.js"></script>
-            <script type="text/javascript" src="/website_event/static/src/js/website_event.js"></script>
-            <script type="text/javascript" src="/website_event/static/src/js/website_event_ticket_details.js"></script>
-            <script type="text/javascript" src="/website_event/static/src/js/website_event_set_customize_options.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_editor" inherit_id="website.assets_editor" name="Event Assets Editor">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_event/static/src/js/website_event.editor.js"></script>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/addons/website_event_exhibitor/__manifest__.py b/addons/website_event_exhibitor/__manifest__.py
index 200a1465620..01657b50730 100644
--- a/addons/website_event_exhibitor/__manifest__.py
+++ b/addons/website_event_exhibitor/__manifest__.py
@@ -18,7 +18,6 @@
         'security/security.xml',
         'security/ir.model.access.csv',
         'data/event_sponsor_data.xml',
-        'views/assets.xml',
         'views/event_templates_sponsor.xml',
         'views/event_sponsor_views.xml',
         'views/event_event_views.xml',
@@ -33,4 +32,11 @@
     ],
     'application': False,
     'installable': True,
+    'assets': {
+        'web.assets_frontend': [
+            'website_event_exhibitor/static/src/scss/event_templates_sponsor.scss',
+            'website_event_exhibitor/static/src/scss/event_exhibitor_templates.scss',
+            'website_event_exhibitor/static/src/js/event_exhibitor_connect.js',
+        ],
+    }
 }
diff --git a/addons/website_event_exhibitor/views/assets.xml b/addons/website_event_exhibitor/views/assets.xml
deleted file mode 100644
index 392e1acb0ca..00000000000
--- a/addons/website_event_exhibitor/views/assets.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Online Exhibitor Frontend Assets">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/website_event_exhibitor/static/src/scss/event_templates_sponsor.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/website_event_exhibitor/static/src/scss/event_exhibitor_templates.scss"/>
-        </xpath>
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website_event_exhibitor/static/src/js/event_exhibitor_connect.js"></script>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/addons/website_event_meet/__manifest__.py b/addons/website_event_meet/__manifest__.py
index b4367b72ea5..1a4c0ec559d 100644
--- a/addons/website_event_meet/__manifest__.py
+++ b/addons/website_event_meet/__manifest__.py
@@ -18,7 +18,6 @@
     'data': [
         'security/ir.model.access.csv',
         'security/security.xml',
-        'views/assets.xml',
         'views/event_meet_templates_list.xml',
         'views/event_meet_templates_page.xml',
         'views/event_meeting_room_views.xml',
@@ -27,4 +26,12 @@
     ],
     'application': False,
     'installable': True,
+    'assets': {
+        'web.assets_frontend': [
+            'website_event_meet/static/src/scss/event_meet_templates.scss',
+            'website_event_meet/static/src/js/customize_options.js',
+            'website_event_meet/static/src/js/website_event_meeting_room.js',
+            'website_event_meet/static/src/js/website_event_create_meeting_room_button.js',
+        ],
+    }
 }
diff --git a/addons/website_event_meet/views/assets.xml b/addons/website_event_meet/views/assets.xml
deleted file mode 100644
index 0d57557fb4d..00000000000
--- a/addons/website_event_meet/views/assets.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Meet Assets">
-        <xpath expr="." position="inside">
-            <link href="/website_event_meet/static/src/scss/event_meet_templates.scss" rel="stylesheet" type="text/scss"/>
-            <script src="/website_event_meet/static/src/js/customize_options.js" type="text/javascript"/>
-            <script src="/website_event_meet/static/src/js/website_event_meeting_room.js" type="text/javascript"/>
-            <script src="/website_event_meet/static/src/js/website_event_create_meeting_room_button.js" type="text/javascript"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/website_event_questions/__manifest__.py b/addons/website_event_questions/__manifest__.py
index 10bd9acb673..29583470c48 100644
--- a/addons/website_event_questions/__manifest__.py
+++ b/addons/website_event_questions/__manifest__.py
@@ -7,7 +7,6 @@
     'version': '1.1',
     'depends': ['website_event'],
     'data': [
-        'views/assets.xml',
         'views/event_views.xml',
         'views/event_registration_answer_views.xml',
         'views/event_registration_views.xml',
@@ -22,4 +21,9 @@
         'data/event_registration_demo.xml',
     ],
     'installable': True,
+    'assets': {
+        'web.assets_tests': [
+            'website_event_questions/static/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/website_event_questions/views/assets.xml b/addons/website_event_questions/views/assets.xml
deleted file mode 100644
index d85a4bda615..00000000000
--- a/addons/website_event_questions/views/assets.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-<data>
-    <template id="assets_tests" name="Website Event Questions Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_event_questions/static/tests/tours/tickets_questions.js"></script>
-        </xpath>
-    </template>
-</data>
-</odoo>
diff --git a/addons/website_event_sale/__manifest__.py b/addons/website_event_sale/__manifest__.py
index 20e062d011d..2a494737f1c 100644
--- a/addons/website_event_sale/__manifest__.py
+++ b/addons/website_event_sale/__manifest__.py
@@ -11,11 +11,15 @@ Sell event tickets through eCommerce app.
     'depends': ['website_event', 'event_sale', 'website_sale'],
     'data': [
         'data/event_data.xml',
-        'views/assets.xml',
         'views/event_event_views.xml',
         'views/website_event_templates.xml',
         'views/website_sale_templates.xml',
         'security/website_event_sale_security.xml',
     ],
-    'auto_install': True
+    'auto_install': True,
+    'assets': {
+        'web.assets_tests': [
+            'website_event_sale/static/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/website_event_sale/views/assets.xml b/addons/website_event_sale/views/assets.xml
deleted file mode 100644
index 9c43f4d0493..00000000000
--- a/addons/website_event_sale/views/assets.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_tests" inherit_id="web.assets_tests" name="Website Event Sale Assets Tests">
-    <xpath expr="." position="inside">
-        <script type="text/javascript" src="/website_event_sale/static/tests/tours/website_event_sale.js"></script>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/addons/website_event_track/__manifest__.py b/addons/website_event_track/__manifest__.py
index 07358cf7ba0..0523f0db3a9 100644
--- a/addons/website_event_track/__manifest__.py
+++ b/addons/website_event_track/__manifest__.py
@@ -15,7 +15,6 @@
         'data/mail_data.xml',
         'data/mail_template_data.xml',
         'data/event_track_data.xml',
-        'views/assets.xml',
         'views/mail_templates.xml',
         'views/event_templates.xml',
         'views/event_track_templates_agenda.xml',
@@ -43,4 +42,15 @@
         'data/event_track_demo_description.xml',
         'data/event_track_visitor_demo.xml',
     ],
+    'assets': {
+        'web.assets_frontend': [
+            'website_event_track/static/src/scss/event_track_templates.scss',
+            'website_event_track/static/src/scss/event_track_templates_online.scss',
+            'website_event_track/static/src/scss/pwa_frontend.scss',
+            'website_event_track/static/src/js/website_event_track.js',
+            'website_event_track/static/src/js/event_track_reminder.js',
+            'website_event_track/static/src/js/website_event_pwa_widget.js',
+            'website_event_track/static/lib/idb-keyval/idb-keyval.js',
+        ],
+    }
 }
diff --git a/addons/website_event_track/views/assets.xml b/addons/website_event_track/views/assets.xml
deleted file mode 100644
index d3ac6c9fdb2..00000000000
--- a/addons/website_event_track/views/assets.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_frontend" inherit_id="website.assets_frontend" name="Website Event Track Assets">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website_event_track/static/src/scss/event_track_templates.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/website_event_track/static/src/scss/event_track_templates_online.scss"/>
-        <link rel="stylesheet" type="text/scss" href="/website_event_track/static/src/scss/pwa_frontend.scss"/>
-    </xpath>
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website_event_track/static/src/js/website_event_track.js"></script>
-        <script type="text/javascript" src="/website_event_track/static/src/js/event_track_reminder.js"></script>
-        <script type="text/javascript" src="/website_event_track/static/src/js/website_event_pwa_widget.js"/>
-        <script type="text/javascript" src="/website_event_track/static/lib/idb-keyval/idb-keyval.js"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/addons/website_event_track_live/__manifest__.py b/addons/website_event_track_live/__manifest__.py
index be28bb71b0b..51bca88129c 100644
--- a/addons/website_event_track_live/__manifest__.py
+++ b/addons/website_event_track_live/__manifest__.py
@@ -14,7 +14,6 @@
         'website_event_track',
     ],
     'data': [
-        'views/assets.xml',
         'views/event_track_templates_list.xml',
         'views/event_track_templates_page.xml',
         'views/event_track_views.xml',
@@ -22,9 +21,16 @@
     'demo': [
         'data/event_track_demo.xml'
     ],
-    'qweb': [
-        'static/src/xml/website_event_track_live_templates.xml'
-    ],
     'application': False,
     'installable': True,
+    'assets': {
+        'web.assets_frontend': [
+            'website_event_track_live/static/src/scss/website_event_track_live.scss',
+            'website_event_track_live/static/src/js/website_event_track_suggestion.js',
+            'website_event_track_live/static/src/js/website_event_track_live.js',
+        ],
+        'web.assets_qweb': [
+            'website_event_track_live/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/website_event_track_live/views/assets.xml b/addons/website_event_track_live/views/assets.xml
deleted file mode 100644
index 0e7e85ce5b7..00000000000
--- a/addons/website_event_track_live/views/assets.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-
-<template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Track Live Assets Frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" href="/website_event_track_live/static/src/scss/website_event_track_live.scss"/>
-    </xpath>
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website_event_track_live/static/src/js/website_event_track_suggestion.js"></script>
-        <script type="text/javascript" src="/website_event_track_live/static/src/js/website_event_track_live.js"></script>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/addons/website_event_track_live_quiz/__manifest__.py b/addons/website_event_track_live_quiz/__manifest__.py
index b01c4da1cce..0d29a82cbe6 100644
--- a/addons/website_event_track_live_quiz/__manifest__.py
+++ b/addons/website_event_track_live_quiz/__manifest__.py
@@ -14,16 +14,19 @@
         'website_event_track_quiz',
     ],
     'data': [
-        'views/assets.xml',
         'views/event_track_templates_page.xml',
     ],
     'demo': [
     ],
-    'qweb': [
-        'static/src/xml/website_event_track_live_templates.xml',
-        'static/src/xml/website_event_track_quiz_templates.xml',
-    ],
     'application': False,
     'installable': True,
     'auto_install': True,
+    'assets': {
+        'web.assets_frontend': [
+            'website_event_track_live_quiz/static/src/js/**/*',
+        ],
+        'web.assets_qweb': [
+            'website_event_track_live_quiz/static/src/xml/**/*',
+        ],
+    }
 }
diff --git a/addons/website_event_track_live_quiz/views/assets.xml b/addons/website_event_track_live_quiz/views/assets.xml
deleted file mode 100644
index 7609ee3c03f..00000000000
--- a/addons/website_event_track_live_quiz/views/assets.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-
-<template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Track Live Quiz Assets Frontend">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website_event_track_live_quiz/static/src/js/website_event_track_suggestion.js"></script>
-        <script type="text/javascript" src="/website_event_track_live_quiz/static/src/js/event_quiz.js"></script>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/addons/website_event_track_quiz/__manifest__.py b/addons/website_event_track_quiz/__manifest__.py
index 810e538146c..0269462a3ae 100644
--- a/addons/website_event_track_quiz/__manifest__.py
+++ b/addons/website_event_track_quiz/__manifest__.py
@@ -16,7 +16,6 @@
     ],
     'data': [
         'security/ir.model.access.csv',
-        'views/assets.xml',
         'views/event_leaderboard_templates.xml',
         'views/event_quiz_views.xml',
         'views/event_quiz_question_views.xml',
@@ -33,4 +32,11 @@
     ],
     'application': False,
     'installable': True,
+    'assets': {
+        'web.assets_frontend': [
+            'website_event_track_quiz/static/src/scss/event_quiz.scss',
+            'website_event_track_quiz/static/src/js/event_quiz.js',
+            'website_event_track_quiz/static/src/js/event_quiz_leaderboard.js',
+        ],
+    }
 }
diff --git a/addons/website_event_track_quiz/views/assets.xml b/addons/website_event_track_quiz/views/assets.xml
deleted file mode 100644
index c20fee1ee80..00000000000
--- a/addons/website_event_track_quiz/views/assets.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" ?>
-<odoo><data>
-    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Track Quiz Frontend Assets">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/website_event_track_quiz/static/src/scss/event_quiz.scss" t-ignore="true"/>
-        </xpath>
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website_event_track_quiz/static/src/js/event_quiz.js"/>
-            <script type="text/javascript" src="/website_event_track_quiz/static/src/js/event_quiz_leaderboard.js"/>
-        </xpath>
-    </template>
-</data></odoo>
diff --git a/addons/website_form/__manifest__.py b/addons/website_form/__manifest__.py
index afb17e1a5a0..0b7ad8fee94 100644
--- a/addons/website_form/__manifest__.py
+++ b/addons/website_form/__manifest__.py
@@ -9,8 +9,8 @@
     'version': '1.0',
     'depends': ['website', 'mail', 'google_recaptcha'],
     'data': [
+        'data/ir_asset.xml',
         'data/mail_mail_data.xml',
-        'views/assets.xml',
         'views/ir_model_views.xml',
         'views/snippets/snippets.xml',
         'views/snippets/s_website_form.xml',
@@ -18,4 +18,13 @@
     ],
     'installable': True,
     'auto_install': True,
+    'assets': {
+        'website.assets_editor': [
+            'website_form/static/src/snippets/s_website_form/options.js',
+            'website_form/static/src/js/website_form_editor_registry.js',
+        ],
+        'web.assets_tests': [
+            'website_form/static/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/website_form/data/ir_asset.xml b/addons/website_form/data/ir_asset.xml
new file mode 100644
index 00000000000..986da8e9c5f
--- /dev/null
+++ b/addons/website_form/data/ir_asset.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="website_form.s_website_form_000_scss" model="ir.asset">
+            <field name="name">Website form 000 SCSS</field>
+            <field name="bundle">web.assets_frontend</field>
+            <field name="glob">website_form/static/src/snippets/s_website_form/000.scss</field>
+            <field name="active" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/addons/website_form/views/assets.xml b/addons/website_form/views/assets.xml
deleted file mode 100644
index 055d07e4578..00000000000
--- a/addons/website_form/views/assets.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <template id="assets_editor" name="Website Form Editor Assets Editor" inherit_id="website.assets_editor">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/website_form/static/src/snippets/s_website_form/options.js"/>
-                <script type="text/javascript" src="/website_form/static/src/js/website_form_editor_registry.js"/>
-            </xpath>
-        </template>
-
-        <template id="assets_tests" name="Website Form Assets Tests" inherit_id="web.assets_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/website_form/static/tests/tours/website_form_editor.js"/>
-            </xpath>
-        </template>
-    </data>
-</odoo>
diff --git a/addons/website_form/views/snippets/s_website_form.xml b/addons/website_form/views/snippets/s_website_form.xml
index 6b00b0c9168..b94d882a172 100644
--- a/addons/website_form/views/snippets/s_website_form.xml
+++ b/addons/website_form/views/snippets/s_website_form.xml
@@ -157,21 +157,24 @@
     </xpath>
 </template>
 
-<template id="assets_snippet_s_website_form_css_000" inherit_id="website.assets_frontend" active="False">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website_form/static/src/snippets/s_website_form/000.scss"/>
-    </xpath>
-</template>
-<template id="assets_snippet_s_website_form_css_001" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website_form/static/src/snippets/s_website_form/001.scss"/>
-    </xpath>
-</template>
 
-<template id="assets_snippet_s_website_form_js_000" inherit_id="website.assets_frontend">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website_form/static/src/snippets/s_website_form/000.js"/>
-    </xpath>
-</template>
+<record id="website_form.s_website_form_000_scss" model="ir.asset">
+    <field name="name">Website form 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website_form/static/src/snippets/s_website_form/000.scss</field>
+    <field name="active" eval="False"/>
+</record>
+
+<record id="website_form.s_website_form_001_scss" model="ir.asset">
+    <field name="name">Website form 001 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website_form/static/src/snippets/s_website_form/001.scss</field>
+</record>
+
+<record id="website_form.s_website_form_000_js" model="ir.asset">
+    <field name="name">Website form 000 JS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website_form/static/src/snippets/s_website_form/000.js</field>
+</record>
 
 </odoo>
diff --git a/addons/website_form_project/__manifest__.py b/addons/website_form_project/__manifest__.py
index 86dfc1f8260..7a7be8b9bcf 100644
--- a/addons/website_form_project/__manifest__.py
+++ b/addons/website_form_project/__manifest__.py
@@ -12,8 +12,12 @@ Generate tasks in Project app from a form published on your website. This module
     'depends': ['website_form', 'project'],
     'data': [
         'data/website_form_project_data.xml',
-        'views/website_form_project_assets.xml',
-    ],
+        ],
     'installable': True,
     'auto_install': True,
+    'assets': {
+        'website.assets_editor': [
+            'website_form_project/static/src/**/*',
+        ],
+    }
 }
diff --git a/addons/website_form_project/views/website_form_project_assets.xml b/addons/website_form_project/views/website_form_project_assets.xml
deleted file mode 100644
index fbc06071ba3..00000000000
--- a/addons/website_form_project/views/website_form_project_assets.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets_editor" name="Website Form Project Assets Editor" inherit_id="website.assets_editor">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_form_project/static/src/js/website_form_project_editor.js"/>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/addons/website_forum/__manifest__.py b/addons/website_forum/__manifest__.py
index 2074a9c5309..5077f510374 100644
--- a/addons/website_forum/__manifest__.py
+++ b/addons/website_forum/__manifest__.py
@@ -33,12 +33,26 @@ Ask questions, get answers, no distractions
         'data/badges_participation.xml',
         'data/badges_moderation.xml',
     ],
-    'qweb': [
-        'static/src/xml/*.xml'
-    ],
     'demo': [
         'data/forum_demo.xml',
     ],
     'installable': True,
     'application': True,
+    'assets': {
+        'website.assets_editor': [
+            'website_forum/static/src/js/tours/website_forum.js',
+            'website_forum/static/src/js/website_forum.editor.js',
+        ],
+        'web.assets_tests': [
+            'website_forum/static/tests/**/*',
+        ],
+        'web.assets_frontend': [
+            'website_forum/static/src/scss/website_forum.scss',
+            'website_forum/static/src/js/website_forum.js',
+            'website_forum/static/src/js/website_forum.share.js',
+        ],
+        'web.assets_qweb': [
+            'website_forum/static/src/xml/*.xml',
+        ],
+    }
 }
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index fcdf65d4231..efa635cf114 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -3,29 +3,6 @@
     <data>
 
 <!-- Editor custom -->
-<template id="assets_editor" inherit_id="website.assets_editor" name="Forum Editor Assets">
-    <xpath expr="." position="inside">
-        <script type="text/javascript" src="/website_forum/static/src/js/tours/website_forum.js"/>
-        <script type="text/javascript" src="/website_forum/static/src/js/website_forum.editor.js"/>
-    </xpath>
-</template>
-
-<template id="assets_tests" name="Website Forum Assets Tests" inherit_id="web.assets_tests">
-    <xpath expr="." position="inside">
-        <script type="text/javascript" src="/website_forum/static/tests/tours/website_forum_question.js"></script>
-    </xpath>
-</template>
-
-<template id="assets_frontend" inherit_id="website.assets_frontend">
-    <xpath expr="link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website_forum/static/src/scss/website_forum.scss"/>
-    </xpath>
-    <xpath expr="script[last()]" position="after">
-        <script type="text/javascript" src="/website_forum/static/src/js/website_forum.js"/>
-        <script type="text/javascript" src="/website_forum/static/src/js/website_forum.share.js"/>
-    </xpath>
-</template>
-
 <!-- helper -->
 <template id="link_button">
     <form  t-attf-method="#{form_method or 'POST'}" t-att-action="url" t-attf-class="#{form_classes} #{not inDropdown and 'btn btn-sm border'}">
diff --git a/addons/website_hr_recruitment/__manifest__.py b/addons/website_hr_recruitment/__manifest__.py
index efc0ade7957..46e85cd168f 100644
--- a/addons/website_hr_recruitment/__manifest__.py
+++ b/addons/website_hr_recruitment/__manifest__.py
@@ -23,4 +23,15 @@
     'installable': True,
     'application': True,
     'auto_install': ['hr_recruitment', 'website_mail'],
+    'assets': {
+        'web.assets_frontend': [
+            'website_hr_recruitment/static/src/scss/**/*',
+        ],
+        'website.assets_editor': [
+            'website_hr_recruitment/static/src/js/**/*',
+        ],
+        'web.assets_tests': [
+            'website_hr_recruitment/static/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
index 76863925297..36bfcab7572 100644
--- a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="assets_frontend" inherit_id="website.assets_frontend" name="Website Hr Recruitment Assets Frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website_hr_recruitment/static/src/scss/website_hr_recruitment.scss"/>
-    </xpath>
-</template>
-
 <template id="job_edit_options" inherit_id="website.user_navbar" name="Edit Job Options">
     <xpath expr="//li[@id='edit-page-menu']" position="after">
         <t t-if="main_object._name == 'hr.job'" t-set="action" t-value="'hr_recruitment.action_hr_job'"/>
@@ -612,16 +606,4 @@
     </xpath>
 </template>
 
-<template id="website_hr_recuitment_assets_editor" name="Website HR Recruitment Assets Editor" inherit_id="website.assets_editor">
-    <xpath expr="." position="inside">
-        <script type="text/javascript" src="/website_hr_recruitment/static/src/js/website_hr_recruitment_editor.js"></script>
-    </xpath>
-</template>
-
-<template id="assets_tests" name="Website HR Recruitment Assets Tests" inherit_id="web.assets_tests">
-    <xpath expr="." position="inside">
-        <script type="text/javascript" src="/website_hr_recruitment/static/tests/tours/website_hr_recruitment.js"></script>
-    </xpath>
-</template>
-
 </odoo>
diff --git a/addons/website_jitsi/__manifest__.py b/addons/website_jitsi/__manifest__.py
index 67ab5197f88..e69db992ee9 100644
--- a/addons/website_jitsi/__manifest__.py
+++ b/addons/website_jitsi/__manifest__.py
@@ -13,11 +13,16 @@
         "website"
     ],
     "data": [
-        'views/assets.xml',
         'views/chat_room_templates.xml',
         'views/chat_room_views.xml',
         'views/res_config_settings.xml',
         'security/ir.model.access.csv',
     ],
     'application': False,
+    'assets': {
+        'web.assets_frontend': [
+            'website_jitsi/static/src/css/chat_room.css',
+            'website_jitsi/static/src/js/chat_room.js',
+        ],
+    }
 }
diff --git a/addons/website_jitsi/views/assets.xml b/addons/website_jitsi/views/assets.xml
deleted file mode 100644
index ced7415c40e..00000000000
--- a/addons/website_jitsi/views/assets.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Event Chat Room Assets Frontend">
-        <xpath expr="//link[last()]" position="after">
-            <link href="/website_jitsi/static/src/css/chat_room.css" rel="stylesheet" type="text/css"/>
-        </xpath>
-        <xpath expr="//script[last()]" position="after">
-            <script src="/website_jitsi/static/src/js/chat_room.js" type="text/javascript"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/website_links/__manifest__.py b/addons/website_links/__manifest__.py
index 045beab51c0..1080efffd20 100644
--- a/addons/website_links/__manifest__.py
+++ b/addons/website_links/__manifest__.py
@@ -14,6 +14,22 @@ Those trackers can be used in Google Analytics to track clicks and visitors, or
         'views/website_links_graphs.xml',
         'security/ir.model.access.csv',
     ],
-    'qweb': ['static/src/xml/*.xml'],
     'auto_install': True,
+    'assets': {
+        'web.assets_frontend': [
+            'website_links/static/src/js/website_links.js',
+            'website_links/static/src/js/website_links_code_editor.js',
+            'website_links/static/src/js/website_links_charts.js',
+            'website_links/static/src/css/website_links.css',
+        ],
+        'web.assets_tests': [
+            'website_links/static/tests/**/*',
+        ],
+        'website.assets_editor': [
+            'website_links/static/src/js/website_links_menu.js',
+        ],
+        'web.assets_qweb': [
+            'website_links/static/src/xml/*.xml',
+        ],
+    }
 }
diff --git a/addons/website_links/views/website_links_template.xml b/addons/website_links/views/website_links_template.xml
index 3f7a95eefd9..127c369ec3a 100644
--- a/addons/website_links/views/website_links_template.xml
+++ b/addons/website_links/views/website_links_template.xml
@@ -1,21 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-        <template id="assets_website_links" inherit_id="website.assets_frontend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/website_links/static/src/js/website_links.js"/>
-                <script type="text/javascript" src="/website_links/static/src/js/website_links_code_editor.js"/>
-                <script type="text/javascript" src="/website_links/static/src/js/website_links_charts.js"/>
-                <link rel="stylesheet" type="text/css" href="/website_links/static/src/css/website_links.css"/>
-            </xpath>
-        </template>
-
-        <template id="assets_tests" name="Website Links Assets Tests" inherit_id="web.assets_tests">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/website_links/static/tests/tours/website_links.js"></script>
-            </xpath>
-        </template>
-
         <template id="share_page_menu" inherit_id="website.user_navbar">
             <xpath expr="//a[@data-action='promote-current-page']" position="after">
                 <a href="/r" id="o_website_links_share_page" class="dropdown-item">
@@ -25,12 +10,6 @@
 
         </template>
 
-        <template id="asset_website_links_menu" inherit_id="website.assets_editor">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/website_links/static/src/js/website_links_menu.js"></script>
-            </xpath>
-        </template>
-
         <template id="create_shorten_url">
             <div class="o_website_links_create_tracked_url">
                 <div class="container">
diff --git a/addons/website_livechat/__manifest__.py b/addons/website_livechat/__manifest__.py
index f30748fec11..69bf27c2bce 100644
--- a/addons/website_livechat/__manifest__.py
+++ b/addons/website_livechat/__manifest__.py
@@ -12,7 +12,6 @@ Allow website visitors to chat with the collaborators. This module also brings a
     'application': False,
     'auto_install': True,
     'data': [
-        'views/assets.xml',
         'views/website_livechat.xml',
         'views/res_config_settings_views.xml',
         'views/website_livechat_view.xml',
@@ -21,10 +20,43 @@ Allow website visitors to chat with the collaborators. This module also brings a
         'security/website_livechat.xml',
         'data/website_livechat_data.xml',
     ],
-    'qweb': [
-        'static/src/bugfix/bugfix.xml',
-        'static/src/bugfix/public_bugfix.xml',
-        'static/src/components/discuss/discuss.xml',
-        'static/src/components/visitor_banner/visitor_banner.xml',
-    ],
+    'assets': {
+        'web.assets_frontend': [
+            'mail/static/src/js/utils.js',
+            'website_livechat/static/src/bugfix/public_bugfix.js',
+            'im_livechat/static/src/legacy/public_livechat.js',
+            'website_livechat/static/src/legacy/public_livechat.js',
+            'im_livechat/static/src/legacy/public_livechat.scss',
+            'website_livechat/static/src/bugfix/public_bugfix.scss',
+        ],
+        'website.assets_editor': [
+            'website_livechat/static/src/js/**/*',
+        ],
+        'web.assets_backend': [
+            'website_livechat/static/src/bugfix/bugfix.js',
+            'website_livechat/static/src/components/discuss/discuss.js',
+            'website_livechat/static/src/components/visitor_banner/visitor_banner.js',
+            'website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler.js',
+            'website_livechat/static/src/models/thread/thread.js',
+            'website_livechat/static/src/models/visitor/visitor.js',
+            'website_livechat/static/src/bugfix/bugfix.scss',
+            'website_livechat/static/src/components/visitor_banner/visitor_banner.scss',
+        ],
+        'web.assets_tests': [
+            'website_livechat/static/tests/tours/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'website_livechat/static/src/bugfix/bugfix_tests.js',
+            'website_livechat/static/src/components/discuss/discuss_tests.js',
+            'website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler_tests.js',
+            'website_livechat/static/tests/helpers/mock_models.js',
+            'website_livechat/static/tests/helpers/mock_server.js',
+        ],
+        'web.assets_qweb': [
+            'website_livechat/static/src/bugfix/bugfix.xml',
+            'website_livechat/static/src/bugfix/public_bugfix.xml',
+            'website_livechat/static/src/components/discuss/discuss.xml',
+            'website_livechat/static/src/components/visitor_banner/visitor_banner.xml',
+        ],
+    }
 }
diff --git a/addons/website_livechat/views/assets.xml b/addons/website_livechat/views/assets.xml
deleted file mode 100644
index 7fe3cb2c102..00000000000
--- a/addons/website_livechat/views/assets.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-<data>
-
-    <template id="assets_backend" name="website livechat assets" inherit_id="web.assets_backend">
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/website_livechat/static/src/bugfix/bugfix.js"/>
-            <script type="text/javascript" src="/website_livechat/static/src/components/discuss/discuss.js"/>
-            <script type="text/javascript" src="/website_livechat/static/src/components/visitor_banner/visitor_banner.js"/>
-            <script type="text/javascript" src="/website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler.js"/>
-            <script type="text/javascript" src="/website_livechat/static/src/models/thread/thread.js"/>
-            <script type="text/javascript" src="/website_livechat/static/src/models/visitor/visitor.js"/>
-        </xpath>
-        <xpath expr="link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/website_livechat/static/src/bugfix/bugfix.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/website_livechat/static/src/components/visitor_banner/visitor_banner.scss"/>
-        </xpath>
-    </template>
-
-    <template id="assets_tests" name="Website Livechat Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_livechat/static/tests/tours/website_livechat_common.js"></script>
-            <script type="text/javascript" src="/website_livechat/static/tests/tours/website_livechat_rating.js"></script>
-            <script type="text/javascript" src="/website_livechat/static/tests/tours/website_livechat_request.js"></script>
-        </xpath>
-    </template>
-
-    <template id="qunit_suite" name="website_livechat_tests" inherit_id="web.qunit_suite_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_livechat/static/src/bugfix/bugfix_tests.js"/>
-            <script type="text/javascript" src="/website_livechat/static/src/components/discuss/discuss_tests.js"/>
-            <script type="text/javascript" src="/website_livechat/static/src/models/messaging_notification_handler/messaging_notification_handler_tests.js"/>
-            <script type="text/javascript" src="/website_livechat/static/tests/helpers/mock_models.js"/>
-            <script type="text/javascript" src="/website_livechat/static/tests/helpers/mock_server.js"/>
-        </xpath>
-    </template>
-</data>
-</odoo>
diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml
index 49080d84a2c..70b7c77f652 100644
--- a/addons/website_livechat/views/website_livechat.xml
+++ b/addons/website_livechat/views/website_livechat.xml
@@ -5,25 +5,6 @@
             Integrate Livechat in Common Frontend for Website
             Template registering all the assets required to execute the Livechat from a page containing Odoo
         -->
-        <template id="assets_frontend" name="im_livechat assets frontend" inherit_id="website.assets_frontend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/mail/static/src/js/utils.js"></script>
-                <script type="text/javascript" src="/website_livechat/static/src/bugfix/public_bugfix.js"></script>
-                <script type="text/javascript" src="/im_livechat/static/src/legacy/public_livechat.js"></script>
-                <!--Chat Request-->
-                <script type="text/javascript" src="/website_livechat/static/src/legacy/public_livechat.js"></script>
-                <!--Stylesheets-->
-                <link rel="stylesheet" type="text/scss" href="/im_livechat/static/src/legacy/public_livechat.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/website_livechat/static/src/bugfix/public_bugfix.scss"/>
-            </xpath>
-        </template>
-
-        <template id="assets_editor_inherit_website_livechat" inherit_id="website.assets_editor" name="website_livechat Assets Editor">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/website_livechat/static/src/js/website_livechat.editor.js"></script>
-            </xpath>
-        </template>
-
         <template id="loader" inherit_id="website.layout" name="Livechat : include loader on Website">
             <xpath expr="//div[@id='wrapwrap']" position="after">
                 <t t-if="website and website.channel_id and not no_livechat">
diff --git a/addons/website_mail/__manifest__.py b/addons/website_mail/__manifest__.py
index b91958c65f2..b516fb6e95e 100644
--- a/addons/website_mail/__manifest__.py
+++ b/addons/website_mail/__manifest__.py
@@ -11,9 +11,14 @@ Module holding mail improvements for website. It holds the follow widget.
 """,
     'depends': ['website', 'mail'],
     'data': [
-        'views/assets.xml',
         'views/website_mail_templates.xml',
     ],
     'installable': True,
     'auto_install': True,
+    'assets': {
+        'web.assets_frontend': [
+            'website_mail/static/src/js/follow.js',
+            'website_mail/static/src/css/website_mail.scss',
+        ],
+    }
 }
diff --git a/addons/website_mail/views/assets.xml b/addons/website_mail/views/assets.xml
deleted file mode 100644
index c0c293a1b39..00000000000
--- a/addons/website_mail/views/assets.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="head" inherit_id="website.assets_frontend" name="Mail customization">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_mail/static/src/js/follow.js"></script>
-            <link rel="stylesheet" type="text/scss" href="/website_mail/static/src/css/website_mail.scss"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/website_mail_channel/__manifest__.py b/addons/website_mail_channel/__manifest__.py
index a8eb363e72c..76f45a70f08 100644
--- a/addons/website_mail_channel/__manifest__.py
+++ b/addons/website_mail_channel/__manifest__.py
@@ -10,9 +10,17 @@ Visitors can join public mail channels managed in the Discuss app in order to ge
     'depends': ['website_mail'],
     'data': [
         'data/mail_template_data.xml',
-        'views/assets.xml',
         'views/snippets/s_channel.xml',
         'views/snippets/snippets.xml',
         'views/website_mail_channel_templates.xml',
     ],
+    'assets': {
+        'web.assets_frontend': [
+            'website_mail_channel/static/src/css/website_mail_channel.css',
+            'website_mail_channel/static/src/js/website_mail_channel.js',
+        ],
+        'website.assets_wysiwyg': [
+            'website_mail_channel/static/src/snippets/s_channel/options.js',
+        ],
+    }
 }
diff --git a/addons/website_mail_channel/views/assets.xml b/addons/website_mail_channel/views/assets.xml
deleted file mode 100644
index c73683f0d49..00000000000
--- a/addons/website_mail_channel/views/assets.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_frontend" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" href="/website_mail_channel/static/src/css/website_mail_channel.css"/>
-    </xpath>
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website_mail_channel/static/src/js/website_mail_channel.js"/>
-    </xpath>
-</template>
-
-<template id="assets_wysiwyg" inherit_id="website.assets_wysiwyg" name="Website Mail Channel Editor Assets">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website_mail_channel/static/src/snippets/s_channel/options.js"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/addons/website_mail_channel/views/snippets/s_channel.xml b/addons/website_mail_channel/views/snippets/s_channel.xml
index 78217040d6c..171a5af755d 100644
--- a/addons/website_mail_channel/views/snippets/s_channel.xml
+++ b/addons/website_mail_channel/views/snippets/s_channel.xml
@@ -38,10 +38,10 @@
     </xpath>
 </template>
 
-<template id="assets_snippet_s_channel_js_000" inherit_id="website.assets_frontend">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website_mail_channel/static/src/snippets/s_channel/000.js"/>
-    </xpath>
-</template>
+<record id="website_mail_channel.s_channel_000_js" model="ir.asset">
+    <field name="name">Channel 000 JS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website_mail_channel/static/src/snippets/s_channel/000.js</field>
+</record>
 
 </odoo>
diff --git a/addons/website_mass_mailing/__manifest__.py b/addons/website_mass_mailing/__manifest__.py
index fdaaceee0ea..2fc13442ef9 100644
--- a/addons/website_mass_mailing/__manifest__.py
+++ b/addons/website_mass_mailing/__manifest__.py
@@ -13,13 +13,24 @@ On a simple click, your visitors can subscribe to mailing lists managed in the E
     'depends': ['website', 'mass_mailing', 'google_recaptcha'],
     'data': [
         'security/ir.model.access.csv',
-        'views/website_mass_mailing_templates.xml',
         'views/snippets_templates.xml',
         'views/mailing_list_views.xml',
         'views/website_mass_mailing_views.xml',
     ],
-    'qweb': [
-        'static/src/xml/*.xml',
-    ],
     'auto_install': ['website', 'mass_mailing'],
+    'assets': {
+        'web.assets_frontend': [
+            'website_mass_mailing/static/src/scss/website_mass_mailing_popup.scss',
+            'website_mass_mailing/static/src/js/website_mass_mailing.js',
+        ],
+        'website.assets_wysiwyg': [
+            'website_mass_mailing/static/src/js/website_mass_mailing.editor.js',
+        ],
+        'web.assets_tests': [
+            'website_mass_mailing/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'website_mass_mailing/static/src/xml/*.xml',
+        ],
+    }
 }
diff --git a/addons/website_mass_mailing/views/website_mass_mailing_templates.xml b/addons/website_mass_mailing/views/website_mass_mailing_templates.xml
deleted file mode 100644
index 54ff6afd2c2..00000000000
--- a/addons/website_mass_mailing/views/website_mass_mailing_templates.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="assets_frontend" inherit_id="website.assets_frontend">
-    <xpath expr="//link[last()]" position="after">
-        <link rel="stylesheet" type="text/scss" href="/website_mass_mailing/static/src/scss/website_mass_mailing_popup.scss"/>
-    </xpath>
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website_mass_mailing/static/src/js/website_mass_mailing.js"/>
-    </xpath>
-</template>
-
-<template id="assets_editor" inherit_id="website.assets_wysiwyg">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website_mass_mailing/static/src/js/website_mass_mailing.editor.js"/>
-    </xpath>
-</template>
-
-<template id="assets_tests" inherit_id="website.assets_tests">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website_mass_mailing/static/tests/tours/newsletter_popup.js"/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/addons/website_membership/__manifest__.py b/addons/website_membership/__manifest__.py
index 3b87b94f5b1..e4f9b5bf46c 100644
--- a/addons/website_membership/__manifest__.py
+++ b/addons/website_membership/__manifest__.py
@@ -17,6 +17,5 @@ Publish your members/association directory publicly.
         'security/website_membership.xml',
     ],
     'demo': ['data/membership_demo.xml'],
-    'qweb': ['static/src/xml/*.xml'],
     'installable': True,
 }
diff --git a/addons/website_profile/__manifest__.py b/addons/website_profile/__manifest__.py
index 1466ee1807c..55533a08611 100644
--- a/addons/website_profile/__manifest__.py
+++ b/addons/website_profile/__manifest__.py
@@ -18,4 +18,10 @@
         'security/ir.model.access.csv',
     ],
     'auto_install': False,
+    'assets': {
+        'web.assets_frontend': [
+            'website_profile/static/src/scss/website_profile.scss',
+            'website_profile/static/src/js/website_profile.js',
+        ],
+    }
 }
diff --git a/addons/website_profile/views/website_profile.xml b/addons/website_profile/views/website_profile.xml
index 52a7338bb3a..d325203013a 100644
--- a/addons/website_profile/views/website_profile.xml
+++ b/addons/website_profile/views/website_profile.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo><data>
-    <template id="assets_frontend" inherit_id="website.assets_frontend">
-        <xpath expr="link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/website_profile/static/src/scss/website_profile.scss"/>
-        </xpath>
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/website_profile/static/src/js/website_profile.js"/>
-        </xpath>
-    </template>
-
     <!-- Sub nav -->
     <template id="user_profile_sub_nav" name="User profile subnav">
         <div class="o_wprofile_all_users_nav">
diff --git a/addons/website_sale/__manifest__.py b/addons/website_sale/__manifest__.py
index a5692a3def8..288b0ac446a 100644
--- a/addons/website_sale/__manifest__.py
+++ b/addons/website_sale/__manifest__.py
@@ -34,9 +34,54 @@
     'demo': [
         'data/demo.xml',
     ],
-    'qweb': ['static/src/xml/*.xml'],
     'installable': True,
     'application': True,
     'pre_init_hook': 'pre_init_hook',
     'uninstall_hook': 'uninstall_hook',
+    'assets': {
+        'web.assets_frontend': [
+            'website_sale/static/src/scss/website_sale.scss',
+            'website_sale/static/src/scss/website_mail.scss',
+            'website_sale/static/src/scss/website_sale_frontend.scss',
+            'sale/static/src/scss/sale_portal.scss',
+            'sale/static/src/scss/product_configurator.scss',
+            'sale/static/src/js/variant_mixin.js',
+            'website_sale/static/src/js/variant_mixin.js',
+            'website_sale/static/src/js/website_sale.js',
+            'website_sale/static/src/js/website_sale_utils.js',
+            'website_sale/static/src/js/website_sale_payment.js',
+            'website_sale/static/src/js/website_sale_validate.js',
+            'website_sale/static/src/js/website_sale_recently_viewed.js',
+            'website_sale/static/src/js/website_sale_tracking.js',
+        ],
+        'web._assets_primary_variables': [
+            'website_sale/static/src/scss/primary_variables.scss',
+        ],
+        'web.assets_backend': [
+            'website_sale/static/src/js/website_sale_video_field_preview.js',
+            'website_sale/static/src/js/website_sale_backend.js',
+            'website_sale/static/src/scss/website_sale_dashboard.scss',
+            'website_sale/static/src/scss/website_sale_backend.scss',
+            'website_sale/static/src/js/tours/website_sale_shop_backend.js',
+        ],
+        'website.assets_wysiwyg': [
+            'website_sale/static/src/scss/website_sale.editor.scss',
+            'website_sale/static/src/snippets/s_dynamic_snippet_products/options.js',
+        ],
+        'website.assets_editor': [
+            'website_sale/static/src/js/website_sale.editor.js',
+            'website_sale/static/src/js/website_sale_form_editor.js',
+            'website_sale/static/src/js/tours/website_sale_shop_frontend.js',
+        ],
+        'web.assets_common': [
+            'website_sale/static/src/js/tours/tour_utils.js',
+            'website_sale/static/src/js/tours/website_sale_shop.js',
+        ],
+        'web.assets_tests': [
+            'website_sale/static/tests/**/*',
+        ],
+        'web.assets_qweb': [
+            'website_sale/static/src/xml/*.xml',
+        ],
+    }
 }
diff --git a/addons/website_sale/views/snippets/s_dynamic_snippet_products.xml b/addons/website_sale/views/snippets/s_dynamic_snippet_products.xml
index 8dee7a7f2da..c8156714804 100644
--- a/addons/website_sale/views/snippets/s_dynamic_snippet_products.xml
+++ b/addons/website_sale/views/snippets/s_dynamic_snippet_products.xml
@@ -26,9 +26,11 @@
             </t>
         </xpath>
     </template>
-    <template id="assets_snippet_s_dynamic_snippet_products_js_000" inherit_id="website.assets_snippet_s_dynamic_snippet_carousel_js_000">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website_sale/static/src/snippets/s_dynamic_snippet_products/000.js"/>
-        </xpath>
-    </template>
+
+    <record id="website_sale.s_dynamic_snippet_products_000_js" model="ir.asset">
+        <field name="name">Dynamic snippet products 000 JS</field>
+        <field name="bundle">web.assets_frontend</field>
+        <field name="glob">website_sale/static/src/snippets/s_dynamic_snippet_products/000.js</field>
+    </record>
+
 </odoo>
diff --git a/addons/website_sale/views/snippets/s_products_searchbar.xml b/addons/website_sale/views/snippets/s_products_searchbar.xml
index 67ae6208ad1..1babca1062c 100644
--- a/addons/website_sale/views/snippets/s_products_searchbar.xml
+++ b/addons/website_sale/views/snippets/s_products_searchbar.xml
@@ -45,10 +45,10 @@
     <xpath expr="//*[@t-set='so_content_addition_selector']" position="inside">, .s_wsale_products_searchbar_input</xpath>
 </template>
 
-<template id="assets_snippet_s_products_searchbar_js_000" inherit_id="website_sale.assets_frontend">
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/website_sale/static/src/snippets/s_products_searchbar/000.js"/>
-    </xpath>
-</template>
+<record id="website_sale.s_products_searchbar_000_js" model="ir.asset">
+    <field name="name">Products searchbar 000 JS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="glob">website_sale/static/src/snippets/s_products_searchbar/000.js</field>
+</record>
 
 </odoo>
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index cf7866d7c00..9dbc7828b3a 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1,79 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="_assets_primary_variables" inherit_id="website._assets_primary_variables">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/website_sale/static/src/scss/primary_variables.scss"/>
-        </xpath>
-    </template>
-
-    <template id="assets_backend" inherit_id="web.assets_backend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_video_field_preview.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_backend.js"></script>
-            <link rel="stylesheet" type="text/scss" href="/website_sale/static/src/scss/website_sale_dashboard.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/website_sale/static/src/scss/website_sale_backend.scss"/>
-            <script type="text/javascript" src="/website_sale/static/src/js/tours/website_sale_shop_backend.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_frontend" inherit_id="website.assets_frontend">
-        <xpath expr="link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/website_sale/static/src/scss/website_sale.scss" />
-            <link rel="stylesheet" type="text/scss" href="/website_sale/static/src/scss/website_mail.scss" />
-            <link rel="stylesheet" type="text/scss" href="/website_sale/static/src/scss/website_sale_frontend.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/sale/static/src/scss/sale_portal.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/sale/static/src/scss/product_configurator.scss"/>
-        </xpath>
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/sale/static/src/js/variant_mixin.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/variant_mixin.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_utils.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_validate.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_recently_viewed.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tracking.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_wysiwyg" inherit_id="website.assets_wysiwyg" name="Shop Wysiwyg Editor">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/website_sale/static/src/scss/website_sale.editor.scss"/>
-            <script type="text/javascript" src="/website_sale/static/src/snippets/s_dynamic_snippet_products/options.js"/>
-        </xpath>
-    </template>
-
-    <template id="assets_editor" inherit_id="website.assets_editor" name="Shop Editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale.editor.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale_form_editor.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/tours/website_sale_shop_frontend.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_common" name="tour" inherit_id="web.assets_common">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_sale/static/src/js/tours/tour_utils.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/tours/website_sale_shop.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_tests" name="Website Sale Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_buy.js"></script>
-            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_complete_flow.js"></script>
-            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_cart_recovery.js"></script>
-            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_mail.js"></script>
-            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_customize.js"></script>
-            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_custom_attribute_value.js"></script>
-            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_zoom.js"></script>
-            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_dynamic_variants.js"></script>
-            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_deleted_archived_variants.js"></script>
-            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_list_view_b2c.js"></script>
-            <script type="text/javascript" src="/website_sale/static/tests/tours/website_sale_shop_no_variant_attribute.js"></script>
-        </xpath>
-    </template>
-
     <template id="header_cart_link" name="Header Cart Link">
         <t t-set="website_sale_order" t-value="website.sale_get_order()" />
         <t t-set="show_cart" t-value="true"/>
diff --git a/addons/website_sale_comparison/__manifest__.py b/addons/website_sale_comparison/__manifest__.py
index c96148ea0d9..b0475843990 100644
--- a/addons/website_sale_comparison/__manifest__.py
+++ b/addons/website_sale_comparison/__manifest__.py
@@ -24,4 +24,13 @@ Finally, the module comes with an option to display an attribute summary table i
         'data/website_sale_comparison_demo.xml',
     ],
     'installable': True,
+    'assets': {
+        'web.assets_frontend': [
+            'website_sale_comparison/static/src/scss/website_sale_comparison.scss',
+            'website_sale_comparison/static/src/js/website_sale_comparison.js',
+        ],
+        'web.assets_tests': [
+            'website_sale_comparison/static/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/website_sale_comparison/views/website_sale_comparison_template.xml b/addons/website_sale_comparison/views/website_sale_comparison_template.xml
index 1f354b8f255..92f59fffa3a 100644
--- a/addons/website_sale_comparison/views/website_sale_comparison_template.xml
+++ b/addons/website_sale_comparison/views/website_sale_comparison_template.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Comparison assets frontend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/website_sale_comparison/static/src/scss/website_sale_comparison.scss"/>
-            <script type="text/javascript" src="/website_sale_comparison/static/src/js/website_sale_comparison.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_tests" inherit_id="web.assets_tests" name="Website Sale Comparison Assets Tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_sale_comparison/static/tests/tours/website_sale_comparison.js"></script>
-        </xpath>
-    </template>
-
     <template id="add_to_compare" inherit_id="website_sale.products_item" customize_show="True" name="Comparison List" priority="22">
         <xpath expr="//div[hasclass('o_wsale_product_btn')]" position="inside">
             <t t-set="product_variant_id" t-value="product._get_first_possible_variant_id()"/>
diff --git a/addons/website_sale_coupon/__manifest__.py b/addons/website_sale_coupon/__manifest__.py
index a47199d8055..ec24951c170 100644
--- a/addons/website_sale_coupon/__manifest__.py
+++ b/addons/website_sale_coupon/__manifest__.py
@@ -17,4 +17,9 @@ Coupon & promotion programs can be edited in the Catalog menu of the Website app
         'views/sale_coupon_program_views.xml',
     ],
     'auto_install': True,
+    'assets': {
+        'web.assets_tests': [
+            'website_sale_coupon/static/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/website_sale_coupon/views/website_sale_templates.xml b/addons/website_sale_coupon/views/website_sale_templates.xml
index 8328dd88ca5..05debafb629 100644
--- a/addons/website_sale_coupon/views/website_sale_templates.xml
+++ b/addons/website_sale_coupon/views/website_sale_templates.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="assets_tests" name="Website Sale Coupon Assets Tests" inherit_id="web.assets_tests">
-    <xpath expr="." position="inside">
-        <script type="text/javascript" src="/website_sale_coupon/static/tests/tours/website_sale_coupon.js"></script>
-    </xpath>
-</template>
 <template id="website_sale_coupon_cart_hide_qty" inherit_id="website_sale.cart_lines">
     <xpath expr="//del" position="attributes">
         <attribute name="t-if">not line.is_reward_line</attribute>
diff --git a/addons/website_sale_coupon_delivery/__manifest__.py b/addons/website_sale_coupon_delivery/__manifest__.py
index b0c32eba02e..ce5568bb38e 100644
--- a/addons/website_sale_coupon_delivery/__manifest__.py
+++ b/addons/website_sale_coupon_delivery/__manifest__.py
@@ -7,8 +7,10 @@
     'category': 'Website/Website',
     'version': '1.0',
     'depends': ['website_sale_delivery', 'sale_coupon_delivery'],
-    'data': [
-        'views/website_sale_coupon_delivery_templates.xml',
-    ],
     'auto_install': True,
+    'assets': {
+        'web.assets_frontend': [
+            'website_sale_coupon_delivery/static/**/*',
+        ],
+    }
 }
diff --git a/addons/website_sale_coupon_delivery/views/website_sale_coupon_delivery_templates.xml b/addons/website_sale_coupon_delivery/views/website_sale_coupon_delivery_templates.xml
deleted file mode 100644
index f42b869f009..00000000000
--- a/addons/website_sale_coupon_delivery/views/website_sale_coupon_delivery_templates.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets_frontend" inherit_id="website.assets_frontend">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_sale_coupon_delivery/static/src/js/website_sale_coupon_delivery.js"></script>
-        </xpath>
-    </template>
-
-</odoo>
diff --git a/addons/website_sale_delivery/__manifest__.py b/addons/website_sale_delivery/__manifest__.py
index 6c4f0ee157d..6b3e6687f7c 100644
--- a/addons/website_sale_delivery/__manifest__.py
+++ b/addons/website_sale_delivery/__manifest__.py
@@ -17,7 +17,14 @@ Configure your own methods with a pricing grid or integrate with carriers for a
     'demo': [
         'data/website_sale_delivery_demo.xml'
     ],
-    'qweb': [],
     'installable': True,
     'auto_install': True,
+    'assets': {
+        'web.assets_frontend': [
+            'website_sale_delivery/static/src/**/*',
+        ],
+        'web.assets_tests': [
+            'website_sale_delivery/static/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
index 42abbc7bdf9..e31703f0196 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
@@ -15,19 +15,6 @@
         </xpath>
     </template>
 
-    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Shop">
-      <xpath expr="." position="inside">
-        <script type="text/javascript" src="/website_sale_delivery/static/src/js/website_sale_delivery.js"></script>
-        <link rel="stylesheet" type="text/scss" href="/website_sale_delivery/static/src/scss/website_sale_delivery.scss"/>
-      </xpath>
-    </template>
-
-    <template id="assets_tests" name="Website Sale Delivery Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_sale_delivery/static/tests/tours/website_free_delivery.js"></script>
-        </xpath>
-    </template>
-
     <template id="payment_delivery_methods">
         <input t-att-value="delivery.id" t-att-id="'delivery_%i' % delivery.id" type="radio" name="delivery_type" t-att-checked="order.carrier_id and order.carrier_id.id == delivery.id and 'checked' or False" t-att-class="'d-none' if delivery_nb == 1 else ''"/>
         <label class="label-optional" t-field="delivery.name"/>
diff --git a/addons/website_sale_gift_card/__manifest__.py b/addons/website_sale_gift_card/__manifest__.py
index f7dac84958f..10eebd12ecc 100644
--- a/addons/website_sale_gift_card/__manifest__.py
+++ b/addons/website_sale_gift_card/__manifest__.py
@@ -13,9 +13,13 @@
         'views/gift_card_views.xml',
         'views/product_views.xml',
         'views/gift_card_menus.xml',
-        'views/assets.xml',
-    ],
+        ],
     'demo': [
         'data/product_demo.xml',
     ],
+    'assets': {
+        'web.assets_frontend': [
+            'website_sale_gift_card/static/**/*',
+        ],
+    }
 }
diff --git a/addons/website_sale_gift_card/views/assets.xml b/addons/website_sale_gift_card/views/assets.xml
deleted file mode 100644
index aef717b11d7..00000000000
--- a/addons/website_sale_gift_card/views/assets.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <template id="assets_frontend_gift_card" inherit_id="website.assets_frontend">
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/website_sale_gift_card/static/src/js/website_sale_gift_card.js"/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/website_sale_management/__manifest__.py b/addons/website_sale_management/__manifest__.py
index c31946ca535..e9e768b85be 100644
--- a/addons/website_sale_management/__manifest__.py
+++ b/addons/website_sale_management/__manifest__.py
@@ -16,5 +16,9 @@ Display orders to invoice in website dashboard.
     ],
     'demo': [
     ],
-    'qweb': ['static/src/xml/*.xml'],
+    'assets': {
+        'web.assets_qweb': [
+            'website_sale_management/static/src/xml/*.xml',
+        ],
+    }
 }
diff --git a/addons/website_sale_product_configurator/__manifest__.py b/addons/website_sale_product_configurator/__manifest__.py
index 1787cc7e9b3..259a0b565af 100644
--- a/addons/website_sale_product_configurator/__manifest__.py
+++ b/addons/website_sale_product_configurator/__manifest__.py
@@ -11,10 +11,21 @@
     'depends': ['website_sale', 'sale_product_configurator'],
     'auto_install': True,
     'data': [
-        'views/assets.xml',
         'views/website_sale_product_configurator_templates.xml',
     ],
     'demo': [
         'data/demo.xml',
     ],
+    'assets': {
+        'web.assets_frontend': [
+            ('before', 'website_sale/static/src/js/website_sale.js', 'sale_product_configurator/static/src/js/product_configurator_modal.js'),
+            ('before', 'website_sale/static/src/js/website_sale.js', 'website_sale_product_configurator/static/src/js/product_configurator_modal.js'),
+            'sale/static/src/scss/product_configurator.scss',
+            'website_sale_product_configurator/static/src/scss/website_sale_options.scss',
+            'website_sale_product_configurator/static/src/js/website_sale_options.js',
+        ],
+        'web.assets_tests': [
+            'website_sale_product_configurator/static/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/website_sale_product_configurator/views/assets.xml b/addons/website_sale_product_configurator/views/assets.xml
deleted file mode 100644
index 95aa13a2dce..00000000000
--- a/addons/website_sale_product_configurator/views/assets.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_frontend" inherit_id="website.assets_frontend" name="website_sale_product_configurator assets frontend">
-        <xpath expr="link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/sale/static/src/scss/product_configurator.scss"/>
-            <link rel="stylesheet" type="text/scss" href="/website_sale_product_configurator/static/src/scss/website_sale_options.scss"/>
-        </xpath>
-        <xpath expr="script[contains(@src, '/website_sale/static/src/js/website_sale.js')]" position="before">
-            <script type="text/javascript" src="/sale_product_configurator/static/src/js/product_configurator_modal.js"></script>
-            <script type="text/javascript" src="/website_sale_product_configurator/static/src/js/product_configurator_modal.js"></script>
-        </xpath>
-        <xpath expr="script[last()]" position="after">
-            <script type="text/javascript" src="/website_sale_product_configurator/static/src/js/website_sale_options.js"></script>
-        </xpath>
-    </template>
-    <template id="assets_tests" name="Website Sale Product Configurator Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_sale_product_configurator/static/tests/tours/website_sale_buy.js"></script>
-            <script type="text/javascript" src="/website_sale_product_configurator/static/tests/tours/website_sale_shop_custom_attributes_value.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/website_sale_slides/__manifest__.py b/addons/website_sale_slides/__manifest__.py
index 62851029eaa..93a410c7e81 100644
--- a/addons/website_sale_slides/__manifest__.py
+++ b/addons/website_sale_slides/__manifest__.py
@@ -11,7 +11,6 @@
     'installable': True,
     'data': [
         'report/sale_report_views.xml',
-        'views/assets.xml',
         'views/website_slides_menu_views.xml',
         'views/slide_channel_views.xml',
         'views/website_slides_templates.xml',
@@ -21,4 +20,9 @@
         'data/slide_demo.xml',
         'data/sale_order_demo.xml',
     ],
+    'assets': {
+        'web.assets_frontend': [
+            'website_sale_slides/static/src/js/**/*',
+        ],
+    }
 }
diff --git a/addons/website_sale_slides/views/assets.xml b/addons/website_sale_slides/views/assets.xml
deleted file mode 100644
index 0aad00a5ae1..00000000000
--- a/addons/website_sale_slides/views/assets.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
-    <data>
-        <template id="assets_frontend" inherit_id="website.assets_frontend" name="Buy course on quiz">
-            <xpath expr="//script[last()]" position="after">
-                <script type="text/javascript" src="/website_sale_slides/static/src/js/slides_course_quiz.js"/>
-                <script type="text/javascript" src="/website_sale_slides/static/src/js/slides_course_join.js"/>
-                <script type="text/javascript" src="/website_sale_slides/static/src/js/slides_course_unsubscribe.js"/>
-            </xpath>
-        </template>
-    </data>
-</odoo>
diff --git a/addons/website_sale_stock/__manifest__.py b/addons/website_sale_stock/__manifest__.py
index 590d8ad9aaa..facf350a8b6 100644
--- a/addons/website_sale_stock/__manifest__.py
+++ b/addons/website_sale_stock/__manifest__.py
@@ -25,4 +25,9 @@ Then it can be made specific at the product level.
         'data/website_sale_stock_demo.xml',
     ],
     'auto_install': True,
+    'assets': {
+        'web.assets_frontend': [
+            'website_sale_stock/static/src/js/**/*',
+        ],
+    }
 }
diff --git a/addons/website_sale_stock/views/website_sale_stock_templates.xml b/addons/website_sale_stock/views/website_sale_stock_templates.xml
index cd010a29fff..5b51331f36d 100644
--- a/addons/website_sale_stock/views/website_sale_stock_templates.xml
+++ b/addons/website_sale_stock/views/website_sale_stock_templates.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Website Sale Stock">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_sale_stock/static/src/js/variant_mixin.js" />
-        </xpath>
-    </template>
-
     <!-- Shopping Cart Lines -->
     <template id="website_sale_stock_cart_lines" inherit_id="website_sale.cart_lines" name="Shopping Cart Lines">
         <xpath expr="//input[@type='text'][hasclass('quantity')]" position="attributes">
diff --git a/addons/website_sale_wishlist/__manifest__.py b/addons/website_sale_wishlist/__manifest__.py
index c96b2adaeb7..b22e2f3fd32 100644
--- a/addons/website_sale_wishlist/__manifest__.py
+++ b/addons/website_sale_wishlist/__manifest__.py
@@ -17,4 +17,12 @@ Allow shoppers of your eCommerce store to create personalized collections of pro
         'views/snippets.xml',
     ],
     'installable': True,
+    'assets': {
+        'web.assets_frontend': [
+            'website_sale_wishlist/static/src/**/*',
+        ],
+        'web.assets_tests': [
+            'website_sale_wishlist/static/tests/**/*',
+        ],
+    }
 }
diff --git a/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml b/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml
index 8cbee02ab64..2c2b0aa7749 100644
--- a/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml
+++ b/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Wishlist assets frontend">
-        <xpath expr="." position="inside">
-            <link rel="stylesheet" type="text/scss" href="/website_sale_wishlist/static/src/scss/website_sale_wishlist.scss"/>
-            <script type="text/javascript" src="/website_sale_wishlist/static/src/js/website_sale_wishlist.js"></script>
-        </xpath>
-    </template>
-
-    <template id="assets_tests" name="Website Sale Wishlist Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_sale_wishlist/static/tests/tours/website_sale_wishlist.js"></script>
-        </xpath>
-    </template>
-
     <template id="add_to_wishlist" inherit_id="website_sale.products_item" customize_show="True" name="Wishlist Button" priority="20">
         <xpath expr="//div[hasclass('o_wsale_product_btn')]" position="inside">
             <t t-set="in_wish" t-value="product._is_in_wishlist()"/>
diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py
index 8bdcbfb64c9..a732d7d92e9 100644
--- a/addons/website_slides/__manifest__.py
+++ b/addons/website_slides/__manifest__.py
@@ -28,7 +28,6 @@ Featuring
     'data': [
         'security/website_slides_security.xml',
         'security/ir.model.access.csv',
-        'views/assets.xml',
         'views/res_config_settings_views.xml',
         'views/res_partner_views.xml',
         'views/rating_rating_views.xml',
@@ -60,9 +59,60 @@ Featuring
         'data/slide_slide_demo.xml',
         'data/slide_user_demo.xml',
     ],
-    'qweb': [
-        'static/src/components/activity/activity.xml',
-    ],
     'installable': True,
     'application': True,
+    'assets': {
+        'web.assets_backend': [
+            'website_slides/static/src/scss/rating_rating_views.scss',
+            'website_slides/static/src/scss/slide_views.scss',
+            'website_slides/static/src/components/activity/activity.js',
+            'website_slides/static/src/js/slide_category_one2many.js',
+            'website_slides/static/src/js/rating_field_backend.js',
+        ],
+        'web.assets_frontend': [
+            'website_slides/static/src/scss/website_slides.scss',
+            'website_slides/static/src/scss/website_slides_profile.scss',
+            'website_slides/static/src/scss/slides_slide_fullscreen.scss',
+            'website_slides/static/src/js/slides.js',
+            'website_slides/static/src/js/slides_share.js',
+            'website_slides/static/src/js/slides_upload.js',
+            'website_slides/static/src/js/slides_category_add.js',
+            'website_slides/static/src/js/slides_category_delete.js',
+            'website_slides/static/src/js/slides_slide_archive.js',
+            'website_slides/static/src/js/slides_slide_toggle_is_preview.js',
+            'website_slides/static/src/js/slides_slide_like.js',
+            'website_slides/static/src/js/slides_course_slides_list.js',
+            'website_slides/static/src/js/slides_course_fullscreen_player.js',
+            'website_slides/static/src/js/slides_course_join.js',
+            'website_slides/static/src/js/slides_course_enroll_email.js',
+            'website_slides/static/src/js/slides_course_quiz.js',
+            'website_slides/static/src/js/slides_course_quiz_question_form.js',
+            'website_slides/static/src/js/slides_course_quiz_finish.js',
+            'website_slides/static/src/js/slides_course_tag_add.js',
+            'website_slides/static/src/js/slides_course_unsubscribe.js',
+            'website_slides/static/src/js/tours/slides_tour.js',
+            'website_slides/static/src/js/portal_chatter.js',
+        ],
+        'web.assets_tests': [
+            'website_slides/static/src/tests/**/*',
+        ],
+        'website.assets_editor': [
+            'website_slides/static/src/js/website_slides.editor.js',
+        ],
+        'website_slides.slide_embed_assets': [
+            ('include', 'web._assets_helpers'),
+            'web/static/lib/bootstrap/scss/_variables.scss',
+            ('include', 'web._assets_bootstrap'),
+            'website_slides/static/src/scss/website_slides.scss',
+            ('include', 'web.pdf_js_lib'),
+            'website_slides/static/lib/pdfslidesviewer/PDFSlidesViewer.js',
+            'website_slides/static/src/js/slides_embed.js',
+        ],
+        'web.qunit_suite_tests': [
+            'website_slides/static/src/components/activity/activity_tests.js',
+        ],
+        'web.assets_qweb': [
+            'website_slides/static/src/components/activity/activity.xml',
+        ],
+    }
 }
diff --git a/addons/website_slides/views/assets.xml b/addons/website_slides/views/assets.xml
deleted file mode 100644
index cad85aebadc..00000000000
--- a/addons/website_slides/views/assets.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
-    <data>
-        <template id="assets_backend" inherit_id="web.assets_backend" name="Slides Backend Assets">
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" type="text/scss" href="/website_slides/static/src/scss/rating_rating_views.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/website_slides/static/src/scss/slide_views.scss"/>
-                <script type="text/javascript" src="/website_slides/static/src/components/activity/activity.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slide_category_one2many.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/rating_field_backend.js"/>
-            </xpath>
-        </template>
-
-        <template id="assets_frontend" inherit_id="website.assets_frontend" name="Slides Frontend Assets">
-            <xpath expr="//link[last()]" position="after">
-                <link rel="stylesheet" type="text/scss" href="/website_slides/static/src/scss/website_slides.scss" t-ignore="true"/>
-                <link rel="stylesheet" type="text/scss" href="/website_slides/static/src/scss/website_slides_profile.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/website_slides/static/src/scss/slides_slide_fullscreen.scss" t-ignore="true"/>
-            </xpath>
-            <xpath expr="//script[last()]" position="after">
-                <script type="text/javascript" src="/website_slides/static/src/js/slides.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_share.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_upload.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_category_add.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_category_delete.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_slide_archive.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_slide_toggle_is_preview.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_slide_like.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_course_slides_list.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_course_fullscreen_player.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_course_join.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_course_enroll_email.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_course_quiz.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_course_quiz_question_form.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_course_quiz_finish.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_course_tag_add.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_course_unsubscribe.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/tours/slides_tour.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/portal_chatter.js"/>
-            </xpath>
-        </template>
-
-        <template id="assets_tests" inherit_id="web.assets_tests" name="Slides Tests Assets">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/website_slides/static/src/tests/tours/slides_tour_tools.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/tests/tours/slides_course_member.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/tests/tours/slides_course_member_yt.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/tests/tours/slides_course_publisher.js"/>
-            </xpath>
-        </template>
-
-        <template id="assets_editor_inherit_website_slides" inherit_id="website.assets_editor" name="website_slides Assets Editor">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/website_slides/static/src/js/website_slides.editor.js"/>
-            </xpath>
-        </template>
-
-        <!-- Bundle (minimal) for embedded slide iframe -->
-        <template id="website_slides.slide_embed_assets" name="Website slides embed assets">
-            <t t-call="web._assets_helpers"/>
-            <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
-            <t t-call="web._assets_bootstrap"/>
-            <link rel="stylesheet" type="text/scss" href="/website_slides/static/src/scss/website_slides.scss" t-ignore="true"/>
-
-            <t t-call="web.pdf_js_lib"></t>
-            <script type="text/javascript" src="/website_slides/static/lib/pdfslidesviewer/PDFSlidesViewer.js"></script>
-            <script type="text/javascript" src="/website_slides/static/src/js/slides_embed.js"></script>
-        </template>
-
-        <template id="website_slides_tests" name="eLearning tests" inherit_id="web.qunit_suite_tests">
-            <xpath expr="//script[last()]" position="after">
-                <script type="text/javascript" src="/website_slides/static/src/components/activity/activity_tests.js"/>
-            </xpath>
-        </template>
-
-    </data>
-</odoo>
diff --git a/addons/website_slides_forum/__manifest__.py b/addons/website_slides_forum/__manifest__.py
index f08b9ea8ae1..4576ea5da03 100644
--- a/addons/website_slides_forum/__manifest__.py
+++ b/addons/website_slides_forum/__manifest__.py
@@ -17,7 +17,6 @@
         'views/forum_views.xml',
         'views/slide_channel_views.xml',
         'views/website_slides_menu_views.xml',
-        'views/assets.xml',
         'views/website_slides_templates.xml',
         'views/website_slides_forum_templates.xml'
     ],
@@ -25,4 +24,9 @@
         'data/slide_channel_demo.xml',
     ],
     'auto_install': True,
+    'assets': {
+        'web.assets_frontend': [
+            'website_slides_forum/static/src/js/**/*',
+        ],
+    }
 }
diff --git a/addons/website_slides_forum/views/assets.xml b/addons/website_slides_forum/views/assets.xml
deleted file mode 100644
index 9c36aa33ab2..00000000000
--- a/addons/website_slides_forum/views/assets.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Website slide forum frontend assets">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website_slides_forum/static/src/js/website_slides_forum.editor.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/website_slides_survey/__manifest__.py b/addons/website_slides_survey/__manifest__.py
index a0c8e44cb47..fefa742d742 100644
--- a/addons/website_slides_survey/__manifest__.py
+++ b/addons/website_slides_survey/__manifest__.py
@@ -11,7 +11,6 @@
     'auto_install': True,
     'data': [
         'security/ir.model.access.csv',
-        'views/assets.xml',
         'views/slide_channel_views.xml',
         'views/slide_slide_views.xml',
         'views/survey_survey_views.xml',
@@ -30,4 +29,15 @@
         'data/slide_slide_demo.xml',
         'data/survey.user_input.line.csv',
     ],
+    'assets': {
+        'web.assets_frontend': [
+            'website_slides_survey/static/src/scss/website_slides_survey.scss',
+            'website_slides_survey/static/src/js/slides_upload.js',
+            'website_slides_survey/static/src/js/slides_course_fullscreen_player.js',
+            'website_slides_survey/static/src/js/slides_certification_upload_toast.js',
+        ],
+        'survey.survey_assets': [
+            'website_slides_survey/static/src/scss/website_slides_survey_result.scss',
+        ],
+    }
 }
diff --git a/addons/website_slides_survey/views/assets.xml b/addons/website_slides_survey/views/assets.xml
deleted file mode 100644
index 203d840963e..00000000000
--- a/addons/website_slides_survey/views/assets.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
-    <data>
-        <template id="assets_frontend" inherit_id="website.assets_frontend" name="Slides Certification">
-            <xpath expr="//link[last()]" position="after">
-                <link rel="stylesheet" type="text/scss" href="/website_slides_survey/static/src/scss/website_slides_survey.scss"/>
-            </xpath>
-            <xpath expr="//script[last()]" position="after">
-                <script type="text/javascript" src="/website_slides_survey/static/src/js/slides_upload.js"/>
-                <script type="text/javascript" src="/website_slides_survey/static/src/js/slides_course_fullscreen_player.js"/>
-                <script type="text/javascript" src="/website_slides_survey/static/src/js/slides_certification_upload_toast.js"/>
-            </xpath>
-        </template>
-        <template id="survey_assets" inherit_id="survey.survey_assets" name="Survey Results assets">
-            <xpath expr="//link[last()]" position="after">
-                <link rel="stylesheet" type="text/scss" href="/website_slides_survey/static/src/scss/website_slides_survey_result.scss"/>
-            </xpath>
-        </template>
-    </data>
-</odoo>
diff --git a/addons/website_twitter/__manifest__.py b/addons/website_twitter/__manifest__.py
index 1eae0b31415..80074e7e21d 100644
--- a/addons/website_twitter/__manifest__.py
+++ b/addons/website_twitter/__manifest__.py
@@ -17,4 +17,13 @@ This module adds a Twitter scroller building block to the website builder, so th
         'views/website_twitter_snippet_templates.xml'
     ],
     'installable': True,
+    'assets': {
+        'web.assets_frontend': [
+            'website_twitter/static/src/scss/website_twitter.scss',
+            'website_twitter/static/src/js/website.twitter.animation.js',
+        ],
+        'website.assets_editor': [
+            'website_twitter/static/src/js/website.twitter.editor.js',
+        ],
+    }
 }
diff --git a/addons/website_twitter/views/website_twitter_snippet_templates.xml b/addons/website_twitter/views/website_twitter_snippet_templates.xml
index 461c23675b0..a001637cd17 100644
--- a/addons/website_twitter/views/website_twitter_snippet_templates.xml
+++ b/addons/website_twitter/views/website_twitter_snippet_templates.xml
@@ -21,17 +21,4 @@
         </xpath>
     </template>
 
-    <template id="twitter" inherit_id="website.assets_frontend">
-        <xpath expr="//link[last()]" position="after">
-            <link rel="stylesheet" type="text/scss" href="/website_twitter/static/src/scss/website_twitter.scss"/>
-        </xpath>
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.animation.js"/>
-        </xpath>
-    </template>
-    <template id="twitter_editor" inherit_id="website.assets_editor">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.editor.js"/>
-        </xpath>
-    </template>
-</odoo>
+    </odoo>
diff --git a/odoo/addons/test_apikeys/__manifest__.py b/odoo/addons/test_apikeys/__manifest__.py
index 0ea5a44fb67..11c9c4ee664 100644
--- a/odoo/addons/test_apikeys/__manifest__.py
+++ b/odoo/addons/test_apikeys/__manifest__.py
@@ -4,5 +4,10 @@
     'name': 'Tests flow of API keys',
     'category': 'Tools',
     'depends': ['web_tour'],
-    'data': ['views/assets.xml'],
+    'assets': {
+        'web.assets_tests': [
+            # inside .
+            'test_apikeys/static/tests/apikey_flow.js',
+        ],
+    }
 }
diff --git a/odoo/addons/test_apikeys/views/assets.xml b/odoo/addons/test_apikeys/views/assets.xml
deleted file mode 100644
index 2ef0318a161..00000000000
--- a/odoo/addons/test_apikeys/views/assets.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<odoo>
-    <template id="assets_tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/test_apikeys/static/tests/apikey_flow.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/odoo/addons/test_assetsbundle/data/ir_asset.xml b/odoo/addons/test_assetsbundle/data/ir_asset.xml
index 01da49e34ad..5b6840ddf7e 100644
--- a/odoo/addons/test_assetsbundle/data/ir_asset.xml
+++ b/odoo/addons/test_assetsbundle/data/ir_asset.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="test_assetsbundle.bundle1" model="ir.asset">
-            <field name="name">Bundle 1</field>
+        <record id="test_assetsbundle.test_jsfile[!4]_js" model="ir.asset">
+            <field name="name">Test jsfile[!4] JS</field>
             <field name="bundle">test_assetsbundle.bundle1</field>
             <field name="glob">test_assetsbundle/static/src/js/test_jsfile[!4].js</field>
         </record>
diff --git a/odoo/addons/test_main_flows/__manifest__.py b/odoo/addons/test_main_flows/__manifest__.py
index 7c8474e16c1..4ee5d437051 100644
--- a/odoo/addons/test_main_flows/__manifest__.py
+++ b/odoo/addons/test_main_flows/__manifest__.py
@@ -9,9 +9,12 @@ This module will test the main workflow of Odoo.
 It will install some main apps and will try to execute the most important actions.
 """,
     'depends': ['web_tour', 'crm', 'sale_timesheet', 'purchase_stock', 'mrp', 'account'],
-    'data': [
-        'views/assets.xml',
-    ],
     'installable': True,
     'post_init_hook': '_auto_install_enterprise_dependencies',
+    'assets': {
+        'web.assets_tests': [
+            # inside .
+            'test_main_flows/static/tests/tours/main_flow.js',
+        ],
+    }
 }
diff --git a/odoo/addons/test_main_flows/views/assets.xml b/odoo/addons/test_main_flows/views/assets.xml
deleted file mode 100644
index c2691297179..00000000000
--- a/odoo/addons/test_main_flows/views/assets.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_tests" name="The Flow Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/test_main_flows/static/tests/tours/main_flow.js"></script>
-        </xpath>
-    </template>
-</odoo>
diff --git a/odoo/addons/test_new_api/__manifest__.py b/odoo/addons/test_new_api/__manifest__.py
index 8b60f6dabc3..d0f1f4bca3d 100644
--- a/odoo/addons/test_new_api/__manifest__.py
+++ b/odoo/addons/test_new_api/__manifest__.py
@@ -13,9 +13,16 @@
         'security/ir.model.access.csv',
         'security/test_new_api_security.xml',
         'views/test_new_api_views.xml',
-        'views/test_new_api_templates.xml',
         'data/test_new_api_data.xml',
     ],
     'demo': [
     ],
+    'assets': {
+        'web.assets_tests': [
+            # inside .
+            'test_new_api/static/tests/tours/constraint.js',
+            # inside .
+            'test_new_api/static/tests/tours/x2many.js',
+        ],
+    }
 }
diff --git a/odoo/addons/test_new_api/views/test_new_api_templates.xml b/odoo/addons/test_new_api/views/test_new_api_templates.xml
deleted file mode 100644
index 8bd75bceab5..00000000000
--- a/odoo/addons/test_new_api/views/test_new_api_templates.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="assets_tests" name="Test New Api Assets Tests" inherit_id="web.assets_tests">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/test_new_api/static/tests/tours/constraint.js"></script>
-            <script type="text/javascript" src="/test_new_api/static/tests/tours/x2many.js"></script>
-        </xpath>
-    </template>
-</odoo>
-
diff --git a/odoo/addons/test_translation_import/__manifest__.py b/odoo/addons/test_translation_import/__manifest__.py
index 5f7ff9a4427..dd16b116b5b 100644
--- a/odoo/addons/test_translation_import/__manifest__.py
+++ b/odoo/addons/test_translation_import/__manifest__.py
@@ -11,7 +11,9 @@
     ],
     'installable': True,
     'auto_install': False,
-    'qweb': [
-        'static/src/xml/js_templates.xml',
-    ]
+    'assets': {
+        'web.assets_qweb': [
+            'test_translation_import/static/src/xml/js_templates.xml',
+        ],
+    }
 }