diff --git a/addons/im_livechat/views/im_livechat_channel_templates.xml b/addons/im_livechat/views/im_livechat_channel_templates.xml
index f47a5c0a591..a736c33d3f0 100644
--- a/addons/im_livechat/views/im_livechat_channel_templates.xml
+++ b/addons/im_livechat/views/im_livechat_channel_templates.xml
@@ -166,14 +166,14 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js b/addons/mail/static/src/js/models/threads/mixins/thread_typing_mixin.js
similarity index 100%
rename from addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js
rename to addons/mail/static/src/js/models/threads/mixins/thread_typing_mixin.js
diff --git a/addons/mail/static/src/js/models/threads/thread_typing_mixin/cc_throttle_function.js b/addons/mail/static/src/js/models/utils/cc_throttle_function.js
similarity index 100%
rename from addons/mail/static/src/js/models/threads/thread_typing_mixin/cc_throttle_function.js
rename to addons/mail/static/src/js/models/utils/cc_throttle_function.js
diff --git a/addons/mail/static/src/js/models/threads/thread_typing_mixin/timer.js b/addons/mail/static/src/js/models/utils/timer.js
similarity index 100%
rename from addons/mail/static/src/js/models/threads/thread_typing_mixin/timer.js
rename to addons/mail/static/src/js/models/utils/timer.js
diff --git a/addons/mail/static/src/js/models/threads/thread_typing_mixin/timers.js b/addons/mail/static/src/js/models/utils/timers.js
similarity index 100%
rename from addons/mail/static/src/js/models/threads/thread_typing_mixin/timers.js
rename to addons/mail/static/src/js/models/utils/timers.js
diff --git a/addons/mail/views/mail_templates.xml b/addons/mail/views/mail_templates.xml
index efe7657e192..b9fe174e470 100644
--- a/addons/mail/views/mail_templates.xml
+++ b/addons/mail/views/mail_templates.xml
@@ -35,11 +35,10 @@
-
-
-
-
-
+
+
+
+
diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml
index a76f5503029..e5f429fc806 100644
--- a/addons/website_livechat/views/website_livechat.xml
+++ b/addons/website_livechat/views/website_livechat.xml
@@ -24,14 +24,14 @@
-
-
-
-
-
+
+
+
+
+