diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 22d3990700c..439d8e8d0e8 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -859,6 +859,15 @@
   -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_header2 .oe_view_manager_header2_row1 {
+  margin: 8px;
+}
+.openerp .oe_view_manager_header2 .oe_view_manager_header2_row2 {
+  margin: 8px;
+}
+.openerp .oe_view_manager_header2 td {
+  line-height: 26px;
+}
 .openerp .oe_view_manager_header2 h2 {
   float: left;
   font-size: 18px;
@@ -867,10 +876,6 @@
 .openerp .oe_view_manager_header2 h2 a {
   color: #8a89ba;
 }
-.openerp .oe_view_manager_header2 td {
-  padding: 4px 8px;
-  line-height: 26px;
-}
 .openerp .oe_view_manager_header2 .oe_button_group {
   display: inline-block;
   border: 1px solid #ababab;
@@ -1672,18 +1677,6 @@
   filter: alpha(opacity=60);
   opacity: 0.6;
 }
-.openerp .oe-listview-content thead th:hover:after {
-  border-bottom: none;
-  border-left: 4px solid transparent;
-  border-right: 4px solid transparent;
-  border-top: 4px solid black;
-  visibility: visible;
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-  -box-shadow: none;
-  filter: alpha(opacity=60);
-  opacity: 0.6;
-}
 .openerp .oe-listview-content tbody {
   cursor: pointer;
   background: white;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index db999f2598c..8c726576a79 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -675,15 +675,18 @@ $colour4: #8a89ba
         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_header2_row1
+            margin: 8px
+        .oe_view_manager_header2_row2
+            margin: 8px
+        td
+            line-height: 26px
         h2
             float: left
             font-size: 18px
             margin: 1px 0
             a
                 color: $colour4
-        td
-            padding: 4px 8px
-            line-height: 26px
         .oe_button_group
             display: inline-block
             border: 1px solid #ababab
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 64998b4d40b..c1b5e2e598a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -413,16 +413,31 @@
             <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>
+                    <div class="oe_view_manager_header2_row1">
+                        <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>
+                </td>
+                <td>
+                    <div class="oe_view_manager_header2_row1">
+                        <div class="oe_view_manager_view_search" t-opentag="true"/>
+                    </div>
                 </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>
+                    <div class="oe_view_manager_header2_row1">
+                        <div class="oe_view_manager_buttons"/>
+                    </div>
+                </td>
+                <td>
+                    <div class="oe_view_manager_header2_row1">
+                        <div class="oe_view_manager_sidebar"/>
+                    </div>
+                </td>
+                <td>
+                    <div class="oe_view_manager_header2_row1">
                     <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">
@@ -430,6 +445,7 @@
                         </t>
                     </ul>
                     <div class="oe_view_manager_pager oe_right"/>
+                    </div>
                 </td>
             </tr>
         </table>