diff --git a/payment.xml b/payment.xml
index 6f31b0aba2..6a7f1aa99c 100644
--- a/payment.xml
+++ b/payment.xml
@@ -117,6 +117,35 @@ this repository contains the full copyright notices and license terms. -->
             <field name="perm_delete" eval="True"/>
         </record>
 
+        <record model="ir.model.button" id="mandate_cancel_button">
+            <field name="name">cancel</field>
+            <field name="string">Cancel</field>
+            <field name="confirm">Are you sure to cancel the mandate?</field>
+            <field name="model"
+                search="[('model', '=', 'account.payment.sepa.mandate')]"/>
+        </record>
+
+        <record model="ir.model.button" id="mandate_draft_button">
+            <field name="name">draft</field>
+            <field name="string">Draft</field>
+            <field name="model"
+                search="[('model', '=', 'account.payment.sepa.mandate')]"/>
+        </record>
+
+        <record model="ir.model.button" id="mandate_validate_mandate_button">
+            <field name="name">validate_mandate</field>
+            <field name="string">Validate</field>
+            <field name="model"
+                search="[('model', '=', 'account.payment.sepa.mandate')]"/>
+        </record>
+
+        <record model="ir.model.button" id="mandate_request_button">
+            <field name="name">request</field>
+            <field name="string">Request</field>
+            <field name="model"
+                search="[('model', '=', 'account.payment.sepa.mandate')]"/>
+        </record>
+
         <record model="ir.sequence.type" id="sequence_type_mandate">
             <field name="name">SEPA Mandate</field>
             <field name="code">account.payment.sepa.mandate</field>
@@ -231,6 +260,41 @@ this repository contains the full copyright notices and license terms. -->
             <field name="perm_delete" eval="True"/>
         </record>
 
+        <record model="ir.model.button" id="message_cancel_button">
+            <field name="name">cancel</field>
+            <field name="string">Cancel</field>
+            <field name="model"
+                search="[('model', '=', 'account.payment.sepa.message')]"/>
+        </record>
+
+        <record model="ir.model.button" id="message_draft_button">
+            <field name="name">draft</field>
+            <field name="string">Draft</field>
+            <field name="model"
+                search="[('model', '=', 'account.payment.sepa.message')]"/>
+        </record>
+
+        <record model="ir.model.button" id="message_wait_button">
+            <field name="name">wait</field>
+            <field name="string">Wait</field>
+            <field name="model"
+                search="[('model', '=', 'account.payment.sepa.message')]"/>
+        </record>
+
+        <record model="ir.model.button" id="message_do_button">
+            <field name="name">do</field>
+            <field name="string">Do</field>
+            <field name="model"
+                search="[('model', '=', 'account.payment.sepa.message')]"/>
+        </record>
+
+        <record model="ir.model.button" id="group_generate_message_button">
+            <field name="name">generate_message</field>
+            <field name="string">Generate Message</field>
+            <field name="model"
+                search="[('model', '=', 'account.payment.group')]"/>
+        </record>
+
         <record model="ir.action.report" id="report_mandate">
             <field name="name">Mandate</field>
             <field name="model">account.payment.sepa.mandate</field>
diff --git a/view/mandate_form.xml b/view/mandate_form.xml
index 58f743d6a8..1dd75628dd 100644
--- a/view/mandate_form.xml
+++ b/view/mandate_form.xml
@@ -23,10 +23,9 @@ this repository contains the full copyright notices and license terms. -->
     <label name="state"/>
     <field name="state"/>
     <group col="-1" colspan="2" id="buttons">
-        <button name="cancel" string="Cancel" icon="tryton-cancel"
-            confirm="Are you sure to cancel the mandate?"/>
-        <button name="draft" string="Draft" icon="tryton-go-previous"/>
-        <button name="request" string="Request" icon="tryton-go-next"/>
-        <button name="validate_mandate" string="Validate" icon="tryton-ok"/>
+        <button name="cancel" icon="tryton-cancel"/>
+        <button name="draft" icon="tryton-go-previous"/>
+        <button name="request" icon="tryton-go-next"/>
+        <button name="validate_mandate" icon="tryton-ok"/>
     </group>
 </form>
diff --git a/view/message_form.xml b/view/message_form.xml
index ef376f1cb5..76b96d81a0 100644
--- a/view/message_form.xml
+++ b/view/message_form.xml
@@ -14,10 +14,10 @@ this repository contains the full copyright notices and license terms. -->
     <label name="state"/>
     <field name="state"/>
     <group col="-1" colspan="4" id="buttons">
-        <button name="cancel" string="Cancel" icon="tryton-cancel"/>
-        <button name="draft" string="Draft" icon="tryton-go-previous"/>
-        <button name="wait" string="Wait" icon="tryton-go-next"/>
-        <button name="do" string="Do" icon="tryton-ok"/>
+        <button name="cancel" icon="tryton-cancel"/>
+        <button name="draft" icon="tryton-go-previous"/>
+        <button name="wait" icon="tryton-go-next"/>
+        <button name="do" icon="tryton-ok"/>
     </group>
     <field name="filename" invisible="1" colspan="6"/>
 </form>
diff --git a/view/message_list.xml b/view/message_list.xml
index 639302b166..6f354118a6 100644
--- a/view/message_list.xml
+++ b/view/message_list.xml
@@ -5,7 +5,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="type"/>
     <field name="message" widget="binary" filename="filename"/>
     <field name="state"/>
-    <button name="cancel" string="Cancel"/>
-    <button name="do" string="Do"/>
+    <button name="cancel"/>
+    <button name="do"/>
     <field name="filename" tree_invisible="1"/>
 </tree>
diff --git a/view/payment_group_form.xml b/view/payment_group_form.xml
index e2409ebfeb..8a0e9d8e74 100644
--- a/view/payment_group_form.xml
+++ b/view/payment_group_form.xml
@@ -4,6 +4,6 @@ this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath expr="/form/field[@name='kind']" position="after">
         <field name="sepa_messages" colspan="4"/>
-        <button name="generate_message" string="Generate Message" colspan="4"/>
+        <button name="generate_message" colspan="4"/>
     </xpath>
 </data>