diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 8389b725131..044eb049240 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -98,29 +98,31 @@
 
 /* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */
 html, body {
-  height: 100%;
   box-sizing: border-box;
-  position: relative;
+  height: 100%;
 }
 
-#wrap {
-  min-height: 100%;
-  height: auto !important;
-  height: 100%;
-  margin: 0 auto -300px;
-  padding: 0 0 364px;
-  box-sizing: border-box;
+body {
+  display: table;
+  width: 100%;
+}
+
+header, #wrap, footer {
+  display: table-row;
 }
 
 footer {
+  height: 100%;
   box-sizing: border-box;
-  height: 380px;
   background: #eff8f8;
-  padding-top: 48px;
-  padding-bottom: 48px;
   background: rgba(100, 200, 200, 0.1);
 }
 
+#footer_container {
+  padding-top: 24px;
+  padding-bottom: 12px;
+}
+
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 .navbar .nav > li > p {
   margin-bottom: 0px;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index e9a5953f1b8..b10de0d5cf5 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -65,26 +65,25 @@
 /* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */
 
 html,body
-    height: 100%
     box-sizing: border-box
-    position: relative
+    height: 100%
 
-#wrap
-    min-height: 100%
-    height: auto !important
-    height: 100%
-    margin: 0 auto -300px
-    padding: 0 0 364px
-    box-sizing: border-box
+body
+    display: table
+    width: 100%
+
+header, #wrap, footer
+    display: table-row
 
 footer
+    height: 100%
     box-sizing: border-box
-    height: 380px
     background: rgb(239, 248, 248)
-    padding-top: 48px
-    padding-bottom: 48px
     background: rgba(100, 200, 200, 0.1)
 
+#footer_container
+    padding-top: 24px
+    padding-bottom: 12px
 
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 401982f4003..e04d2182664 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -109,7 +109,7 @@
                                             Our products are designed for small to medium companies willing to optimize
                                             their performance.
                                         </p>
-                                        <h1 style="padding: 12px 24px;">
+                                        <h1>
                                             <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>