diff --git a/addons/report/views/layouts.xml b/addons/report/views/layouts.xml
index 4f5104c726b..685f5b054f9 100644
--- a/addons/report/views/layouts.xml
+++ b/addons/report/views/layouts.xml
@@ -38,11 +38,6 @@
             <script type="text/javascript" src="/web/static/lib/underscore.string/lib/underscore.string.js"></script>
             <script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
             <script type="text/javascript" src="/web/static/lib/bootstrap/js/bootstrap.js"></script>
-            <script type="text/javascript">
-                // Bootstrap and jQuery UI conflicts
-                $.fn.bstooltip = $.fn.tooltip;
-                $.fn.bsbutton = $.fn.button;
-            </script>
             <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
             <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
             <script type="text/javascript" src="/website/static/src/js/website.js"></script>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index f9ae4f9be31..d28641ef918 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -10,19 +10,10 @@
     <link id="bootstrap_css" rel='stylesheet' href='/web/static/lib/bootstrap/css/bootstrap.css' t-ignore="true"/>
     <link id="website_css" rel='stylesheet' href='/website/static/src/css/website.css' t-ignore="true"/>
 </template>
-<template id="assets" name="Website assets">
-    <t t-call="website.theme"/>
 
-    <script type="text/javascript" src="/web/static/lib/es5-shim/es5-shim.min.js"></script>
-    <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/jquery/jquery.js"></script>
-    <script type="text/javascript" src="/web/static/lib/jquery.form/jquery.form.js"></script>
-    <script type="text/javascript">
-        // Bootstrap and jQuery UI conflicts
-        $.fn.bstooltip = $.fn.tooltip;
-        $.fn.bsbutton = $.fn.button;
-    </script>
+<template id="assets" name="Website assets">
+    <t t-call="web.assets_common"/>
+    <t t-call="website.theme"/>
 
     <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
     <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
@@ -257,10 +248,10 @@
         </div>
     </xpath>
     <xpath expr='//t[@t-call-assets="website.assets"]' position="after">
-        <t t-call-assets="website.editor_assets"/>
+        <t t-call-assets="website.assets_editor"/>
     </xpath>
 </template>
-<template id="editor_assets" name="Editor assets">
+<template id="assets_editor" name="Editor assets">
     <script type="text/javascript">
         var CKEDITOR_BASEPATH = '/web/static/lib/ckeditor/';
     </script>
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 2c6c2dd8bab..9c70282d007 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-<template id="editor_assets" inherit_id="website.editor_assets" name="Blog Editor" groups="base.group_document_user">
+<template id="assets_editor" inherit_id="website.assets_editor" name="Blog Editor" groups="base.group_document_user">
     <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/website.tour.blog.js"></script>
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index f5cb15f288b..81c31e20f78 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-<template id="editor_head" inherit_id="website.editor_assets" name="Event Editor" groups="event.group_event_manager">
+<template id="editor_head" inherit_id="website.assets_editor" name="Event Editor" groups="event.group_event_manager">
     <xpath expr="." position="inside">
         <script type="text/javascript" src="/website_event/static/src/js/website_event.editor.js"></script>
         <script type="text/javascript" src="/website_event/static/src/js/website.tour.event.js"></script>
diff --git a/addons/website_gengo/views/website_gengo.xml b/addons/website_gengo/views/website_gengo.xml
index 78f64a9d47e..55f3c82cc4f 100644
--- a/addons/website_gengo/views/website_gengo.xml
+++ b/addons/website_gengo/views/website_gengo.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-<template id="gengo_editor_assets" inherit_id="website.editor_assets" name="Editor Head" groups="base.group_website_publisher">
+<template id="gengo_assets_editor" inherit_id="website.assets_editor" name="Editor Head" groups="base.group_website_publisher">
     <xpath expr='//script[@src="/website/static/src/js/website.translator.js"]' position="after">
         <link rel="stylesheet" href="/website_gengo/static/src/css/website_gengo.css"></link>
         <script t-if="translatable" type="text/javascript" src="/website_gengo/static/src/js/website_gengo.js"></script>
diff --git a/addons/website_hr_recruitment/views/templates.xml b/addons/website_hr_recruitment/views/templates.xml
index ac00876a85e..6255b188a40 100644
--- a/addons/website_hr_recruitment/views/templates.xml
+++ b/addons/website_hr_recruitment/views/templates.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-<template id="editor_assets" inherit_id="website.editor_assets" name="Jobs Editor" groups="base.group_hr_manager">
+<template id="assets_editor" inherit_id="website.assets_editor" name="Jobs Editor" groups="base.group_hr_manager">
     <xpath expr="." position="inside">
         <script type="text/javascript" src="/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js"></script>
     </xpath>
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 60bbf520450..681ca95e35d 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -25,7 +25,7 @@
         <link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/>
     </xpath>
 </template>
-<template id="editor" inherit_id="website.editor_assets" name="Mail snippet">
+<template id="editor" inherit_id="website.assets_editor" name="Mail snippet">
     <xpath expr="/t" position="inside">
         <script t-if="not translatable" type="text/javascript" src="/website_mail/static/src/js/website_mail.editor.js" groups="base.group_website_publisher"></script>
     </xpath>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index de854f5d533..3c3dac7421b 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -10,7 +10,7 @@
     </xpath>
 </template>
 
-<template id="editor_assets" inherit_id="website.editor_assets" name="Shop Editor" groups="base.group_sale_manager">
+<template id="assets_editor" inherit_id="website.assets_editor" name="Shop Editor" groups="base.group_sale_manager">
   <xpath expr="." position="inside">
       <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.tour.shop.js"></script>
diff --git a/addons/website_twitter/views/twitter_snippet.xml b/addons/website_twitter/views/twitter_snippet.xml
index 6318381c80b..d9611dc19a7 100644
--- a/addons/website_twitter/views/twitter_snippet.xml
+++ b/addons/website_twitter/views/twitter_snippet.xml
@@ -28,7 +28,7 @@
             <script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.animation.js"/>
         </xpath>
     </template>
-    <template id="twitter_editor" inherit_id="website.editor_assets" name="Twitter options">
+    <template id="twitter_editor" inherit_id="website.assets_editor" name="Twitter options">
         <xpath expr="/t" position="inside">
             <script t-if="not translatable" type="text/javascript" src="/website_twitter/static/src/js/website.twitter.editor.js" groups="base.group_website_publisher"/>
         </xpath>