diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 17dd923784c..77885421d2f 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -2,20 +2,20 @@
 <openerp>
     <data>
 
-        <act_window name="Sale Orders"
-            context="{'search_default_opportunity_id': active_id, 'default_opportunity_id': active_id}"
-            res_model="sale.order"
-            src_model="crm.lead"
-            view_mode="form,tree,graph"
-            domain="[('opportunity_id', '=', active_id)]"
-            id="sale_action_quotations_new"/>
+        <record id="sale_action_quotations_new" model="ir.actions.act_window">
+            <field name="name">Quotation</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_mode">form,tree,graph</field>
+            <field name="domain">[('opportunity_id', '=', active_id)]</field>
+            <field name="context">{'search_default_opportunity_id': active_id, 'default_opportunity_id': active_id}</field>
+        </record>
 
-        <act_window name="Sale Orders"
-            context="{'search_default_opportunity_id': [active_id], 'default_opportunity_id': active_id}"
-            res_model="sale.order"
-            src_model="crm.lead"
-            domain="[('opportunity_id', '=', active_id)]"
-            id="sale_action_quotations"/>
+        <record id="sale_action_quotations" model="ir.actions.act_window">
+            <field name="name">Quotations</field>
+            <field name="res_model">sale.order</field>
+            <field name="domain">[('opportunity_id', '=', active_id)]</field>
+            <field name="context">{'search_default_opportunity_id': [active_id], 'default_opportunity_id': active_id}</field>
+        </record>
 
         <record model="ir.ui.view" id="crm_case_form_view_oppor">
             <field name="name">CRM - Opportunities - Quote Inherit</field>
diff --git a/addons/website_quote/views/website_quotation_backend.xml b/addons/website_quote/views/website_quotation_backend.xml
index abb4d5a531e..4da68a453ac 100644
--- a/addons/website_quote/views/website_quotation_backend.xml
+++ b/addons/website_quote/views/website_quotation_backend.xml
@@ -17,13 +17,6 @@
                 <xpath expr="//header/button[@name='print_quotation'][1]" position="replace">
                     <button name="print_quotation" string="Print" type="object" states="draft" groups="base.group_user"/>
                 </xpath>
-                <xpath expr="//sheet/div[@name='buttons']" position="inside">
-                    <button name="open_quotation" type="object" icon="fa fa-book"
-                        class="oe_inline oe_stat_button oe_right"
-                        attrs="{'invisible': [('template_id', '=', False)]}">
-                        <div>View Online<br />Quotation</div>
-                    </button>
-                </xpath>
                 <xpath expr="//page[@string='Order Lines']" position="after">
                     <page string="Suggested Products">
                         <label string="Optional Products &amp; Services" for="options"/>
@@ -42,7 +35,13 @@
                     </page>
                 </xpath>
                 <xpath expr="//field[@name='payment_term_id']" position="after">
-                    <field name="template_id" on_change="onchange_template_id(template_id, partner_id, fiscal_position_id)"/>                    
+                    <label for="template_id"/>
+                    <div>
+                        <field name="template_id" on_change="onchange_template_id(template_id, partner_id, fiscal_position_id)"/>
+                        <button name="open_quotation" type="object" 
+                        class="oe_link" string="View Online Quotation"
+                        attrs="{'invisible': [('template_id', '=', False)]}"/>
+                    </div>
                 </xpath>
                 <xpath expr="//field[@name='client_order_ref']" position="after">
                     <field name="website_description" invisible="1"/>