diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 132efa33888..0a64a562339 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -264,20 +264,20 @@ body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp optio
 .login.database_block .oe-database-manager {
     display: block;
 }
-.login .db_options_row {
-    width: 100%;
-    height: 100%;
-    display: table-row;
-}
-.login .db_options_row .db_right_pane {
-    width: 100%;
-    height: 100%;
-}
 
-.db_container {
+.login .database {
+    float: left;
     width: 196px;
+    height: 100%;
     background: #666666;
 }
+.login .oe_db_options {
+    margin-left: 196px;
+    width: 100%;
+    height: 100%;
+    color: black;
+}
+
 
 ul.db_options li {
     padding: 5px 0 10px 5px;
@@ -300,7 +300,7 @@ ul.db_options li {
     margin: 1px;
     color: #EEEEEE;
     cursor: pointer;
-    width: 196px;
+    width: 189px;
     font-size: 12px;
 }
 
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 6d300db9c31..bd95d304174 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -289,7 +289,6 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
         });
         $.when(fetch_db, fetch_langs).then(function () {self.do_create();});
 
-        this.$element.find('#db-back').click(_.bind(function() {this.hide();}, this));
         this.$element.find('#db-create').click(this.do_create);
         this.$element.find('#db-drop').click(this.do_drop);
         this.$element.find('#db-backup').click(this.do_backup);
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 670b1a377fb..108504c6636 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -313,26 +313,19 @@
   </div>
 </t>
 <t t-name="DatabaseManager">
-    <table class="oe-database-manager">
-        <tr class="db_options_row">
-            <td valign="top" class="db_container">
-                <div class="database">
-                    <ul class="db_options" style="padding: 0px; display: inline;">
-                        <li id="db-back">Back</li>
-                        <li id="db-create">Create</li>
-                        <li id="db-drop">Drop</li>
-                        <li id="db-backup">Backup</li>
-                        <li id="db-restore">Restore</li>
-                        <li id="db-change-password">Password</li>
-                        <li id="back-to-login">Back to Login</li>
-                    </ul>
-                </div>
-            </td>
-            <td valign="top" class="db_right_pane">
-             <div id="oe_db_options"></div>
-            </td>
-        </tr>
-    </table>
+    <div class="oe-database-manager">
+        <div class="database">
+            <ul class="db_options" style="padding: 0px; display: inline;">
+                <li id="db-create">Create</li>
+                <li id="db-drop">Drop</li>
+                <li id="db-backup">Backup</li>
+                <li id="db-restore">Restore</li>
+                <li id="db-change-password">Password</li>
+                <li id="back-to-login">Back to Login</li>
+            </ul>
+        </div>
+        <div id="oe_db_options" class="oe_db_options"></div>
+    </div>
 </t>
 <t t-name="Header">
     <div>