diff --git a/addons/delivery/models/stock_move.py b/addons/delivery/models/stock_move.py
index 5dea1dd82ac..2aa32baf284 100644
--- a/addons/delivery/models/stock_move.py
+++ b/addons/delivery/models/stock_move.py
@@ -37,6 +37,5 @@ class StockMove(models.Model):
             if pickings:
                 pickings.write({
                     'carrier_id': proc.sale_line_id.order_id.carrier_id.id,
-                    'carrier_price': proc.sale_line_id.order_id.delivery_price,
                 })
         return res
diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py
index ef1c6503383..944ffcca5ee 100644
--- a/addons/delivery/models/stock_picking.py
+++ b/addons/delivery/models/stock_picking.py
@@ -139,7 +139,8 @@ class StockPicking(models.Model):
         res = self.carrier_id.send_shipping(self)[0]
         self.carrier_price = res['exact_price']
         self.carrier_tracking_ref = res['tracking_number']
-        msg = _("Shipment sent to carrier %s for expedition with tracking number %s") % (self.carrier_id.name, self.carrier_tracking_ref)
+        order_currency = self.sale_id.currency_id or self.company_id.currency_id
+        msg = _("Shipment sent to carrier %s for expedition with tracking number %s<br/>Cost: %.2f %s") % (self.carrier_id.name, self.carrier_tracking_ref, self.carrier_price, order_currency.name)
         self.message_post(body=msg)
 
     @api.multi
diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index 22aac5c82fb..31144da3942 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -162,11 +162,10 @@
                         <field name="carrier_id"/>
                         <field name="delivery_type" attrs="{'invisible':True}"/>
                         <label for="carrier_tracking_ref"/>
-                        <div>
+                        <div name="tracking">
                             <field name="carrier_tracking_ref" class="oe_inline"/>
                             <button type='object' class="fa fa-arrow-right oe_link" name="cancel_shipment" string="Cancel" attrs="{'invisible':['|','|','|',('carrier_tracking_ref','=',False),('delivery_type','in', ['fixed', 'base_on_rule']),('delivery_type','=',False),('state','not in',('done'))]}"/>
                         </div>
-                        <field name="carrier_price"/>
                     </group>
                     <group>
                         <label for="weight" string="Weight"/>
@@ -276,24 +275,4 @@
             </field>
         </record>
 
-        <record id="view_picking_withcarrier_out_form_shipping" model="ir.ui.view">
-            <field name="name">delivery.stock.picking_withcarrier.form.view.shipping</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="delivery.view_picking_withcarrier_out_form"/>
-            <field name="arch" type="xml">
-                <xpath expr='//group[@name="carrier_data"]' position='replace'>
-                    <group name='carrier_data'>
-                      <field name="carrier_id"/>
-                      <field name="delivery_type" attrs="{'invisible':True}"/>
-                      <label for="carrier_tracking_ref"/>
-                      <div>
-                          <field name="carrier_tracking_ref" class="oe_inline"/>
-                          <button type='object' class="fa fa-arrow-right oe_link" name="cancel_shipment" string="Cancel" attrs="{'invisible':['|','|','|',('carrier_tracking_ref','=',False),('delivery_type','in', ['fixed', 'base_on_rule']),('delivery_type','=',False),('state','not in',('done'))]}"/>
-                      </div>
-                      <field name="carrier_price"/>
-                    </group>
-                </xpath>
-            </field>
-        </record>
-
 </odoo>