diff --git a/addons/email_template/static/src/img/email_template.png b/addons/email_template/static/src/img/email_template.png
new file mode 100644
index 00000000000..d679492bc19
Binary files /dev/null and b/addons/email_template/static/src/img/email_template.png differ
diff --git a/addons/email_template/static/src/img/email_template_save.png b/addons/email_template/static/src/img/email_template_save.png
new file mode 100644
index 00000000000..bf29f9ab4ad
Binary files /dev/null and b/addons/email_template/static/src/img/email_template_save.png differ
diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index ce34ea1d551..a911034cb1a 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -41,21 +41,12 @@
                             on_change="on_change_template(use_template, template_id, False, False, context)"/>
                     </xpath>
                     <xpath expr="//a[@class='oe_mail_compose_message_checklist']" position="before">
-<!--                         
-                        <a href="#" class="oe_mail_compose_message_template">
-                            <img src='/mail/static/src/img/template.png/' alt='Use template'
-                                title='Use a message template'/>
-                        </a>
-                        <a href="#" class="oe_mail_compose_message_template_save">
-                            <img src='/mail/static/src/img/template.png/' alt='Save as template'
-                                title='Use a message template'/>
-                        </a> -->
-                        <button icon="gtk-paste" type="object" name="template_toggle"
-                                class="oe_mail_compose_message_template_toggle"
-                                string="" help="Use a message template" />
-                        <button icon="gtk-save" type="object" name="save_as_template"
-                                class="oe_mail_compose_message_template_save"
-                                string="" help="Save as a new template"/>
+                        <button icon="../../../../../email_template/static/src/img/email_template"
+                            type="object" name="template_toggle" string=""
+                            help="Use a message template"/>
+                        <button icon="../../../../../email_template/static/src/img/email_template_save"
+                            type="object" name="save_as_template" string=""
+                            help="Save as a new template"/>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 6080c45c75c..5593832549a 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -325,6 +325,10 @@
     width: 472px;
 }
 
+/* buttons */
+.openerp .oe_mail_msg_content .oe_mail_compose_message_icons button.oe_form_button {
+    padding: 1px;
+}
 
 /* ------------------------------------------------------------ */
 /* Messages layout
diff --git a/addons/mail/static/src/css/mail_compose_message.css b/addons/mail/static/src/css/mail_compose_message.css
index 58f900389d5..4cd1339ded4 100644
--- a/addons/mail/static/src/css/mail_compose_message.css
+++ b/addons/mail/static/src/css/mail_compose_message.css
@@ -13,4 +13,4 @@
 .openerp .oe_mail_compose_message_icons img {
     width: 20px;
     height: 20px;
-}
\ No newline at end of file
+}
diff --git a/addons/mail/static/src/img/attachment.png b/addons/mail/static/src/img/attachment.png
new file mode 100644
index 00000000000..5cc0c33257d
Binary files /dev/null and b/addons/mail/static/src/img/attachment.png differ
diff --git a/addons/mail/static/src/img/checklist.png b/addons/mail/static/src/img/checklist.png
new file mode 100644
index 00000000000..d252606ff53
Binary files /dev/null and b/addons/mail/static/src/img/checklist.png differ
diff --git a/addons/mail/static/src/img/formatting.png b/addons/mail/static/src/img/formatting.png
new file mode 100644
index 00000000000..cf45fdf192f
Binary files /dev/null and b/addons/mail/static/src/img/formatting.png differ
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index c70aad56710..2b69bf21dda 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -45,6 +45,8 @@
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0" >
                     <group>
+<!--                         <field name="type" invisible="1"/>
+                        <field name="content_subtype" invisible="1"/> -->
                         <field name="subject" colspan="2" nolabel="1" placeholder="Subject..."
                                 class="oe_mail_compose_message_subject oe_mail_compose_message_invisible"/>
                         <field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
@@ -55,10 +57,13 @@
                                 placeholder="Add contacts to notify..."
                                 class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
                         <div>
-                            <button icon="gtk-ok" name="send_mail" string="Post" type="object"/>
+                            <button name="send_mail" string="Post" type="object"/>
                             or <a href="#" class="oe_mail_compose_message_email">Send an Email</a>
                         </div>
                         <div class='oe_mail_compose_message_icons'>
+                            <!-- <button icon="../../../../../mail/static/src/img/checklist"
+                                type="object" name="checklist" string=""
+                                help="Add a checklist"/> -->
                             <a href="#" class="oe_mail_compose_message_checklist">
                                 <img src='/mail/static/src/img/checklist.png/' alt='Checklist'
                                     title='Add a checklist'/>