diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index d8ce605a78a..026770f3f23 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -1011,60 +1011,12 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */
     border-color: #828282;
 }
 
-/* Many2one Autosearch */
-.openerp .ui_combo {
-    height: 19px;
-    top: 6px;
-    width: 20px;
-    position: relative;
-    margin-left: -26px;
+.openerp .oe-m2m-drop-down-button {
+    margin-left: -23px;
 }
-
-.openerp img.m2o_open {
-    vertical-align: middle;
-    cursor: pointer;
+.openerp .oe-m2m-drop-down-button img,
+.openerp .oe-m2m-cm-button img {
+    margin-bottom: -4px;
 }
-/*----- End Many2one Autosearch ------- */
-
-/* Many2one Contextmenu */
-.openerp div.m2o_contextmenu {
-    background-color: #444;
-    border: 1px solid #000;
-    white-space: nowrap;
-    position: absolute;
-    padding: 2px;
-    z-index: 100;
+ {
 }
-
-.openerp div.m2o_contextmenu a,
-.openerp div.m2o_contextmenu span {
-    display: block;
-    text-align: left;
-    text-decoration: none;
-    white-space: nowrap;
-    padding: 2px;
-    color: #FFF;
-    cursor: pointer;
-}
-
-.openerp div.m2o_contextmenu hr {
-    margin: 1px 0 !important;
-}
-
-.openerp div.m2o_contextmenu td {
-    padding: 1px;
-}
-
-.openerp div.m2o_contextmenu a:hover,
-.openerp div.m2o_contextmenu span:hover {
-    color: #FFF;
-    background-color: #505050;
-    text-decoration: none;
-}
-
-.openerp div.m2o_contextmenu a.disabled,
-.openerp div.m2o_contextmenu span.disabled {
-    color: #C0C0C0;
-}
-
-/*----- End Many2one Contextmenu ------- */
diff --git a/addons/base/static/src/img/down-arrow.png b/addons/base/static/src/img/down-arrow.png
new file mode 100644
index 00000000000..b1288e52682
Binary files /dev/null and b/addons/base/static/src/img/down-arrow.png differ
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 4ec0b25872f..ebbf8525617 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -991,8 +991,8 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
         this._super();
         var self = this;
         this.$input = this.$element.find("input");
-        this.$drop_down = this.$element.find("span");
-        this.$menu_btn = this.$element.find("img");
+        this.$drop_down = this.$element.find(".oe-m2m-drop-down-button");
+        this.$menu_btn = this.$element.find(".oe-m2m-cm-button");
         
         var bindings = {};
         bindings[this.cm_id + "_search"] = function() {
@@ -1025,9 +1025,7 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
                 self.value = undefined;
             }
         });
-        this.$drop_down.button({
-            icons: {primary: "ui-icon-triangle-1-s"}, text: false
-        }).click(function() {
+        this.$drop_down.click(function() {
             if (self.$input.autocomplete("widget").is(":visible")) {
                 self.$input.autocomplete("close");
             } else {
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 7b45be97db5..f1d18461b8d 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -527,10 +527,10 @@
 <t t-name="FieldMany2One">
     <div t-att-id="widget.element_id" style="padding-right: 16px;white-space: nowrap;">
         <input t-att-id="widget.element_id + '_input'" type="text" style="width: 100%;"/>
-        <span t-att-id="widget.element_id + '_drop_down'" type="button" class="ui_combo"
-            tabindex="-1" title="Show All Items"></span>
-        <img t-att-id="widget.name + '_open'" alt="Open" title="Create"
-            src="/base/static/src/img/iconset-d-drop.gif" class="m2o_open"/>
+        <span class="oe-m2m-drop-down-button" t-att-id="widget.element_id + '_drop_down'">
+            <img src="/base/static/src/img/down-arrow.png" /></span>
+        <span class="oe-m2m-cm-button" t-att-id="widget.name + '_open'">
+            <img src="/base/static/src/img/icons/gtk-edit.png"/></span>
         <div t-att-id="widget.cm_id" class="contextMenu" style="display:none"><ul>
             <li t-att-id="widget.cm_id + '_search'">Search</li>
             <li t-att-id="widget.cm_id + '_create'">Create</li>