diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 21b44f41a41..217998adcab 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -9,7 +9,11 @@
   font-style: normal;
 }
 
-.openerp2 {
+.openerp.openerp-web-client-container {
+  height: 100%;
+}
+
+.openerp {
   padding: 0;
   margin: 0;
   font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
@@ -22,37 +26,37 @@
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
    */
 }
-.openerp2 a {
+.openerp a {
   text-decoration: none;
 }
-.openerp2 table {
+.openerp table {
   padding: 0;
   font-size: 13px;
   border-collapse: collapse;
 }
-.openerp2 thead {
+.openerp thead {
   font-weight: bold;
   background-color: #f0f0f0;
 }
-.openerp2 thead th {
+.openerp thead th {
   border-right: 1px dotted #afafb6;
 }
-.openerp2 thead th:last-child {
+.openerp thead th:last-child {
   border-right: none;
 }
-.openerp2 th, .openerp2 td {
+.openerp th, .openerp td {
   padding: 0;
   line-height: 18px;
   text-align: left;
 }
-.openerp2 th {
+.openerp th {
   font-weight: bold;
   vertical-align: middle;
 }
-.openerp2 td {
+.openerp td {
   vertical-align: top;
 }
-.openerp2 .zebra tbody tr:nth-child(odd) td {
+.openerp .zebra tbody tr:nth-child(odd) td {
   background-color: #f0f0fa;
   background-color: #f0f0fa;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
@@ -62,7 +66,7 @@
   background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6);
   background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6);
 }
-.openerp2 .zebra tbody tr:hover td {
+.openerp .zebra tbody tr:hover td {
   background-color: #eeeeee;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#dedede));
   background-image: -webkit-linear-gradient(top, #eeeeee, #dedede);
@@ -71,40 +75,40 @@
   background-image: -o-linear-gradient(top, #eeeeee, #dedede);
   background-image: linear-gradient(to bottom, #eeeeee, #dedede);
 }
-.openerp2 .numeric {
+.openerp .numeric {
   text-align: right;
   width: 82px;
 }
-.openerp2 .numeric input {
+.openerp .numeric input {
   text-align: right;
 }
-.openerp2 ul, .openerp2 li, .openerp2 ol {
+.openerp ul, .openerp li, .openerp ol {
   margin: 0;
   padding: 0;
 }
-.openerp2 li {
+.openerp li {
   list-style-type: none;
 }
-.openerp2 .oe_i {
+.openerp .oe_i {
   font-family: "mnmliconsRegular" !important;
   font-size: 21px;
   font-weight: 300 !important;
 }
-.openerp2 .oe_left {
+.openerp .oe_left {
   float: left;
   margin-right: 8px;
 }
-.openerp2 .oe_right {
+.openerp .oe_right {
   float: right;
   margin-left: 8px;
 }
-.openerp2 .oe_clear {
+.openerp .oe_clear {
   clear: both;
 }
-.openerp2 .oe_wait {
+.openerp .oe_wait {
   cursor: wait;
 }
-.openerp2 a.button:link, .openerp2 a.button:visited, .openerp2 button, .openerp2 input[type='submit'] {
+.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'] {
   display: inline-block;
   border: 1px solid #ababab;
   color: #404040;
@@ -129,7 +133,7 @@
   -webkit-font-smoothing: antialiased;
   outline: none;
 }
-.openerp2 a.button:hover, .openerp2 button:hover, .openerp2 input[type='submit']:hover {
+.openerp a.button:hover, .openerp button:hover, .openerp input[type='submit']:hover {
   background-color: #f6f6f6;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3));
   background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3);
@@ -139,7 +143,7 @@
   background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3);
   cursor: pointer;
 }
-.openerp2 a.button:focus, .openerp2 button:focus, .openerp2 input[type='submit']:focus {
+.openerp a.button:focus, .openerp button:focus, .openerp input[type='submit']:focus {
   border: 1px solid #80bfff;
   background-color: #f6f6f6;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3));
@@ -152,7 +156,7 @@
   -webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
   -box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
 }
-.openerp2 a.button:active, .openerp2 a.button.active, .openerp2 button:active, .openerp2 button.active, .openerp2 input[type='submit']:active, .openerp2 input[type='submit'].active {
+.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active {
   background: #e3e3e3;
   background: -moz-linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f;
   background: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6)) #1b468f;
@@ -161,7 +165,7 @@
   -webkit-box-shadow: none;
   -box-shadow: none;
 }
-.openerp2 a.button.disabled, .openerp2 button:disabled, .openerp2 input[type='submit']:disabled {
+.openerp a.button.disabled, .openerp button:disabled, .openerp input[type='submit']:disabled {
   background: #efefef !important;
   border: 1px solid #d1d1d1 !important;
   -moz-box-shadow: none !important;
@@ -171,7 +175,7 @@
   cursor: default;
   text-shadow: 0 1px 1px white !important;
 }
-.openerp2 button.primary {
+.openerp button.primary {
   color: white;
   background-color: #dc5f59;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630));
@@ -184,7 +188,7 @@
   -webkit-box-shadow: none;
   -box-shadow: none;
 }
-.openerp2 button.primary:hover {
+.openerp button.primary:hover {
   background-color: #df6b66;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33));
   background-image: -webkit-linear-gradient(top, #df6b66, #bf3a33);
@@ -196,7 +200,7 @@
   -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
   -box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
 }
-.openerp2 button.primary:active {
+.openerp button.primary:active {
   background-color: #b33630;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#b33630), to(#dc5f59));
   background-image: -webkit-linear-gradient(top, #b33630, #dc5f59);
@@ -208,7 +212,7 @@
   -webkit-box-shadow: none;
   -box-shadow: none;
 }
-.openerp2 button.following {
+.openerp button.following {
   color: white;
   width: 90px;
   background-color: #8a89ba;
@@ -219,7 +223,7 @@
   background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
   background-image: linear-gradient(to bottom, #8a89ba, #807fb4);
 }
-.openerp2 button.unfollow {
+.openerp button.unfollow {
   display: none;
   color: white;
   width: 90px;
@@ -231,7 +235,7 @@
   background-image: -o-linear-gradient(top, #dc5f59, #b33630);
   background-image: linear-gradient(to bottom, #dc5f59, #b33630);
 }
-.openerp2 .oe_loading {
+.openerp .oe_loading {
   display: none;
   z-index: 100;
   position: fixed;
@@ -248,20 +252,20 @@
   border-bottom-right-radius: 8px;
   border-bottom-left-radius: 8px;
 }
-.openerp2 .oe_notification {
+.openerp .oe_notification {
   z-index: 1050;
 }
-.openerp2 .oe_login {
+.openerp .oe_login {
   background: url("/web/static/src/img/pattern.png") repeat;
   text-align: center;
   font-size: 14px;
   height: 100%;
 }
-.openerp2 .oe_login li {
+.openerp .oe_login li {
   list-style-type: none;
   padding-bottom: 4px;
 }
-.openerp2 .oe_login button {
+.openerp .oe_login button {
   float: right;
   display: inline-block;
   cursor: pointer;
@@ -283,7 +287,7 @@
   -webkit-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;
 }
-.openerp2 .oe_login input, .openerp2 .oe_login select {
+.openerp .oe_login input, .openerp .oe_login select {
   width: 252px;
   font-family: "Lucida Grande", Helvetica, Verdana, Arial;
   border: 1px solid #999999;
@@ -295,14 +299,14 @@
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
-.openerp2 .oe_login input {
+.openerp .oe_login input {
   margin-bottom: 9px;
   padding: 5px 6px;
 }
-.openerp2 .oe_login select {
+.openerp .oe_login select {
   padding: 1px;
 }
-.openerp2 .oe_login .oe_login_dbpane {
+.openerp .oe_login .oe_login_dbpane {
   position: fixed;
   top: 0;
   right: 8px;
@@ -315,11 +319,11 @@
   -webkit-border-radius: 0 0 8px 8px;
   border-radius: 0 0 8px 8px;
 }
-.openerp2 .oe_login .oe_login_dbpane input {
+.openerp .oe_login .oe_login_dbpane input {
   padding: 2px 4px;
   margin: 4px 0;
 }
-.openerp2 .oe_login .oe_login_bottom {
+.openerp .oe_login .oe_login_bottom {
   position: absolute;
   top: 50%;
   left: 0;
@@ -334,7 +338,7 @@
   background-image: -o-linear-gradient(top, #b41616, #600606);
   background-image: linear-gradient(to bottom, #b41616, #600606);
 }
-.openerp2 .oe_login .oe_login_pane {
+.openerp .oe_login .oe_login_pane {
   position: absolute;
   top: 50%;
   left: 50%;
@@ -352,11 +356,11 @@
   -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
   -box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
 }
-.openerp2 .oe_login .oe_login_pane h2 {
+.openerp .oe_login .oe_login_pane h2 {
   margin-top: 0;
   font-size: 18px;
 }
-.openerp2 .oe_login .oe_login_logo {
+.openerp .oe_login .oe_login_logo {
   position: absolute;
   top: -70px;
   left: 0;
@@ -364,25 +368,25 @@
   margin: 0 auto;
   text-align: center;
 }
-.openerp2 .oe_login .oe_login_footer {
+.openerp .oe_login .oe_login_footer {
   position: absolute;
   bottom: -40px;
   left: 0;
   width: 100%;
   text-align: center;
 }
-.openerp2 .oe_login .oe_login_footer a {
+.openerp .oe_login .oe_login_footer a {
   color: #eeeeee;
   margin: 0 8px;
 }
-.openerp2 .oe_login .oe_login_footer a:hover {
+.openerp .oe_login .oe_login_footer a:hover {
   text-decoration: underline;
 }
-.openerp2 .oe_login .oe_login_footer span {
+.openerp .oe_login .oe_login_footer span {
   font-weight: bold;
   font-size: 16px;
 }
-.openerp2 .oe_login .oe_login_error_message {
+.openerp .oe_login .oe_login_error_message {
   display: none;
   background-color: #b41616;
   color: #eeeeee;
@@ -396,30 +400,30 @@
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8);
   -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8);
 }
-.openerp2 .oe_login .oe_login_invalid .oe_login_error_message {
+.openerp .oe_login .oe_login_invalid .oe_login_error_message {
   display: inline-block;
 }
-.openerp2 .oe_database_manager {
+.openerp .oe_database_manager {
   background: white;
   color: black;
   text-align: left;
 }
-.openerp2 .oe_database_manager .oe_database_manager_menu {
+.openerp .oe_database_manager .oe_database_manager_menu {
   color: black;
 }
-.openerp2 .oe_webclient {
+.openerp .oe_webclient {
   width: 100%;
   height: 100%;
   border-spacing: 0px;
 }
-.openerp2 .oe_content_full_screen .oe_application {
+.openerp .oe_content_full_screen .oe_application {
   top: 0;
   left: 0;
 }
-.openerp2 .oe_content_full_screen .oe_topbar, .openerp2 .oe_content_full_screen .oe_leftbar {
+.openerp .oe_content_full_screen .oe_topbar, .openerp .oe_content_full_screen .oe_leftbar {
   display: none;
 }
-.openerp2 .oe_topbar {
+.openerp .oe_topbar {
   width: 100%;
   height: 31px;
   border-top: solid 1px #d3d3d3;
@@ -432,17 +436,17 @@
   background-image: -o-linear-gradient(top, #646060, #262626);
   background-image: linear-gradient(to bottom, #646060, #262626);
 }
-.openerp2 .oe_topbar .oe_systray {
+.openerp .oe_topbar .oe_systray {
   float: right;
 }
-.openerp2 .oe_topbar .oe_systray > div {
+.openerp .oe_topbar .oe_systray > div {
   float: left;
   padding: 0 4px 0 4px;
 }
-.openerp2 .oe_topbar .oe_topbar_item li {
+.openerp .oe_topbar .oe_topbar_item li {
   float: left;
 }
-.openerp2 .oe_topbar .oe_topbar_item li a {
+.openerp .oe_topbar .oe_topbar_item li a {
   display: block;
   padding: 5px 10px 7px;
   line-height: 20px;
@@ -451,14 +455,14 @@
   vertical-align: top;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
 }
-.openerp2 .oe_topbar .oe_topbar_item li a:hover {
+.openerp .oe_topbar .oe_topbar_item li a:hover {
   background: #303030;
   color: white;
   -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
 }
-.openerp2 .oe_topbar .oe_topbar_item .oe_active {
+.openerp .oe_topbar .oe_topbar_item .oe_active {
   background: #303030;
   font-weight: bold;
   color: white;
@@ -466,7 +470,7 @@
   -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
 }
-.openerp2 .oe_topbar .oe_topbar_avatar {
+.openerp .oe_topbar .oe_topbar_avatar {
   width: 24px;
   height: 24px;
   margin: -2px 2px 0 0;
@@ -474,10 +478,10 @@
   -webkit-border-radius: 4px;
   border-radius: 4px;
 }
-.openerp2 .oe_topbar .oe_topbar_avatar {
+.openerp .oe_topbar .oe_topbar_avatar {
   vertical-align: top;
 }
-.openerp2 .oe_topbar .oe_dropdown_toggle:after {
+.openerp .oe_topbar .oe_dropdown_toggle:after {
   width: 0;
   height: 0;
   display: inline-block;
@@ -492,25 +496,25 @@
   filter: alpha(opacity=50);
   opacity: 0.5;
 }
-.openerp2 .oe_leftbar {
+.openerp .oe_leftbar {
   width: 220px;
   background: #f0eeee;
   border-right: 1px solid #afafb6;
   text-shadow: 0 1px 1px white;
 }
-.openerp2 a.oe_logo {
+.openerp a.oe_logo {
   width: 220px;
   display: block;
   text-align: center;
   height: 70px;
   line-height: 70px;
 }
-.openerp2 a.oe_logo img {
+.openerp a.oe_logo img {
   height: 40px;
   width: 157px;
   margin: 14px 0;
 }
-.openerp2 .oe_footer {
+.openerp .oe_footer {
   position: fixed;
   bottom: 0;
   padding: 4px 0;
@@ -518,29 +522,29 @@
   width: 220px;
   text-align: center;
 }
-.openerp2 .oe_footer a {
+.openerp .oe_footer a {
   font-weight: 800;
   font-family: serif;
   font-size: 16px;
   color: black;
 }
-.openerp2 .oe_footer a span {
+.openerp .oe_footer a span {
   color: #c81010;
   font-style: italic;
 }
-.openerp2 .oe_user_menu {
+.openerp .oe_user_menu {
   float: right;
   padding: 0;
   margin: 0;
 }
-.openerp2 .oe_user_menu li {
+.openerp .oe_user_menu li {
   list-style-type: none;
   float: left;
 }
-.openerp2 .oe_user_menu .oe_dropdown {
+.openerp .oe_user_menu .oe_dropdown {
   position: relative;
 }
-.openerp2 .oe_user_menu .oe_dropdown_options {
+.openerp .oe_user_menu .oe_dropdown_options {
   float: left;
   background: #333333;
   background: rgba(37, 37, 37, 0.9);
@@ -568,12 +572,12 @@
   -moz-background-clip: padding-box;
   background-clip: padding-box;
 }
-.openerp2 .oe_user_menu .oe_dropdown_options li {
+.openerp .oe_user_menu .oe_dropdown_options li {
   float: none;
   display: block;
   background-color: none;
 }
-.openerp2 .oe_user_menu .oe_dropdown_options li a {
+.openerp .oe_user_menu .oe_dropdown_options li a {
   display: block;
   padding: 4px 15px;
   clear: both;
@@ -581,7 +585,7 @@
   line-height: 18px;
   color: #eeeeee;
 }
-.openerp2 .oe_user_menu .oe_dropdown_options li a:hover {
+.openerp .oe_user_menu .oe_dropdown_options li a:hover {
   background-color: #292929;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919));
   background-image: -webkit-linear-gradient(top, #292929, #191919);
@@ -593,15 +597,15 @@
   -webkit-box-shadow: none;
   -box-shadow: none;
 }
-.openerp2 .oe_menu {
+.openerp .oe_menu {
   float: left;
   padding: 0;
   margin: 0;
 }
-.openerp2 .oe_menu li {
+.openerp .oe_menu li {
   float: left;
 }
-.openerp2 .oe_menu a {
+.openerp .oe_menu a {
   display: block;
   padding: 5px 10px 7px;
   line-height: 20px;
@@ -610,14 +614,14 @@
   vertical-align: top;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
 }
-.openerp2 .oe_menu a:hover {
+.openerp .oe_menu a:hover {
   background: #303030;
   color: white;
   -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
 }
-.openerp2 .oe_menu .oe_active {
+.openerp .oe_menu .oe_active {
   background: #303030;
   font-weight: bold;
   color: white;
@@ -625,10 +629,10 @@
   -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
 }
-.openerp2 .oe_menu_more_container {
+.openerp .oe_menu_more_container {
   position: relative;
 }
-.openerp2 .oe_menu_more_container .oe_menu_more {
+.openerp .oe_menu_more_container .oe_menu_more {
   position: absolute;
   padding: 0;
   background-color: #646060;
@@ -637,33 +641,33 @@
   border-bottom-left-radius: 5px;
   border-bottom-right-radius: 5px;
 }
-.openerp2 .oe_menu_more_container .oe_menu_more li {
+.openerp .oe_menu_more_container .oe_menu_more li {
   float: none;
 }
-.openerp2 .oe_menu_more_container .oe_menu_more li a {
+.openerp .oe_menu_more_container .oe_menu_more li a {
   white-space: nowrap;
 }
-.openerp2 .oe_secondary_menu_section {
+.openerp .oe_secondary_menu_section {
   font-weight: bold;
   margin-left: 8px;
   color: #8a89ba;
 }
-.openerp2 .oe_secondary_submenu {
+.openerp .oe_secondary_submenu {
   padding: 2px 0 8px 0;
   margin: 0;
   width: 100%;
   display: inline-block;
 }
-.openerp2 .oe_secondary_submenu li {
+.openerp .oe_secondary_submenu li {
   position: relative;
   padding: 1px 0 1px 16px;
 }
-.openerp2 .oe_secondary_submenu li a {
+.openerp .oe_secondary_submenu li a {
   display: block;
   color: #4c4c4c;
   padding: 2px 4px 2px 0;
 }
-.openerp2 .oe_secondary_submenu li .oe_menu_label {
+.openerp .oe_secondary_submenu li .oe_menu_label {
   position: absolute;
   top: 1px;
   right: 1px;
@@ -681,7 +685,7 @@
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
   -box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
 }
-.openerp2 .oe_secondary_submenu .oe_menu_counter {
+.openerp .oe_secondary_submenu .oe_menu_counter {
   float: right;
   background: #8a89ba;
   color: #eeeeee;
@@ -694,7 +698,7 @@
   -webkit-border-radius: 4px;
   border-radius: 4px;
 }
-.openerp2 .oe_secondary_submenu .oe_active {
+.openerp .oe_secondary_submenu .oe_active {
   background: #8a89ba;
   border-top: 1px solid lightGray;
   border-bottom: 1px solid lightGray;
@@ -703,10 +707,10 @@
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
   -box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
 }
-.openerp2 .oe_secondary_submenu .oe_active a {
+.openerp .oe_secondary_submenu .oe_active a {
   color: white;
 }
-.openerp2 .oe_secondary_submenu .oe_active .oe_menu_label {
+.openerp .oe_secondary_submenu .oe_active .oe_menu_label {
   background: #eeeeee;
   color: #8a89ba;
   text-shadow: 0 1px 1px white;
@@ -714,11 +718,11 @@
   -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
 }
-.openerp2 .oe_secondary_submenu .oe_active .oe_menu_counter {
+.openerp .oe_secondary_submenu .oe_active .oe_menu_counter {
   background: #eeeeee;
   color: #8a89ba;
 }
-.openerp2 .oe_secondary_submenu .oe_menu_toggler:before {
+.openerp .oe_secondary_submenu .oe_menu_toggler:before {
   width: 0;
   height: 0;
   display: inline-block;
@@ -734,7 +738,7 @@
   filter: alpha(opacity=50);
   opacity: 0.5;
 }
-.openerp2 .oe_secondary_submenu .oe_menu_opened:before {
+.openerp .oe_secondary_submenu .oe_menu_opened:before {
   margin-top: 6px;
   margin-left: -12px;
   margin-right: 4px;
@@ -742,16 +746,16 @@
   border-right: 4px solid transparent;
   border-top: 4px solid #4c4c4c;
 }
-.openerp2 .oe_application {
+.openerp .oe_application {
   width: 100%;
 }
-.openerp2 .oe_application a {
+.openerp .oe_application a {
   color: #8a89ba;
 }
-.openerp2 .oe_application a:hover {
+.openerp .oe_application a:hover {
   text-decoration: underline;
 }
-.openerp2 .oe-view-manager-header {
+.openerp .oe-view-manager-header {
   border-top: 1px solid #cacaca;
   border-bottom: 1px solid #cacaca;
   background-color: #fcfcfc;
@@ -765,74 +769,74 @@
   -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);
 }
-.openerp2 .oe-view-manager-header h2 {
+.openerp .oe-view-manager-header h2 {
   float: left;
   font-size: 18px;
   margin: 1px 0;
 }
-.openerp2 .oe-view-manager-header h2 a {
+.openerp .oe-view-manager-header h2 a {
   color: #8a89ba;
 }
-.openerp2 .oe-view-manager-header .buttons {
+.openerp .oe-view-manager-header .buttons {
   padding-right: 8px;
 }
-.openerp2 .oe-view-manager-header .buttons li {
+.openerp .oe-view-manager-header .buttons li {
   float: left;
   margin-right: 12px;
 }
-.openerp2 .oe-view-manager-header .filter {
+.openerp .oe-view-manager-header .filter {
   vertical-align: top;
 }
-.openerp2 .oe-view-manager-header .filter li {
+.openerp .oe-view-manager-header .filter li {
   height: 24px;
   line-height: 24px;
   padding: 0 8px;
 }
-.openerp2 .oe-view-manager-header .header-row {
+.openerp .oe-view-manager-header .header-row {
   height: 26px;
   line-height: 26px;
   margin: 8px;
   clear: both;
   text-shadow: 0 1px 1px white;
 }
-.openerp2 .oe-view-manager-header .header-row .dropdown-toggle:after {
+.openerp .oe-view-manager-header .header-row .dropdown-toggle:after {
   margin-top: 7px;
   margin-left: 6px;
   border-top-color: #404040;
 }
-.openerp2 .oe-view-manager-header .oe_vm_switch li {
+.openerp .oe-view-manager-header .oe_vm_switch li {
   padding-left: 1px;
   text-align: center;
   width: 24px;
   height: 24px;
   line-height: 24px;
 }
-.openerp2 .oe-view-manager-header .pagination li {
+.openerp .oe-view-manager-header .pagination li {
   height: 24px;
   line-height: 24px;
   padding: 0 8px;
 }
-.openerp2 .oe-view-manager-header .button-group {
+.openerp .oe-view-manager-header .button-group {
   display: inline-block;
   border: 1px solid #ababab;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
   border-radius: 5px;
 }
-.openerp2 .oe-view-manager-header .button-group li {
+.openerp .oe-view-manager-header .button-group li {
   float: left;
   border-right: 1px solid #ababab;
 }
-.openerp2 .oe-view-manager-header .button-group li:last-child {
+.openerp .oe-view-manager-header .button-group li:last-child {
   border: none;
 }
-.openerp2 .oe-view-manager-header .button-group a {
+.openerp .oe-view-manager-header .button-group a {
   color: #4c4c4c;
 }
-.openerp2 .oe-view-manager-header .button-group a:hover {
+.openerp .oe-view-manager-header .button-group a:hover {
   text-decoration: none;
 }
-.openerp2 .oe-view-manager-header .button-group .active {
+.openerp .oe-view-manager-header .button-group .active {
   width: 100%;
   background: #999999;
   -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
@@ -841,7 +845,7 @@
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
 }
-.openerp2 .oe_view_manager_header {
+.openerp .oe_view_manager_header {
   border-top: 1px solid #cacaca;
   border-bottom: 1px solid #cacaca;
   background-color: #fcfcfc;
@@ -855,7 +859,7 @@
   -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);
 }
-.openerp2 .oe_view_manager_header .oe_view_manager_row {
+.openerp .oe_view_manager_header .oe_view_manager_row {
   height: 26px;
   line-height: 26px;
   margin: 8px;
@@ -863,78 +867,78 @@
   text-shadow: 0 1px 1px white;
   text-align: center;
 }
-.openerp2 .oe_view_manager_header .oe_view_manager_row h2 {
+.openerp .oe_view_manager_header .oe_view_manager_row h2 {
   float: left;
   font-size: 18px;
   margin: 1px 0;
 }
-.openerp2 .oe_view_manager_header .oe_view_manager_row h2 a {
+.openerp .oe_view_manager_header .oe_view_manager_row h2 a {
   color: #8a89ba;
 }
-.openerp2 .oe_view_manager_header .oe_view_manager_row .dropdown-toggle:after {
+.openerp .oe_view_manager_header .oe_view_manager_row .dropdown-toggle:after {
   margin-top: 7px;
   margin-left: 6px;
   border-top-color: #404040;
 }
-.openerp2 .oe_view_manager_header .oe_filter {
+.openerp .oe_view_manager_header .oe_filter {
   vertical-align: top;
 }
-.openerp2 .oe_view_manager_header .oe_filter li {
+.openerp .oe_view_manager_header .oe_filter li {
   height: 24px;
   line-height: 24px;
   padding: 0 8px;
 }
-.openerp2 .oe_view_manager_header .oe_button_group {
+.openerp .oe_view_manager_header .oe_button_group {
   display: inline-block;
   border: 1px solid #ababab;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
   border-radius: 5px;
 }
-.openerp2 .oe_view_manager_header .oe_button_group li {
+.openerp .oe_view_manager_header .oe_button_group li {
   float: left;
   border-right: 1px solid #ababab;
 }
-.openerp2 .oe_view_manager_header .oe_button_group li:last-child {
+.openerp .oe_view_manager_header .oe_button_group li:last-child {
   border: none;
 }
-.openerp2 .oe_view_manager_header .oe_button_group a {
+.openerp .oe_view_manager_header .oe_button_group a {
   color: #4c4c4c;
 }
-.openerp2 .oe_view_manager_header .oe_button_group a:hover {
+.openerp .oe_view_manager_header .oe_button_group a:hover {
   text-decoration: none;
 }
-.openerp2 .oe_view_manager_header .oe_button_group .active {
+.openerp .oe_view_manager_header .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;
 }
-.openerp2 .oe_view_manager_header .oe_button_group .active a {
+.openerp .oe_view_manager_header .oe_button_group .active a {
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
 }
-.openerp2 .oe_view_manager_header .pagination li {
+.openerp .oe_view_manager_header .pagination li {
   height: 24px;
   line-height: 24px;
   padding: 0 8px;
 }
-.openerp2 .oe_view_manager_header .oe_view_manager_buttons {
+.openerp .oe_view_manager_header .oe_view_manager_buttons {
   padding-right: 8px;
   float: left;
   margin-right: 12px;
 }
-.openerp2 .oe_view_manager_header .oe_view_manager_sidebar {
+.openerp .oe_view_manager_header .oe_view_manager_sidebar {
   display: inline-block;
 }
-.openerp2 .oe_view_manager_header .oe_view_manager_pager {
+.openerp .oe_view_manager_header .oe_view_manager_pager {
   float: right;
 }
-.openerp2 .oe_pager_value {
+.openerp .oe_pager_value {
   float: left;
   margin-right: 8px;
 }
-.openerp2 .oe_pager_group {
+.openerp .oe_pager_group {
   float: left;
   height: 24px;
   line-height: 24px;
@@ -945,64 +949,64 @@
   -webkit-border-radius: 5px;
   border-radius: 5px;
 }
-.openerp2 .oe_pager_group li {
+.openerp .oe_pager_group li {
   height: 24px;
   line-height: 24px;
   padding: 0;
   float: left;
   border-right: 1px solid #ababab;
 }
-.openerp2 .oe_pager_group li:last-child {
+.openerp .oe_pager_group li:last-child {
   border: none;
 }
-.openerp2 .oe_pager_group a {
+.openerp .oe_pager_group a {
   color: #4c4c4c;
   padding: 0 8px;
 }
-.openerp2 .oe_pager_group a:hover {
+.openerp .oe_pager_group a:hover {
   text-decoration: none;
 }
-.openerp2 .oe_pager_group .active {
+.openerp .oe_pager_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;
 }
-.openerp2 .oe_pager_group .active a {
+.openerp .oe_pager_group .active a {
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
 }
-.openerp2 .oe_view_manager_switch li {
+.openerp .oe_view_manager_switch li {
   padding-left: 1px;
   text-align: center;
   width: 24px;
   height: 24px;
   line-height: 24px;
 }
-.openerp2 .oe_view_manager_switch .oe_vm_switch_list:after, .openerp2 .oe_view_manager_switch .oe_vm_switch_tree:after {
+.openerp .oe_view_manager_switch .oe_vm_switch_list:after, .openerp .oe_view_manager_switch .oe_vm_switch_tree:after {
   content: "ö";
 }
-.openerp2 .oe_view_manager_switch .oe_vm_switch_graph:after {
+.openerp .oe_view_manager_switch .oe_vm_switch_graph:after {
   content: "ó";
 }
-.openerp2 .oe_view_manager_switch .oe_vm_switch_gantt:after {
+.openerp .oe_view_manager_switch .oe_vm_switch_gantt:after {
   content: "y";
 }
-.openerp2 .oe_view_manager_switch .oe_vm_switch_calendar:after {
+.openerp .oe_view_manager_switch .oe_vm_switch_calendar:after {
   content: "b";
 }
-.openerp2 .oe_view_manager_switch .oe_vm_switch_kanban:after {
+.openerp .oe_view_manager_switch .oe_vm_switch_kanban:after {
   content: "ó";
 }
-.openerp2 .oe_view_manager_switch .oe_vm_switch_diagram:after {
+.openerp .oe_view_manager_switch .oe_vm_switch_diagram:after {
   content: "}";
 }
-.openerp2 .oe_form_dropdown_section {
+.openerp .oe_form_dropdown_section {
   position: relative;
   display: inline-block;
   margin-right: 4px;
 }
-.openerp2 .oe_dropdown_toggle:after {
+.openerp .oe_dropdown_toggle:after {
   width: 0;
   height: 0;
   display: inline-block;
@@ -1018,7 +1022,7 @@
   margin-left: 6px;
   border-top-color: #404040;
 }
-.openerp2 .oe_dropdown_menu {
+.openerp .oe_dropdown_menu {
   display: none;
   position: absolute;
   top: 28px;
@@ -1036,13 +1040,13 @@
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
   -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
 }
-.openerp2 .oe_dropdown_menu li {
+.openerp .oe_dropdown_menu li {
   list-style-type: none;
   float: none;
   display: block;
   background-color: none;
 }
-.openerp2 .oe_dropdown_menu li a {
+.openerp .oe_dropdown_menu li a {
   display: block;
   padding: 3px 6px;
   clear: both;
@@ -1051,7 +1055,7 @@
   color: #4c4c4c;
   text-decoration: none;
 }
-.openerp2 .oe_dropdown_menu li a:hover {
+.openerp .oe_dropdown_menu li a:hover {
   text-decoration: none;
   background-color: #f0f0fa;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
@@ -1064,46 +1068,46 @@
   -webkit-box-shadow: none;
   -box-shadow: none;
 }
-.openerp2 .oe_searchview {
+.openerp .oe_searchview {
   position: relative;
   float: right;
 }
-.openerp2 .oe_searchview .VS-search .VS-search-box {
+.openerp .oe_searchview .VS-search .VS-search-box {
   min-height: 0;
   border-width: 1px;
   padding: 0;
   width: 410px;
 }
-.openerp2 .oe_searchview .VS-search .VS-icon {
+.openerp .oe_searchview .VS-search .VS-icon {
   top: 5px;
 }
-.openerp2 .oe_searchview .VS-search .VS-icon-search {
+.openerp .oe_searchview .VS-search .VS-icon-search {
   left: 5px;
 }
-.openerp2 .oe_searchview .VS-search .VS-search-inner {
+.openerp .oe_searchview .VS-search .VS-search-inner {
   margin: 0 40px 0 17px;
   font-size: 13px;
 }
-.openerp2 .oe_searchview .VS-search .VS-search-inner input {
+.openerp .oe_searchview .VS-search .VS-search-inner input {
   font-size: inherit;
   line-height: inherit;
   height: auto;
   padding: 0;
 }
-.openerp2 .oe_searchview .VS-search .VS-search-inner .VS-input-width-tester {
+.openerp .oe_searchview .VS-search .VS-search-inner .VS-input-width-tester {
   font-size: inherit;
   padding: 0;
 }
-.openerp2 .oe_searchview .VS-search .VS-search-inner .search_input {
+.openerp .oe_searchview .VS-search .VS-search-inner .search_input {
   margin-left: 0;
   height: 22px;
 }
-.openerp2 .oe_searchview .VS-search .VS-search-inner .search_input input, .openerp2 .oe_searchview .VS-search .VS-search-inner .search_input .VS-input-width-tester {
+.openerp .oe_searchview .VS-search .VS-search-inner .search_input input, .openerp .oe_searchview .VS-search .VS-search-inner .search_input .VS-input-width-tester {
   padding: 0 2px;
   height: inherit;
   margin: 0;
 }
-.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet {
+.openerp .oe_searchview .VS-search .VS-search-inner .search_facet {
   padding: 0;
   margin: 1px 0;
   border: 1px solid #afafb6;
@@ -1113,21 +1117,21 @@
   background: #f0f0fa;
   height: 18px;
 }
-.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected {
+.openerp .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected {
   border-color: #a6a6fe;
   -moz-box-shadow: 0 0 3px 1px #a6a6fe;
   -webkit-box-shadow: 0 0 3px 1px #a6a6fe;
   -box-shadow: 0 0 3px 1px #a6a6fe;
 }
-.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected .category {
+.openerp .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected .category {
   margin-left: 0;
 }
-.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected .VS-icon-cancel {
+.openerp .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected .VS-icon-cancel {
   filter: alpha(opacity=100);
   opacity: 1;
   background-position: center 0;
 }
-.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet .category {
+.openerp .oe_searchview .VS-search .VS-search-inner .search_facet .category {
   padding: 0 4px 0 14px;
   color: white;
   background: #8786b7;
@@ -1138,21 +1142,21 @@
   line-height: 18px;
   font-size: inherit;
 }
-.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet .search_facet_input_container {
+.openerp .oe_searchview .VS-search .VS-search-inner .search_facet .search_facet_input_container {
   border-left: 1px solid #afafb6;
   height: 18px;
   line-height: 18px;
   padding: 0 4px;
   cursor: pointer;
 }
-.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet .search_facet_remove {
+.openerp .oe_searchview .VS-search .VS-search-inner .search_facet .search_facet_remove {
   left: 1px;
   top: 3px;
 }
-.openerp2 .oe_searchview .VS-search .VS-icon-cancel {
+.openerp .oe_searchview .VS-search .VS-icon-cancel {
   right: 24px;
 }
-.openerp2 .oe_searchview .VS-search .oe_vs_unfold_drawer {
+.openerp .oe_searchview .VS-search .oe_vs_unfold_drawer {
   position: absolute;
   top: 0;
   right: 0;
@@ -1162,13 +1166,13 @@
   color: #cccccc;
   cursor: pointer;
 }
-.openerp2 .oe_searchview .VS-search .oe_vs_unfold_drawer:before {
+.openerp .oe_searchview .VS-search .oe_vs_unfold_drawer:before {
   content: "▾";
 }
-.openerp2 .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer {
+.openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer {
   display: block;
 }
-.openerp2 .oe_searchview .oe_searchview_drawer {
+.openerp .oe_searchview .oe_searchview_drawer {
   position: absolute;
   z-index: 1;
   top: 100%;
@@ -1178,68 +1182,68 @@
   display: none;
   border: 1px solid #cccccc;
 }
-.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters {
   display: table;
   width: 100%;
 }
-.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters > div {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters > div {
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   display: table-cell;
   width: 50%;
 }
-.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters h3 {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters h3 {
   margin: 2px 4px 2px 8px;
   color: #8786b7;
 }
-.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters ul {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters ul {
   margin: 0 12px 3px;
   padding: 0;
   list-style: none;
 }
-.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters li {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li {
   list-style: none;
   padding: 3px 6px;
   height: 14px;
   color: inherit;
   cursor: pointer;
 }
-.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters li:hover {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li:hover {
   background-color: #f0f0fa;
 }
-.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4 {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4 {
   border-top: 1px solid #cccccc;
   margin: 5px 0 3px;
   cursor: pointer;
 }
-.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4:before {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4:before {
   content: "▸ ";
 }
-.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced div {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced div {
   display: none;
 }
-.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced button.oe_add_condition:before {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced button.oe_add_condition:before {
   content: "⊞ ";
 }
-.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced button.oe_apply:before {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced button.oe_apply:before {
   content: "⚡ ";
 }
-.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced ul {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced ul {
   list-style: none;
   padding: 0;
 }
-.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li {
   list-style: none;
   margin: 0;
 }
-.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened h4:before {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened h4:before {
   content: "▾ ";
 }
-.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened div {
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened div {
   display: block;
 }
-.openerp2 .oe_view_topbar {
+.openerp .oe_view_topbar {
   border-bottom: 1px solid #cacaca;
   background-color: #fcfcfc;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
@@ -1251,14 +1255,14 @@
   padding: 0 8px;
   line-height: 30px;
 }
-.openerp2 .oe_form_header {
+.openerp .oe_form_header {
   padding: 8px;
 }
-.openerp2 .oe_form_invalid input, .openerp2 .oe_form_invalid select, .openerp2 .oe_form_invalid textarea {
+.openerp .oe_form_invalid input, .openerp .oe_form_invalid select, .openerp .oe_form_invalid textarea {
   background-color: #ff6666 !important;
   border: 1px solid #dd0000 !important;
 }
-.openerp2 .oe_form_button_save_dirty {
+.openerp .oe_form_button_save_dirty {
   color: white;
   background: #dc5f59;
   background: -moz-linear-gradient(#dc5f59, #b33630);
@@ -1269,10 +1273,10 @@
   -box-shadow: none;
   font-weight: bold;
 }
-.openerp2 .oe_form_button_save_dirty:hover {
+.openerp .oe_form_button_save_dirty:hover {
   background: #ed6f6a;
 }
-.openerp2 .oe_form_topbar {
+.openerp .oe_form_topbar {
   border-bottom: 1px solid #cacaca;
   background-color: #fcfcfc;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
@@ -1284,7 +1288,7 @@
   padding: 0 8px;
   line-height: 30px;
 }
-.openerp2 .oe_form_topbar button {
+.openerp .oe_form_topbar button {
   font-size: 12px;
   height: 24px;
   line-height: 24px;
@@ -1292,11 +1296,11 @@
   padding: 0 10px;
   margin: 3px 0;
 }
-.openerp2 .oe_form_topbar button span.i {
+.openerp .oe_form_topbar button span.i {
   line-height: 20px;
   height: 24px;
 }
-.openerp2 .oe_form_topbar ul {
+.openerp .oe_form_topbar ul {
   height: 30px;
   padding: 0;
   margin: 0;
@@ -1304,7 +1308,7 @@
   border-left: 1px solid #cacaca;
   border-right: 1px solid #cacaca;
 }
-.openerp2 .oe_form_topbar ul li {
+.openerp .oe_form_topbar ul li {
   padding: 0;
   margin: 0;
   float: left;
@@ -1313,45 +1317,45 @@
   height: 30px;
   padding: 0 12px;
 }
-.openerp2 .oe_form_topbar ul li:first-child {
+.openerp .oe_form_topbar ul li:first-child {
   border-left: 1px solid #cacaca;
 }
-.openerp2 .oe_form_topbar ul li a {
+.openerp .oe_form_topbar ul li a {
   color: #4c4c4c;
 }
-.openerp2 .oe_form_topbar ul li a:hover {
+.openerp .oe_form_topbar ul li a:hover {
   color: black;
 }
-.openerp2 .oe_form_topbar .oe_form_steps img {
+.openerp .oe_form_topbar .oe_form_steps img {
   margin: 0 8px;
   vertical-align: top;
 }
-.openerp2 .oe_form_topbar .oe_form_steps li {
+.openerp .oe_form_topbar .oe_form_steps li {
   border-right: none;
   padding: 0;
 }
-.openerp2 .oe_form_topbar .oe_form_steps li:first-child {
+.openerp .oe_form_topbar .oe_form_steps li:first-child {
   margin-left: 12px;
   border-left: none;
 }
-.openerp2 .oe_form_topbar .oe_form_steps li:last-child {
+.openerp .oe_form_topbar .oe_form_steps li:last-child {
   margin-right: 12px;
 }
-.openerp2 .oe_form_topbar .oe_form_steps_active {
+.openerp .oe_form_topbar .oe_form_steps_active {
   font-weight: bold;
   color: #b33630;
 }
-.openerp2 .oe_application .oe_form_sheetbg {
+.openerp .oe_application .oe_form_sheetbg {
   background: url(/web/static/src/img/form_sheetbg.png);
   padding: 8px;
   border-bottom: 1px solid #dddddd;
 }
-.openerp2 .oe_application .oe_form_sheet_width {
+.openerp .oe_application .oe_form_sheet_width {
   min-width: 650px;
   max-width: 980px;
   margin: 0 auto;
 }
-.openerp2 .oe_application .oe_form_sheet {
+.openerp .oe_application .oe_form_sheet {
   padding: 8px 8px 8px 8px;
   background: white;
   min-height: 420px;
@@ -1360,67 +1364,67 @@
   -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
   -box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
 }
-.openerp2 .oe_form_autolayout .oe_button {
+.openerp .oe_form_autolayout .oe_button {
   height: 22px;
 }
-.openerp2 .oe_form_autolayout .oe_form_group_cell {
+.openerp .oe_form_autolayout .oe_form_group_cell {
   line-height: 18px;
   padding: 2px;
   height: 25px;
 }
-.openerp2 .oe_form_autolayout .oe_form_group_cell .oe_form_button {
+.openerp .oe_form_autolayout .oe_form_group_cell .oe_form_button {
   width: 100%;
   white-space: nowrap;
 }
-.openerp2 .oe_form_autolayout .oe_form_group_cell > .oe_form_field_many2one,
-.openerp2 .oe_form_autolayout .oe_form_group_cell > .oe_form_field_many2one input,
-.openerp2 .oe_form_autolayout .oe_form_group_cell > .oe_form_field_char input,
-.openerp2 .oe_form_autolayout .oe_form_group_cell > .oe_form_field_text textarea,
-.openerp2 .oe_form_autolayout .oe_form_group_cell > .oe_form_field_email,
-.openerp2 .oe_form_autolayout .oe_form_group_cell > .oe_form_field_email input,
-.openerp2 .oe_form_autolayout .oe_form_group_cell > .oe_form_field_url,
-.openerp2 .oe_form_autolayout .oe_form_group_cell > .oe_form_field_url input,
-.openerp2 .oe_form_autolayout .oe_form_group_cell > .oe_form_field_date input,
-.openerp2 .oe_form_autolayout .oe_form_group_cell > .oe_form_field_float input,
-.openerp2 .oe_form_autolayout .oe_form_group_cell > .oe_form_field_selection select,
-.openerp2 .oe_form_autolayout .oe_form_group_cell > .oe_datepicker_root {
+.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_many2one,
+.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_many2one input,
+.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_char input,
+.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_text textarea,
+.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_email,
+.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_email input,
+.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_url,
+.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_url input,
+.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_date input,
+.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_float input,
+.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_selection select,
+.openerp .oe_form_autolayout .oe_form_group_cell > .oe_datepicker_root {
   width: 100%;
 }
-.openerp2 .oe_form_autolayout .oe_form_button.oe_button {
+.openerp .oe_form_autolayout .oe_form_button.oe_button {
   color: #4c4c4c;
   white-space: nowrap;
   min-width: 100%;
   width: 100%;
   height: 22px;
 }
-.openerp2 .oe_form_autolayout .oe_form_button.oe_button span {
+.openerp .oe_form_autolayout .oe_form_button.oe_button span {
   position: relative;
   vertical-align: top;
 }
-.openerp2 .oe_form_autolayout .oe_form_group_cell.oe_form_group_nested {
+.openerp .oe_form_autolayout .oe_form_group_cell.oe_form_group_nested {
   padding: 0;
 }
-.openerp2 .oe_form label {
+.openerp .oe_form label {
   font-weight: bold;
 }
-.openerp2 .oe_form_label_help[for], .openerp2 .oe_form_label[for] {
+.openerp .oe_form_label_help[for], .openerp .oe_form_label[for] {
   white-space: nowrap;
 }
-.openerp2 .oe_form textarea {
+.openerp .oe_form textarea {
   resize: vertical;
 }
-.openerp2 .oe_form input[type="text"],
-.openerp2 .oe_form input[type="password"],
-.openerp2 .oe_form input[type="file"],
-.openerp2 .oe_form select {
+.openerp .oe_form input[type="text"],
+.openerp .oe_form input[type="password"],
+.openerp .oe_form input[type="file"],
+.openerp .oe_form select {
   height: 22px;
   padding-top: 2px;
 }
-.openerp2 .oe_form input[type="text"],
-.openerp2 .oe_form input[type="password"],
-.openerp2 .oe_form input[type="file"],
-.openerp2 .oe_form select,
-.openerp2 .oe_form textarea {
+.openerp .oe_form input[type="text"],
+.openerp .oe_form input[type="password"],
+.openerp .oe_form input[type="file"],
+.openerp .oe_form select,
+.openerp .oe_form textarea {
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
   -ms-box-sizing: border-box;
@@ -1435,20 +1439,20 @@
   min-width: 90px;
   color: #1f1f1f;
 }
-.openerp2 .oe_form input[readonly],
-.openerp2 .oe_form select[readonly],
-.openerp2 .oe_form textarea[readonly],
-.openerp2 .oe_form input[disabled],
-.openerp2 .oe_form select[disabled],
-.openerp2 .oe_form textarea[disabled] {
+.openerp .oe_form input[readonly],
+.openerp .oe_form select[readonly],
+.openerp .oe_form textarea[readonly],
+.openerp .oe_form input[disabled],
+.openerp .oe_form select[disabled],
+.openerp .oe_form textarea[disabled] {
   background: #e5e5e5 !important;
   color: #666666;
 }
-.openerp2 .oe_form .oe_form_field_many2one input,
-.openerp2 .oe_form .oe_form_field_binary input,
-.openerp2 .oe_form .oe_form_field_binary input,
-.openerp2 .oe_form .oe_form_field_email input,
-.openerp2 .oe_form .oe_form_field_url input {
+.openerp .oe_form .oe_form_field_many2one input,
+.openerp .oe_form .oe_form_field_binary input,
+.openerp .oe_form .oe_form_field_binary input,
+.openerp .oe_form .oe_form_field_email input,
+.openerp .oe_form .oe_form_field_url input {
   border-right: none;
   -webkit-border-top-right-radius: 0px;
   -webkit-border-bottom-right-radius: 0px;
@@ -1457,36 +1461,36 @@
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
 }
-.openerp2 .oe_form .oe_form_field_email button img,
-.openerp2 .oe_form .oe_form_field_url button img {
+.openerp .oe_form .oe_form_field_email button img,
+.openerp .oe_form .oe_form_field_url button img {
   vertical-align: top;
 }
-.openerp2 .oe_form .oe_form_field_translatable,
-.openerp2 .oe_form .oe_form_field_many2one,
-.openerp2 .oe_form .oe_form_field_date,
-.openerp2 .oe_form .oe_form_field_datetime {
+.openerp .oe_form .oe_form_field_translatable,
+.openerp .oe_form .oe_form_field_many2one,
+.openerp .oe_form .oe_form_field_date,
+.openerp .oe_form .oe_form_field_datetime {
   white-space: nowrap;
 }
-.openerp2 .oe_form .oe_form_field_boolean {
+.openerp .oe_form .oe_form_field_boolean {
   padding-top: 4px;
 }
-.openerp2 .oe_form .oe_form_field_datetime input {
+.openerp .oe_form .oe_form_field_datetime input {
   min-width: 11em;
 }
-.openerp2 .oe_form .oe_datepicker_container {
+.openerp .oe_form .oe_datepicker_container {
   display: none;
 }
-.openerp2 .oe_form .oe_datepicker_root {
+.openerp .oe_form .oe_datepicker_root {
   display: inline-block;
 }
-.openerp2 .oe_form .oe_form_required input, .openerp2 .oe_form .oe_form_required select, .openerp2 .oe_form .oe_form_required textarea {
+.openerp .oe_form .oe_form_required input, .openerp .oe_form .oe_form_required select, .openerp .oe_form .oe_form_required textarea {
   background-color: #d2d2ff !important;
 }
-.openerp2 .oe_form .oe_form_invalid input, .openerp2 .oe_form .oe_form_invalid select, .openerp2 .oe_form .oe_form_invalid textarea {
+.openerp .oe_form .oe_form_invalid input, .openerp .oe_form .oe_form_invalid select, .openerp .oe_form .oe_form_invalid textarea {
   background-color: #ff6666 !important;
   border: 1px solid #dd0000 !important;
 }
-.openerp2 .oe_form .oe_button.oe_field_button {
+.openerp .oe_form .oe_button.oe_field_button {
   -webkit-border-top-left-radius: 0px;
   -webkit-border-bottom-left-radius: 0px;
   -moz-border-radius-topleft: 0px;
@@ -1496,12 +1500,12 @@
   margin-right: -1px;
   height: 22px;
 }
-.openerp2 .oe_form .oe_input_icon {
+.openerp .oe_form .oe_input_icon {
   cursor: pointer;
   margin: 3px 0 0 -21px;
   vertical-align: top;
 }
-.openerp2 .oe_form .oe_input_icon_disabled {
+.openerp .oe_form .oe_input_icon_disabled {
   position: absolute;
   cursor: default;
   opacity: 0.5;
@@ -1509,13 +1513,13 @@
   right: 5px;
   top: 3px;
 }
-.openerp2 .oe_form .oe-binary-file-set {
+.openerp .oe_form .oe-binary-file-set {
   overflow: hidden;
   position: relative;
   width: 45px;
   height: 30px;
 }
-.openerp2 .oe_form input.oe-binary-file {
+.openerp .oe_form input.oe-binary-file {
   z-index: 0;
   line-height: 0;
   font-size: 12px;
@@ -1528,51 +1532,51 @@
   margin: 0;
   padding: 0;
 }
-.openerp2 .oe_horizontal_separator {
+.openerp .oe_horizontal_separator {
   font-weight: bold;
   border: 0 solid #666666;
   border-bottom-width: 1px;
   margin: 3px 4px 3px 1px;
   height: 17px;
 }
-.openerp2 .oe_horizontal_separator:empty {
+.openerp .oe_horizontal_separator:empty {
   height: 5px;
 }
-.openerp2 .oe_vertical_separator {
+.openerp .oe_vertical_separator {
   border-left: 1px solid #666666;
   padding: 0 4px 0 4px;
 }
-.openerp2 .oe_form_notebook {
+.openerp .oe_form_notebook {
   margin: 8px 0;
   padding: 0 8px;
   list-style: none;
   zoom: 1;
 }
-.openerp2 .oe_form_notebook:before, .openerp2 .oe_form_notebook:after {
+.openerp .oe_form_notebook:before, .openerp .oe_form_notebook:after {
   display: table;
   content: "";
   zoom: 1;
 }
-.openerp2 .oe_form_notebook:after {
+.openerp .oe_form_notebook:after {
   clear: both;
 }
-.openerp2 .oe_form_notebook > li {
+.openerp .oe_form_notebook > li {
   float: left;
 }
-.openerp2 .oe_form_notebook > li > a {
+.openerp .oe_form_notebook > li > a {
   display: block;
   color: #4c4c4c;
 }
-.openerp2 .oe_form_notebook {
+.openerp .oe_form_notebook {
   border-color: #dddddd;
   border-style: solid;
   border-width: 0 0 1px;
 }
-.openerp2 .oe_form_notebook > li {
+.openerp .oe_form_notebook > li {
   position: relative;
   margin-bottom: -1px;
 }
-.openerp2 .oe_form_notebook > li > a {
+.openerp .oe_form_notebook > li > a {
   padding: 0 12px;
   margin-right: 2px;
   line-height: 30px;
@@ -1581,21 +1585,21 @@
   -webkit-border-radius: 4px 4px 0 0;
   border-radius: 4px 4px 0 0;
 }
-.openerp2 .oe_form_notebook > li > a:hover {
+.openerp .oe_form_notebook > li > a:hover {
   text-decoration: none;
   background-color: #eeeeee;
   border-color: #eeeeee #eeeeee #dddddd;
 }
-.openerp2 .oe_form_notebook > li.ui-state-active > a, .openerp2 .oe_form_notebook > li.ui-state-active > a:hover {
+.openerp .oe_form_notebook > li.ui-state-active > a, .openerp .oe_form_notebook > li.ui-state-active > a:hover {
   background-color: white;
   border: 1px solid #dddddd;
   border-bottom-color: transparent;
   cursor: default;
 }
-.openerp2 .ui-tabs-hide {
+.openerp .ui-tabs-hide {
   display: none;
 }
-.openerp2 .oe_form .oe_form_field_progressbar.ui-progressbar {
+.openerp .oe_form .oe_form_field_progressbar.ui-progressbar {
   height: 22px;
   font-size: 10px;
   -moz-box-sizing: border-box;
@@ -1609,42 +1613,42 @@
   background: white;
   min-width: 90px;
 }
-.openerp2 .oe_form .oe_form_field_progressbar.ui-progressbar span {
+.openerp .oe_form .oe_form_field_progressbar.ui-progressbar span {
   position: absolute;
   margin-left: 10px;
   font-weight: bold;
 }
-.openerp2 .oe_form .oe_form_field_progressbar.ui-progressbar .ui-widget-header {
+.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;
 }
-.openerp2 .oe_form .oe_view_manager_row:first-child {
+.openerp .oe_form .oe_view_manager_row:first-child {
   display: none;
 }
-.openerp2 .oe-listview-content {
+.openerp .oe-listview-content {
   width: 100%;
 }
-.openerp2 .oe-listview-content thead, .openerp2 .oe-listview-content tfoot {
+.openerp .oe-listview-content thead, .openerp .oe-listview-content tfoot {
   border-bottom: 1px solid #cacaca;
   background: #eeeeee;
 }
-.openerp2 .oe-listview-content tfoot {
+.openerp .oe-listview-content tfoot {
   border-bottom: 1px solid #cacaca;
   font-weight: bold;
 }
-.openerp2 .oe-listview-content tbody {
+.openerp .oe-listview-content tbody {
   cursor: pointer;
   background: white;
 }
-.openerp2 .oe-listview-content thead {
+.openerp .oe-listview-content thead {
   vertical-align: top;
 }
-.openerp2 .oe-listview-content td.oe_list_checkbox:first-child, .openerp2 .oe-listview-content th.oe_list_checkbox:first-child {
+.openerp .oe-listview-content td.oe_list_checkbox:first-child, .openerp .oe-listview-content th.oe_list_checkbox:first-child {
   width: 17px;
 }
-.openerp2 .oe-listview-content td.oe_list_checkbox:first-child:after, .openerp2 .oe-listview-content th.oe_list_checkbox:first-child:after {
+.openerp .oe-listview-content td.oe_list_checkbox:first-child:after, .openerp .oe-listview-content th.oe_list_checkbox:first-child:after {
   border-width: 0;
 }
-.openerp2 .oe-listview-content tbody tr:nth-child(odd) td, .openerp2 .oe-listview-content tbody tr:nth-child(odd) th {
+.openerp .oe-listview-content tbody tr:nth-child(odd) td, .openerp .oe-listview-content tbody tr:nth-child(odd) th {
   background-color: #f0f0fa;
   background-color: #f0f0fa;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
@@ -1654,7 +1658,7 @@
   background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6);
   background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6);
 }
-.openerp2 .oe-listview-content tbody tr:hover td, .openerp2 .oe-listview-content tbody tr:hover th {
+.openerp .oe-listview-content tbody tr:hover td, .openerp .oe-listview-content tbody tr:hover th {
   background-color: #eeeeee;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#dedede));
   background-image: -webkit-linear-gradient(top, #eeeeee, #dedede);
@@ -1663,23 +1667,23 @@
   background-image: -o-linear-gradient(top, #eeeeee, #dedede);
   background-image: linear-gradient(to bottom, #eeeeee, #dedede);
 }
-.openerp2 .oe-listview-content td, .openerp2 .oe-listview-content th {
+.openerp .oe-listview-content td, .openerp .oe-listview-content th {
   padding: 3px 6px;
   line-height: 18px;
 }
-.openerp2 .oe-listview-content .numeric {
+.openerp .oe-listview-content .numeric {
   text-align: right;
   width: 82px;
 }
-.openerp2 .oe-listview-content .numeric input {
+.openerp .oe-listview-content .numeric input {
   text-align: right;
 }
-.openerp2 .oe-listview-content table .sortdown:after, .openerp2 .oe-listview-content table .sortdown:hover:after {
+.openerp .oe-listview-content table .sortdown:after, .openerp .oe-listview-content table .sortdown:hover:after {
   visibility: visible;
   filter: alpha(opacity=60);
   opacity: 0.6;
 }
-.openerp2 .oe-listview-content table .sortup:after {
+.openerp .oe-listview-content table .sortup:after {
   border-bottom: none;
   border-left: 4px solid transparent;
   border-right: 4px solid transparent;
@@ -1691,13 +1695,13 @@
   filter: alpha(opacity=60);
   opacity: 0.6;
 }
-.openerp2 .oe_kanban_group_title {
+.openerp .oe_kanban_group_title {
   margin: 1px 1px 4px;
   font-size: 15px;
   font-weight: bold;
   text-shadow: 0 1px 0 white;
 }
-.openerp2 .oe_kanban_column, .openerp2 .oe_kanban_group_header {
+.openerp .oe_kanban_column, .openerp .oe_kanban_group_header {
   width: 240px;
   vertical-align: top;
   padding: 6px 7px 6px 6px;
@@ -1705,7 +1709,7 @@
   border-left: 1px solid #f0f8f8;
   border-right: 1px solid #b9b9b9;
 }
-.openerp2 .oe_kanban_record {
+.openerp .oe_kanban_record {
   position: relative;
   display: block;
   min-height: 50px;
@@ -1715,14 +1719,14 @@
   -webkit-border-radius: 4px;
   border-radius: 4px;
 }
-.openerp2 .oe_kanban_record:last-child {
+.openerp .oe_kanban_record:last-child {
   margin-bottom: 0;
 }
-.openerp2 .oe_kanban_record .oe_kanban_title {
+.openerp .oe_kanban_record .oe_kanban_title {
   font-weight: bold;
   margin: 2px 4px;
 }
-.openerp2 .oe_kanban_gravatar {
+.openerp .oe_kanban_gravatar {
   width: 20px;
   height: 20px;
   -moz-border-radius: 3px;
@@ -1732,35 +1736,35 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
   -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
-.openerp2 .oe_trad_field.touched {
+.openerp .oe_trad_field.touched {
   border: 1px solid green !important;
 }
-.openerp2 .oe_layout_debugging .oe_form_group {
+.openerp .oe_layout_debugging .oe_form_group {
   border: 2px dashed red;
 }
-.openerp2 .oe_layout_debugging .oe_form_group_cell {
+.openerp .oe_layout_debugging .oe_form_group_cell {
   border: 1px solid blue;
   padding-bottom: 1em;
 }
-.openerp2 .oe_layout_debugging .oe_layout_debug_cell {
+.openerp .oe_layout_debugging .oe_layout_debug_cell {
   color: white;
   background: #669966;
   font-size: 80%;
   text-align: center;
 }
-.openerp2 .oe_layout_debugging .oe_layout_debug_cell {
+.openerp .oe_layout_debugging .oe_layout_debug_cell {
   display: block;
 }
-.openerp2 .oe_layout_debug_cell {
+.openerp .oe_layout_debug_cell {
   display: none;
 }
-.openerp2 .oe_debug_view {
+.openerp .oe_debug_view {
   float: left;
 }
-.openerp2 .oe_debug_view_log {
+.openerp .oe_debug_view_log {
   font-size: 95%;
 }
-.openerp2 .oe_debug_view_log label {
+.openerp .oe_debug_view_log label {
   display: block;
   width: 49%;
   text-align: right;
@@ -1768,7 +1772,7 @@
   font-weight: bold;
   color: #000099;
 }
-.openerp2 .oe_debug_view_log span {
+.openerp .oe_debug_view_log span {
   display: block;
   width: 49%;
   float: right;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index d946b595820..4913a12a449 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -66,7 +66,10 @@ $colour4: #8a89ba
 
 // }}}
 
-.openerp2
+.openerp.openerp-web-client-container
+    height: 100%
+
+.openerp
     // Group {{{
     // }}}
     // Global style {{{
diff --git a/addons/web/static/src/css/base_old.css b/addons/web/static/src/css/base_old.css
index ed538cf329f..a8878e06513 100644
--- a/addons/web/static/src/css/base_old.css
+++ b/addons/web/static/src/css/base_old.css
@@ -5,10 +5,6 @@
     font-family: Ubuntu, Helvetica, sans-serif;
 }
 
-.openerp.openerp-web-client-container {
-    height: 100%;
-}
-
 .openerp, .openerp textarea, .openerp input, .openerp select, .openerp option,
 .openerp button, .openerp .ui-widget {
     font-family: Ubuntu, Helvetica, sans-serif;
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index eb195ac2245..e1706bc4158 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -45,7 +45,7 @@ openerp.web.Notification =  openerp.web.Widget.extend({
 
 openerp.web.dialog = function(element) {
     var result = element.dialog.apply(element, _.rest(_.toArray(arguments)));
-    result.dialog("widget").addClass("openerp openerp2");
+    result.dialog("widget").addClass("openerp");
     return result;
 }
 
@@ -881,7 +881,7 @@ openerp.web.WebClient = openerp.web.Widget.extend({
     },
     start: function() {
         var self = this;
-        this.$element.addClass("openerp openerp2 openerp-web-client-container");
+        this.$element.addClass("openerp openerp-web-client-container");
         if (jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
             this.$element.addClass("kitten-mode-activated");
             this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) {
@@ -1036,7 +1036,7 @@ openerp.web.EmbeddedClient = openerp.web.Widget.extend({
     },
     start: function() {
         var self = this;
-        this.am.appendTo(this.$element.addClass('openerp openerp2'));
+        this.am.appendTo(this.$element.addClass('openerp'));
         return this.rpc("/web/action/load", { action_id: this.action_id }, function(result) {
             var action = result.result;
             action.flags = _.extend({
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 4e722f80740..140dc3cadd9 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2403,7 +2403,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.extend(
             minLength: 0,
             delay: 0
         });
-        this.$input.autocomplete("widget").addClass("openerp openerp2");
+        this.$input.autocomplete("widget").addClass("openerp");
         // used to correct a bug when selecting an element by pushing 'enter' in an editable list
         this.$input.keyup(function(e) {
             if (e.which === 13) {