diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index a05b1bc25e5..601133b2e7f 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -111,17 +111,6 @@
 .openerp h4 {
   margin: 4px 0;
 }
-.openerp .oe_semantic_html_override_ul {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_semantic_html_override_ul ul, .openerp .oe_semantic_html_override_ul ol, .openerp .oe_semantic_html_override_ul li {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_semantic_html_override_ul li {
-  list-style-type: none;
-}
 .openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol {
   margin: 0;
   padding: 0;
@@ -1325,16 +1314,15 @@
   width: 100%;
   table-layout: fixed;
 }
-.openerp .oe_view_manager table.oe_view_manager_header ul, .openerp .oe_view_manager table.oe_view_manager_header ol {
-  margin: 0;
+.openerp .oe_view_manager table.oe_view_manager_header ul {
   padding: 0;
+  margin-right: 0;
+  margin-top: 0;
+  margin-bottom: 0;
 }
-.openerp .oe_view_manager table.oe_view_manager_header ul ul, .openerp .oe_view_manager table.oe_view_manager_header ul ol, .openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol ul, .openerp .oe_view_manager table.oe_view_manager_header ol ol, .openerp .oe_view_manager table.oe_view_manager_header ol li {
-  margin: 0;
-  padding: 0;
-}
-.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li {
+.openerp .oe_view_manager table.oe_view_manager_header ul li {
   list-style-type: none;
+  margin: 0;
 }
 .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row {
   clear: both;
@@ -1445,11 +1433,15 @@
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
 }
+.openerp .oe_view_manager .oe_view_manager_switch {
+  margin-left: 8px;
+}
 .openerp .oe_view_manager .oe_view_manager_switch li {
   text-align: center;
   width: 24px;
   height: 24px;
   line-height: 16px;
+  padding: 0;
 }
 .openerp .oe_view_manager .oe_view_manager_switch li a {
   position: relative;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 438f59df11f..6ee03494e7d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -200,8 +200,6 @@ $sheet-max-width: 860px
         vertical-align: middle
     h4
         margin: 4px 0
-    .oe_semantic_html_override_ul
-        @include ul-html-override
     .oe_semantic_html_override
         @include semantic-html-override
     ul.oe_semantic_html_override
@@ -1014,7 +1012,14 @@ $sheet-max-width: 860px
         table.oe_view_manager_header
             width: 100%
             table-layout: fixed
-            @include semantic-html-override
+            ul
+                padding: 0
+                margin-right: 0
+                margin-top: 0
+                margin-bottom: 0
+                li
+                    list-style-type: none
+                    margin: 0
             .oe_header_row
                 //min-height: 26px
                 //line-height: 26px
@@ -1099,11 +1104,13 @@ $sheet-max-width: 860px
         // }}}
         // ViewManager.switches {{{
         .oe_view_manager_switch
+            margin-left: 8px
             li
                 text-align: center
                 width: 24px
                 height: 24px
                 line-height: 16px
+                padding: 0
                 a
                     position: relative
             .oe_vm_switch_list:after, .oe_vm_switch_tree:after