diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 870dd1c7ddc..5288ce13a17 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -847,7 +847,8 @@
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
 }
-.openerp .oe_view_manager_header {
+.openerp .oe_view_manager_header2 {
+  width: 100%;
   border-top: 1px solid #cacaca;
   border-bottom: 1px solid #cacaca;
   background-color: #fcfcfc;
@@ -861,77 +862,48 @@
   -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1);
   -box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1);
 }
-.openerp .oe_view_manager_header .oe_view_manager_row {
-  height: 26px;
-  line-height: 26px;
-  margin: 8px;
-  clear: both;
-  text-shadow: 0 1px 1px white;
-  text-align: center;
-}
-.openerp .oe_view_manager_header .oe_view_manager_row h2 {
+.openerp .oe_view_manager_header2 h2 {
   float: left;
   font-size: 18px;
   margin: 1px 0;
 }
-.openerp .oe_view_manager_header .oe_view_manager_row h2 a {
+.openerp .oe_view_manager_header2 h2 a {
   color: #8a89ba;
 }
-.openerp .oe_view_manager_header .oe_view_manager_row .dropdown-toggle:after {
-  margin-top: 7px;
-  margin-left: 6px;
-  border-top-color: #404040;
+.openerp .oe_view_manager_header2 td {
+  padding: 4px 8px;
+  line-height: 26px;
 }
-.openerp .oe_view_manager_header .oe_filter {
-  vertical-align: top;
-}
-.openerp .oe_view_manager_header .oe_filter li {
-  height: 24px;
-  line-height: 24px;
-  padding: 0 8px;
-}
-.openerp .oe_view_manager_header .oe_button_group {
+.openerp .oe_view_manager_header2 .oe_button_group {
   display: inline-block;
   border: 1px solid #ababab;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
   border-radius: 5px;
 }
-.openerp .oe_view_manager_header .oe_button_group li {
+.openerp .oe_view_manager_header2 .oe_button_group li {
   float: left;
   border-right: 1px solid #ababab;
 }
-.openerp .oe_view_manager_header .oe_button_group li:last-child {
+.openerp .oe_view_manager_header2 .oe_button_group li:last-child {
   border: none;
 }
-.openerp .oe_view_manager_header .oe_button_group a {
+.openerp .oe_view_manager_header2 .oe_button_group a {
   color: #4c4c4c;
 }
-.openerp .oe_view_manager_header .oe_button_group a:hover {
+.openerp .oe_view_manager_header2 .oe_button_group a:hover {
   text-decoration: none;
 }
-.openerp .oe_view_manager_header .oe_button_group .active {
+.openerp .oe_view_manager_header2 .oe_button_group .active {
   background: #999999;
   -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
   -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
 }
-.openerp .oe_view_manager_header .oe_button_group .active a {
+.openerp .oe_view_manager_header2 .oe_button_group .active a {
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
 }
-.openerp .oe_view_manager_header .oe_view_manager_buttons {
-  padding-right: 8px;
-  float: left;
-  margin-right: 12px;
-}
-.openerp .oe_view_manager_header .oe_view_manager_sidebar {
-  margin: 0 auto;
-  width: 33%;
-}
-.openerp .oe_view_manager_header .oe_view_manager_pager {
-  float: right;
-}
 .openerp .oe_view_manager_body h4 {
   margin: 8px 0;
 }
@@ -1627,8 +1599,20 @@
 .openerp .oe_form .oe_form_field_progressbar.ui-progressbar .ui-widget-header {
   background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
 }
-.openerp .oe_form .oe_view_manager_row:first-child {
-  display: none;
+.openerp .oe_form .oe_view_manager_header2 td {
+  padding: 0px 8px;
+  line-height: 16px;
+}
+.openerp .oe_form .oe_view_manager_header2 td .oe_i {
+  font-size: 13px;
+}
+.openerp .oe_form .oe_view_manager_header2 td .oe_pager_group {
+  height: auto;
+  line-height: 16px;
+}
+.openerp .oe_form .oe_view_manager_header2 td .oe_pager_group li {
+  height: auto;
+  line-height: 16px;
 }
 .openerp .oe-listview-content {
   width: 100%;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 9074fa8d6e2..6afddbee2fa 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -671,34 +671,21 @@ $colour4: #8a89ba
                 text-shadow: 0 1px 2px rgba(0,0,0,0.4)
     // }}}
     // ViewManager.header {{{
-    .oe_view_manager_header
+    .oe_view_manager_header2
+        width: 100%
         border-top: 1px solid #cacaca
         border-bottom: 1px solid #cacaca
         @include vertical-gradient(#fcfcfc, #dedede)
         @include box-shadow((0 1px 0 rgba(255,255,255,0.4), 0 0 9px rgba(0,0,0,0.1)))
-        .oe_view_manager_row
-            height: 26px
+        h2
+            float: left
+            font-size: 18px
+            margin: 1px 0
+            a
+                color: $colour4
+        td
+            padding: 4px 8px
             line-height: 26px
-            margin: 8px
-            clear: both
-            text-shadow: 0 1px 1px white
-            text-align: center
-            h2
-                float: left
-                font-size: 18px
-                margin: 1px 0
-                a
-                    color: $colour4
-            .dropdown-toggle:after
-                margin-top: 7px
-                margin-left: 6px
-                border-top-color: #404040
-        .oe_filter
-            vertical-align: top
-            li
-                height: 24px
-                line-height: 24px
-                padding: 0 8px
         .oe_button_group
             display: inline-block
             border: 1px solid #ababab
@@ -718,23 +705,12 @@ $colour4: #8a89ba
                 a
                     color: #fff
                     text-shadow: 0 1px 2px rgba(0,0,0,0.4)
-        .oe_view_manager_buttons
-            padding-right: 8px
-            float: left
-            margin-right: 12px
-        .oe_view_manager_sidebar
-            margin: 0 auto
-            width: 33%
-        .oe_view_manager_pager
-            float: right
     // }}}
-
     // ViewManager.body {{{
     .oe_view_manager_body
         h4
             margin: 8px 0
     // }}}
-
     // ViewManager.pager {{{
     .oe_pager_value
         float: left
@@ -1372,8 +1348,19 @@ $colour4: #8a89ba
     // }}}
     // FormView.viewmanager {{{
     .oe_form
-        .oe_view_manager_row:first-child
-            display: none
+        .oe_view_manager_header2
+            td
+                padding: 0px 8px
+                line-height: 16px
+                .oe_i
+                    font-size: 13px
+                .oe_pager_group
+                    height: auto
+                    line-height: 16px
+                    li
+                        height: auto
+                        line-height: 16px
+
     // }}}
     // ListView {{{
     .oe-listview-content
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f92862fbf70..fdf5a5a7b5f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -407,25 +407,32 @@
 
 <t t-name="ViewManager">
     <div class="oe_view_manager">
-        <div class="oe_view_manager_header">
-            <div class="oe_view_manager_row">
-                <h2 class="oe_view_title" t-if="widget.flags.display_title !== false">
-                    <span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span>
-                </h2>
-                <div class="oe_view_manager_view_search" t-opentag="true"/>
-            </div>
-            <div class="oe_view_manager_row">
-                <div class="oe_view_manager_buttons"/>
-                <ul class="oe_view_manager_switch oe_button_group oe_right">
-                    <t t-if="widget.views_src.length != 1" t-foreach="widget.views_src" t-as="view">
-                      <li><a t-attf-class="oe_vm_switch_#{view.view_type} oe_i" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
-                        </a></li>
-                    </t>
-                </ul>
-                <div class="oe_view_manager_pager"/>
-                <div class="oe_view_manager_sidebar"/>
-            </div>
-        </div>
+        <table class="oe_view_manager_header2">
+            <col width="33%"/>
+            <col width="33%"/>
+            <col width="34%"/>
+            <tr>
+                <td colspan="2">
+                    <h2 class="oe_view_title" t-if="widget.flags.display_title !== false">
+                        <span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span>
+                    </h2>
+                </td>
+                <td> <div class="oe_view_manager_view_search" t-opentag="true"/> </td>
+            </tr>
+            <tr>
+                <td> <div class="oe_view_manager_buttons"/> </td>
+                <td> <div class="oe_view_manager_sidebar"/> </td>
+                <td>
+                    <ul class="oe_view_manager_switch oe_button_group oe_right">
+                        <t t-if="widget.views_src.length != 1" t-foreach="widget.views_src" t-as="view">
+                          <li><a t-attf-class="oe_vm_switch_#{view.view_type} oe_i" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
+                            </a></li>
+                        </t>
+                    </ul>
+                    <div class="oe_view_manager_pager oe_right"/>
+                </td>
+            </tr>
+        </table>
         <div class="oe_view_manager_body">
             <t t-foreach="widget.views_src" t-as="view">
                 <div t-attf-class="oe_view_manager_view_#{view.view_type}"/>