diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 0ef00e26bbe..2fa530cf1c0 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1215,14 +1215,16 @@ label.error {
     color: #1f1f1f;
 }
 
-.openerp input[type="text"].field_binary,
-.openerp input[type="text"].field_email,
-.openerp input[type="text"].field_url  {
-    border-right:none;
+.openerp .oe_forms input.field_many2one,
+.openerp .oe_forms input.field_binary,
+.openerp .oe_forms input.field_binary,
+.openerp .oe_forms input.field_email,
+.openerp .oe_forms input.field_url  {
+    border-right: none;
     -webkit-border-top-right-radius: 0px;
     -webkit-border-bottom-right-radius: 0px;
-    -moz-border-radius-topleft: 0px;
-    -moz-border-radius-bottomleft: 0px;
+    -moz-border-radius-topright: 0px;
+    -moz-border-radius-bottomright: 0px;
     border-top-right-radius: 0px;
     border-bottom-right-radius: 0px;
 }
@@ -1671,27 +1673,10 @@ label.error {
     border-color: #828282;
 }
 
-.openerp .oe-m2o {
-    padding-right: 22px;
-    white-space: nowrap;
-    height:22px;
-}
-
-.openerp .oe_forms .oe-m2o input[type="text"] {
-    padding-right: 20px;
-    padding-top: 2px;
-    -webkit-border-top-right-radius: 0px;
-    -webkit-border-bottom-right-radius: 0px;
-    -moz-border-radius-topright: 0px;
-    -moz-border-radius-bottomright: 0px;
-    border-top-right-radius: 0px;
-    border-bottom-right-radius: 0px;
-}
 .openerp .oe-m2o-drop-down-button {
-    margin-left: -23px;
+    margin-left: -24px;
 }
-.openerp .oe-m2o-drop-down-button img,
-.openerp .oe-m2o-cm-button img {
+.openerp .oe-m2o-drop-down-button img {
     margin-bottom: -4px;
     cursor: pointer;
 }
@@ -1700,32 +1685,6 @@ label.error {
     margin-right: 0px !important;
     padding-bottom: 2px !important;
 }
-.openerp .oe-m2o-cm-button, .openerp .oe-m2o-cm-button:active, .openerp .oe-m2o-cm-button:hover {
-    border: 1px solid #999;
-    -webkit-border-top-left-radius: 0px;
-    -webkit-border-bottom-left-radius: 0px;
-    -moz-border-radius-topleft: 0px;
-    -moz-border-radius-bottomleft: 0px;
-    border-top-left-radius: 0px;
-    border-bottom-left-radius: 0px;
-    -webkit-border-top-right-radius: 3px;
-    -webkit-border-bottom-right-radius: 3px;
-    -moz-border-radius-topright: 3px;
-    -moz-border-radius-bottomright: 3px;
-    border-top-right-radius: 3px;
-    border-bottom-right-radius: 3px;
-    background-color:#eee;
-    background: url("/web/static/src/img/icons/STOCK_JUMP_TO.png") no-repeat scroll center center, -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3));
-    background: url("/web/static/src/img/icons/STOCK_JUMP_TO.png") no-repeat scroll center center, -webkit-linear-gradient(#f6f6f6, #e3e3e3);
-    background: url("/web/static/src/img/icons/STOCK_JUMP_TO.png") no-repeat scroll center center, -moz-linear-gradient(#f6f6f6, #e3e3e3);
-    background: url("/web/static/src/img/icons/STOCK_JUMP_TO.png") no-repeat scroll center center, -o-linear-gradient(top, #f6f6f6, #e3e3e3);
-    background: url("/web/static/src/img/icons/STOCK_JUMP_TO.png") no-repeat scroll center center, -khtml-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3));
-    vertical-align:top;
-    margin:0;
-    padding:0 0 2px 0;
-    width: 22px;
-    height: 22px;
-}
 .openerp .oe-m2o-disabled-cm {
     color: grey;
 }
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 55b8354d2c5..ef7437c888b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -918,7 +918,7 @@
 <t t-name="FieldEmail">
     <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
-        <td width="100%" style="position: relative">
+        <td width="100%">
             <t t-call="FieldChar"/>
         </td>
         <td width="16">
@@ -932,7 +932,7 @@
 <t t-name="FieldUrl">
     <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
-        <td width="100%" style="position: relative">
+        <td width="100%">
             <t t-call="FieldChar"/>
         </td>
         <td width="16">
@@ -973,15 +973,22 @@
     </select>
 </t>
 <t t-name="FieldMany2One">
-    <div class="oe-m2o">
-        <input type="text" size="1" style="width: 100%;"
-                t-att-id="widget.element_id"/>
-        <span class="oe-m2o-drop-down-button">
-            <img t-att-src='_s + "/web/static/src/img/down-arrow.png"' /></span>
-        <button class="oe-m2o-cm-button" t-att-id="widget.name + '_open'"></button>
-        <div t-att-id="widget.cm_id" class="contextMenu" style="display:none">
-        </div>
-    </div>
+    <table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td width="100%" valign="top">
+            <t t-call="FieldChar"/>
+            <span class="oe-m2o-drop-down-button">
+                <img t-att-src='_s + "/web/static/src/img/down-arrow.png"' /></span>
+        </td>
+        <td>
+            <button class="oe_button oe_field_button oe-m2o-cm-button" t-att-id="widget.name + '_open'">
+                <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
+            </button>
+            <div t-att-id="widget.cm_id" class="contextMenu" style="display:none">
+            </div>
+        </td>
+    </tr>
+    </table>
 </t>
 <t t-name="FieldMany2One.context_menu">
     <ul>