diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index f47daad8c83..eff864d500c 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -141,10 +141,10 @@ html, body {
 
 footer {
   box-sizing: border-box;
-  height: 300px;
+  height: 380px;
   background: #eff8f8;
-  padding-top: 64px;
-  padding-bottom: 64px;
+  padding-top: 48px;
+  padding-bottom: 48px;
 }
 
 /* ---- HOMEPAGE THEME CUSTOMIZATION ---- */
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index c5e45aa288f..3ae32d8830a 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -102,10 +102,10 @@ html,body
 
 footer
     box-sizing: border-box
-    height: 300px
+    height: 380px
     background: rgb(239, 248, 248) // rgb(221, 235, 227)
-    padding-top: 64px
-    padding-bottom: 64px
+    padding-top: 48px
+    padding-bottom: 48px
 
 /* ---- HOMEPAGE THEME CUSTOMIZATION ---- */
 
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 78f11f6051d..2f518a9593c 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -19,31 +19,49 @@
         <template id="footer">
                 <div class="container">
                     <div class="row">
-                        <div class="span4" name="product">
-                            <h5>Product and services</h5>
-                            <ul class='unstyled'>
-                                <li><a href="https://www.openerp.com/start?download">Download</a></li>
-                                <li><a href="https://launchpad.net/openobject">Launchpad</a></li>
-                                <li><a href="http://runbot.openerp.com">Automated Tests</a></li>
+                        <div class="span3" name="product">
+                            <h5>Our products</h5>
+                            <ul class='unstyled' name="products">
+                                <li><a href="/">Home</a></li>
                             </ul>
                         </div>
-                        <div class="span4" name="social">
-                            <h5>Social</h5>
+                        <div class="span3" name="info">
+                            <h5>Connect with us</h5>
                             <ul class='unstyled'>
-                                <li><a href="http://twitter.com/openerp"><i class="icon-twitter-sign"></i>Twitter</a></li>
-                                <li><a href="http://www.facebook.com/OpenERP"><i class="icon-facebook-sign"></i>Facebook</a></li>
-                                <li><a href="https://plus.google.com/+openerp/posts"><i class="icon-google-plus-sign"></i>Google+</a></li>
-                            </ul>
-                        </div>
-                        <div class="span4" name="about_us">
-                            <h5 t-field="res_company.name">Company name</h5>
-                            <ul class='unstyled'>
-                                <li><a href="/page/website.contactus">Contact us</a></li>
-                                <li><a href="/page/website.news">News</a></li>
                                 <li><a href="/page/website.aboutus">About us</a></li>
-                                <li><a href='#'>&amp;#x2706; <span t-field="res_company.phone"/></a></li>
+                                <li><a href="/page/website.contactus">Contact us</a></li>
+                            </ul>
+                            <ul class='unstyled'>
+                                <li><i class="icon-phone"></i> <span t-field="res_company.phone"/></li>
+                                <li><i class="icon-envelope"></i> <span t-field="res_company.email"></span></li>
                             </ul>
                         </div>
+                        <div class="span5 offset1" name="about_us">
+                            <h5 t-field="res_company.name">About us</h5>
+                            <p>
+                                We are a team of passionated 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
+                                companies willing to optimize their
+                                performance.
+                            </p>
+                            <h1 style="padding: 12px 24px">
+                                <a href="http://twitter.com/openerp"><i class="icon-twitter-sign"></i></a>
+                                <a href="http://facebook.com/OpenERP"><i class="icon-facebook-sign"></i></a>
+                                <a href="https://plus.google.com/+openerp/posts"><i class="icon-google-plus-sign"></i></a>
+                            </h1>
+                        </div>
+                    </div>
+                </div>
+                <div class="container mt16">
+                    <div class="pull-right" t-ignore="1">
+                        Create a <a href="http://openerp.com/apps/website">free website</a> with <a class="label label-important">OpenERP</a>
+                    </div>
+                    <div class="pull-left muted">
+                        Copyright &amp;copy; <span t-field="res_company.name">Company name</span> - <a href="">Sitemap</a>
                     </div>
                 </div>
         </template>
@@ -86,7 +104,6 @@
                         </div>
                         <footer>
                             <t t-call="website.footer"/>
-                            <p class="text-center">&amp;copy; <span t-field="res_company.name">Company name</span>.</p>
                         </footer>
 
                         <div class='oe_snippet_editor' style="display: none;">
@@ -363,8 +380,8 @@
                         <div class="span4">
                             <address>
                                 <strong t-field="res_company.name">Name</strong><br/>
-                                <span t-field="res_company.street"/><br/>
-                                <span t-field="res_company.city"/>, <span t-field="res_company.zip"/><br/>
+                                <span t-field="res_company.street"/> <span t-field="res_company.state_id"/><br/>
+                                <span t-field="res_company.zip"/> <span t-field="res_company.city"/><br/>
                                 <span t-field="res_company.country_id"> </span><br/>
                                 <br/>
                                 <span>&amp;#x2706; <span t-field="res_company.phone"></span></span><br/>