diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 25e593170c6..51b6d0e26dc 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -88,12 +88,6 @@ body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp optio
 .openerp .login {
     display: none;
 }
-.openerp .login form {
-    float: left;
-    width: 420px;
-    margin-left: 40px;
-    margin-bottom: 60px;
-}
 .openerp .login fieldset {
     padding-bottom: 5px;
     min-width: 100px;
@@ -133,19 +127,27 @@ body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp optio
 }
 .openerp .login .login_error_message {
     display: none;
-    background-color: #9A0404;
-    border-radius: 3px;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    color: white;
+    background-color: #b41616;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8);
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8);
+    -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8);
+    filter: alpha(opacity=95);
+    -khtml-opacity: 0.95;
+    -moz-opacity: 0.95;
+    color: #eee;
     font-size: 16px;
-    font-weight: bold;
-    padding: 5px;
-    margin-top: 5px;
+    padding: 8px 12px;
+    margin-top: 15px;
+    text-align: center;
+}
+.openerp .login .login_invalid {
     text-align: center;
 }
 .openerp .login .login_invalid .login_error_message {
-    display: block;
+    display: inline-block;
 }
 
 .openerp.login-mode .login-container {
@@ -157,6 +159,8 @@ body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp optio
 .openerp.login-mode .menu,
 .openerp.login-mode .secondary_menu,
 .openerp.login-mode .oe-application,
+.openerp.login-mode .oe_footer,
+.openerp.login-mode .header,
 .openerp.login-mode .db_options_row {
     display: none;
 }
@@ -1841,3 +1845,154 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after {
     cursor: default;
     text-shadow: 0 1px 1px white !important;
 }
+
+/* Login page */
+
+#oe_login {
+    padding: 0;
+    margin: 0;
+    font-family: "Lucida Grande", Helvetica, Verdana, Arial;
+    background: url("/web/static/src/img/pattern.png") repeat;
+    color: #eee;
+    font-size: 14px;
+    height: 100%;
+}
+
+#oe_login ul, ol {
+    padding: 0;
+    margin: 0;
+}
+
+#oe_login li {
+    list-style-type: none;
+    padding-bottom: 4px;
+}
+
+#oe_login a {
+    color: #eee;
+    text-decoration: none;
+}
+
+#oe_login button {
+    float: right;
+    display: inline-block;
+    cursor: pointer;
+    padding: 6px 16px;
+    font-size: 13px;
+    font-family: "Lucida Grande", Helvetica, Verdana, Arial;
+    border: 1px solid #222222;
+    color: white;
+    margin: 0;
+    background: #600606;
+    background: -moz-linear-gradient(#b92020, #600606);
+    background: -webkit-gradient(linear, left top, left bottom, from(#b92020), to(#600606));
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
+    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(155, 155, 155, 0.4) inset;
+    -o-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
+}
+
+#oe_login input, #oe_login select {
+    width: 250px;
+    margin-bottom: 10px;
+    font-size: 14px;
+    padding: 5px 6px;
+    border: 1px solid #999999;
+    background: whitesmoke;
+    -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
+    -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
+    -box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+}
+
+#oe_login .dbpane {
+    position: fixed;
+    top: 0;
+    right: 8px;
+    padding: 6px 12px 0px;
+    color: #eee;
+    border: solid 1px #333;
+    background: #101010;
+    filter: alpha(opacity=95);
+    -khtml-opacity: 0.95;
+    -moz-opacity: 0.95;
+    opacity: 0.95;
+    -moz-border-radius: 0 0 8px 8px;
+    -webkit-border-radius: 0 0 8px 8px;
+    border-radius: 0 0 8px 8px;
+}
+
+#oe_login .bottom {
+    position: absolute;
+    top: 50%;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    text-shadow: 0 1px 1px #999999;
+    background: #600606;
+    background: -moz-linear-gradient(#b41616, #600606);
+    background: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606));
+}
+
+#oe_login .pane {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    margin: -160px -166px;
+    border: solid 1px #333333;
+    background: #101010;
+    padding: 20px 32px;
+    text-align: left;
+    -moz-border-radius: 8px;
+    -webkit-border-radius: 8px;
+    border-radius: 8px;
+    -moz-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
+    -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
+    -box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
+    filter: alpha(opacity=95);
+    -khtml-opacity: 0.95;
+    -moz-opacity: 0.95;
+    opacity: 0.95;
+}
+
+#oe_login .pane h2 {
+    margin-top: 0;
+    font-size: 18px;
+}
+
+#oe_login #logo {
+    position: absolute;
+    top: -70px;
+    left: 0;
+    width: 100%;
+    margin: 0 auto;
+    text-align: center;
+}
+
+#oe_login .footer {
+    position: absolute;
+    bottom: -40px;
+    left: 0;
+    width: 100%;
+    text-align: center;
+}
+
+#oe_login .footer a {
+    font-size: 13px;
+    margin: 0 8px;
+}
+
+#oe_login .footer a:hover {
+    text-decoration: underline;
+}
+
+#oe_login .openerp {
+    font-weight: bold;
+    font-family: serif;
+    font-size: 16px;
+}
diff --git a/addons/web/static/src/img/logo2.png b/addons/web/static/src/img/logo2.png
new file mode 100644
index 00000000000..49e789fa01d
Binary files /dev/null and b/addons/web/static/src/img/logo2.png differ
diff --git a/addons/web/static/src/img/pattern.png b/addons/web/static/src/img/pattern.png
new file mode 100644
index 00000000000..7e3a2b37834
Binary files /dev/null and b/addons/web/static/src/img/pattern.png differ
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 20b9cb9d782..b327d3d2d61 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -19,6 +19,7 @@
 </t>
 <t t-name="Interface">
     <div id="oe_loading"></div>
+
     <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" class="main_table">
     <tr>
         <td colspan="2" valign="top">
@@ -36,7 +37,7 @@
             <div id="oe_database" class="database"></div>
         </td>
         <td valign="top">
-        	<div id="oe_db_options"></div>
+         <div id="oe_db_options"></div>
         </td>
     </tr>
     <tr>
@@ -61,6 +62,41 @@
         </td>
     </tr>
     </table>
+
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" class="main_table">
+    <tr>
+        <td colspan="2" valign="top" >
+            <div id="oe_header" class="header"></div>
+            <div id="oe_menu" class="menu"></div>
+        </td>
+    </tr>
+    <tr>
+        <td valign="top" class="login-container" colspan="2">
+            <div id="oe_login" class="login"></div>
+        </td>
+    </tr>
+    <tr class="db_options_row">
+        <td valign="top" class="db_container">
+            <div id="oe_database" class="database"></div>
+        </td>
+        <td valign="top">
+          <div id="oe_db_options"></div>
+        </td>
+    </tr>
+    <tr>
+        <td colspan="2" valign="top" height="100%">
+            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
+            <tr>
+                <td valign="top" id="oe_secondary_menu" class="secondary_menu"> </td>
+                <td valign="top" class="oe-application-container">
+                    <div id="oe_app" class="oe-application">
+                    </div>
+                </td>
+            </tr>
+            </table>
+        </td>
+    </tr>
+    </table>
 </t>
 <t t-name="Loading">
     <div class="loading">
@@ -262,80 +298,30 @@
 </t>
 
 <t t-name="Login">
-    <div>
-    <form class="oe_forms">
-        <fieldset>
-            <legend style="">
-                <img t-att-src='_s + "/web/static/src/img/stock_person.png"' alt="" />
-            </legend>
-            <div class="oe_box2">
-                <table align="center" cellspacing="2px" cellpadding="0">
-                    <tr>
-                        <td><label for="db">Database:</label></td>
-                        <td>
-                            <input type="text" name="db" t-att-value="widget.selected_db || ''" autofocus="true"/>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><label for="login">User:</label></td>
-                        <td><input type="text" name="login"
-                            t-att-value="widget.selected_login || ''" autofocus="true"/></td>
-                    </tr>
-                    <tr>
-                        <td><label for="password">Password:</label></td>
-                        <td><input type="password" name="password"
-                                t-att-value="widget.selected_password || ''"/></td>
-                    </tr>
-                    <tr>
-                        <td></td>
-                        <td>
-                        	<button type="button" id="oe-db-config">Database</button>
-                            <button name="submit">Login</button>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </fieldset>
-        <div class="login_error_message">Bad username or password</div>
-    </form>
-    <div class="oe_login_right_pane">
-        <p>We think that daily job activities can be more intuitive, efficient, automated, .. and even fun.</p>
-        <h3>OpenERP's vision to be:</h3>
-
-        <table cellpadding="0" cellspacing="0" width="100%" style="border:none;">
-            <tbody>
-            <tr>
-                <td>
-                    <img t-att-src='_s + "/web/static/src/img/product.png"'/>
-                </td>
-                <td>
-                    <strong>Full featured</strong><br />
-                    Today's enterprise challenges are multiple. We provide one module for each need.
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <img t-att-src='_s + "/web/static/src/img/accessories-archiver.png"'/>
-                </td>
-                <td>
-                    <strong>Open Source</strong><br />
-                    To Build a great product, we rely on the knowledge of thousands of contributors.
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <img t-att-src='_s + "/web/static/src/img/partner.png"' />
-                </td>
-                <td>
-                    <strong>User Friendly</strong><br />
-                    In order to be productive, people need clean and easy to use interface.
-                </td>
-            </tr>
-            </tbody>
-        </table>
-
-    </div>
+  <div>
+    <div class="bottom"> </div>
+    <div class="login_error_message">Invalid username or password</div>
+    <div class="pane">
+      <div id="logo"><img src="/web/static/src/img/logo2.png"/></div>
+      <form action="" method="post">
+        <div class="dbpane" >
+          Database: 
+          <input name="db"></input>
+        </div>
+        <ul>
+          <li>Username</li>
+          <li><input type="text" name="login" autofocus="autofocus"/></li>
+          <li>Password</li>
+          <li><input type="password" name="password" value=""/></li>
+          <li><button name="submit">Log in</button></li>
+        </ul>
+      </form>
+      <div class="footer">
+        <a href="#" id="oe-db-config">Manage Databases</a> |
+        <a href="www.openerp.com">Powered by <span class="openerp">OpenERP</span></a>
+      </div>
     </div>
+  </div>
 </t>
 <t t-name="Header">
     <div>