diff --git a/account_usability/views/account_move.xml b/account_usability/views/account_move.xml
index 0d45b2f..d3404c3 100644
--- a/account_usability/views/account_move.xml
+++ b/account_usability/views/account_move.xml
@@ -18,6 +18,12 @@
         <field name="invoice_incoterm_id" position="attributes">
             <attribute name="widget">selection</attribute>
         </field>
+        <button name="action_register_payment" position="before">
+            <button name="%(account.account_invoices)d" type="action" string="Print" attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund'))]}"/>
+        </button>
+        <button name="preview_invoice" position="attributes">
+            <attribute name="attrs">{'invisible': 1}</attribute>
+        </button>
         <!-- move sent field and make it visible -->
         <field name="is_move_sent" position="replace"/>
         <field name="invoice_origin" position="after">
diff --git a/purchase_usability/models/purchase_order.py b/purchase_usability/models/purchase_order.py
index 4ac88ef..7177438 100644
--- a/purchase_usability/models/purchase_order.py
+++ b/purchase_usability/models/purchase_order.py
@@ -24,11 +24,6 @@ class PurchaseOrder(models.Model):
         for order in self:
             order.delivery_partner_id = order.dest_address_id
 
-    def print_order(self):
-        report = self.env.ref('purchase.action_report_purchase_order')
-        action = report.report_action(self)
-        return action
-
     # Re-write native name_get() to use amount_untaxed instead of amount_total
     @api.depends('name', 'partner_ref')
     def name_get(self):
diff --git a/purchase_usability/views/purchase_order.xml b/purchase_usability/views/purchase_order.xml
index f165427..023e097 100644
--- a/purchase_usability/views/purchase_order.xml
+++ b/purchase_usability/views/purchase_order.xml
@@ -14,7 +14,7 @@
     <field name="inherit_id" ref="purchase.purchase_order_form"/>
     <field name="arch" type="xml">
         <button name="action_rfq_send" states="purchase" position="after">
-            <button name="print_order" states="purchase" string="Print Order" type="object"/>
+            <button name="%(purchase.action_report_purchase_order)d" states="purchase,done" string="Print" type="action"/>
         </button>
         <field name="fiscal_position_id" position="attributes">
             <attribute name="widget">selection</attribute>
diff --git a/sale_usability/views/sale_order.xml b/sale_usability/views/sale_order.xml
index c9046dc..3e1129b 100644
--- a/sale_usability/views/sale_order.xml
+++ b/sale_usability/views/sale_order.xml
@@ -26,6 +26,9 @@
         <field name="date_order" position="after">
             <field name="client_order_ref"/>
         </field>
+        <button name="action_quotation_send" states="sent,sale" position="after">
+            <button name="%(sale.action_report_saleorder)d" type="action" string="Print" states="draft,sent,sale,done"/>
+        </button>
         <xpath expr="//field[@name='order_line']/tree/field[@name='product_template_id']" position="after">
             <field name="product_barcode" optional="hide"/>
         </xpath>