diff --git a/addons/portal/static/src/scss/portal.scss b/addons/portal/static/src/scss/portal.scss
index 9eeb6a538b5..ea68b013d8a 100644
--- a/addons/portal/static/src/scss/portal.scss
+++ b/addons/portal/static/src/scss/portal.scss
@@ -61,18 +61,6 @@ ul.nav-stacked > li > a {
 
 footer {
     background-color: #F8F8F8;
-
-    #footer {
-        padding-top: 32px;
-
-        // TODO This solves a bug that should be solved differently when
-        // possible. When automatic footer option is enabled, <ul/> become non
-        // editable because of <xpath/>. So adding a link does not duplicate the
-        // <li/> elements but the <a/> elements.
-        ul.list-unstyled > li > a {
-            display: block;
-        }
-    }
 }
 
 // Odoo options classes
diff --git a/addons/website/static/src/js/tours/banner.js b/addons/website/static/src/js/tours/banner.js
index c7251da418c..a0926a721f3 100644
--- a/addons/website/static/src/js/tours/banner.js
+++ b/addons/website/static/src/js/tours/banner.js
@@ -19,7 +19,7 @@ tour.register("banner", {
     trigger: "#snippet_structure .oe_snippet:eq(1) .oe_snippet_thumbnail",
     content: _t("Drag the <i>Cover</i> block and drop it in your page."),
     position: "bottom",
-    run: "drag_and_drop",
+    run: "drag_and_drop #wrap",
 }, {
     trigger: "#wrapwrap .s_text_block_image_fw h2",
     content: _t("<b>Click on a text</b> to start editing it. <i>It's that easy to edit your content!</i>"),
@@ -35,7 +35,7 @@ tour.register("banner", {
     trigger: "#snippet_structure .oe_snippet:eq(3) .oe_snippet_thumbnail",
     content: _t("Drag another block in your page, below the cover."),
     position: "bottom",
-    run: "drag_and_drop",
+    run: "drag_and_drop #wrap",
 }, {
     trigger: "button[data-action=save]",
     extra_trigger: ".oe_overlay_options .oe_options",
diff --git a/addons/website/static/src/js/tours/rte.js b/addons/website/static/src/js/tours/rte.js
index 47402c016c8..fb2a0cacea1 100644
--- a/addons/website/static/src/js/tours/rte.js
+++ b/addons/website/static/src/js/tours/rte.js
@@ -18,11 +18,14 @@ tour.register('rte_translator', {
     content: "load french",
     trigger: '.modal-footer button:first',
     extra_trigger: '.modal select[name="lang"]:propValueContains(fr_BE)',
+}, {
+    content : "click language dropdown",
+    trigger : '.js_language_selector .dropdown-toggle',
+    timeout: 60000,
 }, {
     content: "go to english version",
     trigger: '.js_language_selector a[data-lang="en_US"]',
     extra_trigger: 'html[lang*="fr"]',
-    timeout: 60000,
 }, {
     content: "Open new page menu",
     trigger: '#new-content-menu > a',
@@ -41,7 +44,7 @@ tour.register('rte_translator', {
 }, {
     content: "drop a snippet",
     trigger: "#snippet_structure .oe_snippet:eq(1) .oe_snippet_thumbnail",
-    run: 'drag_and_drop',
+    run: 'drag_and_drop #wrap',
 }, {
     content: "change content",
     trigger: '.oe_overlay_options .oe_options:visible',
@@ -56,6 +59,10 @@ tour.register('rte_translator', {
     content: "save",
     trigger: 'button[data-action=save]',
     extra_trigger: '#wrap p:first b',
+
+}, {
+    content : "click language dropdown",
+    trigger : '.js_language_selector .dropdown-toggle',
 }, {
     content: "click on french version",
     trigger: '.js_language_selector a[data-lang="fr_BE"]',
@@ -112,6 +119,11 @@ tour.register('rte_translator', {
     content: "check: placeholder translation",
     trigger: 'input[placeholder="test french placeholder"]',
     run: function () {}, // it's a check
+
+}, {
+    content : "click language dropdown",
+    trigger : '.js_language_selector .dropdown-toggle',
+
 }, {
     content: "return to english version",
     trigger: '.js_language_selector a[data-lang="en_US"]',
@@ -139,6 +151,11 @@ tour.register('rte_translator', {
     content: "save new change",
     trigger: 'button[data-action=save]',
     extra_trigger: '#wrap p u',
+
+    }, {
+    content : "click language dropdown",
+    trigger : '.js_language_selector .dropdown-toggle',
+
 }, {
     content: "return in french",
     trigger: 'html[lang="en-US"] .js_language_selector a[data-lang="fr_BE"]',
diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss
index aa267460bc2..37f979f7e34 100644
--- a/addons/website/static/src/scss/website.scss
+++ b/addons/website/static/src/scss/website.scss
@@ -540,3 +540,19 @@ div.carousel {
         }
     }
 }
+
+// COPYRIGHT
+.o_footer_copyright {
+    padding: 8px;
+    .js_language_selector {
+        display: inline-block;
+    }
+    @media (min-width: $screen-sm-min) {
+        .row {
+            @include o-flex-display;
+            > div {
+                margin: auto 0;
+            }
+        }
+    }
+}
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index a0d404be395..512ab161712 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -210,18 +210,27 @@
 
 <template id="layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright">
     <xpath expr="//footer" position="inside">
-        <div class="container mt16 mb8">
-            <div class="pull-right" t-ignore="true" t-if="not editable">
-                Create a <a target="_blank" href="http://www.odoo.com/page/website-builder">free website</a> with
-                <a target="_blank" class="label label-danger" href="http://www.odoo.com/page/website-builder">Odoo</a>
-            </div>
-            <div class="pull-left text-muted" itemscope="itemscope" itemtype="http://schema.org/Organization">
-                Copyright &amp;copy; <span t-field="res_company.name" itemprop="name">Company name</span>
+        <div class="container o_footer_copyright">
+            <div class="row">
+                <div class="col-md-6 text-muted text-center-xs">
+                    <span>Copyright &amp;copy;</span> <span t-field="res_company.name" itemprop="name">Company name</span>
+                    <t t-call="website.language_selector"/>
+                </div>
+                <div class="col-md-6 text-right o_not_editable" t-if="not editable">
+                    <t t-call="website.brand_promotion"/>
+                </div>
             </div>
         </div>
     </xpath>
 </template>
 
+<template id="brand_promotion" name="Brand Promotion">
+    <div class="o_brand_promotion">
+        Create a <a target="_blank" href="http://www.odoo.com/page/website-builder">free website</a> with
+        <a target="_blank" class="label label-danger" href="http://www.odoo.com/page/website-builder">Odoo</a>
+    </div>
+</template>
+
 <template id="layout_logo_show" inherit_id="website.layout" customize_show="True" name="Show Logo">
     <xpath expr="//header//a[hasclass('navbar-brand')]" position="replace">
         <a href="/" class="navbar-brand logo">
@@ -257,26 +266,45 @@
 
 <template id="footer_custom" inherit_id="website.layout" name="Footer">
     <xpath expr="//div[@id='footer']" position="replace">
-        <div class="oe_structure" id="footer" t-if='not no_footer'>
-            <section>
+        <div id="footer" class="oe_structure" t-ignore="true" t-if="not no_footer">
+            <section class="s_text_block pt16 pb8">
                 <div class="container">
                     <div class="row">
                         <div class="col-md-4">
-                            <h4 class="mt16">Subtitle</h4>
-                            <p>
-                                <a href="/">Homepage</a>
-                            </p>
+                            <h4>Our Products &amp; Services</h4>
+                            <ul class="list-unstyled">
+                                <li><a href="/">Home</a></li>
+                            </ul>
                         </div>
                         <div class="col-md-4">
-                            <h4 class="mt16">Subtitle 2</h4>
-                            <p>
-                                ...
-                            </p>
+                            <h4>Connect with us</h4>
+                            <ul class="list-unstyled">
+                                <li><a href="/contactus">Contact us</a></li>
+                                <li><i class="fa fa-phone"/> <span t-field="res_company.phone"/></li>
+                                <li><i class="fa fa-envelope"/>  <span t-field="res_company.email"/></li>
+                            </ul>
+                            <div class="btn-group">
+                                <a t-if="website.social_facebook" t-att-href="website.social_facebook" class="btn btn-xs btn-link"><i class="fa fa-2x fa-facebook-square"/></a>
+                                <a t-if="website.social_twitter" t-att-href="website.social_twitter" class="btn btn-xs btn-link"><i class="fa fa-2x fa-twitter"/></a>
+                                <a t-if="website.social_linkedin" t-att-href="website.social_linkedin" class="btn btn-xs btn-link"><i class="fa fa-2x fa-linkedin"/></a>
+                                <a t-if="website.social_youtube" t-att-href="website.social_youtube" class="btn btn-xs btn-link"><i class="fa fa-2x fa-youtube-play"/></a>
+                                <a t-if="website.social_googleplus" t-att-href="website.social_googleplus" class="btn btn-xs btn-link" rel="publisher"><i class="fa fa-2x fa-google-plus-square"/></a>
+                                <a t-if="website.social_github" t-att-href="website.social_github" class="btn btn-xs btn-link"><i class="fa fa-2x fa-github"/></a>
+                            </div>
                         </div>
                         <div class="col-md-4">
-                            <h4 class="mt16">Subtitle 3</h4>
+                            <h4>
+                                <span t-field="res_company.name"/>
+                                <small> - <a href="/aboutus">About us</a></small>
+                            </h4>
                             <p>
-                                ...
+                                We are a team of passionate people whose goal is to improve everyone's
+                                life through disruptive products. We build great products to solve your
+                                business problems.
+                            </p>
+                            <p>
+                                Our products are designed for small to medium size companies willing to optimize
+                                their performance.
                             </p>
                         </div>
                     </div>
@@ -287,16 +315,23 @@
 </template>
 
 <template id="language_selector">
-    <ul class="list-inline js_language_selector mt16" t-if="(request and request.is_frontend_multilang and len(languages) &gt; 1) or (website and (editable or translatable))">
-        <li t-foreach="languages" t-as="lg">
-          <a
-            t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=lg[0])"
-            t-att-data-default-lang="(editable or translatable) and 'true' if website and lg[0] == website.default_lang_code else None"
-            t-att-data-lang="lg[0]"
-            class="js_change_lang"
-          >
-            <t t-esc="lg[1].split('/').pop()"/>
-          </a>
+    <ul class="js_language_selector mb0 list-inline" t-if="(request and request.is_frontend_multilang and len(languages) &gt; 1) or (website and (editable or translatable))">
+        <li>
+            <div class="dropup">
+                <button class="btn btn-sm btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                    <span t-esc="list(filter(lambda lg : lg[0] == lang, languages))[0][1].split('/').pop()"/>
+                    <span class="caret ml4"/>
+                </button>
+                <ul class="dropdown-menu" role="menu">
+                    <li t-foreach="languages" t-as="lg">
+                        <a t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=lg[0])"
+                           t-att-data-default-lang="(editable or translatable) and 'true' if website and lg[0] == website.default_lang_code else None"
+                           t-att-data-lang="lg[0]" class="js_change_lang">
+                            <t t-esc="lg[1].split('/').pop()"/>
+                        </a>
+                    </li>
+                </ul>
+            </div>
         </li>
         <li groups="website.group_website_publisher">
             <t t-set="url_return" t-value="url_for('', '[lang]') + '?' + keep_query()"/>
@@ -308,57 +343,6 @@
     </ul>
 </template>
 
-<template id="footer_default" inherit_id="website.footer_custom" customize_show="True" name="Automatic Footer">
-    <xpath expr="//div[@id='footer']" position="replace" >
-        <div id="footer" class="container hidden-print" t-if='not no_footer'>
-            <div class="row">
-                <div class="col-md-4 col-lg-3">
-                    <h4>Our Products &amp; Services</h4>
-                    <ul class="list-unstyled" id="products">
-                        <li><a href="/">Home</a></li>
-                    </ul>
-                </div>
-                <div class="col-md-4  col-lg-3" id="info">
-                    <h4>Connect with us</h4>
-                    <ul class="list-unstyled">
-                        <li><a href="/contactus">Contact us</a></li>
-                    </ul>
-                    <ul class="list-unstyled">
-                        <li t-ignore="true"><i class="fa fa-phone"></i> <span t-field="res_company.phone"></span></li>
-                        <li t-ignore="true"><i class="fa fa-envelope"></i>  <span t-field="res_company.email"></span></li>
-                    </ul>
-                    <h2>
-                        <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="fa fa-facebook-square"/></a>
-                        <a t-att-href="website.social_twitter" t-if="website.social_twitter"><i class="fa fa-twitter"/></a>
-                        <a t-att-href="website.social_linkedin" t-if="website.social_linkedin"><i class="fa fa-linkedin"/></a>
-                        <a t-att-href="website.social_youtube" t-if="website.social_youtube"><i class="fa fa-youtube-play"/></a>
-                        <a t-att-href="website.social_googleplus" t-if="website.social_googleplus" rel="publisher"><i class="fa fa-google-plus-square"/></a>
-                        <a t-att-href="website.social_github" t-if="website.social_github"><i class="fa fa-github"/></a>
-                    </h2>
-                </div>
-                <div class="col-md-4 col-lg-5 col-lg-offset-1">
-                    <h4>
-                        <span t-field="res_company.name" />
-                        <small> - <a href="/aboutus">About us</a></small>
-                    </h4>
-                    <div>
-                        <p>
-                            We are a team of passionate people whose goal is to improve everyone's
-                            life through disruptive products. We build great products to solve your
-                            business problems.
-                        </p>
-                        <p>
-                            Our products are designed for small to medium size companies willing to optimize
-                            their performance.
-                        </p>
-                    </div>
-                    <t t-call="website.language_selector"/>
-                </div>
-            </div>
-        </div>
-    </xpath>
-</template>
-
 <!-- Util template -->
 <template id="publish_management">
     <div groups="website.group_website_publisher" t-ignore="true" class="pull-right css_editable_mode_hidden" t-att-style="style or None">
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 86e986578a4..02dfbc27fe2 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -17,13 +17,6 @@
     </xpath>
 </template>
 
-<!-- Layout add nav and footer -->
-<template id="header_footer_custom" inherit_id="website.footer_default" name="Footer News Blog Link">
-    <xpath expr="//div[@id='info']/ul" position="inside">
-        <li><a t-attf-href="/blog/%(website_blog.blog_blog_1)d">News</a></li>
-    </xpath>
-</template>
-
 <!-- Overview of all blog posts -->
 <template id="latest_blogs" name="Latest Blogs">
     <t t-call="website.layout">
diff --git a/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml b/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml
index 6944f68287c..55c39a6fd10 100644
--- a/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml
+++ b/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+    <data>
         <record model="crm.lead.tag" id="tag_portal_lead_partner_unavailable">
             <field name="name">No more partner available</field>
             <field name="color">3</field>
@@ -50,4 +51,15 @@ PS: It looks like you do not have an account manager assigned to you, please con
 % endif
             ]]></field>
         </record>
+    </data>
+
+    <data noupdate="1">
+        <record id="menu_resellers" model="website.menu">
+            <field name="name">Resellers</field>
+            <field name="url">/partners</field>
+            <field name="parent_id" ref="website.main_menu"/>
+            <field name="sequence">55</field>
+        </record>
+    </data>
+
 </odoo>
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 c07c7577e45..0e18e6cb866 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
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<!-- Layout add nav and footer -->
-<template id="footer_custom" inherit_id="website.footer_default" name="Footer Partners Link">
-    <xpath expr="//div[@id='info']/ul" position="inside">
-        <li><a href="/partners">Resellers</a></li>
-    </xpath>
-</template>
-
 <!-- Page -->
 <template id="layout" name="Partners Layout">
     <t t-call="website.layout">
diff --git a/addons/website_customer/__manifest__.py b/addons/website_customer/__manifest__.py
index d51129e12bb..2e1e0ea3e85 100644
--- a/addons/website_customer/__manifest__.py
+++ b/addons/website_customer/__manifest__.py
@@ -20,6 +20,7 @@ Odoo Customer References
         'data/res_partner_demo.xml',
     ],
     'data': [
+        'data/website_customer_data.xml',
         'views/website_customer_templates.xml',
         'views/res_partner_views.xml',
         'security/ir.model.access.csv',
diff --git a/addons/website_customer/data/website_customer_data.xml b/addons/website_customer/data/website_customer_data.xml
new file mode 100644
index 00000000000..46d3e781292
--- /dev/null
+++ b/addons/website_customer/data/website_customer_data.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <data noupdate="1">
+        <record id="menu_customers" model="website.menu">
+            <field name="name">References</field>
+            <field name="url">/customers</field>
+            <field name="parent_id" ref="website.main_menu"/>
+            <field name="sequence">55</field>
+        </record>
+    </data>
+
+</odoo>
diff --git a/addons/website_customer/views/website_customer_templates.xml b/addons/website_customer/views/website_customer_templates.xml
index 5674f3d3440..2f2f8463cff 100644
--- a/addons/website_customer/views/website_customer_templates.xml
+++ b/addons/website_customer/views/website_customer_templates.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<!-- Layout add nav and footer -->
-<template id="footer_custom" inherit_id="website.footer_default" name="Footer Customer References Link">
-    <xpath expr="//div[@id='info']/ul" position="inside">
-        <li><a href="/customers">Our References</a></li>
-    </xpath>
-</template>
-
 <template id="index" name="Our References">
     <t t-call="website.layout">
         <div id="wrap">
diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml
index cf813068e97..5d52cefc049 100644
--- a/addons/website_event/views/event_templates.xml
+++ b/addons/website_event/views/event_templates.xml
@@ -15,13 +15,6 @@
     </xpath>
 </template>
 
-<!-- Layout add nav and footer -->
-<template id="header_footer_custom" inherit_id="website.footer_default" name="Footer Events Link">
-    <xpath expr="//ul[@id='products']" position="inside">
-        <li><a href="/event">Events</a></li>
-    </xpath>
-</template>
-
 <!-- Page -->
 <template id="index" name="Events">
     <t t-call="website.layout">
@@ -713,18 +706,13 @@
     </t>
 </template>
 
-<template id="website.layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright">
-  <xpath expr="//footer" position="inside">
-      <div class="container mt16 mb8">
-          <div class="pull-right" t-ignore="true" t-if="not editable">
+<template id="website_event.brand_promotion" inherit_id="website.brand_promotion">
+    <xpath expr="//div[hasclass('o_brand_promotion')]" position="replace">
+        <div class="o_brand_promotion">
             Powered by <a target="_blank" class="label label-danger" href="http://www.odoo.com/page/website-builder">Odoo</a>.
             Try the <a target="_blank" href="http://www.odoo.com/page/website-builder">open source website builder</a>.
-          </div>
-          <div class="pull-left text-muted">
-              Copyright &amp;copy; <span t-field="res_company.name">Company name</span>
-          </div>
-      </div>
-  </xpath>
+        </div>
+    </xpath>
 </template>
 
 
diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml
index 4331e2f04a4..1e2007fcd96 100644
--- a/addons/website_forum/data/forum_data.xml
+++ b/addons/website_forum/data/forum_data.xml
@@ -5,9 +5,9 @@
             <field name="name">Help</field>
         </record>
 
-        <record id="menu_questions" model="website.menu">
-            <field name="name">Forum</field>
-            <field name="url" eval="'/forum/'+str(ref('website_forum.forum_help'))"/>
+        <record id="menu_website_forums" model="website.menu">
+            <field name="name">Forums</field>
+            <field name="url">/forum</field>
             <field name="parent_id" ref="website.main_menu"/>
             <field name="sequence" type="int">35</field>
         </record>
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 6998f6b2311..f10d2a39f79 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -21,15 +21,6 @@
     </xpath>
 </template>
 
-<!-- Layout add nav and footer -->
-<template id="header_footer_custom" inherit_id="website.footer_default"
-    name="Footer Questions Link">
-    <xpath expr="//ul[@id='products']" position="inside">
-        <li><a t-attf-href="/forum/%(website_forum.forum_help)d">Q&amp;amp;A</a></li>
-        <li><a href="/forum">Forums</a></li>
-    </xpath>
-</template>
-
 <!-- helper -->
 <template id="link_button">
     <form method="POST" t-att-action="url">
diff --git a/addons/website_forum_doc/data/doc_data.xml b/addons/website_forum_doc/data/doc_data.xml
index 14992afeccb..fc69525bb56 100644
--- a/addons/website_forum_doc/data/doc_data.xml
+++ b/addons/website_forum_doc/data/doc_data.xml
@@ -14,7 +14,7 @@
             <field name="name">Documentation</field>
             <field name="url" eval="'/forum/how-to'"/>
             <field name="parent_id" ref="website.main_menu"/>
-            <field name="sequence" type="int">65</field>
+            <field name="sequence">55</field>
         </record>
 
         <record id="base.open_menu" model="ir.actions.todo">
diff --git a/addons/website_forum_doc/views/website_doc.xml b/addons/website_forum_doc/views/website_doc.xml
index d4e4099d01c..07b2be462a6 100644
--- a/addons/website_forum_doc/views/website_doc.xml
+++ b/addons/website_forum_doc/views/website_doc.xml
@@ -8,14 +8,6 @@
             </xpath>
         </template>
 
-        <!-- Layout add nav and footer -->
-        <template id="header_footer_custom" inherit_id="website.footer_default"
-            name="Footer Documentation Link">
-            <xpath expr="//ul[@id='products']" position="inside">
-                <li><a href="/forum/how-to">Documentation</a></li>
-            </xpath>
-        </template>
-
         <!-- Page Index -->
         <template id="toc" name="Documentation Index">
             <t t-set="level" t-value="level+1"/>
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 87e471e6f4d..8d7eee806e4 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="job_footer_custom" inherit_id="website.footer_default" name="Footer Job Link">
-    <xpath expr="//div[@id='info']/ul" position="inside">
-    <li><a href="/jobs">Jobs</a></li>
-    </xpath>
-</template>
-
 <template id="index" name="Jobs">
     <t t-call="website.layout">
         <div id="wrap">
diff --git a/addons/website_livechat/data/website_livechat_data.xml b/addons/website_livechat/data/website_livechat_data.xml
index 850898308f9..42a52461863 100644
--- a/addons/website_livechat/data/website_livechat_data.xml
+++ b/addons/website_livechat/data/website_livechat_data.xml
@@ -11,5 +11,11 @@
              <field name="channel_id" ref="website_livechat.im_livechat_channel_data_website"></field>
          </record>
 
+         <record id="menu_livechat" model="website.menu">
+            <field name="name">Live Support</field>
+            <field name="url">/livechat</field>
+            <field name="parent_id" ref="website.main_menu"/>
+            <field name="sequence">55</field>
+        </record>
      </data>
 </odoo>
diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml
index 265b8741cd9..14b077078f5 100644
--- a/addons/website_livechat/views/website_livechat.xml
+++ b/addons/website_livechat/views/website_livechat.xml
@@ -30,13 +30,6 @@
             </xpath>
         </template>
 
-        <!-- Layout add footer -->
-        <template id="header_footer_custom" inherit_id="website.footer_default" name="Footer Rating Livechat Link">
-            <xpath expr="//ul[@id='products']" position="inside">
-                <li><a href="/livechat/">Livechat Support</a></li>
-            </xpath>
-        </template>
-
         <!-- Page Layout -->
         <template id="channel_page" name="Livechat Channel Satisfaction Page">
             <t t-call="website.layout">
diff --git a/addons/website_mail_channel/data/mail_template_data.xml b/addons/website_mail_channel/data/mail_template_data.xml
index 31c602f99a3..03b90d44c28 100644
--- a/addons/website_mail_channel/data/mail_template_data.xml
+++ b/addons/website_mail_channel/data/mail_template_data.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <data>
         <record id="mail_template_list_subscribe" model="mail.template">
             <field name="name">Subscribe to mailing list</field>
             <field name="model_id" ref="mail.model_mail_channel"/>
@@ -26,4 +27,15 @@
 <p>If this was a mistake or you did not requested this action, please ignore this message.</p>
 </field>
         </record>
+    </data>
+
+    <data noupdate="1">
+        <record id="menu_mailing_list" model="website.menu">
+            <field name="name">Mailing Lists</field>
+            <field name="url">/groups</field>
+            <field name="parent_id" ref="website.main_menu"/>
+            <field name="sequence">55</field>
+        </record>
+    </data>
+
 </odoo>
diff --git a/addons/website_mail_channel/views/website_mail_channel_templates.xml b/addons/website_mail_channel/views/website_mail_channel_templates.xml
index 541683b7e8a..4f47793876d 100644
--- a/addons/website_mail_channel/views/website_mail_channel_templates.xml
+++ b/addons/website_mail_channel/views/website_mail_channel_templates.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="footer_mailing_list" inherit_id="website.footer_default" name="Footer Mailing List Link">
-    <xpath expr="//div[@id='info']/ul" position="inside">
-        <li><a t-attf-href="/groups">Mailing List</a></li>
-    </xpath>
-</template>
-
 <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"/>
diff --git a/addons/website_membership/__manifest__.py b/addons/website_membership/__manifest__.py
index 9fc58ed9835..6bfbc76e35d 100644
--- a/addons/website_membership/__manifest__.py
+++ b/addons/website_membership/__manifest__.py
@@ -13,6 +13,7 @@ Website for browsing Associations, Groups and Memberships
 """,
     'depends': ['website_partner', 'website_google_map', 'association', 'website_sale'],
     'data': [
+        'data/membership_data.xml',
         'views/website_membership_templates.xml',
         'security/ir.model.access.csv',
         'security/website_membership.xml',
diff --git a/addons/website_membership/data/membership_data.xml b/addons/website_membership/data/membership_data.xml
new file mode 100644
index 00000000000..b542857e5ec
--- /dev/null
+++ b/addons/website_membership/data/membership_data.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+
+    <data noupdate="1">
+        <record id="menu_members" model="website.menu">
+            <field name="name">Members</field>
+            <field name="url">/members</field>
+            <field name="parent_id" ref="website.main_menu"/>
+            <field name="sequence">55</field>
+        </record>
+    </data>
+
+</odoo>
diff --git a/addons/website_membership/views/website_membership_templates.xml b/addons/website_membership/views/website_membership_templates.xml
index dec7a9fb9ba..1a0f868f25f 100644
--- a/addons/website_membership/views/website_membership_templates.xml
+++ b/addons/website_membership/views/website_membership_templates.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<!-- Layout add nav and footer -->
-<template id="footer_custom" inherit_id="website.footer_default" name="Footer Associations Link">
-    <xpath expr="//div[@id='info']/ul" position="inside">
-        <li><a href="/members">Members</a></li>
-    </xpath>
-</template>
-
 <template id="index" name="Members">
     <t t-call="website.layout">
         <t t-set="additional_title">Members</t>
diff --git a/addons/website_payment/__init__.py b/addons/website_payment/__init__.py
index dc5e6b693d1..67dee8c60db 100644
--- a/addons/website_payment/__init__.py
+++ b/addons/website_payment/__init__.py
@@ -1,4 +1,2 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from . import models
diff --git a/addons/website_payment/__manifest__.py b/addons/website_payment/__manifest__.py
index fce4212ca02..d569e2ea5d9 100644
--- a/addons/website_payment/__manifest__.py
+++ b/addons/website_payment/__manifest__.py
@@ -13,7 +13,6 @@
     ],
     'data': [
         'views/website_payment_view.xml',
-        'views/website_payment_templates.xml',
     ],
     'auto_install': False,
 }
diff --git a/addons/website_payment/models/__init__.py b/addons/website_payment/models/__init__.py
deleted file mode 100644
index bd190fa80b4..00000000000
--- a/addons/website_payment/models/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import website
diff --git a/addons/website_payment/models/website.py b/addons/website_payment/models/website.py
deleted file mode 100644
index ff2159f384d..00000000000
--- a/addons/website_payment/models/website.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import api, models
-
-
-class Website(models.Model):
-    _inherit = "website"
-
-    @api.model
-    def payment_icons(self):
-        """ This function returns the list of payment icons which are supported by payment acquirers that are published
-        """
-        return self.env['payment.icon'].sudo().search([('acquirer_ids.website_published', '=', True)])
diff --git a/addons/website_payment/views/website_payment_templates.xml b/addons/website_payment/views/website_payment_templates.xml
deleted file mode 100644
index f81ab5e6e50..00000000000
--- a/addons/website_payment/views/website_payment_templates.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="header_footer_custom_payment" inherit_id="website.footer_default" customize_show="True" active="False" name="Payment Icons">
-        <xpath expr="//div[@id='info']" position="inside">
-            <h4 class="payment_method_title">Payment Icons</h4>
-            <ul class="payment_method_list list-inline">
-                <t t-foreach="request.website.payment_icons()" t-as="icon">
-                    <li>
-                        <span t-field="icon.image" t-options='{"widget": "image", "alt-field": "name"}' />
-                    </li>
-                </t>
-            </ul>
-        </xpath>
-    </template>
-</odoo>
diff --git a/addons/website_quote/views/website_quote_templates.xml b/addons/website_quote/views/website_quote_templates.xml
index 8ce7b5fc04d..1c033d59867 100644
--- a/addons/website_quote/views/website_quote_templates.xml
+++ b/addons/website_quote/views/website_quote_templates.xml
@@ -671,16 +671,11 @@
         </t>
   </template>
 
-  <template id="website.layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright">
-      <xpath expr="//footer" position="inside">
-          <div class="container mt16 mb8">
-              <div class="pull-right" t-ignore="true" t-if="not editable">
-                  Powered by <a target="_blank" class="label label-danger" href="http://www.odoo.com/page/website-builder">Odoo</a>,
-                  an awesome <a target="_blank" href="http://www.odoo.com/page/crm">Open Source CRM</a>.
-              </div>
-              <div class="pull-left text-muted">
-                  Copyright &amp;copy; <span t-field="res_company.name">Company name</span>
-              </div>
+  <template id="website_quote.brand_promotion" inherit_id="website.brand_promotion">
+      <xpath expr="//div[hasclass('o_brand_promotion')]" position="replace">
+          <div class="o_brand_promotion">
+              Powered by <a target="_blank" class="label label-danger" href="http://www.odoo.com/page/website-builder">Odoo</a>,
+              an awesome <a target="_blank" href="http://www.odoo.com/page/crm">Open Source CRM</a>.
           </div>
       </xpath>
   </template>
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index f5adfd01b39..11735204384 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1591,15 +1591,11 @@
         </div>
     </template>
 
-    <template id="website.layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright">
-        <xpath expr="//footer" position="inside">
-            <div class="container mt16 mb8">
-                <div class="pull-right" t-ignore="true" t-if="not editable">
-                                                      Powered by <a target="_blank" class="label label-danger" href="http://www.odoo.com/page/website-builder">Odoo</a>,
-                                                      the #1 <a target="_blank" href="http://www.odoo.com/page/e-commerce">Open Source eCommerce</a>.
-                                                    </div>
-                <div class="pull-left text-muted">
-                                                      Copyright &amp;copy; <span t-field="res_company.name">Company name</span></div>
+    <template id="website_sale.brand_promotion" inherit_id="website.brand_promotion">
+        <xpath expr="//div[hasclass('o_brand_promotion')]" position="replace">
+            <div class="o_brand_promotion">
+                Powered by <a target="_blank" class="label label-danger" href="http://www.odoo.com/page/website-builder">Odoo</a>,
+                the #1 <a target="_blank" href="http://www.odoo.com/page/e-commerce">Open Source eCommerce</a>.
             </div>
         </xpath>
     </template>
diff --git a/addons/website_slides/views/website_slides.xml b/addons/website_slides/views/website_slides.xml
index a6413200299..c4655a2b3d9 100644
--- a/addons/website_slides/views/website_slides.xml
+++ b/addons/website_slides/views/website_slides.xml
@@ -2,15 +2,6 @@
 <odoo>
 <data>
 
-<!-- add link to the standard footer -->
-<template id="slide_footer" inherit_id="website.footer_default" name="Footer Slides Link">
-    <xpath expr="//div[@id='info']//ul[hasclass('list-unstyled')]" position="inside">
-        <li>
-            <a href="/slides">Presentations</a>
-        </li>
-    </xpath>
-</template>
-
 <!-- assets -->
 <template id="assets_frontend" inherit_id="website.assets_frontend" name="Slide">
     <xpath expr="." position="inside">