diff --git a/addons/mail/mail_message_subtype.xml b/addons/mail/mail_message_subtype.xml
index 156c366af30..91317003e78 100644
--- a/addons/mail/mail_message_subtype.xml
+++ b/addons/mail/mail_message_subtype.xml
@@ -37,7 +37,7 @@
         <record model="ir.ui.view" id="view_edit_message_subtype_tree">
             <field name="name">edit.message.subtype.tree</field>
             <field name="model">mail.message.subtype</field>
-            <field name="priority">9</field>
+            <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Edit Subtype" editable="top">
                     <field name="name"/>
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 3ed2482911c..8056c95ecb3 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -619,9 +619,11 @@
 }
 .openerp .oe_followers .oe_edit_subtype{
     cursor: pointer;
-    line-height: 26px;
     position: absolute;
     right: 12px;
+    margin-top: 6px;
+    width: 10px !important;
+    height: 12px !important;
 }
 
 .openerp .oe_followers .oe_show_more{
diff --git a/addons/mail/static/src/img/icon-edit.gif b/addons/mail/static/src/img/icon-edit.gif
new file mode 100644
index 00000000000..6e9aa5ef659
Binary files /dev/null and b/addons/mail/static/src/img/icon-edit.gif differ
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index c22d253b1f7..1e88deb7960 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -32,7 +32,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <a t-if="widget.view_is_editable" class="oe_edit_subtype" title="Edit Subtype" t-att-data-id="record.id">Edit</a>
+        <img class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>