diff --git a/addons/hr/__manifest__.py b/addons/hr/__manifest__.py
index 80d52698994..acdcee85c50 100644
--- a/addons/hr/__manifest__.py
+++ b/addons/hr/__manifest__.py
@@ -50,8 +50,6 @@
     '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',
@@ -62,13 +60,11 @@
             '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/static/src/bugfix/bugfix.js b/addons/hr/static/src/bugfix/bugfix.js
deleted file mode 100644
index 0351046fab3..00000000000
--- a/addons/hr/static/src/bugfix/bugfix.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * This file allows introducing new JS modules without contaminating other files.
- * This is useful when bug fixing requires adding such JS modules in stable
- * versions of Odoo. Any module that is defined in this file should be isolated
- * in its own file in master.
- */
-odoo.define('hr/static/src/bugfix/bugfix.js', function (require) {
-'use strict';
-
-});
diff --git a/addons/hr/static/src/bugfix/bugfix.scss b/addons/hr/static/src/bugfix/bugfix.scss
deleted file mode 100644
index c4272e527b4..00000000000
--- a/addons/hr/static/src/bugfix/bugfix.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
-* This file allows introducing new styles without contaminating other files.
-* This is useful when bug fixing requires adding new components for instance in
-* stable versions of Odoo. Any style that is defined in this file should be isolated
-* in its own file in master.
-*/
diff --git a/addons/hr/static/src/bugfix/bugfix.xml b/addons/hr/static/src/bugfix/bugfix.xml
deleted file mode 100644
index c17906f75bb..00000000000
--- a/addons/hr/static/src/bugfix/bugfix.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-<!--
-    This file allows introducing new static templates without contaminating other files.
-    This is useful when bug fixing requires adding new components for instance in stable
-    versions of Odoo. Any template that is defined in this file should be isolated
-    in its own file in master.
--->
-
-</templates>
diff --git a/addons/hr/static/src/bugfix/bugfix_tests.js b/addons/hr/static/src/bugfix/bugfix_tests.js
deleted file mode 100644
index 8b23d37282d..00000000000
--- a/addons/hr/static/src/bugfix/bugfix_tests.js
+++ /dev/null
@@ -1,18 +0,0 @@
-odoo.define('hr/static/src/bugfix/bugfix_tests.js', function (require) {
-'use strict';
-
-/**
- * This file allows introducing new QUnit test modules without contaminating
- * other test files. This is useful when bug fixing requires adding new
- * components for instance in stable versions of Odoo. Any test that is defined
- * in this file should be isolated in its own file in master.
- */
-QUnit.module('hr', {}, function () {
-QUnit.module('bugfix', {}, function () {
-QUnit.module('bugfix_tests.js', {
-
-});
-});
-});
-
-});
diff --git a/addons/hr_holidays/__manifest__.py b/addons/hr_holidays/__manifest__.py
index 8f21378806d..21908a23e1c 100644
--- a/addons/hr_holidays/__manifest__.py
+++ b/addons/hr_holidays/__manifest__.py
@@ -61,25 +61,21 @@ A synchronization with an internal agenda (Meetings of the CRM module) is also p
         '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',
diff --git a/addons/hr_holidays/static/src/bugfix/bugfix.js b/addons/hr_holidays/static/src/bugfix/bugfix.js
deleted file mode 100644
index 1f0782785eb..00000000000
--- a/addons/hr_holidays/static/src/bugfix/bugfix.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * This file allows introducing new JS modules without contaminating other files.
- * This is useful when bug fixing requires adding such JS modules in stable
- * versions of Odoo. Any module that is defined in this file should be isolated
- * in its own file in master.
- */
-odoo.define('hr_holidays/static/src/bugfix/bugfix.js', function (require) {
-'use strict';
-
-});
diff --git a/addons/hr_holidays/static/src/bugfix/bugfix.scss b/addons/hr_holidays/static/src/bugfix/bugfix.scss
deleted file mode 100644
index c4272e527b4..00000000000
--- a/addons/hr_holidays/static/src/bugfix/bugfix.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
-* This file allows introducing new styles without contaminating other files.
-* This is useful when bug fixing requires adding new components for instance in
-* stable versions of Odoo. Any style that is defined in this file should be isolated
-* in its own file in master.
-*/
diff --git a/addons/hr_holidays/static/src/bugfix/bugfix.xml b/addons/hr_holidays/static/src/bugfix/bugfix.xml
deleted file mode 100644
index c17906f75bb..00000000000
--- a/addons/hr_holidays/static/src/bugfix/bugfix.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-<!--
-    This file allows introducing new static templates without contaminating other files.
-    This is useful when bug fixing requires adding new components for instance in stable
-    versions of Odoo. Any template that is defined in this file should be isolated
-    in its own file in master.
--->
-
-</templates>
diff --git a/addons/hr_holidays/static/src/bugfix/bugfix_tests.js b/addons/hr_holidays/static/src/bugfix/bugfix_tests.js
deleted file mode 100644
index a18e79a4020..00000000000
--- a/addons/hr_holidays/static/src/bugfix/bugfix_tests.js
+++ /dev/null
@@ -1,18 +0,0 @@
-odoo.define('hr_holidays/static/src/bugfix/bugfix_tests.js', function (require) {
-'use strict';
-
-/**
- * This file allows introducing new QUnit test modules without contaminating
- * other test files. This is useful when bug fixing requires adding new
- * components for instance in stable versions of Odoo. Any test that is defined
- * in this file should be isolated in its own file in master.
- */
-QUnit.module('hr_holidays', {}, function () {
-QUnit.module('bugfix', {}, function () {
-QUnit.module('bugfix_tests.js', {
-
-});
-});
-});
-
-});
diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py
index 7bbc800aa7d..d2db715e6d9 100644
--- a/addons/im_livechat/__manifest__.py
+++ b/addons/im_livechat/__manifest__.py
@@ -46,24 +46,22 @@ Help your customers with this chat, and analyse their feedback.
         '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/chat_window/chat_window.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',
@@ -75,7 +73,6 @@ Help your customers with this chat, and analyse their feedback.
             '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/static/src/bugfix/bugfix.scss b/addons/im_livechat/static/src/bugfix/bugfix.scss
deleted file mode 100644
index c4272e527b4..00000000000
--- a/addons/im_livechat/static/src/bugfix/bugfix.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
-* This file allows introducing new styles without contaminating other files.
-* This is useful when bug fixing requires adding new components for instance in
-* stable versions of Odoo. Any style that is defined in this file should be isolated
-* in its own file in master.
-*/
diff --git a/addons/im_livechat/static/src/bugfix/bugfix.xml b/addons/im_livechat/static/src/bugfix/bugfix.xml
deleted file mode 100644
index c17906f75bb..00000000000
--- a/addons/im_livechat/static/src/bugfix/bugfix.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-<!--
-    This file allows introducing new static templates without contaminating other files.
-    This is useful when bug fixing requires adding new components for instance in stable
-    versions of Odoo. Any template that is defined in this file should be isolated
-    in its own file in master.
--->
-
-</templates>
diff --git a/addons/im_livechat/static/src/bugfix/bugfix_tests.js b/addons/im_livechat/static/src/bugfix/bugfix_tests.js
deleted file mode 100644
index b125a62d137..00000000000
--- a/addons/im_livechat/static/src/bugfix/bugfix_tests.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/** @odoo-module **/
-
-/**
- * This file allows introducing new QUnit test modules without contaminating
- * other test files. This is useful when bug fixing requires adding new
- * components for instance in stable versions of Odoo. Any test that is defined
- * in this file should be isolated in its own file in master.
- */
-QUnit.module('im_livechat', {}, function () {
-QUnit.module('bugfix', {}, function () {
-QUnit.module('bugfix_tests.js', {
-
-});
-});
-});
diff --git a/addons/im_livechat/static/src/bugfix/bugfix.js b/addons/im_livechat/static/src/models/chat_window/chat_window.js
similarity index 69%
rename from addons/im_livechat/static/src/bugfix/bugfix.js
rename to addons/im_livechat/static/src/models/chat_window/chat_window.js
index 6eca4837483..6bce83a6e90 100644
--- a/addons/im_livechat/static/src/bugfix/bugfix.js
+++ b/addons/im_livechat/static/src/models/chat_window/chat_window.js
@@ -1,12 +1,5 @@
 /** @odoo-module **/
 
-/**
- * This file allows introducing new JS modules without contaminating other files.
- * This is useful when bug fixing requires adding such JS modules in stable
- * versions of Odoo. Any module that is defined in this file should be isolated
- * in its own file in master.
- */
-
 import { registerInstancePatchModel } from '@mail/model/model_core';
 
 registerInstancePatchModel('mail.chat_window', 'im_livechat/static/src/models/chat_window/chat_window.js', {
diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index 326edbfacf0..37d335142d4 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -89,7 +89,6 @@
             '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',
@@ -211,7 +210,6 @@
             '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',
@@ -286,7 +284,6 @@
             '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',
@@ -355,7 +352,6 @@
             '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',
diff --git a/addons/mail/static/src/bugfix/bugfix.js b/addons/mail/static/src/bugfix/bugfix.js
deleted file mode 100644
index b1b1d43d03b..00000000000
--- a/addons/mail/static/src/bugfix/bugfix.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * This file allows introducing new JS modules without contaminating other files.
- * This is useful when bug fixing requires adding such JS modules in stable
- * versions of Odoo. Any module that is defined in this file should be isolated
- * in its own file in master.
- */
diff --git a/addons/mail/static/src/bugfix/bugfix.scss b/addons/mail/static/src/bugfix/bugfix.scss
deleted file mode 100644
index c4272e527b4..00000000000
--- a/addons/mail/static/src/bugfix/bugfix.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
-* This file allows introducing new styles without contaminating other files.
-* This is useful when bug fixing requires adding new components for instance in
-* stable versions of Odoo. Any style that is defined in this file should be isolated
-* in its own file in master.
-*/
diff --git a/addons/mail/static/src/bugfix/bugfix.xml b/addons/mail/static/src/bugfix/bugfix.xml
deleted file mode 100644
index c17906f75bb..00000000000
--- a/addons/mail/static/src/bugfix/bugfix.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-<!--
-    This file allows introducing new static templates without contaminating other files.
-    This is useful when bug fixing requires adding new components for instance in stable
-    versions of Odoo. Any template that is defined in this file should be isolated
-    in its own file in master.
--->
-
-</templates>
diff --git a/addons/mail/static/src/bugfix/bugfix_tests.js b/addons/mail/static/src/bugfix/bugfix_tests.js
deleted file mode 100644
index a5ecddded12..00000000000
--- a/addons/mail/static/src/bugfix/bugfix_tests.js
+++ /dev/null
@@ -1,18 +0,0 @@
-odoo.define('mail/static/src/bugfix/bugfix_tests.js', function (require) {
-'use strict';
-
-/**
- * This file allows introducing new QUnit test modules without contaminating
- * other test files. This is useful when bug fixing requires adding new
- * components for instance in stable versions of Odoo. Any test that is defined
- * in this file should be isolated in its own file in master.
- */
-QUnit.module('mail', {}, function () {
-QUnit.module('bugfix', {}, function () {
-QUnit.module('bugfix_tests.js', {
-
-});
-});
-});
-
-});
diff --git a/addons/mail_bot/__manifest__.py b/addons/mail_bot/__manifest__.py
index 37ecbb6f4f4..8d02c638176 100644
--- a/addons/mail_bot/__manifest__.py
+++ b/addons/mail_bot/__manifest__.py
@@ -21,20 +21,14 @@
     ],
     '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/static/src/bugfix/bugfix.js b/addons/mail_bot/static/src/bugfix/bugfix.js
deleted file mode 100644
index 676db9d9214..00000000000
--- a/addons/mail_bot/static/src/bugfix/bugfix.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/** @odoo-module **/
-
-/**
- * This file allows introducing new JS modules without contaminating other files.
- * This is useful when bug fixing requires adding such JS modules in stable
- * versions of Odoo. Any module that is defined in this file should be isolated
- * in its own file in master.
- */
diff --git a/addons/mail_bot/static/src/bugfix/bugfix.scss b/addons/mail_bot/static/src/bugfix/bugfix.scss
deleted file mode 100644
index c4272e527b4..00000000000
--- a/addons/mail_bot/static/src/bugfix/bugfix.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
-* This file allows introducing new styles without contaminating other files.
-* This is useful when bug fixing requires adding new components for instance in
-* stable versions of Odoo. Any style that is defined in this file should be isolated
-* in its own file in master.
-*/
diff --git a/addons/mail_bot/static/src/bugfix/bugfix.xml b/addons/mail_bot/static/src/bugfix/bugfix.xml
deleted file mode 100644
index c17906f75bb..00000000000
--- a/addons/mail_bot/static/src/bugfix/bugfix.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-<!--
-    This file allows introducing new static templates without contaminating other files.
-    This is useful when bug fixing requires adding new components for instance in stable
-    versions of Odoo. Any template that is defined in this file should be isolated
-    in its own file in master.
--->
-
-</templates>
diff --git a/addons/mail_bot/static/src/bugfix/bugfix_tests.js b/addons/mail_bot/static/src/bugfix/bugfix_tests.js
deleted file mode 100644
index 613e777b6cb..00000000000
--- a/addons/mail_bot/static/src/bugfix/bugfix_tests.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/** @odoo-module **/
-
-/**
- * This file allows introducing new QUnit test modules without contaminating
- * other test files. This is useful when bug fixing requires adding new
- * components for instance in stable versions of Odoo. Any test that is defined
- * in this file should be isolated in its own file in master.
- */
-QUnit.module('mail_bot', {}, function () {
-QUnit.module('bugfix', {}, function () {
-QUnit.module('bugfix_tests.js', {
-
-});
-});
-});
diff --git a/addons/sms/__manifest__.py b/addons/sms/__manifest__.py
index 0bac9334468..72db7d68655 100644
--- a/addons/sms/__manifest__.py
+++ b/addons/sms/__manifest__.py
@@ -43,20 +43,16 @@ The service is provided by the In App Purchase Odoo platform.
         '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/static/src/bugfix/bugfix.js b/addons/sms/static/src/bugfix/bugfix.js
deleted file mode 100644
index ee604b8b695..00000000000
--- a/addons/sms/static/src/bugfix/bugfix.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * This file allows introducing new JS modules without contaminating other files.
- * This is useful when bug fixing requires adding such JS modules in stable
- * versions of Odoo. Any module that is defined in this file should be isolated
- * in its own file in master.
- */
-odoo.define('sms/static/src/bugfix/bugfix.js', function (require) {
-'use strict';
-
-});
diff --git a/addons/sms/static/src/bugfix/bugfix.scss b/addons/sms/static/src/bugfix/bugfix.scss
deleted file mode 100644
index c4272e527b4..00000000000
--- a/addons/sms/static/src/bugfix/bugfix.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
-* This file allows introducing new styles without contaminating other files.
-* This is useful when bug fixing requires adding new components for instance in
-* stable versions of Odoo. Any style that is defined in this file should be isolated
-* in its own file in master.
-*/
diff --git a/addons/sms/static/src/bugfix/bugfix.xml b/addons/sms/static/src/bugfix/bugfix.xml
deleted file mode 100644
index c17906f75bb..00000000000
--- a/addons/sms/static/src/bugfix/bugfix.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-<!--
-    This file allows introducing new static templates without contaminating other files.
-    This is useful when bug fixing requires adding new components for instance in stable
-    versions of Odoo. Any template that is defined in this file should be isolated
-    in its own file in master.
--->
-
-</templates>
diff --git a/addons/sms/static/src/bugfix/bugfix_tests.js b/addons/sms/static/src/bugfix/bugfix_tests.js
deleted file mode 100644
index 938426c6c60..00000000000
--- a/addons/sms/static/src/bugfix/bugfix_tests.js
+++ /dev/null
@@ -1,18 +0,0 @@
-odoo.define('sms/static/src/bugfix/bugfix_tests.js', function (require) {
-'use strict';
-
-/**
- * This file allows introducing new QUnit test modules without contaminating
- * other test files. This is useful when bug fixing requires adding new
- * components for instance in stable versions of Odoo. Any test that is defined
- * in this file should be isolated in its own file in master.
- */
-QUnit.module('sms', {}, function () {
-QUnit.module('bugfix', {}, function () {
-QUnit.module('bugfix_tests.js', {
-
-});
-});
-});
-
-});
diff --git a/addons/snailmail/__manifest__.py b/addons/snailmail/__manifest__.py
index aa1949df840..f5bd935edc7 100644
--- a/addons/snailmail/__manifest__.py
+++ b/addons/snailmail/__manifest__.py
@@ -30,7 +30,6 @@ Allows users to send documents by post
             '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',
@@ -38,19 +37,16 @@ Allows users to send documents by post
             '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',
diff --git a/addons/snailmail/static/src/bugfix/bugfix.js b/addons/snailmail/static/src/bugfix/bugfix.js
deleted file mode 100644
index a375f40fd3c..00000000000
--- a/addons/snailmail/static/src/bugfix/bugfix.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * This file allows introducing new JS modules without contaminating other files.
- * This is useful when bug fixing requires adding such JS modules in stable
- * versions of Odoo. Any module that is defined in this file should be isolated
- * in its own file in master.
- */
-odoo.define('snailmail/static/src/bugfix/bugfix.js', function (require) {
-'use strict';
-
-});
diff --git a/addons/snailmail/static/src/bugfix/bugfix.scss b/addons/snailmail/static/src/bugfix/bugfix.scss
deleted file mode 100644
index c4272e527b4..00000000000
--- a/addons/snailmail/static/src/bugfix/bugfix.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
-* This file allows introducing new styles without contaminating other files.
-* This is useful when bug fixing requires adding new components for instance in
-* stable versions of Odoo. Any style that is defined in this file should be isolated
-* in its own file in master.
-*/
diff --git a/addons/snailmail/static/src/bugfix/bugfix.xml b/addons/snailmail/static/src/bugfix/bugfix.xml
deleted file mode 100644
index c17906f75bb..00000000000
--- a/addons/snailmail/static/src/bugfix/bugfix.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-<!--
-    This file allows introducing new static templates without contaminating other files.
-    This is useful when bug fixing requires adding new components for instance in stable
-    versions of Odoo. Any template that is defined in this file should be isolated
-    in its own file in master.
--->
-
-</templates>
diff --git a/addons/snailmail/static/src/bugfix/bugfix_tests.js b/addons/snailmail/static/src/bugfix/bugfix_tests.js
deleted file mode 100644
index beffb29b463..00000000000
--- a/addons/snailmail/static/src/bugfix/bugfix_tests.js
+++ /dev/null
@@ -1,18 +0,0 @@
-odoo.define('snailmail/static/src/bugfix/bugfix_tests.js', function (require) {
-'use strict';
-
-/**
- * This file allows introducing new QUnit test modules without contaminating
- * other test files. This is useful when bug fixing requires adding new
- * components for instance in stable versions of Odoo. Any test that is defined
- * in this file should be isolated in its own file in master.
- */
-QUnit.module('snailmail', {}, function () {
-QUnit.module('bugfix', {}, function () {
-QUnit.module('bugfix_tests.js', {
-
-});
-});
-});
-
-});
diff --git a/addons/website_livechat/__manifest__.py b/addons/website_livechat/__manifest__.py
index 69bf27c2bce..5029de3fae0 100644
--- a/addons/website_livechat/__manifest__.py
+++ b/addons/website_livechat/__manifest__.py
@@ -23,38 +23,32 @@ Allow website visitors to chat with the collaborators. This module also brings a
     '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_livechat/static/src/legacy/public_livechat.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/static/src/bugfix/bugfix.js b/addons/website_livechat/static/src/bugfix/bugfix.js
deleted file mode 100644
index b2f0f5e8231..00000000000
--- a/addons/website_livechat/static/src/bugfix/bugfix.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * This file allows introducing new JS modules without contaminating other files.
- * This is useful when bug fixing requires adding such JS modules in stable
- * versions of Odoo. Any module that is defined in this file should be isolated
- * in its own file in master.
- */
-odoo.define('website_livechat/static/src/bugfix/bugfix.js', function (require) {
-'use strict';
-
-});
diff --git a/addons/website_livechat/static/src/bugfix/bugfix.scss b/addons/website_livechat/static/src/bugfix/bugfix.scss
deleted file mode 100644
index c4272e527b4..00000000000
--- a/addons/website_livechat/static/src/bugfix/bugfix.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
-* This file allows introducing new styles without contaminating other files.
-* This is useful when bug fixing requires adding new components for instance in
-* stable versions of Odoo. Any style that is defined in this file should be isolated
-* in its own file in master.
-*/
diff --git a/addons/website_livechat/static/src/bugfix/bugfix.xml b/addons/website_livechat/static/src/bugfix/bugfix.xml
deleted file mode 100644
index c17906f75bb..00000000000
--- a/addons/website_livechat/static/src/bugfix/bugfix.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-<!--
-    This file allows introducing new static templates without contaminating other files.
-    This is useful when bug fixing requires adding new components for instance in stable
-    versions of Odoo. Any template that is defined in this file should be isolated
-    in its own file in master.
--->
-
-</templates>
diff --git a/addons/website_livechat/static/src/bugfix/bugfix_tests.js b/addons/website_livechat/static/src/bugfix/bugfix_tests.js
deleted file mode 100644
index 24179c314ed..00000000000
--- a/addons/website_livechat/static/src/bugfix/bugfix_tests.js
+++ /dev/null
@@ -1,18 +0,0 @@
-odoo.define('website_livechat/static/src/bugfix/bugfix_tests.js', function (require) {
-'use strict';
-
-/**
- * This file allows introducing new QUnit test modules without contaminating
- * other test files. This is useful when bug fixing requires adding new
- * components for instance in stable versions of Odoo. Any test that is defined
- * in this file should be isolated in its own file in master.
- */
-QUnit.module('website_livechat', {}, function () {
-QUnit.module('bugfix', {}, function () {
-QUnit.module('bugfix_tests.js', {
-
-});
-});
-});
-
-});
diff --git a/addons/website_livechat/static/src/bugfix/public_bugfix.js b/addons/website_livechat/static/src/bugfix/public_bugfix.js
deleted file mode 100644
index b2f0f5e8231..00000000000
--- a/addons/website_livechat/static/src/bugfix/public_bugfix.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * This file allows introducing new JS modules without contaminating other files.
- * This is useful when bug fixing requires adding such JS modules in stable
- * versions of Odoo. Any module that is defined in this file should be isolated
- * in its own file in master.
- */
-odoo.define('website_livechat/static/src/bugfix/bugfix.js', function (require) {
-'use strict';
-
-});
diff --git a/addons/website_livechat/static/src/bugfix/public_bugfix.scss b/addons/website_livechat/static/src/bugfix/public_bugfix.scss
deleted file mode 100644
index fff015c21de..00000000000
--- a/addons/website_livechat/static/src/bugfix/public_bugfix.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
-* This file allows introducing new styles without contaminating other files.
-* This is useful when bug fixing requires adding new components for instance in
-* stable versions of Odoo. Any style that is defined in this file should be isolated
-* in its own file in master.
-*/
-
-.editor_has_snippets {
-    .o_livechat_button, .o_thread_window {
-        // TODO add this in an edit-mode only file in master (in 14.0 that asset
-        // would be website.assets_wysiwyg...)
-        right: $o-we-sidebar-width !important;
-    }
-}
diff --git a/addons/website_livechat/static/src/bugfix/public_bugfix.xml b/addons/website_livechat/static/src/bugfix/public_bugfix.xml
deleted file mode 100644
index c17906f75bb..00000000000
--- a/addons/website_livechat/static/src/bugfix/public_bugfix.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-<!--
-    This file allows introducing new static templates without contaminating other files.
-    This is useful when bug fixing requires adding new components for instance in stable
-    versions of Odoo. Any template that is defined in this file should be isolated
-    in its own file in master.
--->
-
-</templates>
diff --git a/addons/website_livechat/static/src/legacy/public_livechat.scss b/addons/website_livechat/static/src/legacy/public_livechat.scss
new file mode 100644
index 00000000000..e89d968f454
--- /dev/null
+++ b/addons/website_livechat/static/src/legacy/public_livechat.scss
@@ -0,0 +1,7 @@
+.editor_has_snippets {
+    .o_livechat_button, .o_thread_window {
+        // TODO add this in an edit-mode only file in master (in 14.0 that asset
+        // would be website.assets_wysiwyg...)
+        right: $o-we-sidebar-width !important;
+    }
+}