diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index b8b9234a60b..eb353023cff 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -88,8 +88,8 @@
                 </t>
             </t>
 
-            <t t-call-assets="web.assets_common"/>
-            <t t-call-assets="website.assets_frontend"/>
+            <t t-call-assets="web.assets_common" t-js="false"/>
+            <t t-call-assets="website.assets_frontend" t-js="false"/>
 
             <t t-raw="head or ''" name='layout_head'/>
             <t t-if="website and website.google_analytics_key">
@@ -150,6 +150,9 @@
                     </div>
                 </footer>
             </div>
+
+            <t t-call-assets="web.assets_common" t-css="false"/>
+            <t t-call-assets="website.assets_frontend" t-css="false"/>
         </body>
     </html>
 </template>
@@ -177,8 +180,11 @@
 </template>
 
 <template id="editor_head" inherit_id="website.layout" name="Editor" groups="base.group_website_publisher,base.group_website_designer">
-    <xpath expr='//t[@t-call-assets="website.assets_frontend"]' position="after">
-        <t t-call-assets="website.assets_editor"/>
+    <xpath expr='//t[@t-call-assets="website.assets_frontend"][@t-js]' position="after">
+        <t t-call-assets="website.assets_editor" t-js="false"/>
+    </xpath>
+    <xpath expr='//t[@t-call-assets="website.assets_frontend"][@t-css]' position="after">
+        <t t-call-assets="website.assets_editor" t-css="false"/>
     </xpath>
 </template>
 
diff --git a/addons/website_instantclick/views/website_instantclick.xml b/addons/website_instantclick/views/website_instantclick.xml
index 3674cea1953..c2f6245582f 100644
--- a/addons/website_instantclick/views/website_instantclick.xml
+++ b/addons/website_instantclick/views/website_instantclick.xml
@@ -9,7 +9,7 @@
         </template>
 
         <template id="instant_click_init" inherit_id="website.layout" name="Instant Click Init" groups="base.group_public">
-            <xpath expr="//div[@id='wrapwrap']" position="after">
+            <xpath expr="//body" position="inside">
                 <script data-no-instant="">
                     InstantClick.init();
                 </script>
diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml
index 75aeaea9d55..63f0d334327 100644
--- a/addons/website_livechat/views/website_livechat.xml
+++ b/addons/website_livechat/views/website_livechat.xml
@@ -3,7 +3,7 @@
     <data>
 
 <template id="header" inherit_id="website.layout" name="LiveChat Import (internal) Scripts">
-    <xpath expr="//head" position="inside">
+    <xpath expr="//body" position="inside">
         <t t-if="website and website.channel_id">
             <t t-raw="website.channel_id.script_internal"/>
         </t>