From 63f5e481b1b580ab73bcf6fd1d98fa0ba7595542 Mon Sep 17 00:00:00 2001
From: Hotlander <j.casteleijn@labelgoods.nl>
Date: Tue, 25 Aug 2020 10:22:35 +0200
Subject: [PATCH] Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4

0bc0152d4 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer
633f25913 MM-42: Test and fix functionality (#66)
6d656f838 MM-42: Test and fix functionality (#65)
a62f4b7f9 MM-40: Test and fix import order functionality (#63)
49b65509c MM-38: Implement sync processors (#61)
1d6be06cb MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58)
d0d640da1 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit
ad177b07e - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity
4ce14c756 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates
0a23414cc - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates
f23050815 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation
1f44fe29e - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory
224ba3458 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation
a287a3ae9 - fixed renaming email templates for Order and Invoice notifications
361a7651a - Updated email templates with new style
88337f551 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart
87716bd00 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start
1f318b4a0 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly
04a60f850 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation
3d518511d - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid
8b9df7516 - split the SalesBundle migrations as v1_3 was already released...
36e9e92ab Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0
044200010 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle
9ac3f0641 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54)

git-subtree-dir: package/marello
git-subtree-split: 0bc0152d406e055bb48cb0b0f9703209cffe90ca
---
 .../EventListener/RefreshContextListener.php  |  51 ++++
 .../CoreBundle/Resources/config/services.yml  |   7 +-
 .../Provider/AvailableInventoryProvider.php   |   2 +-
 .../Resources/config/oro/datagrids.yml        |   4 +-
 .../Data/ORM/UpdateEmailTemplates.php         |  48 +++
 .../marello_send_invoice.html.twig            | 176 +++++------
 .../Bundle/OrderBundle/Entity/Order.php       |  73 ++++-
 .../Bundle/OrderBundle/Entity/OrderItem.php   |   4 +
 .../Doctrine/OrderWorkflowStartListener.php   |  37 +--
 .../Doctrine/PendingOrderStatusListener.php   |  46 +++
 .../Factory/OrderPaymentContextFactory.php    |  84 +++---
 .../Factory/OrderShippingContextFactory.php   |  91 +++---
 .../Data/ORM/LoadOrderStatusData.php          |  48 +++
 .../ORM/UpdateEmailTemplatesProductUnit.php   |   2 +-
 .../Migrations/Data/ORM/data/.DS_Store        | Bin 0 -> 6148 bytes
 ...ello_order_accepted_confirmation.html.twig | 215 +++++++------
 .../emails/marello_order_cancelled.html.twig  | 248 ++++++++-------
 .../emails/marello_order_credited.html.twig   | 250 ++++++++--------
 .../emails/marello_order_invoiced.html.twig   | 282 ++++++++----------
 .../data/emails/marello_order_paid.html.twig  | 272 ++++++++---------
 .../marello_order_payment_reminder.html.twig  | 205 +++++++------
 ...rello_order_shipped_confirmation.html.twig | 201 ++++++++-----
 .../marello_order_shipping_prepared.html.twig | 215 ++++++++-----
 ...rder_shipping_prepared_warehouse.html.twig | 195 ++++++------
 .../Schema/MarelloOrderBundleInstaller.php    |  27 +-
 .../Schema/v1_13/MarelloOrderBundle.php       |  63 ++++
 .../Schema/v1_13_1/MarelloOrderBundle.php     |  33 ++
 .../Model/OrderStatusesInterface.php          |  20 ++
 ...derDashboardOrderItemsByStatusProvider.php |   1 +
 .../Resources/config/oro/actions.yml          |  11 +
 .../Resources/config/oro/workflows.yml        |  80 +++++
 .../OrderBundle/Resources/config/services.yml |   7 +
 .../Resources/config/validation.yml           |   8 +-
 .../Resources/translations/jsmessages.en.yml  |   2 +-
 .../Resources/translations/messages.en.yml    |   2 +
 .../Resources/views/Order/view.html.twig      |  14 +-
 .../OrderWorkflowStartListenerTest.php        | 131 ++++----
 ...ashboardOrderItemsByStatusProviderTest.php |   2 +
 .../AvailableInventoryValidatorTest.php       |  72 -----
 .../Validator/AvailableInventoryValidator.php |  30 +-
 .../CompositePaymentMethodProvider.php        |  19 +-
 .../Method/RemotePaymentMethod.php            |  67 +++++
 .../Resources/config/services.yml             |   2 +
 .../CompositePaymentMethodProviderTest.php    |  13 +-
 .../ChannelPricingSubscriber.php              |  17 +-
 .../Form/EventListener/PricingSubscriber.php  |  24 +-
 .../EmailTwigSandboxConfigurationPass.php     |  40 +++
 .../Bundle/ProductBundle/Entity/Product.php   |   2 +-
 .../Entity/Repository/ProductRepository.php   |   2 +-
 .../ProductBundle/MarelloProductBundle.php    |  14 +-
 .../Resources/config/services.yml             |  13 +
 .../Unit/Twig/ProductUnitExtensionTest.php    | 160 ++++++++++
 .../Twig/ProductUnitExtension.php             | 106 +++++++
 .../Provider/ProductUnitVariablesProvider.php |  43 +++
 .../Entity/PurchaseOrder.php                  |   2 +-
 .../Entity/PurchaseOrderItem.php              |   2 +-
 .../UpdateEmailTemplatesHtmlEscapeTags.php    |   2 +-
 .../marello_purchase_order_advice.html.twig   |  85 +++---
 .../marello_purchase_order_supplier.html.twig | 101 ++++---
 .../Data/ORM/UpdateEmailTemplates.php         |  48 +++
 .../emails/marello_refund_credited.html.twig  |  64 ++--
 .../ORM/UpdateEmailTemplatesProductUnit.php   |   2 +-
 .../emails/marello_return_created.html.twig   | 123 ++++----
 ...marello_return_inspection_not_ok.html.twig |  89 +++---
 .../marello_return_not_verified.html.twig     |  90 +++---
 .../emails/marello_return_received.html.twig  |  90 +++---
 .../emails/marello_return_reminder.html.twig  |  89 +++---
 ..._return_shipping_label_warehouse.html.twig |  89 +++---
 .../Acl/Voter/SalesChannelGroupVoter.php      |   2 +-
 .../Autocomplete/GroupSalesChannelHandler.php |  32 +-
 .../SalesChannelGroupRepository.php           |  17 ++
 .../Repository/SalesChannelRepository.php     |  28 ++
 .../SalesBundle/Entity/SalesChannelGroup.php  |   2 -
 .../Form/Type/SalesChannelType.php            |   1 -
 .../Schema/MarelloSalesBundleInstaller.php    |   2 +-
 .../Schema/v1_3_1/MarelloSalesBundle.php      |  47 +++
 .../SalesBundle/Resources/config/form.yml     |   2 +-
 .../SalesBundle/Resources/config/services.yml |   2 +-
 .../Bundle/TaxBundle/Entity/TaxCode.php       |   2 +-
 .../TaxBundle/Entity/TaxJurisdiction.php      |   2 +-
 .../Bundle/TaxBundle/Entity/TaxRate.php       |   2 +-
 .../Bundle/TaxBundle/Entity/TaxRule.php       |   2 +-
 82 files changed, 2913 insertions(+), 1887 deletions(-)
 create mode 100644 src/Marello/Bundle/CoreBundle/EventListener/RefreshContextListener.php
 create mode 100644 src/Marello/Bundle/InvoiceBundle/Migrations/Data/ORM/UpdateEmailTemplates.php
 create mode 100644 src/Marello/Bundle/OrderBundle/EventListener/Doctrine/PendingOrderStatusListener.php
 create mode 100644 src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/LoadOrderStatusData.php
 create mode 100644 src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/.DS_Store
 create mode 100644 src/Marello/Bundle/OrderBundle/Migrations/Schema/v1_13/MarelloOrderBundle.php
 create mode 100644 src/Marello/Bundle/OrderBundle/Migrations/Schema/v1_13_1/MarelloOrderBundle.php
 create mode 100644 src/Marello/Bundle/OrderBundle/Model/OrderStatusesInterface.php
 create mode 100644 src/Marello/Bundle/PaymentBundle/Method/RemotePaymentMethod.php
 create mode 100644 src/Marello/Bundle/ProductBundle/DependencyInjection/Compiler/EmailTwigSandboxConfigurationPass.php
 create mode 100644 src/Marello/Bundle/ProductBundle/Tests/Unit/Twig/ProductUnitExtensionTest.php
 create mode 100644 src/Marello/Bundle/ProductBundle/Twig/ProductUnitExtension.php
 create mode 100644 src/Marello/Bundle/ProductBundle/Twig/Provider/ProductUnitVariablesProvider.php
 create mode 100644 src/Marello/Bundle/RefundBundle/Migrations/Data/ORM/UpdateEmailTemplates.php
 create mode 100644 src/Marello/Bundle/SalesBundle/Migrations/Schema/v1_3_1/MarelloSalesBundle.php

diff --git a/src/Marello/Bundle/CoreBundle/EventListener/RefreshContextListener.php b/src/Marello/Bundle/CoreBundle/EventListener/RefreshContextListener.php
new file mode 100644
index 000000000..d4bbd679e
--- /dev/null
+++ b/src/Marello/Bundle/CoreBundle/EventListener/RefreshContextListener.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Marello\Bundle\CoreBundle\EventListener;
+
+use Doctrine\Common\Util\ClassUtils;
+use Doctrine\ORM\Event\OnClearEventArgs;
+use Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationAwareTokenInterface;
+use Oro\Bundle\SecurityBundle\EventListener\RefreshContextListener as ParentListener;
+use ProxyManager\Proxy\VirtualProxyInterface;
+
+/**
+ * Fix issue with "Proxy interface given instead of class manager",
+ * it occurs because EntityManager was made as lazy in https://github.com/doctrine/DoctrineBundle/pull/559
+ */
+class RefreshContextListener extends ParentListener
+{
+    /**
+     * @param OnClearEventArgs                $event
+     * @param OrganizationAwareTokenInterface $token
+     */
+    protected function checkOrganization(OnClearEventArgs $event, OrganizationAwareTokenInterface $token)
+    {
+        $organization = $token->getOrganization();
+        if (!is_object($organization)) {
+            return;
+        }
+        $organizationClass = ClassUtils::getClass($organization);
+        if ($event->getEntityClass() && $event->getEntityClass() !== $organizationClass) {
+            return;
+        }
+        /**
+         * Start customization
+         */
+        $em = $event->getEntityManager();
+        $classEm = $this->doctrine->getManagerForClass($organizationClass);
+        if ($classEm instanceof VirtualProxyInterface) {
+            $classEm = $classEm->getWrappedValueHolderValue();
+        }
+        if ($em !== $classEm) {
+            return;
+        }
+        /**
+         * End customization
+         */
+        $organization = $this->refreshEntity($organization, $organizationClass, $em);
+        if (!$organization) {
+            return;
+        }
+        $token->setOrganization($organization);
+    }
+}
diff --git a/src/Marello/Bundle/CoreBundle/Resources/config/services.yml b/src/Marello/Bundle/CoreBundle/Resources/config/services.yml
index dd4569f4e..7db82f13e 100644
--- a/src/Marello/Bundle/CoreBundle/Resources/config/services.yml
+++ b/src/Marello/Bundle/CoreBundle/Resources/config/services.yml
@@ -75,4 +75,9 @@ services:
         arguments:
             - '@oro_entity.doctrine_helper'
         tags:
-            - { name: twig.extension }
\ No newline at end of file
+            - { name: twig.extension }
+
+    marello_core.event_listener.refresh_context:
+        class: Marello\Bundle\CoreBundle\EventListener\RefreshContextListener
+        decorates: oro_security.listener.refresh_context_listener
+        parent: oro_security.listener.refresh_context_listener
diff --git a/src/Marello/Bundle/InventoryBundle/Provider/AvailableInventoryProvider.php b/src/Marello/Bundle/InventoryBundle/Provider/AvailableInventoryProvider.php
index a324d8999..d28a564be 100644
--- a/src/Marello/Bundle/InventoryBundle/Provider/AvailableInventoryProvider.php
+++ b/src/Marello/Bundle/InventoryBundle/Provider/AvailableInventoryProvider.php
@@ -49,7 +49,7 @@ private function getAvailableBalancedInventory(Product $product, SalesChannel $s
         $salesChannelGroup = $salesChannel->getGroup();
         $result = $this->getBalancedInventoryLevel($product, $salesChannelGroup);
 
-        return ($result) ? $result->getBalancedInventoryQty() : 0;
+        return ($result) ? $result->getInventoryQty() : 0;
     }
 
     /**
diff --git a/src/Marello/Bundle/InventoryBundle/Resources/config/oro/datagrids.yml b/src/Marello/Bundle/InventoryBundle/Resources/config/oro/datagrids.yml
index 507aee6bd..9fba1a0c6 100644
--- a/src/Marello/Bundle/InventoryBundle/Resources/config/oro/datagrids.yml
+++ b/src/Marello/Bundle/InventoryBundle/Resources/config/oro/datagrids.yml
@@ -8,7 +8,7 @@ datagrids:
                     - p.denormalizedDefaultName as productName
                     - p.sku as productSku
                     - i.enableBatchInventory as enableBatchInventory
-                    - productUnit.name as productUnit
+                    - pu.name as productUnit
                     - COALESCE(SUM(il.inventory), 0) AS inventoryQty
                     - COALESCE(SUM(il.allocatedInventory), 0) AS allocatedInventoryQty
                     - COALESCE(SUM(il.inventory - il.allocatedInventory), 0) AS virtualInventoryQty
@@ -18,7 +18,7 @@ datagrids:
                     left:
                         - { join: i.product, alias: p }
                         - { join: i.inventoryLevels, alias: il }
-                        - { join: i.productUnit, alias: productUnit }
+                        - { join: i.productUnit, alias: pu }
                 groupBy: i.id
         columns:
             productSku:
diff --git a/src/Marello/Bundle/InvoiceBundle/Migrations/Data/ORM/UpdateEmailTemplates.php b/src/Marello/Bundle/InvoiceBundle/Migrations/Data/ORM/UpdateEmailTemplates.php
new file mode 100644
index 000000000..c03c22222
--- /dev/null
+++ b/src/Marello/Bundle/InvoiceBundle/Migrations/Data/ORM/UpdateEmailTemplates.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Marello\Bundle\InvoiceBundle\Migrations\Data\ORM;
+
+use Doctrine\Common\Persistence\ObjectManager;
+
+use Oro\Bundle\EmailBundle\Migrations\Data\ORM\AbstractEmailFixture;
+use Oro\Bundle\MigrationBundle\Fixture\VersionedFixtureInterface;
+
+class UpdateEmailTemplates extends AbstractEmailFixture implements
+    VersionedFixtureInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function findExistingTemplate(ObjectManager $manager, array $template)
+    {
+        $name = $template['params']['name'];
+        if (empty($name)) {
+            return null;
+        }
+
+        return $manager->getRepository('OroEmailBundle:EmailTemplate')->findOneBy([
+            'name' => $template['params']['name'],
+            'entityName' => 'Marello\Bundle\InvoiceBundle\Entity\Invoice'
+        ]);
+    }
+
+    /**
+     * Return path to email templates
+     *
+     * @return string
+     */
+    public function getEmailsDir()
+    {
+        return $this->container
+            ->get('kernel')
+            ->locateResource('@MarelloInvoiceBundle/Migrations/Data/ORM/data/email_templates');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getVersion()
+    {
+        return '1.2';
+    }
+}
diff --git a/src/Marello/Bundle/InvoiceBundle/Migrations/Data/ORM/data/email_templates/marello_send_invoice.html.twig b/src/Marello/Bundle/InvoiceBundle/Migrations/Data/ORM/data/email_templates/marello_send_invoice.html.twig
index ec46a18e1..45c509f4d 100644
--- a/src/Marello/Bundle/InvoiceBundle/Migrations/Data/ORM/data/email_templates/marello_send_invoice.html.twig
+++ b/src/Marello/Bundle/InvoiceBundle/Migrations/Data/ORM/data/email_templates/marello_send_invoice.html.twig
@@ -5,12 +5,12 @@
 @isEditable = 1
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" style="background-color: #fff;">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +45,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +69,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +231,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +310,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +318,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +334,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +398,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +424,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,168 +439,136 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <h1>Dear {{ entity.customer.firstName ~ ' ' ~ entity.customer.middleName ~ ' ' ~ entity.customer.lastName }},</h1>
-                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">Thank you for your order from {{ entity.salesChannel.name }}.</p>
-                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">Once your package ships we will send an email with a link to track your order. Your order summary is below.</p>
+                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">
+                                            The order #{{ entity.order.orderNumber }} has been invoiced.</p>
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <p style="font-size: 16px; margin: 1em 0;">Your order <span class="no-link">#{{ entity.order.orderNumber }}</span></p>
-                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.order.createdAt|date('d-m-Y H:i:s') }}</p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.order.purchaseDate|date('d-m-Y H:i:s') }}</p>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
-                                        <table class="order-details" style="border-collapse: collapse; width: 100%;">
-                                            <tr>
-                                                <td class="address-details" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Bill to:</h3>
-                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.billingAddress | oro_format_address | escape | nl2br }}</p>
-                                                </td>
-                                                <td class="address-details" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Ship to:</h3>
-                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.shippingAddress | oro_format_address | escape | nl2br }}</p>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <!--{% if entity.shippingMethod is not null %}-->
-                                                <td class="method-info" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Shipping method:</h3>
-                                                    <p style="font-size: 16px; margin: 1em 0;">{{ marello_shipping_method_with_type_label(entity.shippingMethod, entity.shippingMethodType) }}</p>
-                                                </td>
-                                                <!--{% endif %}-->
-                                                <td class="method-info" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Payment method:</h3>
-                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.paymentMethod }}</p>
-                                                </td>
-                                            </tr>
-                                        </table>
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
                                             <thead>
                                             <tr>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product Name
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
                                                 </th>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product SKU
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
                                                 </th>
-                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Quantity
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Unit
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    UNIT
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Price excl Tax
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    PRICE EXCL TAX
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Tax
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    TAX
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Row Total Incl Tax
-                                                </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Details
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    ROW TOTAL INCL TAX
                                                 </th>
                                             </tr>
                                             </thead>
                                             <tbody>
                                             <!--{% for item in entity.order.items %}-->
                                             <tr>
-                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                     {{ item.productName }}
                                                 </td>
-                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                     {{ item.productSku }}
                                                 </td>
-                                                <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                     {{ item.quantity }}
                                                 </td>
-                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                    {{ item.productUnit }}
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productUnit.name }}
                                                 </td>
-                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
                                                     {{ item.price|oro_format_currency({'currency': entity.currency}) }}
                                                 </td>
-                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
                                                     {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
                                                 </td>
-                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding:10px 8px; font-size:13px; text-align:right; font-weight: 300;">
                                                     {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
                                                 </td>
-                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                    {% if item.status == marello_get_order_item_status('waiting_for_supply') %}
-                                                        item will be shipped later
-                                                    {% endif %}
-                                                </td>
                                             </tr>
                                             <!--{% endfor %}-->
                                             </tbody>
                                             <tfoot class="order-totals">
                                             <tr class="subtotal">
-                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align: right;">
-                                                    Subtotal:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; text-align: right;">
+                                                    SUBTOTAL:
                                                 </th>
-                                                <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align: right;">
+                                                <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; text-align: right;">
                                                     <span class="price" style="white-space: nowrap;">{{ entity.subtotal|oro_format_currency({'currency': entity.currency}) }}</span>
                                                 </td>
                                             </tr>
                                             <tr class="tax">
-                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    Tax:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    TAX:
                                                 </th>
-                                                <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    <span class="price" style="white-space: nowrap;">{{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">({{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }})</span>
                                                 </td>
                                             </tr>
                                             <!--{% if entity.order.discountAmount %}-->
                                             <tr class="discount">
-                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    Discount:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    DISCOUNT:
                                                 </th>
-                                                <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
+                                                <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
                                                     <span class="price" style="white-space: nowrap;">{{ entity.order.discountAmount|oro_format_currency({'currency': entity.currency}) }}</span>
                                                 </td>
                                             </tr>
                                             <!--{% endif %}-->
                                             <tr class="shipping">
-                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    Shipping cost:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    SHIPPING COST:
                                                 </th>
-                                                <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
+                                                <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
                                                     <span class="price" style="white-space: nowrap;">{{ entity.shippingAmountInclTax|oro_format_currency({'currency': entity.currency}) }}</span>
                                                 </td>
                                             </tr>
                                             <tr class="grand_total">
-                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    <strong style="font-weight: 600;">
-                                                        Total:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
+                                                        TOTAL:
                                                     </strong>
                                                 </th>
-                                                <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    <strong style="font-weight: 600;">
+                                                <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
                                                         <span class="price" style="white-space: nowrap;">{{ entity.grandTotal|oro_format_currency({'currency': entity.currency}) }}</span>
                                                     </strong>
                                                 </td>
diff --git a/src/Marello/Bundle/OrderBundle/Entity/Order.php b/src/Marello/Bundle/OrderBundle/Entity/Order.php
index e17e5bd69..3ae5e90b7 100644
--- a/src/Marello/Bundle/OrderBundle/Entity/Order.php
+++ b/src/Marello/Bundle/OrderBundle/Entity/Order.php
@@ -187,6 +187,15 @@ class Order extends ExtendOrder implements
      */
     protected $currency;
 
+    /**
+     * Represent locale in ICU format
+     *
+     * @var string
+     *
+     * @ORM\Column(name="locale_id", type="string", length=255, nullable=true)
+     */
+    protected $localeId;
+
     /**
      * @var string
      * @ORM\Column(name="payment_method", type="string", length=255, nullable=true)
@@ -359,6 +368,9 @@ class Order extends ExtendOrder implements
      * @ORM\OrderBy({"id" = "ASC"})
      * @Oro\ConfigField(
      *      defaultValues={
+     *          "importexport"={
+     *              "full"=true
+     *          },
      *          "email"={
      *              "available_in_template"=true
      *          },
@@ -392,6 +404,9 @@ class Order extends ExtendOrder implements
      * @ORM\JoinColumn(name="billing_address_id", referencedColumnName="id")
      * @Oro\ConfigField(
      *      defaultValues={
+     *          "importexport"={
+     *              "full"=true
+     *          },
      *          "dataaudit"={
      *              "auditable"=true
      *          }
@@ -407,6 +422,9 @@ class Order extends ExtendOrder implements
      * @ORM\JoinColumn(name="shipping_address_id", referencedColumnName="id")
      * @Oro\ConfigField(
      *      defaultValues={
+     *          "importexport"={
+     *              "full"=true
+     *          },
      *          "dataaudit"={
      *              "auditable"=true
      *          }
@@ -436,9 +454,6 @@ class Order extends ExtendOrder implements
      * @ORM\JoinColumn(onDelete="SET NULL", nullable=true)
      * @Oro\ConfigField(
      *      defaultValues={
-     *          "importexport"={
-     *              "full"=true
-     *          },
      *          "dataaudit"={
      *              "auditable"=true
      *          }
@@ -531,6 +546,18 @@ class Order extends ExtendOrder implements
      */
     protected $poNumber;
 
+    /**
+     * @var \Extend\Entity\EV_Marello_Order_Status
+     * @Oro\ConfigField(
+     *      defaultValues={
+     *          "dataaudit"={
+     *              "auditable"=true
+     *          }
+     *      }
+     * )
+     */
+    protected $orderStatus;
+
     /**
      * @param AbstractAddress|null $billingAddress
      * @param AbstractAddress|null $shippingAddress
@@ -825,6 +852,26 @@ public function setCurrency($currency)
         return $this;
     }
 
+    /**
+     * @param string $localeId
+     *
+     * @return $this
+     */
+    public function setLocaleId($localeId)
+    {
+        $this->localeId = $localeId;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLocaleId()
+    {
+        return $this->localeId;
+    }
+
     /**
      * @return string
      */
@@ -1326,4 +1373,24 @@ public function setPoNumber(string $poNumber)
 
         return $this;
     }
+
+
+    /**
+     * @return \Extend\Entity\EV_Marello_Order_Status
+     */
+    public function getOrderStatus()
+    {
+        return $this->orderStatus;
+    }
+
+    /**
+     * @param string $orderStatus
+     * @return $this
+     */
+    public function setOrderStatus($orderStatus)
+    {
+        $this->orderStatus = $orderStatus;
+
+        return $this;
+    }
 }
diff --git a/src/Marello/Bundle/OrderBundle/Entity/OrderItem.php b/src/Marello/Bundle/OrderBundle/Entity/OrderItem.php
index 5103e5bb1..4f4ada5d5 100644
--- a/src/Marello/Bundle/OrderBundle/Entity/OrderItem.php
+++ b/src/Marello/Bundle/OrderBundle/Entity/OrderItem.php
@@ -368,6 +368,10 @@ public function __construct()
      */
     public function prePersist()
     {
+        if (null === $this->product) {
+            return;
+        }
+
         // prevent overriding product name if already being set
         if (is_null($this->productName)) {
             $this->setProductName((string)$this->product->getName());
diff --git a/src/Marello/Bundle/OrderBundle/EventListener/Doctrine/OrderWorkflowStartListener.php b/src/Marello/Bundle/OrderBundle/EventListener/Doctrine/OrderWorkflowStartListener.php
index a342324ed..079ebaaab 100644
--- a/src/Marello/Bundle/OrderBundle/EventListener/Doctrine/OrderWorkflowStartListener.php
+++ b/src/Marello/Bundle/OrderBundle/EventListener/Doctrine/OrderWorkflowStartListener.php
@@ -8,6 +8,7 @@
 use Oro\Bundle\WorkflowBundle\Model\Workflow;
 use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
 use Oro\Bundle\WorkflowBundle\Model\WorkflowManager;
+use Oro\Bundle\WorkflowBundle\Model\WorkflowStartArguments;
 
 use Marello\Bundle\OrderBundle\Entity\Order;
 use Marello\Bundle\OrderBundle\Model\WorkflowNameProviderInterface;
@@ -19,12 +20,12 @@ class OrderWorkflowStartListener
     /** @var WorkflowManager $workflowManager */
     private $workflowManager;
 
-    /** @var string $orderId*/
-    private $orderId;
-
     /** @var DoctrineHelper $doctrineHelper */
     private $doctrineHelper;
 
+    /** @var array $entitiesScheduledForWorkflowStart */
+    protected $entitiesScheduledForWorkflowStart = [];
+
     /**
      * @param WorkflowManager $workflowManager
      */
@@ -36,31 +37,30 @@ public function __construct(WorkflowManager $workflowManager)
     /**
      * @param LifecycleEventArgs $args
      */
-    public function postPersist(LifecycleEventArgs $args): void
+    public function postPersist(LifecycleEventArgs $args)
     {
         $entity = $args->getEntity();
         if ($entity instanceof Order) {
-            $this->orderId = $entity->getId();
+            if ($workflow = $this->getApplicableWorkflow($entity)) {
+                $this->entitiesScheduledForWorkflowStart[] = new WorkflowStartArguments(
+                    $workflow->getName(),
+                    $entity,
+                    [],
+                    self::TRANSIT_TO_STEP
+                );
+            }
         }
     }
 
     /**
      * @param PostFlushEventArgs $args
-     * @throws \Oro\Bundle\WorkflowBundle\Exception\WorkflowRecordGroupException
      */
-    public function postFlush(PostFlushEventArgs $args): void
+    public function postFlush(PostFlushEventArgs $args)
     {
-        if ($this->orderId) {
-            $entityManager = $args->getEntityManager();
-            /** @var Order $entity */
-            $entity = $this->doctrineHelper
-                ->getEntityManagerForClass(Order::class)
-                ->getRepository(Order::class)
-                ->find($this->orderId);
-            if ($entity && $workflow = $this->getApplicableWorkflow($entity)) {
-                $this->orderId = null;
-                $this->workflowManager->startWorkflow($workflow->getName(), $entity, self::TRANSIT_TO_STEP);
-            }
+        if (!empty($this->entitiesScheduledForWorkflowStart)) {
+            $massStartData = $this->entitiesScheduledForWorkflowStart;
+            unset($this->entitiesScheduledForWorkflowStart);
+            $this->workflowManager->massStartWorkflow($massStartData);
         }
     }
 
@@ -102,6 +102,7 @@ protected function getDefaultWorkflowNames(): array
     }
 
     /**
+     * @deprecated
      * @param DoctrineHelper $doctrineHelper
      */
     public function setDoctrineHelper(DoctrineHelper $doctrineHelper)
diff --git a/src/Marello/Bundle/OrderBundle/EventListener/Doctrine/PendingOrderStatusListener.php b/src/Marello/Bundle/OrderBundle/EventListener/Doctrine/PendingOrderStatusListener.php
new file mode 100644
index 000000000..296616baf
--- /dev/null
+++ b/src/Marello/Bundle/OrderBundle/EventListener/Doctrine/PendingOrderStatusListener.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Marello\Bundle\OrderBundle\EventListener\Doctrine;
+
+use Doctrine\ORM\Event\LifecycleEventArgs;
+
+use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
+use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper;
+use Oro\Bundle\EntityExtendBundle\Entity\Repository\EnumValueRepository;
+
+use Marello\Bundle\OrderBundle\Entity\Order;
+use Marello\Bundle\OrderBundle\Model\OrderStatusesInterface;
+
+class PendingOrderStatusListener
+{
+    /**
+     * @var DoctrineHelper
+     */
+    protected $doctrineHelper;
+
+    /**
+     * @param DoctrineHelper $doctrineHelper
+     */
+    public function __construct(DoctrineHelper $doctrineHelper)
+    {
+        $this->doctrineHelper = $doctrineHelper;
+    }
+
+    /**
+     * @param LifecycleEventArgs $args
+     */
+    public function postPersist(LifecycleEventArgs $args)
+    {
+        $entity = $args->getEntity();
+        if ($entity instanceof Order && $entity->getOrderStatus() === null) {
+            $className = ExtendHelper::buildEnumValueClassName(OrderStatusesInterface::ORDER_STATUS_ENUM_CLASS);
+            /** @var EnumValueRepository $enumRepo */
+            $enumRepo = $this->doctrineHelper
+                ->getEntityManagerForClass($className)
+                ->getRepository($className);
+
+            $orderStatus = $enumRepo->findOneBy(['id' => 'pending']);
+            $entity->setOrderStatus($orderStatus);
+        }
+    }
+}
diff --git a/src/Marello/Bundle/OrderBundle/Factory/OrderPaymentContextFactory.php b/src/Marello/Bundle/OrderBundle/Factory/OrderPaymentContextFactory.php
index 622ddda74..ac5d76336 100644
--- a/src/Marello/Bundle/OrderBundle/Factory/OrderPaymentContextFactory.php
+++ b/src/Marello/Bundle/OrderBundle/Factory/OrderPaymentContextFactory.php
@@ -70,56 +70,44 @@ public function create($order)
             $order,
             (string)$order->getId()
         );
-        $orderWarehouseResults = $this->orderWarehousesProvider->getWarehousesForOrder($order);
-        if (!empty($orderWarehouseResults)) {
-            $results = [];
-            foreach ($orderWarehouseResults as $orderWarehouseResult) {
-                $whOrderItems = $orderWarehouseResult->getOrderItems();
-                $subtotal = 0.00;
-                foreach ($whOrderItems as $whOrderItem) {
-                    $subtotal += $whOrderItem->getPrice() * $whOrderItem->getQuantity();
-                }
-                $subtotal = Price::create(
-                    $subtotal,
-                    $order->getCurrency()
-                );
-
-                $paymentContextBuilder
-                    ->setSubTotal($subtotal)
-                    ->setCurrency($order->getCurrency());
-
-                $convertedLineItems = $this->paymentLineItemConverter->convertLineItems($whOrderItems);
-                $paymentOrigin = $orderWarehouseResult->getWarehouse()->getAddress();
-
-                if (null !== $paymentOrigin) {
-                    $paymentContextBuilder->setShippingOrigin($paymentOrigin);
-                }
-
-                if (null !== $order->getShippingAddress()) {
-                    $paymentContextBuilder->setShippingAddress($order->getShippingAddress());
-                }
-
-                if (null !== $order->getBillingAddress()) {
-                    $paymentContextBuilder->setBillingAddress($order->getBillingAddress());
-                }
-
-                if (null !== $order->getCustomer()) {
-                    $paymentContextBuilder->setCustomer($order->getCustomer());
-                }
-
-                if (null !== $convertedLineItems) {
-                    $paymentContextBuilder->setLineItems($convertedLineItems);
-                }
-                $paymentContext = $paymentContextBuilder->getResult();
-                $event = new OrderPaymentContextBuildingEvent($paymentContext);
-                $this->eventDispatcher->dispatch(OrderPaymentContextBuildingEvent::NAME, $event);
-                $results[] = $paymentContext = $event->getPaymentContext();
-            }
-
-            return $results;
+
+        $results = [];
+        $orderItems = $order->getItems();
+        $subtotal = 0.00;
+        foreach ($orderItems as $orderItem) {
+            $subtotal += $orderItem->getPrice() * $orderItem->getQuantity();
+        }
+        $subtotal = Price::create(
+            $subtotal,
+            $order->getCurrency()
+        );
+
+        $paymentContextBuilder
+            ->setSubTotal($subtotal)
+            ->setCurrency($order->getCurrency());
+
+        $convertedLineItems = $this->paymentLineItemConverter->convertLineItems($orderItems);
+        if (null !== $order->getShippingAddress()) {
+            $paymentContextBuilder->setShippingAddress($order->getShippingAddress());
+        }
+
+        if (null !== $order->getBillingAddress()) {
+            $paymentContextBuilder->setBillingAddress($order->getBillingAddress());
+        }
+
+        if (null !== $order->getCustomer()) {
+            $paymentContextBuilder->setCustomer($order->getCustomer());
+        }
+
+        if (null !== $convertedLineItems) {
+            $paymentContextBuilder->setLineItems($convertedLineItems);
         }
+        $paymentContext = $paymentContextBuilder->getResult();
+        $event = new OrderPaymentContextBuildingEvent($paymentContext);
+        $this->eventDispatcher->dispatch(OrderPaymentContextBuildingEvent::NAME, $event);
+        $results[] = $event->getPaymentContext();
 
-        return [];
+        return $results;
     }
 
     /**
diff --git a/src/Marello/Bundle/OrderBundle/Factory/OrderShippingContextFactory.php b/src/Marello/Bundle/OrderBundle/Factory/OrderShippingContextFactory.php
index bbcc7aa0b..9972d7120 100644
--- a/src/Marello/Bundle/OrderBundle/Factory/OrderShippingContextFactory.php
+++ b/src/Marello/Bundle/OrderBundle/Factory/OrderShippingContextFactory.php
@@ -7,6 +7,7 @@
 use Marello\Bundle\InventoryBundle\Provider\OrderWarehousesProviderInterface;
 use Marello\Bundle\OrderBundle\Converter\OrderShippingLineItemConverterInterface;
 use Marello\Bundle\OrderBundle\Entity\Order;
+use Marello\Bundle\OrderBundle\Entity\OrderItem;
 use Marello\Bundle\OrderBundle\Event\OrderShippingContextBuildingEvent;
 use Marello\Bundle\ShippingBundle\Context\Builder\Factory\ShippingContextBuilderFactoryInterface;
 use Marello\Bundle\ShippingBundle\Context\ShippingContextFactoryInterface;
@@ -73,57 +74,51 @@ public function create($order)
             $order,
             (string)$order->getId()
         );
+
+        $results = [];
+        $orderItems = $order->getItems();
+        $subtotal = 0.00;
+        /** @var OrderItem $orderItem */
+        foreach ($orderItems as $orderItem) {
+            $subtotal += $orderItem->getPrice() * $orderItem->getQuantity();
+        }
+        $subtotal = Price::create(
+            $subtotal,
+            $order->getCurrency()
+        );
+
+        $shippingContextBuilder
+            ->setSubTotal($subtotal)
+            ->setCurrency($order->getCurrency());
+
+        $convertedLineItems = $this->shippingLineItemConverter->convertLineItems($orderItems);
+
         $this->orderWarehousesProvider->setEstimation($this->estimation);
-        $orderWarehouseResults = $this->orderWarehousesProvider->getWarehousesForOrder($order);
-        if (!empty($orderWarehouseResults)) {
-            $results = [];
-            foreach ($orderWarehouseResults as $orderWarehouseResult) {
-                $whOrderItems = $orderWarehouseResult->getOrderItems();
-                $subtotal = 0.00;
-                foreach ($whOrderItems as $whOrderItem) {
-                    $subtotal += $whOrderItem->getPrice() * $whOrderItem->getQuantity();
-                }
-                $subtotal = Price::create(
-                    $subtotal,
-                    $order->getCurrency()
-                );
-
-                $shippingContextBuilder
-                    ->setSubTotal($subtotal)
-                    ->setCurrency($order->getCurrency());
-
-                $convertedLineItems = $this->shippingLineItemConverter->convertLineItems($whOrderItems);
-                $shippingOrigin = $orderWarehouseResult->getWarehouse()->getAddress();
-
-                if (null !== $shippingOrigin) {
-                    $shippingContextBuilder->setShippingOrigin($shippingOrigin);
-                }
-
-                if (null !== $order->getShippingAddress()) {
-                    $shippingContextBuilder->setShippingAddress($order->getShippingAddress());
-                }
-
-                if (null !== $order->getBillingAddress()) {
-                    $shippingContextBuilder->setBillingAddress($order->getBillingAddress());
-                }
-
-                if (null !== $order->getCustomer()) {
-                    $shippingContextBuilder->setCustomer($order->getCustomer());
-                }
-
-                if (null !== $convertedLineItems) {
-                    $shippingContextBuilder->setLineItems($convertedLineItems);
-                }
-                $shippingContext = $shippingContextBuilder->getResult();
-                $event = new OrderShippingContextBuildingEvent($shippingContext);
-                $this->eventDispatcher->dispatch(OrderShippingContextBuildingEvent::NAME, $event);
-                $results[] = $shippingContext = $event->getShippingContext();
-            }
-
-            return $results;
+        $shippingOrigin = $this->getShippingOrigin($order);
+        if (null !== $shippingOrigin) {
+            $shippingContextBuilder->setShippingOrigin($shippingOrigin);
+        }
+        if (null !== $order->getShippingAddress()) {
+            $shippingContextBuilder->setShippingAddress($order->getShippingAddress());
+        }
+
+        if (null !== $order->getBillingAddress()) {
+            $shippingContextBuilder->setBillingAddress($order->getBillingAddress());
+        }
+
+        if (null !== $order->getCustomer()) {
+            $shippingContextBuilder->setCustomer($order->getCustomer());
+        }
+
+        if (null !== $convertedLineItems) {
+            $shippingContextBuilder->setLineItems($convertedLineItems);
         }
+        $shippingContext = $shippingContextBuilder->getResult();
+        $event = new OrderShippingContextBuildingEvent($shippingContext);
+        $this->eventDispatcher->dispatch(OrderShippingContextBuildingEvent::NAME, $event);
+        $results[] = $event->getShippingContext();
 
-        return [];
+        return $results;
     }
 
     /**
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/LoadOrderStatusData.php b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/LoadOrderStatusData.php
new file mode 100644
index 000000000..e39450a92
--- /dev/null
+++ b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/LoadOrderStatusData.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Marello\Bundle\OrderBundle\Migrations\Data\ORM;
+
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\Persistence\ObjectManager;
+
+use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper;
+use Oro\Bundle\EntityExtendBundle\Entity\Repository\EnumValueRepository;
+
+use Marello\Bundle\OrderBundle\Model\OrderStatusesInterface;
+
+class LoadOrderStatusData extends AbstractFixture
+{
+    /** @var array */
+    protected $data = [
+        OrderStatusesInterface::OS_PENDING => true,
+        OrderStatusesInterface::OS_CANCELLED => false,
+        OrderStatusesInterface::OS_INVOICED => false,
+        OrderStatusesInterface::OS_PAID => false,
+        OrderStatusesInterface::OS_PARTIALLY_PAID => false,
+        OrderStatusesInterface::OS_PICK_AND_PACK => false,
+        OrderStatusesInterface::OS_SHIPPED => false,
+        OrderStatusesInterface::OS_PARTIALLY_SHIPPED => false,
+        OrderStatusesInterface::OS_CLOSED => false,
+        OrderStatusesInterface::OS_ON_HOLD => false,
+        OrderStatusesInterface::OS_PROCESSING => false
+    ];
+
+    /**
+     * @param ObjectManager $manager
+     */
+    public function load(ObjectManager $manager)
+    {
+        $className = ExtendHelper::buildEnumValueClassName(OrderStatusesInterface::ORDER_STATUS_ENUM_CLASS);
+
+        /** @var EnumValueRepository $enumRepo */
+        $enumRepo = $manager->getRepository($className);
+
+        $priority = 0;
+        foreach ($this->data as $name => $isDefault) {
+            $enumOption = $enumRepo->createEnumValue($name, $priority++, $isDefault);
+            $manager->persist($enumOption);
+        }
+
+        $manager->flush();
+    }
+}
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/UpdateEmailTemplatesProductUnit.php b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/UpdateEmailTemplatesProductUnit.php
index 93f94320c..e5d312748 100644
--- a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/UpdateEmailTemplatesProductUnit.php
+++ b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/UpdateEmailTemplatesProductUnit.php
@@ -43,6 +43,6 @@ public function getEmailsDir()
      */
     public function getVersion()
     {
-        return '1.4';
+        return '1.6';
     }
 }
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/.DS_Store b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..7def01175be9514013e977c65658e948e11900a6
GIT binary patch
literal 6148
zcmeHKOG*SW5UtWd8r;lMTxI8aZV-ofg1LZ>BaYBb4~Y9*Xf81a@hrajD6|Fy7cxo}
zB(IYCbow=&q=<-@FPjC?oQOI!K^CPUGTk(txbqCinxm)Z{&BIoABSBd(J@ZR+Rx~L
z2D+msYOjA{AI4JF{kTS4S6;97m)pbj=N!Yh`POH*{Zl+0<F|`71p~oAFc1v<i~*e4
zBHg)R^ua(d5Da`UAp1i?6U>g)P`3_rS^@y&8m$6dY6*!+j@hvq!UACn1zIS3iNO|*
z`Q(1tu^L)9u@@igPkt|6Sf7skN!^LFVf4X3Ffe7{)P{38|8MZiG>iOcNQ{DkVBnuI
zz_YR{OT3hytzTYG&f0`_izXs|RTK#H$t3^-*+(waX!ayJ{IX*;lq@o@;lQ{EC?U}W
I1HZt)8!F{1egFUf

literal 0
HcmV?d00001

diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_accepted_confirmation.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_accepted_confirmation.html.twig
index 7803b16af..551ea3460 100644
--- a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_accepted_confirmation.html.twig
+++ b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_accepted_confirmation.html.twig
@@ -10,7 +10,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +46,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +70,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +232,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +311,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +319,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +335,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +399,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +425,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,169 +440,161 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <h1>Dear {{ entity.customer.firstName ~ ' ' ~ entity.customer.middleName ~ ' ' ~ entity.customer.lastName }},</h1>
                                         <p class="greeting" style="font-size: 16px; margin: 1em 0;">Thank you for your order from {{ entity.salesChannelName }}.</p>
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <p style="font-size: 16px; margin: 1em 0;">Your order <span class="no-link">#{{ entity.orderNumber }}</span></p>
-                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.createdAt|date('d-m-Y H:i:s') }}</p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.purchaseDate|date('d-m-Y H:i:s') }}</p>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <table class="order-details" style="border-collapse: collapse; width: 100%;">
                                             <tr>
-                                                <td class="address-details" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Bill to:</h3>
+                                                <td class="address-details" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
+                                                    <h3 style="display: block; font-size: 16px; font-weight: 400; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">BILL TO:</h3>
                                                     <p style="font-size: 16px; margin: 1em 0;">{{ entity.billingAddress | oro_format_address | escape | nl2br }}</p>
                                                 </td>
-                                                <td class="address-details" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Ship to:</h3>
+                                                <td class="address-details" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
+                                                    <h3 style="display: block; font-size: 16px; font-weight: 400; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">SHIP TO:</h3>
                                                     <p style="font-size: 16px; margin: 1em 0;">{{ entity.shippingAddress | oro_format_address| escape | nl2br }}</p>
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <!--{% if entity.shippingMethod is not null %}-->
-                                                    <td class="method-info" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                        <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Shipping method:</h3>
-                                                        <p style="font-size: 16px; margin: 1em 0;">{{ marello_shipping_method_with_type_label(entity.shippingMethod, entity.shippingMethodType) }}</p>
-                                                    </td>
-                                                <!--{% endif %}-->
                                                 <!--{% if entity.paymentMethod is not null %}-->
-                                                    <td class="method-info" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                        <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Payment method::</h3>
-                                                        <p style="font-size: 16px; margin: 1em 0;">{{ entity.paymentMethod }}</p>
-                                                    </td>
+                                                <td class="method-info" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
+                                                    <h3 style="display: block; font-size: 16px; font-weight: 400; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">PAYMENT METHOD:</h3>
+                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.paymentMethod }}</p>
+                                                </td>
+                                                <!--{% endif %}-->
+                                                <!--{% if entity.shippingMethod is not null %}-->
+                                                <td class="method-info" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
+                                                    <h3 style="display: block; font-size: 16px; font-weight: 400; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">SHIPPING METHOD:</h3>
+                                                    <p style="font-size: 16px; margin: 1em 0;">{{ marello_shipping_method_with_type_label(entity.shippingMethod, entity.shippingMethodType) }}</p>
+                                                </td>
                                                 <!--{% endif %}-->
                                             </tr>
                                         </table>
                                         <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
                                             <thead>
                                             <tr>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product Name
-                                                </th>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product SKU
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
                                                 </th>
-                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Quantity
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
                                                 </th>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Unit
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Price excl Tax
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    UNIT
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Tax
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    PRICE EXCL TAX
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Row Total Incl Tax
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    TAX
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Details
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    ROW TOTAL INCL TAX
                                                 </th>
                                             </tr>
                                             </thead>
                                             <tbody>
                                             <!--{% for item in entity.items %}-->
-                                                <tr>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.productName }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.productSku }}
-                                                    </td>
-                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.quantity }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.productUnit }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                        {{ item.price|oro_format_currency({'currency': entity.currency}) }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                        {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                        {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                        {% if item.status == marello_get_order_item_status('waiting_for_supply') %}
-                                                            item will be shipped later
-                                                        {% endif %}
-                                                    </td>
-                                                </tr>
+                                            <tr>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productName }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productSku }}
+                                                </td>
+                                                <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.quantity }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productUnit.name }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.price|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding:10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                            </tr>
                                             <!--{% endfor %}-->
                                             </tbody>
                                             <tfoot class="order-totals">
                                             <tr class="subtotal">
-                                                <th colspan="7" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align: right;">
-                                                    Subtotal:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; text-align: right;">
+                                                    SUBTOTAL:
                                                 </th>
-                                                <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align: right;">
+                                                <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; text-align: right;">
                                                     <span class="price" style="white-space: nowrap;">{{ entity.subtotal|oro_format_currency({'currency': entity.currency}) }}</span>
                                                 </td>
                                             </tr>
                                             <tr class="tax">
-                                                <th colspan="7" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    Tax:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    TAX:
                                                 </th>
-                                                <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    <span class="price" style="white-space: nowrap;">{{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">({{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }})</span>
                                                 </td>
                                             </tr>
                                             <!--{% if entity.discountAmount %}-->
-                                                <tr class="discount">
-                                                    <th colspan="7" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        Discount:
-                                                    </th>
-                                                    <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <span class="price" style="white-space: nowrap;">{{ entity.discountAmount|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                    </td>
-                                                </tr>
+                                            <tr class="discount">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    DISCOUNT:
+                                                </th>
+                                                <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.discountAmount|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
                                             <!--{% endif %}-->
                                             <tr class="shipping">
-                                                <th colspan="7" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    Shipping cost:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    SHIPPING COST:
                                                 </th>
-                                                <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
+                                                <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
                                                     <span class="price" style="white-space: nowrap;">{{ entity.shippingAmountInclTax|oro_format_currency({'currency': entity.currency}) }}</span>
                                                 </td>
                                             </tr>
                                             <tr class="grand_total">
-                                                <th colspan="7" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    <strong style="font-weight: 600;">
-                                                        Total:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
+                                                        TOTAL:
                                                     </strong>
                                                 </th>
-                                                <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    <strong style="font-weight: 600;">
+                                                <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
                                                         <span class="price" style="white-space: nowrap;">{{ entity.grandTotal|oro_format_currency({'currency': entity.currency}) }}</span>
                                                     </strong>
                                                 </td>
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_cancelled.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_cancelled.html.twig
index eb14f5a42..55d40d07a 100644
--- a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_cancelled.html.twig
+++ b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_cancelled.html.twig
@@ -5,12 +5,12 @@
 @isEditable = 1
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" style="background-color: #fff;">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +45,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +69,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +231,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +310,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +318,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +334,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +398,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +424,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,140 +439,140 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <h1>Dear {{ entity.customer.firstName ~ ' ' ~ entity.customer.middleName ~ ' ' ~ entity.customer.lastName }},</h1>
                                         <p class="greeting" style="font-size: 16px; margin: 1em 0;">
                                             The order #{{ entity.orderNumber }} has been cancelled.</p>
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <p style="font-size: 16px; margin: 1em 0;">Your order <span class="no-link">#{{ entity.orderNumber }}</span></p>
-                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.createdAt|date('d-m-Y H:i:s') }}</p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.purchaseDate|date('d-m-Y H:i:s') }}</p>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
                                             <thead>
-                                                <tr>
-                                                    <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Product Name
-                                                    </th>
-                                                    <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Product SKU
-                                                    </th>
-                                                    <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Quantity
-                                                    </th>
-                                                    <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Unit
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                        Price excl Tax
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                        Tax
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                        Row Total Incl Tax
-                                                    </th>
-                                                </tr>
+                                            <tr>
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
+                                                </th>
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
+                                                </th>
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
+                                                </th>
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    UNIT
+                                                </th>
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    PRICE EXCL TAX
+                                                </th>
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    TAX
+                                                </th>
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    ROW TOTAL INCL TAX
+                                                </th>
+                                            </tr>
                                             </thead>
                                             <tbody>
-                                                <!--{% for item in entity.items %}-->
-                                                    <tr>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.productName }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.productSku }}
-                                                        </td>
-                                                        <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.quantity }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.productUnit }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                            {{ item.price|oro_format_currency({'currency': entity.currency}) }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                            {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                            {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
-                                                        </td>
-                                                    </tr>
-                                                <!--{% endfor %}-->
+                                            <!--{% for item in entity.items %}-->
+                                            <tr>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productName }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productSku }}
+                                                </td>
+                                                <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.quantity }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productUnit.name }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.price|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding:10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                            </tr>
+                                            <!--{% endfor %}-->
                                             </tbody>
                                             <tfoot class="order-totals">
-                                                <tr class="subtotal">
-                                                    <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align: right;">
-                                                        Subtotal:
-                                                    </th>
-                                                    <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align: right;">
-                                                        <span class="price" style="white-space: nowrap;">{{ entity.subtotal|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                    </td>
-                                                </tr>
-                                                <tr class="tax">
-                                                    <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        Tax:
-                                                    </th>
-                                                    <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <span class="price" style="white-space: nowrap;">{{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                    </td>
-                                                </tr>
-                                                <!--{% if entity.discountAmount %}-->
-                                                    <tr class="discount">
-                                                        <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                            Discount:
-                                                        </th>
-                                                        <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                            <span class="price" style="white-space: nowrap;">{{ entity.discountAmount|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                        </td>
-                                                    </tr>
-                                                <!--{% endif %}-->
-                                                <tr class="shipping">
-                                                    <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        Shipping cost:
-                                                    </th>
-                                                    <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <span class="price" style="white-space: nowrap;">{{ entity.shippingAmountInclTax|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                    </td>
-                                                </tr>
-                                                <tr class="grand_total">
-                                                    <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <strong style="font-weight: 600;">
-                                                            Total:
-                                                        </strong>
-                                                    </th>
-                                                    <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <strong style="font-weight: 600;">
-                                                            <span class="price" style="white-space: nowrap;">{{ entity.grandTotal|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                        </strong>
-                                                    </td>
-                                                </tr>
+                                            <tr class="subtotal">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; text-align: right;">
+                                                    SUBTOTAL:
+                                                </th>
+                                                <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.subtotal|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <tr class="tax">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    TAX:
+                                                </th>
+                                                <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">({{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }})</span>
+                                                </td>
+                                            </tr>
+                                            <!--{% if entity.discountAmount %}-->
+                                            <tr class="discount">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    DISCOUNT:
+                                                </th>
+                                                <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.discountAmount|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <!--{% endif %}-->
+                                            <tr class="shipping">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    SHIPPING COST:
+                                                </th>
+                                                <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.shippingAmountInclTax|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <tr class="grand_total">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
+                                                        TOTAL:
+                                                    </strong>
+                                                </th>
+                                                <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
+                                                        <span class="price" style="white-space: nowrap;">{{ entity.grandTotal|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                    </strong>
+                                                </td>
+                                            </tr>
                                             </tfoot>
                                         </table>
                                     </td>
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_credited.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_credited.html.twig
index a7337e0bc..523c13d2b 100644
--- a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_credited.html.twig
+++ b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_credited.html.twig
@@ -5,12 +5,12 @@
 @isEditable = 1
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" style="background-color: #fff;">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +45,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +69,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +231,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +310,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +318,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +334,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +398,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +424,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,140 +439,140 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <h1>Dear {{ entity.customer.firstName ~ ' ' ~ entity.customer.middleName ~ ' ' ~ entity.customer.lastName }},</h1>
                                         <p class="greeting" style="font-size: 16px; margin: 1em 0;">
                                             The order #{{ entity.orderNumber }} has been credited.</p>
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <p style="font-size: 16px; margin: 1em 0;">Your order <span class="no-link">#{{ entity.orderNumber }}</span></p>
-                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.createdAt|date('d-m-Y H:i:s') }}</p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.purchaseDate|date('d-m-Y H:i:s') }}</p>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
                                             <thead>
-                                                <tr>
-                                                    <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Product Name
-                                                    </th>
-                                                    <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Product SKU
-                                                    </th>
-                                                    <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Quantity
-                                                    </th>
-                                                    <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Unit
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                        Price excl Tax
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                        Tax
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                        Row Total Incl Tax
-                                                    </th>
-                                                </tr>
+                                            <tr>
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
+                                                </th>
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
+                                                </th>
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
+                                                </th>
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    UNIT
+                                                </th>
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    PRICE EXCL TAX
+                                                </th>
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    TAX
+                                                </th>
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    ROW TOTAL INCL TAX
+                                                </th>
+                                            </tr>
                                             </thead>
                                             <tbody>
-                                                <!--{% for item in entity.items %}-->
-                                                    <tr>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.productName }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.productSku }}
-                                                        </td>
-                                                        <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.quantity }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.quantity }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                            {{ item.price|oro_format_currency({'currency': entity.currency}) }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                            {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                            {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
-                                                        </td>
-                                                    </tr>
-                                                <!--{% endfor %}-->
+                                            <!--{% for item in entity.items %}-->
+                                            <tr>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productName }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productSku }}
+                                                </td>
+                                                <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.quantity }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productUnit.name }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.price|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding:10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                            </tr>
+                                            <!--{% endfor %}-->
                                             </tbody>
                                             <tfoot class="order-totals">
-                                                <tr class="subtotal">
-                                                    <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align: right;">
-                                                        Subtotal:
-                                                    </th>
-                                                    <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align: right;">
-                                                        <span class="price" style="white-space: nowrap;">{{ entity.subtotal|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                    </td>
-                                                </tr>
-                                                <tr class="tax">
-                                                    <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        Tax:
-                                                    </th>
-                                                    <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <span class="price" style="white-space: nowrap;">{{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                    </td>
-                                                </tr>
-                                                <!--{% if entity.discountAmount %}-->
-                                                    <tr class="discount">
-                                                        <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                            Discount:
-                                                        </th>
-                                                        <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                            <span class="price" style="white-space: nowrap;">{{ entity.discountAmount|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                        </td>
-                                                    </tr>
-                                                <!--{% endif %}-->
-                                                <tr class="shipping">
-                                                    <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        Shipping cost:
-                                                    </th>
-                                                    <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <span class="price" style="white-space: nowrap;">{{ entity.shippingAmountInclTax|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                    </td>
-                                                </tr>
-                                                <tr class="grand_total">
-                                                    <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <strong style="font-weight: 600;">
-                                                            Total:
-                                                        </strong>
-                                                    </th>
-                                                    <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <strong style="font-weight: 600;">
-                                                            <span class="price" style="white-space: nowrap;">{{ entity.grandTotal|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                        </strong>
-                                                    </td>
-                                                </tr>
+                                            <tr class="subtotal">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; text-align: right;">
+                                                    SUBTOTAL:
+                                                </th>
+                                                <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.subtotal|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <tr class="tax">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    TAX:
+                                                </th>
+                                                <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">({{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }})</span>
+                                                </td>
+                                            </tr>
+                                            <!--{% if entity.discountAmount %}-->
+                                            <tr class="discount">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    DISCOUNT:
+                                                </th>
+                                                <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.discountAmount|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <!--{% endif %}-->
+                                            <tr class="shipping">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    SHIPPING COST:
+                                                </th>
+                                                <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.shippingAmountInclTax|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <tr class="grand_total">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
+                                                        TOTAL:
+                                                    </strong>
+                                                </th>
+                                                <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
+                                                        <span class="price" style="white-space: nowrap;">{{ entity.grandTotal|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                    </strong>
+                                                </td>
+                                            </tr>
                                             </tfoot>
                                         </table>
                                     </td>
@@ -590,4 +588,4 @@
     <!-- End wrapper table -->
 </center>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_invoiced.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_invoiced.html.twig
index 5c8f499d5..4ba5cbba6 100644
--- a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_invoiced.html.twig
+++ b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_invoiced.html.twig
@@ -5,12 +5,12 @@
 @isEditable = 1
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" style="background-color: #fff;">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +45,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +69,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +231,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +310,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +318,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +334,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +398,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +424,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,172 +439,140 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <h1>Dear {{ entity.customer.firstName ~ ' ' ~ entity.customer.middleName ~ ' ' ~ entity.customer.lastName }},</h1>
-                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">Thank you for your order from {{ entity.salesChannelName }}.</p>
-                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">Once your package ships we will send an email with a link to track your order. Your order summary is below.</p>
+                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">
+                                            The order #{{ entity.orderNumber }} has been invoiced.</p>
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <p style="font-size: 16px; margin: 1em 0;">Your order <span class="no-link">#{{ entity.orderNumber }}</span></p>
-                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.createdAt|date('d-m-Y H:i:s') }}</p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.purchaseDate|date('d-m-Y H:i:s') }}</p>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
-                                        <table class="order-details" style="border-collapse: collapse; width: 100%;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
+                                        <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
+                                            <thead>
                                             <tr>
-                                                <td class="address-details" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Bill to:</h3>
-                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.billingAddress | oro_format_address | escape | nl2br }}</p>
-                                                </td>
-                                                <td class="address-details" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Ship to:</h3>
-                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.shippingAddress | oro_format_address | escape | nl2br }}</p>
-                                                </td>
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
+                                                </th>
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
+                                                </th>
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
+                                                </th>
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    UNIT
+                                                </th>
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    PRICE EXCL TAX
+                                                </th>
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    TAX
+                                                </th>
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    ROW TOTAL INCL TAX
+                                                </th>
                                             </tr>
+                                            </thead>
+                                            <tbody>
+                                            <!--{% for item in entity.items %}-->
                                             <tr>
-                                                <!--{% if entity.shippingMethod is not null %}-->
-                                                    <td class="method-info" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                        <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Shipping method:</h3>
-                                                        <p style="font-size: 16px; margin: 1em 0;">{{ marello_shipping_method_with_type_label(entity.shippingMethod, entity.shippingMethodType) }}</p>
-                                                    </td>
-                                                <!--{% endif %}-->
-                                                <td class="method-info" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Payment method:</h3>
-                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.paymentMethod }}</p>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productName }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productSku }}
+                                                </td>
+                                                <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.quantity }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productUnit.name }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.price|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding:10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
                                                 </td>
                                             </tr>
-                                        </table>
-                                        <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
-                                            <thead>
-                                                <tr>
-                                                    <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Product Name
-                                                    </th>
-                                                    <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Product SKU
-                                                    </th>
-                                                    <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Quantity
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Unit
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                        Price excl Tax
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                        Tax
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                        Row Total Incl Tax
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                        Details
-                                                    </th>
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-                                                <!--{% for item in entity.items %}-->
-                                                    <tr>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.productName }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.productSku }}
-                                                        </td>
-                                                        <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.quantity }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.productUnit }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                            {{ item.price|oro_format_currency({'currency': entity.currency}) }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                            {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                            {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                            {% if item.status == marello_get_order_item_status('waiting_for_supply') %}
-                                                                item will be shipped later
-                                                            {% endif %}
-                                                        </td>
-                                                    </tr>
-                                                <!--{% endfor %}-->
+                                            <!--{% endfor %}-->
                                             </tbody>
                                             <tfoot class="order-totals">
-                                                <tr class="subtotal">
-                                                    <th colspan="7" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align: right;">
-                                                        Subtotal:
-                                                    </th>
-                                                    <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align: right;">
-                                                        <span class="price" style="white-space: nowrap;">{{ entity.subtotal|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                    </td>
-                                                </tr>
-                                                <tr class="tax">
-                                                    <th colspan="7" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        Tax:
-                                                    </th>
-                                                    <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <span class="price" style="white-space: nowrap;">{{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                    </td>
-                                                </tr>
-                                                <!--{% if entity.discountAmount %}-->
-                                                    <tr class="discount">
-                                                        <th colspan="7" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                            Discount:
-                                                        </th>
-                                                        <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                            <span class="price" style="white-space: nowrap;">{{ entity.discountAmount|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                        </td>
-                                                    </tr>
-                                                <!--{% endif %}-->
-                                                <tr class="shipping">
-                                                    <th colspan="7" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        Shipping cost:
-                                                    </th>
-                                                    <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <span class="price" style="white-space: nowrap;">{{ entity.shippingAmountInclTax|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                    </td>
-                                                </tr>
-                                                <tr class="grand_total">
-                                                    <th colspan="7" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <strong style="font-weight: 600;">
-                                                            Total:
-                                                        </strong>
-                                                    </th>
-                                                    <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <strong style="font-weight: 600;">
-                                                            <span class="price" style="white-space: nowrap;">{{ entity.grandTotal|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                        </strong>
-                                                    </td>
-                                                </tr>
+                                            <tr class="subtotal">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; text-align: right;">
+                                                    SUBTOTAL:
+                                                </th>
+                                                <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.subtotal|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <tr class="tax">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    TAX:
+                                                </th>
+                                                <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">({{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }})</span>
+                                                </td>
+                                            </tr>
+                                            <!--{% if entity.discountAmount %}-->
+                                            <tr class="discount">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    DISCOUNT:
+                                                </th>
+                                                <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.discountAmount|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <!--{% endif %}-->
+                                            <tr class="shipping">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    SHIPPING COST:
+                                                </th>
+                                                <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.shippingAmountInclTax|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <tr class="grand_total">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
+                                                        TOTAL:
+                                                    </strong>
+                                                </th>
+                                                <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
+                                                        <span class="price" style="white-space: nowrap;">{{ entity.grandTotal|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                    </strong>
+                                                </td>
+                                            </tr>
                                             </tfoot>
                                         </table>
                                     </td>
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_paid.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_paid.html.twig
index 85e63c0a8..186e783d3 100644
--- a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_paid.html.twig
+++ b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_paid.html.twig
@@ -5,12 +5,12 @@
 @isEditable = 1
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" style="background-color: #fff;">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +45,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +69,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +231,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +310,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +318,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +334,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +398,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +424,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,162 +439,140 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <h1>Dear {{ entity.customer.firstName ~ ' ' ~ entity.customer.middleName ~ ' ' ~ entity.customer.lastName }},</h1>
-                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">Thank you for your order from {{ entity.salesChannelName }}.</p>
-                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">Once your package ships we will send an email with a link to track your order. Your order summary is below.</p>
+                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">
+                                            The order #{{ entity.orderNumber }} has been paid.</p>
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <p style="font-size: 16px; margin: 1em 0;">Your order <span class="no-link">#{{ entity.orderNumber }}</span></p>
-                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.createdAt|date('d-m-Y H:i:s') }}</p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.purchaseDate|date('d-m-Y H:i:s') }}</p>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
-                                        <table class="order-details" style="border-collapse: collapse; width: 100%;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
+                                        <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
+                                            <thead>
                                             <tr>
-                                                <td class="address-details" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Bill to:</h3>
-                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.billingAddress | oro_format_address | escape | nl2br }}</p>
-                                                </td>
-                                                <td class="address-details" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Ship to:</h3>
-                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.shippingAddress | oro_format_address | escape | nl2br }}</p>
-                                                </td>
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
+                                                </th>
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
+                                                </th>
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
+                                                </th>
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    UNIT
+                                                </th>
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    PRICE EXCL TAX
+                                                </th>
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    TAX
+                                                </th>
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    ROW TOTAL INCL TAX
+                                                </th>
                                             </tr>
+                                            </thead>
+                                            <tbody>
+                                            <!--{% for item in entity.items %}-->
                                             <tr>
-                                                <!--{% if entity.shippingMethod is not null %}-->
-                                                    <td class="method-info" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                        <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Shipping method:</h3>
-                                                        <p style="font-size: 16px; margin: 1em 0;">{{ marello_shipping_method_with_type_label(entity.shippingMethod, entity.shippingMethodType) }}</p>
-                                                    </td>
-                                                <!--{% endif %}-->
-                                                <td class="method-info" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Payment method:</h3>
-                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.paymentMethod }}</p>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productName }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productSku }}
+                                                </td>
+                                                <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.quantity }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productUnit.name }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.price|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding:10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
                                                 </td>
                                             </tr>
-                                        </table>
-                                        <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
-                                            <thead>
-                                                <tr>
-                                                    <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Product Name
-                                                    </th>
-                                                    <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Product SKU
-                                                    </th>
-                                                    <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Quantity
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Unit
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                        Price excl Tax
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                        Tax
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                        Row Total Incl Tax
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                        Details
-                                                    </th>
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-                                                <!--{% for item in entity.items %}-->
-                                                    <tr>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.productName }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.productSku }}
-                                                        </td>
-                                                        <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.quantity }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.productUnit }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                            {{ item.price|oro_format_currency({'currency': entity.currency}) }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                            {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                            {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                            {% if item.status == marello_get_order_item_status('waiting_for_supply') %}
-                                                                item will be shipped later
-                                                            {% endif %}
-                                                        </td>
-                                                    </tr>
-                                                <!--{% endfor %}-->
+                                            <!--{% endfor %}-->
                                             </tbody>
                                             <tfoot class="order-totals">
-                                                <tr class="subtotal">
-                                                    <th colspan="7" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align: right;">
-                                                        Subtotal:
-                                                    </th>
-                                                    <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align: right;">
-                                                        <span class="price" style="white-space: nowrap;">{{ entity.subtotal|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                    </td>
-                                                </tr>
-                                                <tr class="tax">
-                                                    <th colspan="7" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        Tax:
-                                                    </th>
-                                                    <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <span class="price" style="white-space: nowrap;">{{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                    </td>
-                                                </tr>
-                                                <tr class="shipping">
-                                                    <th colspan="7" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        Shipping cost:
-                                                    </th>
-                                                    <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <span class="price" style="white-space: nowrap;">{{ entity.shippingAmountInclTax|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                    </td>
-                                                </tr>
-                                                <tr class="grand_total">
-                                                    <th colspan="7" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <strong style="font-weight: 600;">
-                                                            Total:
-                                                        </strong>
-                                                    </th>
-                                                    <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <strong style="font-weight: 600;">
-                                                            <span class="price" style="white-space: nowrap;">{{ entity.grandTotal|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                        </strong>
-                                                    </td>
-                                                </tr>
+                                            <tr class="subtotal">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; text-align: right;">
+                                                    SUBTOTAL:
+                                                </th>
+                                                <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.subtotal|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <tr class="tax">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    TAX:
+                                                </th>
+                                                <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">({{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }})</span>
+                                                </td>
+                                            </tr>
+                                            <!--{% if entity.discountAmount %}-->
+                                            <tr class="discount">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    DISCOUNT:
+                                                </th>
+                                                <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.discountAmount|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <!--{% endif %}-->
+                                            <tr class="shipping">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    SHIPPING COST:
+                                                </th>
+                                                <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.shippingAmountInclTax|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <tr class="grand_total">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
+                                                        TOTAL:
+                                                    </strong>
+                                                </th>
+                                                <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
+                                                        <span class="price" style="white-space: nowrap;">{{ entity.grandTotal|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                    </strong>
+                                                </td>
+                                            </tr>
                                             </tfoot>
                                         </table>
                                     </td>
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_payment_reminder.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_payment_reminder.html.twig
index 14e56b53d..1ebf53bc5 100644
--- a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_payment_reminder.html.twig
+++ b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_payment_reminder.html.twig
@@ -10,7 +10,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +46,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +70,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +232,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +311,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +319,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +335,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +399,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +425,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,27 +440,27 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <h1>Dear {{ entity.customer.firstName ~ ' ' ~ entity.customer.middleName ~ ' ' ~ entity.customer.lastName }},</h1>
                                         <p class="greeting" style="font-size: 16px; margin: 1em 0;">Thank you for your order from {{ entity.salesChannelName }}.</p>
                                         <p class="greeting" style="font-size: 16px; margin: 1em 0;">
@@ -470,135 +469,135 @@
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <p style="font-size: 16px; margin: 1em 0;">Your order <span class="no-link">#{{ entity.orderNumber }}</span></p>
-                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.createdAt|date('d-m-Y H:i:s') }}</p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.purchaseDate|date('d-m-Y H:i:s') }}</p>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <table class="order-details" style="border-collapse: collapse; width: 100%;">
                                             <tr>
-                                                <td class="address-details" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Bill to:</h3>
+                                                <td class="address-details" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
+                                                    <h3 style="display: block; font-size: 16px; font-weight: 400; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">BILL TO:</h3>
                                                     <p style="font-size: 16px; margin: 1em 0;">{{ entity.billingAddress | oro_format_address | escape | nl2br }}</p>
                                                 </td>
-                                                <td class="address-details" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Ship to:</h3>
-                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.shippingAddress | oro_format_address | escape | nl2br }}</p>
+                                                <td class="address-details" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
+                                                    <h3 style="display: block; font-size: 16px; font-weight: 400; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">SHIP TO:</h3>
+                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.shippingAddress | oro_format_address| escape | nl2br }}</p>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <!--{% if entity.shippingMethod is not null %}-->
-                                                    <td class="method-info" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                        <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Shipping method:</h3>
-                                                        <p style="font-size: 16px; margin: 1em 0;">{{ marello_shipping_method_with_type_label(entity.shippingMethod, entity.shippingMethodType) }}</p>
-                                                    </td>
+                                                <td class="method-info" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
+                                                    <h3 style="display: block; font-size: 16px; font-weight: 400; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">SHIPPING METHOD:</h3>
+                                                    <p style="font-size: 16px; margin: 1em 0;">{{ marello_shipping_method_with_type_label(entity.shippingMethod, entity.shippingMethodType) }}</p>
+                                                </td>
                                                 <!--{% endif %}-->
                                                 <!--{% if entity.paymentMethod is not null %}-->
-                                                    <td class="method-info" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                        <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Payment method::</h3>
-                                                        <p style="font-size: 16px; margin: 1em 0;">{{ entity.paymentMethod }}</p>
-                                                    </td>
+                                                <td class="method-info" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
+                                                    <h3 style="display: block; font-size: 16px; font-weight: 400; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">PAYMENT METHOD:</h3>
+                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.paymentMethod }}</p>
+                                                </td>
                                                 <!--{% endif %}-->
                                             </tr>
                                         </table>
                                         <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
                                             <thead>
                                             <tr>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product Name
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
                                                 </th>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product SKU
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
                                                 </th>
-                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Quantity
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Unit
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    UNIT
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Price excl Tax
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    PRICE EXCL TAX
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Tax
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    TAX
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Row Total Incl Tax
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    ROW TOTAL INCL TAX
                                                 </th>
                                             </tr>
                                             </thead>
                                             <tbody>
                                             <!--{% for item in entity.items %}-->
-                                                <tr>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.productName }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.productSku }}
-                                                    </td>
-                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.quantity }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.productUnit }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                        {{ item.price|oro_format_currency({'currency': entity.currency}) }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                        {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                        {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
-                                                    </td>
-                                                </tr>
+                                            <tr>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productName }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productSku }}
+                                                </td>
+                                                <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.quantity }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productUnit.name }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.price|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding:10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                            </tr>
                                             <!--{% endfor %}-->
                                             </tbody>
                                             <tfoot class="order-totals">
                                             <tr class="subtotal">
-                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align: right;">
-                                                    Subtotal:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; text-align: right;">
+                                                    SUBTOTAL:
                                                 </th>
-                                                <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align: right;">
+                                                <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; text-align: right;">
                                                     <span class="price" style="white-space: nowrap;">{{ entity.subtotal|oro_format_currency({'currency': entity.currency}) }}</span>
                                                 </td>
                                             </tr>
                                             <tr class="tax">
-                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    Tax:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    TAX:
                                                 </th>
-                                                <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    <span class="price" style="white-space: nowrap;">{{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">({{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }})</span>
                                                 </td>
                                             </tr>
                                             <!--{% if entity.discountAmount %}-->
-                                                <tr class="discount">
-                                                    <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        Discount:
-                                                    </th>
-                                                    <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <span class="price" style="white-space: nowrap;">{{ entity.discountAmount|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                    </td>
-                                                </tr>
+                                            <tr class="discount">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    DISCOUNT:
+                                                </th>
+                                                <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.discountAmount|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
                                             <!--{% endif %}-->
                                             <tr class="shipping">
-                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    Shipping cost:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    SHIPPING COST:
                                                 </th>
-                                                <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
+                                                <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
                                                     <span class="price" style="white-space: nowrap;">{{ entity.shippingAmountInclTax|oro_format_currency({'currency': entity.currency}) }}</span>
                                                 </td>
                                             </tr>
                                             <tr class="grand_total">
-                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    <strong style="font-weight: 600;">
-                                                        Total:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
+                                                        TOTAL:
                                                     </strong>
                                                 </th>
-                                                <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    <strong style="font-weight: 600;">
+                                                <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
                                                         <span class="price" style="white-space: nowrap;">{{ entity.grandTotal|oro_format_currency({'currency': entity.currency}) }}</span>
                                                     </strong>
                                                 </td>
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipped_confirmation.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipped_confirmation.html.twig
index 1ed56ad15..0f200a3ca 100644
--- a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipped_confirmation.html.twig
+++ b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipped_confirmation.html.twig
@@ -5,12 +5,12 @@
 @isEditable = 1
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" style="background-color: #fff;">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +45,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +69,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +231,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +310,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +318,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +334,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +398,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +424,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,110 +439,157 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <h1>Dear {{ entity.customer.firstName ~ ' ' ~ entity.customer.middleName ~ ' ' ~ entity.customer.lastName }},</h1>
                                         <p class="greeting" style="font-size: 16px; margin: 1em 0;">Thank you for your order from {{ entity.salesChannelName }}.</p>
                                         <p class="greeting" style="font-size: 16px; margin: 1em 0;">
-                                        <!-- {% if entity.items | length > 1 %}-->
+                                            <!-- {% if entity.items | length > 1 %}-->
                                             The products below from your order #{{ entity.orderNumber }} have been shipped.</p>
                                         <!-- {% else %}-->
-                                            The product below from your order #{{ entity.orderNumber }} has been shipped.</p>
+                                        The product below from your order #{{ entity.orderNumber }} has been shipped.</p>
                                         <!-- {% endif %}-->
                                         <!-- {% if entity.shippingMethod is not null %}-->
-                                            <p class="greeting" style="font-size: 16px; margin: 1em 0;">
-                                                Your order will be delivered by {{ marello_shipping_method_with_type_label(entity.shippingMethod, entity.shippingMethodType) }}.</p>
+                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">
+                                            Your order will be delivered by {{ marello_shipping_method_with_type_label(entity.shippingMethod, entity.shippingMethodType) }}.</p>
                                         <!-- {% endif %}-->
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <p style="font-size: 16px; margin: 1em 0;">Your order <span class="no-link">#{{ entity.orderNumber }}</span></p>
-                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.createdAt|date('d-m-Y H:i:s') }}</p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.purchaseDate|date('d-m-Y H:i:s') }}</p>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <table class="order-details" style="border-collapse: collapse; width: 100%;">
                                             <tr>
-                                                <td class="address-details" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Ship to:</h3>
-                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.shippingAddress | oro_format_address | escape | nl2br }}</p>
+                                                <td class="address-details" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
+                                                    <h3 style="display: block; font-size: 16px; font-weight: 400; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">SHIP TO:</h3>
+                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.shippingAddress | oro_format_address| escape | nl2br }}</p>
                                                 </td>
                                             </tr>
-                                        </table>
-                                        <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
+                                        </table><table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
                                             <thead>
                                             <tr>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product Name
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
                                                 </th>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product SKU
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
                                                 </th>
-                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Quantity
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Unit
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    UNIT
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Price excl Tax
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    PRICE EXCL TAX
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Tax
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    TAX
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Row Total Incl Tax
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    ROW TOTAL INCL TAX
                                                 </th>
                                             </tr>
                                             </thead>
                                             <tbody>
-                                            <!--{% for item in marello_get_order_items_for_notification(entity, 'marello_order_shipped_confirmation') %}-->
-                                                <tr>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.productName }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.productSku }}
-                                                    </td>
-                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.quantity }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.productUnit }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                        {{ item.price|oro_format_currency({'currency': entity.currency}) }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                        {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                        {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
-                                                    </td>
-                                                </tr>
+                                            <!--{% for item in entity.items %}-->
+                                            <tr>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productName }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productSku }}
+                                                </td>
+                                                <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.quantity }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productUnit.name }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.price|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding:10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                            </tr>
                                             <!--{% endfor %}-->
                                             </tbody>
+                                            <tfoot class="order-totals">
+                                            <tr class="subtotal">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; text-align: right;">
+                                                    SUBTOTAL:
+                                                </th>
+                                                <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.subtotal|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <tr class="tax">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    TAX:
+                                                </th>
+                                                <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">({{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }})</span>
+                                                </td>
+                                            </tr>
+                                            <!--{% if entity.discountAmount %}-->
+                                            <tr class="discount">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    DISCOUNT:
+                                                </th>
+                                                <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.discountAmount|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <!--{% endif %}-->
+                                            <tr class="shipping">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    SHIPPING COST:
+                                                </th>
+                                                <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.shippingAmountInclTax|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <tr class="grand_total">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
+                                                        TOTAL:
+                                                    </strong>
+                                                </th>
+                                                <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
+                                                        <span class="price" style="white-space: nowrap;">{{ entity.grandTotal|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                    </strong>
+                                                </td>
+                                            </tr>
+                                            </tfoot>
                                         </table>
                                     </td>
                                 </tr>
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipping_prepared.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipping_prepared.html.twig
index 1546ad5b2..8bb9fa977 100644
--- a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipping_prepared.html.twig
+++ b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipping_prepared.html.twig
@@ -10,7 +10,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +46,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +70,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +232,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +311,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +319,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +335,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +399,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +425,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,118 +440,172 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <h1>Dear {{ entity.customer.firstName ~ ' ' ~ entity.customer.middleName ~ ' ' ~ entity.customer.lastName }},</h1>
                                         <p class="greeting" style="font-size: 16px; margin: 1em 0;">Thank you for your order from {{ entity.salesChannelName }}.</p>
                                         <p class="greeting" style="font-size: 16px; margin: 1em 0;">
                                             <!--{% if entity.items | length > 1 %}-->
-                                                The products below from your order #{{ entity.orderNumber }} are being prepared to ship.</p>
-                                            <!--{% else %}-->
-                                                The product below from your order #{{ entity.orderNumber }} is being prepared to ship.</p>
-                                            <!--{% endif %}-->
+                                            The products below from your order #{{ entity.orderNumber }} are being prepared to ship.</p>
+                                        <!--{% else %}-->
+                                        The product below from your order #{{ entity.orderNumber }} is being prepared to ship.</p>
+                                        <!--{% endif %}-->
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <p style="font-size: 16px; margin: 1em 0;">Your order <span class="no-link">#{{ entity.orderNumber }}</span></p>
-                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.createdAt|date('d-m-Y H:i:s') }}</p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.purchaseDate|date('d-m-Y H:i:s') }}</p>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <table class="order-details" style="border-collapse: collapse; width: 100%;">
                                             <tr>
-                                                <td class="address-details" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Bill to:</h3>
+                                                <td class="address-details" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
+                                                    <h3 style="display: block; font-size: 16px; font-weight: 400; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">BILL TO:</h3>
                                                     <p style="font-size: 16px; margin: 1em 0;">{{ entity.billingAddress | oro_format_address | escape | nl2br }}</p>
                                                 </td>
-                                                <td class="address-details" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Ship to:</h3>
-                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.shippingAddress | oro_format_address | escape | nl2br }}</p>
+                                                <td class="address-details" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
+                                                    <h3 style="display: block; font-size: 16px; font-weight: 400; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">SHIP TO:</h3>
+                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.shippingAddress | oro_format_address| escape | nl2br }}</p>
                                                 </td>
                                             </tr>
                                             <tr>
+                                                <!--{% if entity.paymentMethod is not null %}-->
+                                                <td class="method-info" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
+                                                    <h3 style="display: block; font-size: 16px; font-weight: 400; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">PAYMENT METHOD:</h3>
+                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.paymentMethod }}</p>
+                                                </td>
+                                                <!--{% endif %}-->
                                                 <!--{% if entity.shippingMethod is not null %}-->
-                                                    <td class="method-info" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                        <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Shipping method:</h3>
-                                                        <p style="font-size: 16px; margin: 1em 0;">{{ marello_shipping_method_with_type_label(entity.shippingMethod, entity.shippingMethodType) }}</p>
-                                                    </td>
+                                                <td class="method-info" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
+                                                    <h3 style="display: block; font-size: 16px; font-weight: 400; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">SHIPPING METHOD:</h3>
+                                                    <p style="font-size: 16px; margin: 1em 0;">{{ marello_shipping_method_with_type_label(entity.shippingMethod, entity.shippingMethodType) }}</p>
+                                                </td>
                                                 <!--{% endif %}-->
                                             </tr>
                                         </table>
                                         <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
                                             <thead>
                                             <tr>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product Name
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
                                                 </th>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product SKU
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
                                                 </th>
-                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Quantity
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Unit
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    UNIT
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Price excl Tax
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    PRICE EXCL TAX
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Tax
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    TAX
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Row Total Incl Tax
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    ROW TOTAL INCL TAX
                                                 </th>
                                             </tr>
                                             </thead>
                                             <tbody>
-                                            <!--{% for item in marello_get_order_items_for_notification(entity, 'marello_order_shipping_prepared') %}-->
-                                                <tr>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.productName }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.productSku }}
-                                                    </td>
-                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.quantity }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.productUnit }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                        {{ item.price|oro_format_currency({'currency': entity.currency}) }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                        {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                        {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
-                                                    </td>
-                                                </tr>
+                                            <!--{% for item in entity.items %}-->
+                                            <tr>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productName }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productSku }}
+                                                </td>
+                                                <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.quantity }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productUnit.name }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.price|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding:10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                            </tr>
                                             <!--{% endfor %}-->
                                             </tbody>
+                                            <tfoot class="order-totals">
+                                            <tr class="subtotal">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; text-align: right;">
+                                                    SUBTOTAL:
+                                                </th>
+                                                <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.subtotal|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <tr class="tax">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    TAX:
+                                                </th>
+                                                <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">({{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }})</span>
+                                                </td>
+                                            </tr>
+                                            <!--{% if entity.discountAmount %}-->
+                                            <tr class="discount">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    DISCOUNT:
+                                                </th>
+                                                <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.discountAmount|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <!--{% endif %}-->
+                                            <tr class="shipping">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    SHIPPING COST:
+                                                </th>
+                                                <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.shippingAmountInclTax|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
+                                            <tr class="grand_total">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
+                                                        TOTAL:
+                                                    </strong>
+                                                </th>
+                                                <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
+                                                        <span class="price" style="white-space: nowrap;">{{ entity.grandTotal|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                    </strong>
+                                                </td>
+                                            </tr>
+                                            </tfoot>
                                         </table>
                                     </td>
                                 </tr>
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipping_prepared_warehouse.html.twig b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipping_prepared_warehouse.html.twig
index fbcd19513..f310d0eec 100644
--- a/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipping_prepared_warehouse.html.twig
+++ b/src/Marello/Bundle/OrderBundle/Migrations/Data/ORM/data/emails/marello_order_shipping_prepared_warehouse.html.twig
@@ -10,7 +10,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +46,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +70,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +232,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +311,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +319,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +335,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +399,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +425,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,151 +440,151 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
-                                        <h1>Dear Warehouse,</h1>
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
+                                        <h1>Dear Warehouse</h1>
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <p style="font-size: 16px; margin: 1em 0;">The order <span class="no-link">#{{ entity.orderNumber }}</span></p>
-                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.createdAt|date('d-m-Y H:i:s') }}</p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.purchaseDate|date('d-m-Y H:i:s') }}</p>
                                         <p style="font-size: 16px; margin: 1em 0;">can be prepared to ship</p>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <table class="order-details" style="border-collapse: collapse; width: 100%;">
                                             <tr>
-                                                <td class="address-details" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                    <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Ship to:</h3>
-                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.shippingAddress | oro_format_address | escape | nl2br }}</p>
+                                                <td class="address-details" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
+                                                    <h3 style="display: block; font-size: 16px; font-weight: 400; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">SHIP TO:</h3>
+                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.shippingAddress | oro_format_address| escape | nl2br }}</p>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <!--{% if entity.shippingMethod is not null %}-->
-                                                    <td class="method-info" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
-                                                        <h3 style="display: block; font-size: 20px; font-weight: 600; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">Shipping method:</h3>
-                                                        <p style="font-size: 16px; margin: 1em 0;">{{ marello_shipping_method_with_type_label(entity.shippingMethod, entity.shippingMethodType) }}</p>
-                                                    </td>
+                                                <td class="method-info" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
+                                                    <h3 style="display: block; font-size: 16px; font-weight: 400; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">SHIPPING METHOD:</h3>
+                                                    <p style="font-size: 16px; margin: 1em 0;">{{ marello_shipping_method_with_type_label(entity.shippingMethod, entity.shippingMethodType) }}</p>
+                                                </td>
                                                 <!--{% endif %}-->
                                             </tr>
                                         </table>
                                         <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
                                             <thead>
                                             <tr>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product Name
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
                                                 </th>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product SKU
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
                                                 </th>
-                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Quantity
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Unit
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    UNIT
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Price excl Tax
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    PRICE EXCL TAX
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Tax
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    TAX
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align:right;">
-                                                    Row Total Incl Tax
+                                                <th class="item-info" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; text-align:right; font-size:13px;">
+                                                    ROW TOTAL INCL TAX
                                                 </th>
                                             </tr>
                                             </thead>
                                             <tbody>
                                             <!--{% for item in entity.items %}-->
-                                                <tr>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.productName }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.productSku }}
-                                                    </td>
-                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.quantity }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.productUnit }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                        {{ item.price|oro_format_currency({'currency': entity.currency}) }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                        {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
-                                                    </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align:right;">
-                                                        {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
-                                                    </td>
-                                                </tr>
+                                            <tr>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productName }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productSku }}
+                                                </td>
+                                                <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.quantity }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                    {{ item.productUnit.name }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.price|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.tax|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                                <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding:10px 8px; font-size:13px; text-align:right; font-weight: 300;">
+                                                    {{ item.rowTotalInclTax|oro_format_currency({'currency': entity.currency}) }}
+                                                </td>
+                                            </tr>
                                             <!--{% endfor %}-->
                                             </tbody>
                                             <tfoot class="order-totals">
                                             <tr class="subtotal">
-                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; text-align: right;">
-                                                    Subtotal:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; text-align: right;">
+                                                    SUBTOTAL:
                                                 </th>
-                                                <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; text-align: right;">
+                                                <td data-th="subtotaal" style="background-color: #f8f8f8; border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; text-align: right;">
                                                     <span class="price" style="white-space: nowrap;">{{ entity.subtotal|oro_format_currency({'currency': entity.currency}) }}</span>
                                                 </td>
                                             </tr>
                                             <tr class="tax">
-                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    Tax:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    TAX:
                                                 </th>
-                                                <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    <span class="price" style="white-space: nowrap;">{{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                <td data-th="tax" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">({{ entity.totalTax|oro_format_currency({'currency': entity.currency}) }})</span>
                                                 </td>
                                             </tr>
                                             <!--{% if entity.discountAmount %}-->
-                                                <tr class="discount">
-                                                    <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        Discount:
-                                                    </th>
-                                                    <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                        <span class="price" style="white-space: nowrap;">{{ entity.discountAmount|oro_format_currency({'currency': entity.currency}) }}</span>
-                                                    </td>
-                                                </tr>
+                                            <tr class="discount">
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    DISCOUNT:
+                                                </th>
+                                                <td data-th="discount" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <span class="price" style="white-space: nowrap;">{{ entity.discountAmount|oro_format_currency({'currency': entity.currency}) }}</span>
+                                                </td>
+                                            </tr>
                                             <!--{% endif %}-->
                                             <tr class="shipping">
-                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    Shipping cost:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    SHIPPING COST:
                                                 </th>
-                                                <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
+                                                <td data-th="Verzending en verwerking" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
                                                     <span class="price" style="white-space: nowrap;">{{ entity.shippingAmountInclTax|oro_format_currency({'currency': entity.currency}) }}</span>
                                                 </td>
                                             </tr>
                                             <tr class="grand_total">
-                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    <strong style="font-weight: 600;">
-                                                        Total:
+                                                <th colspan="6" scope="row" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
+                                                        TOTAL:
                                                     </strong>
                                                 </th>
-                                                <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px; padding-top: 0; text-align: right;">
-                                                    <strong style="font-weight: 600;">
+                                                <td data-th="Groot Totaal" style="background-color: #f8f8f8; border-top: 0; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 20px 8px; font-size:13px; padding-top: 0; text-align: right;">
+                                                    <strong style="font-weight: 400;">
                                                         <span class="price" style="white-space: nowrap;">{{ entity.grandTotal|oro_format_currency({'currency': entity.currency}) }}</span>
                                                     </strong>
                                                 </td>
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Schema/MarelloOrderBundleInstaller.php b/src/Marello/Bundle/OrderBundle/Migrations/Schema/MarelloOrderBundleInstaller.php
index 0f5990365..488378b2e 100644
--- a/src/Marello/Bundle/OrderBundle/Migrations/Schema/MarelloOrderBundleInstaller.php
+++ b/src/Marello/Bundle/OrderBundle/Migrations/Schema/MarelloOrderBundleInstaller.php
@@ -3,15 +3,18 @@
 namespace Marello\Bundle\OrderBundle\Migrations\Schema;
 
 use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+use Oro\Bundle\MigrationBundle\Migration\Installation;
+use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
 use Oro\Bundle\ActivityBundle\Migration\Extension\ActivityExtension;
-use Oro\Bundle\ActivityBundle\Migration\Extension\ActivityExtensionAwareInterface;
+use Oro\Bundle\EntityExtendBundle\Migration\Extension\ExtendExtension;
 use Oro\Bundle\AttachmentBundle\Migration\Extension\AttachmentExtension;
+use Oro\Bundle\ActivityBundle\Migration\Extension\ActivityExtensionAwareInterface;
 use Oro\Bundle\AttachmentBundle\Migration\Extension\AttachmentExtensionAwareInterface;
-use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
-use Oro\Bundle\EntityExtendBundle\Migration\Extension\ExtendExtension;
 use Oro\Bundle\EntityExtendBundle\Migration\Extension\ExtendExtensionAwareInterface;
-use Oro\Bundle\MigrationBundle\Migration\Installation;
-use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+use Marello\Bundle\OrderBundle\Model\OrderStatusesInterface;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyMethods)
@@ -43,7 +46,7 @@ class MarelloOrderBundleInstaller implements
      */
     public function getMigrationVersion()
     {
-        return 'v1_12';
+        return 'v1_13_1';
     }
 
     /**
@@ -79,6 +82,7 @@ protected function createMarelloOrderOrderTable(Schema $schema)
         $table->addColumn('subtotal', 'money', ['precision' => 19, 'scale' => 4, 'comment' => '(DC2Type:money)']);
         $table->addColumn('total_tax', 'money', ['precision' => 19, 'scale' => 4, 'comment' => '(DC2Type:money)']);
         $table->addColumn('grand_total', 'money', ['precision' => 19, 'scale' => 4, 'comment' => '(DC2Type:money)']);
+        $table->addColumn('locale_id', 'string', ['notnull' => false, 'length' => 255]);
         $table->addColumn('currency', 'string', ['notnull' => false, 'length' => 10]);
         $table->addColumn('payment_method', 'string', ['notnull' => false, 'length' => 255]);
         $table->addColumn(
@@ -152,6 +156,17 @@ protected function createMarelloOrderOrderTable(Schema $schema)
 
         $this->activityExtension->addActivityAssociation($schema, 'marello_notification', $table->getName());
         $this->activityExtension->addActivityAssociation($schema, 'oro_email', $table->getName());
+        $this->extendExtension->addEnumField(
+            $schema,
+            $table,
+            'orderStatus',
+            OrderStatusesInterface::ORDER_STATUS_ENUM_CLASS,
+            false,
+            false,
+            [
+                'extend' => ['owner' => ExtendScope::OWNER_SYSTEM],
+            ]
+        );
     }
 
     /**
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Schema/v1_13/MarelloOrderBundle.php b/src/Marello/Bundle/OrderBundle/Migrations/Schema/v1_13/MarelloOrderBundle.php
new file mode 100644
index 000000000..a6f3bc8e9
--- /dev/null
+++ b/src/Marello/Bundle/OrderBundle/Migrations/Schema/v1_13/MarelloOrderBundle.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Marello\Bundle\OrderBundle\Migrations\Schema\v1_13;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
+use Oro\Bundle\EntityExtendBundle\Migration\Extension\ExtendExtension;
+use Oro\Bundle\EntityExtendBundle\Migration\Extension\ExtendExtensionAwareInterface;
+
+use Marello\Bundle\OrderBundle\Model\OrderStatusesInterface;
+
+class MarelloOrderBundle implements Migration, ExtendExtensionAwareInterface
+{
+    /**
+     * @var ExtendExtension
+     */
+    protected $extendExtension;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $this->updateOrderTable($schema);
+    }
+
+    private function updateOrderTable(Schema $schema)
+    {
+        $tableName = $this->extendExtension
+            ->getNameGenerator()
+            ->generateEnumTableName(OrderStatusesInterface::ORDER_STATUS_ENUM_CLASS);
+        // enum table is already available and created...
+        if ($schema->hasTable($tableName)) {
+            return;
+        }
+
+        $table = $schema->getTable('marello_order_order');
+        $this->extendExtension->addEnumField(
+            $schema,
+            $table,
+            'orderStatus',
+            OrderStatusesInterface::ORDER_STATUS_ENUM_CLASS,
+            false,
+            false,
+            [
+                'extend' => ['owner' => ExtendScope::OWNER_SYSTEM],
+            ]
+        );
+    }
+
+    /**
+     * Sets the ExtendExtension
+     *
+     * @param ExtendExtension $extendExtension
+     */
+    public function setExtendExtension(ExtendExtension $extendExtension)
+    {
+        $this->extendExtension = $extendExtension;
+    }
+}
diff --git a/src/Marello/Bundle/OrderBundle/Migrations/Schema/v1_13_1/MarelloOrderBundle.php b/src/Marello/Bundle/OrderBundle/Migrations/Schema/v1_13_1/MarelloOrderBundle.php
new file mode 100644
index 000000000..69560bd4b
--- /dev/null
+++ b/src/Marello/Bundle/OrderBundle/Migrations/Schema/v1_13_1/MarelloOrderBundle.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Marello\Bundle\OrderBundle\Migrations\Schema\v1_13_1;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\EntityConfigBundle\Migration\UpdateEntityConfigFieldValueQuery;
+
+use Marello\Bundle\OrderBundle\Entity\Order;
+
+class MarelloOrderBundle implements Migration
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $table = $schema->getTable('marello_order_order');
+        $table->addColumn('locale_id', 'string', ['notnull' => false, 'length' => 255]);
+
+        $queries->addQuery(
+            new UpdateEntityConfigFieldValueQuery(
+                Order::class,
+                'salesChannel',
+                'importexport',
+                'full',
+                false
+            )
+        );
+    }
+}
diff --git a/src/Marello/Bundle/OrderBundle/Model/OrderStatusesInterface.php b/src/Marello/Bundle/OrderBundle/Model/OrderStatusesInterface.php
new file mode 100644
index 000000000..1308a2d48
--- /dev/null
+++ b/src/Marello/Bundle/OrderBundle/Model/OrderStatusesInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Marello\Bundle\OrderBundle\Model;
+
+interface OrderStatusesInterface
+{
+    const ORDER_STATUS_ENUM_CLASS = 'marello_order_status';
+
+    const OS_PENDING = 'Pending';
+    const OS_CANCELLED = 'Cancelled';
+    const OS_INVOICED = 'Invoiced';
+    const OS_PAID = 'Paid';
+    const OS_PARTIALLY_PAID = 'Partially Paid';
+    const OS_PICK_AND_PACK = 'Pick and Pack';
+    const OS_SHIPPED = 'Shipped';
+    const OS_PARTIALLY_SHIPPED = 'Partially Shipped';
+    const OS_CLOSED = 'Closed';
+    const OS_ON_HOLD = 'Hold';
+    const OS_PROCESSING = 'Processing';
+}
diff --git a/src/Marello/Bundle/OrderBundle/Provider/OrderDashboardOrderItemsByStatusProvider.php b/src/Marello/Bundle/OrderBundle/Provider/OrderDashboardOrderItemsByStatusProvider.php
index 859c7d663..37ae46700 100644
--- a/src/Marello/Bundle/OrderBundle/Provider/OrderDashboardOrderItemsByStatusProvider.php
+++ b/src/Marello/Bundle/OrderBundle/Provider/OrderDashboardOrderItemsByStatusProvider.php
@@ -70,6 +70,7 @@ public function getOrderItemsGroupedByStatus(WidgetOptionBag $widgetOptions)
         $orderitemRepository = $this->registry->getRepository('MarelloOrderBundle:Order');
         $qb = $orderitemRepository->createQueryBuilder('o')
             ->select('IDENTITY (oi.status) status, COUNT(oi.id) as quantity')
+            ->andWhere('IDENTITY (oi.status) IS NOT NULL')
             ->innerJoin('o.items', 'oi')
             ->groupBy('oi.status')
             ->orderBy('quantity', 'DESC');
diff --git a/src/Marello/Bundle/OrderBundle/Resources/config/oro/actions.yml b/src/Marello/Bundle/OrderBundle/Resources/config/oro/actions.yml
index 1e76227b1..d6c64079f 100644
--- a/src/Marello/Bundle/OrderBundle/Resources/config/oro/actions.yml
+++ b/src/Marello/Bundle/OrderBundle/Resources/config/oro/actions.yml
@@ -87,3 +87,14 @@ action_groups:
                                                 - filename: '$.filename'
                                                   body: '$.invoice_pdf'
                                                   mimetype: 'application/pdf'
+    marello_order_status_change:
+        parameters:
+            order:
+                type: object
+            status:
+                type: string
+        actions:
+            - '@request_enum_entity':
+                enum_code: 'marello_order_status'
+                attribute: $.order.orderStatus
+                identifier: $.status
\ No newline at end of file
diff --git a/src/Marello/Bundle/OrderBundle/Resources/config/oro/workflows.yml b/src/Marello/Bundle/OrderBundle/Resources/config/oro/workflows.yml
index ac586d2a4..ce650eb67 100644
--- a/src/Marello/Bundle/OrderBundle/Resources/config/oro/workflows.yml
+++ b/src/Marello/Bundle/OrderBundle/Resources/config/oro/workflows.yml
@@ -130,6 +130,11 @@ workflows:
                         parameters_mapping:
                             order: $order
                             current_transition: pending
+                    - '@run_action_group':
+                        action_group: marello_order_status_change
+                        parameters_mapping:
+                            order: $order
+                            status: 'pending'
             cancel_definition:
                 conditions:
                     '@and':
@@ -150,6 +155,11 @@ workflows:
                         parameters_mapping:
                             order: $order
                             current_transition: cancel
+                    - '@run_action_group':
+                        action_group: marello_order_status_change
+                        parameters_mapping:
+                            order: $order
+                            status: 'cancelled'
             hold_definition:
                 actions:
                     - '@tree':
@@ -166,6 +176,11 @@ workflows:
                         parameters_mapping:
                             order: $order
                             current_transition: hold
+                    - '@run_action_group':
+                        action_group: marello_order_status_change
+                        parameters_mapping:
+                            order: $order
+                            status: 'hold'
             un_hold_definition:
                 post_actions:
                     - '@run_action_group':
@@ -173,6 +188,11 @@ workflows:
                         parameters_mapping:
                             order: $order
                             current_transition: un_hold
+                    - '@run_action_group':
+                        action_group: marello_order_status_change
+                        parameters_mapping:
+                            order: $order
+                            status: 'processing'
             invoice_definition:
                 conditions:
                     '@and':
@@ -193,6 +213,11 @@ workflows:
                         parameters_mapping:
                             order: $order
                             current_transition: invoice
+                    - '@run_action_group':
+                        action_group: marello_order_status_change
+                        parameters_mapping:
+                            order: $order
+                            status: 'invoiced'
             payment_received_definition:
                 conditions:
                     '@and':
@@ -212,6 +237,11 @@ workflows:
                         parameters_mapping:
                             order: $order
                             current_transition: payment_received
+                    - '@run_action_group':
+                        action_group: marello_order_status_change
+                        parameters_mapping:
+                            order: $order
+                            status: 'paid'
             prepare_shipping_definition:
                 conditions:
                     '@and':
@@ -242,6 +272,11 @@ workflows:
                         parameters_mapping:
                             order: $order
                             current_transition: prepare_shipping
+                    - '@run_action_group':
+                        action_group: marello_order_status_change
+                        parameters_mapping:
+                            order: $order
+                            status: 'pick_and_pack'
             ship_definition:
                 conditions:
                     '@and':
@@ -266,6 +301,11 @@ workflows:
                         parameters_mapping:
                             order: $order
                             current_transition: ship
+                    - '@run_action_group':
+                        action_group: marello_order_status_change
+                        parameters_mapping:
+                            order: $order
+                            status: 'shipped'
             payment_reminder_definition:
                 post_actions:
                     - '@marello_notification_send':
@@ -398,6 +438,11 @@ workflows:
                         parameters_mapping:
                             order: $order
                             current_transition: pending
+                    - '@run_action_group':
+                        action_group: marello_order_status_change
+                        parameters_mapping:
+                            order: $order
+                            status: 'pending'
             cancel_definition:
                 conditions:
                     '@and':
@@ -417,6 +462,11 @@ workflows:
                         parameters_mapping:
                             order: $order
                             current_transition: cancel
+                    - '@run_action_group':
+                        action_group: marello_order_status_change
+                        parameters_mapping:
+                            order: $order
+                            status: 'cancelled'
             hold_definition:
                 post_actions:
                     - '@run_action_group':
@@ -424,6 +474,11 @@ workflows:
                         parameters_mapping:
                             order: $order
                             current_transition: hold
+                    - '@run_action_group':
+                        action_group: marello_order_status_change
+                        parameters_mapping:
+                            order: $order
+                            status: 'hold'
             un_hold_definition:
                 post_actions:
                     - '@run_action_group':
@@ -431,6 +486,11 @@ workflows:
                         parameters_mapping:
                             order: $order
                             current_transition: un_hold
+                    - '@run_action_group':
+                        action_group: marello_order_status_change
+                        parameters_mapping:
+                            order: $order
+                            status: 'processing'
             invoice_definition:
                 conditions:
                     '@and':
@@ -451,6 +511,11 @@ workflows:
                         parameters_mapping:
                             order: $order
                             current_transition: invoice
+                    - '@run_action_group':
+                        action_group: marello_order_status_change
+                        parameters_mapping:
+                            order: $order
+                            status: 'invoiced'
             payment_received_definition:
                 conditions:
                     '@and':
@@ -474,6 +539,11 @@ workflows:
                         parameters_mapping:
                             order: $order
                             current_transition: payment_received
+                    - '@run_action_group':
+                        action_group: marello_order_status_change
+                        parameters_mapping:
+                            order: $order
+                            status: 'paid'
             prepare_shipping_definition:
                 conditions:
                     '@and':
@@ -504,6 +574,11 @@ workflows:
                         parameters_mapping:
                             order: $order
                             current_transition: prepare_shipping
+                    - '@run_action_group':
+                        action_group: marello_order_status_change
+                        parameters_mapping:
+                            order: $order
+                            status: 'pick_and_pack'
             ship_definition:
                 conditions:
                     '@and':
@@ -528,6 +603,11 @@ workflows:
                         parameters_mapping:
                             order: $order
                             current_transition: ship
+                    - '@run_action_group':
+                        action_group: marello_order_status_change
+                        parameters_mapping:
+                            order: $order
+                            status: 'shipped'
             payment_reminder_definition:
                 post_actions:
                     - '@marello_notification_send':
diff --git a/src/Marello/Bundle/OrderBundle/Resources/config/services.yml b/src/Marello/Bundle/OrderBundle/Resources/config/services.yml
index d1d3df1a7..e60c1fc00 100644
--- a/src/Marello/Bundle/OrderBundle/Resources/config/services.yml
+++ b/src/Marello/Bundle/OrderBundle/Resources/config/services.yml
@@ -66,6 +66,13 @@ services:
             - { name: kernel.event_listener, event: marello_order.order_shipping_context_building, method: onOrderShippingContextBuilding }
             - { name: kernel.event_listener, event: marello_order.order_items_for_notification, method: onSelectingOrderItemsForNotification }
 
+    marello_order.listener.doctrine.pending_order_status:
+        class: Marello\Bundle\OrderBundle\EventListener\Doctrine\PendingOrderStatusListener
+        arguments:
+            - '@oro_entity.doctrine_helper'
+        tags:
+            - { name: doctrine.event_listener, event: postPersist }
+
     marello_order.provider.order_statistic_provider:
         class: 'Marello\Bundle\OrderBundle\Provider\OrderDashboardStatisticProvider'
         arguments:
diff --git a/src/Marello/Bundle/OrderBundle/Resources/config/validation.yml b/src/Marello/Bundle/OrderBundle/Resources/config/validation.yml
index 5d0c9fcec..b93945f5e 100644
--- a/src/Marello/Bundle/OrderBundle/Resources/config/validation.yml
+++ b/src/Marello/Bundle/OrderBundle/Resources/config/validation.yml
@@ -33,11 +33,15 @@ Marello\Bundle\OrderBundle\Entity\Order:
             - NotBlank: { groups: [Default, commerce], message: 'marello.order.address.validation.billing_not_blank' }
         shippingAddress:
             - NotBlank: { groups: [Default, commerce], message: 'marello.order.address.validation.shipping_not_blank' }
-
+        items:
+            - Count:
+                min: 1
+                minMessage: 'marello.order.item.count'
+            - Valid: ~
     constraints:
         - Marello\Bundle\CoreBundle\Validator\Constraints\GreaterThanDate:
             field: 'deliveryDate'
             greaterThan: 'today'
             nullable: true
             errorPath: deliveryDate
-            message: 'marello.order.delivery_date.messages.error.greater_than_date'
\ No newline at end of file
+            message: 'marello.order.delivery_date.messages.error.greater_than_date'
diff --git a/src/Marello/Bundle/OrderBundle/Resources/translations/jsmessages.en.yml b/src/Marello/Bundle/OrderBundle/Resources/translations/jsmessages.en.yml
index ce379a28c..611c99db9 100644
--- a/src/Marello/Bundle/OrderBundle/Resources/translations/jsmessages.en.yml
+++ b/src/Marello/Bundle/OrderBundle/Resources/translations/jsmessages.en.yml
@@ -12,4 +12,4 @@ marello:
         possible_payment_methods.confirmation.title: Review Payment Methods
         possible_payment_methods.confirmation.content: As order content has been modified, payment methods may have changed. Please, review the payment method selection before saving the order to make sure that the payment method is acceptable.
 
-        continue_editing: Continue Editing
\ No newline at end of file
+        continue_editing: Continue Editing
diff --git a/src/Marello/Bundle/OrderBundle/Resources/translations/messages.en.yml b/src/Marello/Bundle/OrderBundle/Resources/translations/messages.en.yml
index 1740a95b4..edf6417fe 100644
--- a/src/Marello/Bundle/OrderBundle/Resources/translations/messages.en.yml
+++ b/src/Marello/Bundle/OrderBundle/Resources/translations/messages.en.yml
@@ -16,6 +16,7 @@ marello:
         sales_channel.label:        Sales Channel
         sales_channel_name.label:   Sales Channel
         order_reference.label:      Order Reference
+        locale_id.label:            Locale ID
         localization.label:         Localization
         workflow_item.label:        Workflow Item
         workflow_step.label:        Workflow Step
@@ -43,6 +44,7 @@ marello:
         estimated_shipping_cost_amount.label: Estimated Shipping Costs
         overridden_shipping_cost_amount.label: Overridden Shipping Cost Amount
         status.label:               Order Status
+        order_status.label:               Order Status
         billing_address:
             label:                  Billing Address
             name.label:             Bill to Name
diff --git a/src/Marello/Bundle/OrderBundle/Resources/views/Order/view.html.twig b/src/Marello/Bundle/OrderBundle/Resources/views/Order/view.html.twig
index 283a8a66a..6f94dd372 100644
--- a/src/Marello/Bundle/OrderBundle/Resources/views/Order/view.html.twig
+++ b/src/Marello/Bundle/OrderBundle/Resources/views/Order/view.html.twig
@@ -35,17 +35,19 @@
             <div class="title">
                 <span class="widget-title">{{ 'marello.order.datablock.customer_information'|trans }}</span>
             </div>
-            {% if entity.customer.company %}
+            {% if entity.customer and entity.customer.company %}
                 {{ UI.renderHtmlProperty(
                 'marello.customer.company.entity_label'|trans,
                 UI.entityViewLink(entity.customer.company, entity.customer.company.name, 'marello_customer_company_view')
                 ) }}
             {% endif %}
-            {{ UI.renderHtmlProperty(
-            'marello.customer.entity_label'|trans,
-            UI.entityViewLink(entity.customer, entity.customer|oro_format_name, 'marello_customer_view')
-            )}}
-            {{ UI.renderProperty('marello.customer.email.label'|trans, entity.customer.email) }}
+            {% if entity.customer %}
+                {{ UI.renderHtmlProperty(
+                'marello.customer.entity_label'|trans,
+                UI.entityViewLink(entity.customer, entity.customer|oro_format_name, 'marello_customer_view')
+                )}}
+                {{ UI.renderProperty('marello.customer.email.label'|trans, entity.customer.email) }}
+            {% endif %}
         </div>
     {% endset %}
 
diff --git a/src/Marello/Bundle/OrderBundle/Tests/Unit/EventListener/Doctrine/OrderWorkflowStartListenerTest.php b/src/Marello/Bundle/OrderBundle/Tests/Unit/EventListener/Doctrine/OrderWorkflowStartListenerTest.php
index 02e69d030..d6b4f5536 100644
--- a/src/Marello/Bundle/OrderBundle/Tests/Unit/EventListener/Doctrine/OrderWorkflowStartListenerTest.php
+++ b/src/Marello/Bundle/OrderBundle/Tests/Unit/EventListener/Doctrine/OrderWorkflowStartListenerTest.php
@@ -7,6 +7,7 @@
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PostFlushEventArgs;
 
+use Oro\Bundle\WorkflowBundle\Model\WorkflowStartArguments;
 use PHPUnit\Framework\TestCase;
 
 use Oro\Bundle\WorkflowBundle\Model\Workflow;
@@ -47,11 +48,12 @@ protected function setUp()
     public function testEntityIsNotEligibleToProcess()
     {
         $entity = $this->createMock(OrderItem::class);
-        $this->runFirstSequenceOfWorkflowListenerTest($entity, static::never());
+        $this->setWorkflowManagerHasApplicableWorkflowsMockExpectation($entity, static::never(), false);
+        $this->runPostPersistWorkflowListenerTest($entity, static::never(), null, $this->workflowManagerMock);
         /** @var PostFlushEventArgs|\PHPUnit\Framework\MockObject\MockObject $eventPostFlushArgs */
         $eventPostFlushArgs = $this->createMock(PostFlushEventArgs::class);
-        $this->doctrineHelperMock->expects(static::never())
-            ->method('getEntityManagerForClass');
+        $this->workflowManagerMock->expects(static::never())
+            ->method('massStartWorkflow');
 
         $this->orderWorkflowStartListener->postFlush($eventPostFlushArgs);
     }
@@ -62,30 +64,44 @@ public function testEntityIsNotEligibleToProcess()
     public function testEntityIsEligibleToProcess()
     {
         $entity = $this->createMock(Order::class);
-        $this->runFirstSequenceOfWorkflowListenerTest($entity, static::once(), 1);
-        /** @var PostFlushEventArgs|\PHPUnit\Framework\MockObject\MockObject $eventPostFlushArgs */
-        $eventPostFlushArgs = $this->createPostFlushEventArgsMock($entity);
-        $this->setWorkflowManagerHasApplicableWorkflowsMockExpectation($entity);
-
+        /** @var Workflow|\PHPUnit\Framework\MockObject\MockObject $workflowMock */
         $workflowMock = $this->createMock(Workflow::class);
         $workflowMock->expects(static::once())
             ->method('getName')
             ->willReturn(WorkflowNameProviderInterface::ORDER_WORKFLOW_1);
+        $this->setWorkflowManagerHasApplicableWorkflowsMockExpectation($entity, static::once());
+        $this->runPostPersistWorkflowListenerTest(
+            $entity,
+            static::once(),
+            [ WorkflowNameProviderInterface::ORDER_WORKFLOW_1 => $workflowMock ],
+            $this->workflowManagerMock
+        );
 
-        $this->workflowManagerMock->expects(static::once())
-            ->method('getApplicableWorkflows')
-            ->with($entity)
-            ->willReturn([WorkflowNameProviderInterface::ORDER_WORKFLOW_1 => $workflowMock]);
+        /** @var PostFlushEventArgs|\PHPUnit\Framework\MockObject\MockObject $eventPostFlushArgs */
+        $eventPostFlushArgs = $this->createPostFlushEventArgsMock($entity);
+        $expectedSchedule = [
+            0 =>
+                new WorkflowStartArguments(
+                    WorkflowNameProviderInterface::ORDER_WORKFLOW_1,
+                    $entity,
+                    [],
+                    'pending'
+                )
+        ];
+
+        $this->assertAttributeEquals(
+            $expectedSchedule,
+            'entitiesScheduledForWorkflowStart',
+            $this->orderWorkflowStartListener
+        );
 
         $this->workflowManagerMock->expects(static::once())
-            ->method('startWorkflow')
-            ->with(
-                WorkflowNameProviderInterface::ORDER_WORKFLOW_1,
-                $entity,
-                OrderWorkflowStartListener::TRANSIT_TO_STEP
-            );
+            ->method('massStartWorkflow')
+            ->with($expectedSchedule);
 
         $this->orderWorkflowStartListener->postFlush($eventPostFlushArgs);
+
+        $this->assertAttributeEmpty('entitiesScheduledForWorkflowStart', $this->orderWorkflowStartListener);
     }
 
     /**
@@ -94,29 +110,30 @@ public function testEntityIsEligibleToProcess()
     public function testTwoApplicableWorkflowsOnOrderEntity()
     {
         $entity = $this->createMock(Order::class);
-        $this->runFirstSequenceOfWorkflowListenerTest($entity, static::once(), 1);
+        $workflowMock = $this->createMock(Workflow::class);
+
+        $this->setWorkflowManagerHasApplicableWorkflowsMockExpectation($entity, static::once());
+        $this->runPostPersistWorkflowListenerTest(
+            $entity,
+            static::once(),
+            [
+                WorkflowNameProviderInterface::ORDER_WORKFLOW_1 => $workflowMock,
+                WorkflowNameProviderInterface::ORDER_WORKFLOW_2 => $workflowMock
+            ],
+            $this->workflowManagerMock
+        );
+        $this->assertAttributeEmpty('entitiesScheduledForWorkflowStart', $this->orderWorkflowStartListener);
         /** @var PostFlushEventArgs|\PHPUnit\Framework\MockObject\MockObject $eventPostFlushArgs */
         $eventPostFlushArgs = $this->createPostFlushEventArgsMock($entity);
-        $this->setWorkflowManagerHasApplicableWorkflowsMockExpectation($entity);
-
-        $workflowMock = $this->createMock(Workflow::class);
-        $this->workflowManagerMock->expects(static::once())
-            ->method('getApplicableWorkflows')
-            ->with($entity)
-            ->willReturn(
-                [
-                    WorkflowNameProviderInterface::ORDER_WORKFLOW_1 => $workflowMock,
-                    WorkflowNameProviderInterface::ORDER_WORKFLOW_2 => $workflowMock
-                ]
-            );
 
         $workflowMock->expects(static::never())
             ->method('getName');
 
         $this->workflowManagerMock->expects(static::never())
-            ->method('startWorkflow');
+            ->method('massStartWorkflow');
 
         $this->orderWorkflowStartListener->postFlush($eventPostFlushArgs);
+        $this->assertAttributeEmpty('entitiesScheduledForWorkflowStart', $this->orderWorkflowStartListener);
     }
 
     /**
@@ -125,22 +142,23 @@ public function testTwoApplicableWorkflowsOnOrderEntity()
     public function testZeroOrCustomApplicableWorkflowsOnOrderEntity()
     {
         $entity = $this->createMock(Order::class);
-        $this->runFirstSequenceOfWorkflowListenerTest($entity, static::once(), 1);
-        /** @var PostFlushEventArgs|\PHPUnit\Framework\MockObject\MockObject $eventPostFlushArgs */
-        $eventPostFlushArgs = $this->createPostFlushEventArgsMock($entity);
-        $this->setWorkflowManagerHasApplicableWorkflowsMockExpectation($entity);
+        $workflowMock = $this->createMock(Workflow::class);
 
-        $this->workflowManagerMock->expects(static::once())
-            ->method('getApplicableWorkflows')
-            ->with($entity)
-            ->willReturn([]);
+        $this->setWorkflowManagerHasApplicableWorkflowsMockExpectation($entity, static::once());
+        $this->runPostPersistWorkflowListenerTest(
+            $entity,
+            static::once(),
+            [],
+            $this->workflowManagerMock
+        );
 
-        $workflowMock = $this->createMock(Workflow::class);
+        /** @var PostFlushEventArgs|\PHPUnit\Framework\MockObject\MockObject $eventPostFlushArgs */
+        $eventPostFlushArgs = $this->createPostFlushEventArgsMock($entity);
         $workflowMock->expects(static::never())
             ->method('getName');
 
         $this->workflowManagerMock->expects(static::never())
-            ->method('startWorkflow');
+            ->method('massStartWorkflow');
 
         $this->orderWorkflowStartListener->postFlush($eventPostFlushArgs);
     }
@@ -166,15 +184,16 @@ protected function createEventArgsMock($entity)
      * @param $expected
      * @param null $returnValue
      */
-    protected function runFirstSequenceOfWorkflowListenerTest($entity, $expected, $returnValue = null)
+    protected function runPostPersistWorkflowListenerTest(
+        $entity, $expected, $returnValue = null, $workflowManagerMock)
     {
         $eventArgs = $this->createEventArgsMock($entity);
-        $entity
+        $workflowManagerMock
             ->expects($expected)
-            ->method('getId')
+            ->method('getApplicableWorkflows')
             ->willReturn($returnValue);
 
-        $this->orderWorkflowStartListener->postPersist($eventArgs);
+         $this->orderWorkflowStartListener->postPersist($eventArgs);
     }
 
     /**
@@ -185,20 +204,6 @@ protected function runFirstSequenceOfWorkflowListenerTest($entity, $expected, $r
     protected function createPostFlushEventArgsMock($entity)
     {
         $eventPostFlushArgs = $this->createMock(PostFlushEventArgs::class);
-        $entityManager = $this->createMock(EntityManagerInterface::class);
-        $this->doctrineHelperMock->expects(static::once())
-            ->method('getEntityManagerForClass')
-            ->willReturn($entityManager);
-
-        $entityRepository = $this->createMock(EntityRepository::class);
-        $entityManager->expects(static::once())
-            ->method('getRepository')
-            ->willReturn($entityRepository);
-
-        $entityRepository->expects(static::once())
-            ->method('find')
-            ->with(1)
-            ->willReturn($entity);
 
         return $eventPostFlushArgs;
     }
@@ -207,11 +212,11 @@ protected function createPostFlushEventArgsMock($entity)
      * {@inheritdoc}
      * @param $entity|\PHPUnit\Framework\MockObject\MockObject
      */
-    protected function setWorkflowManagerHasApplicableWorkflowsMockExpectation($entity)
+    protected function setWorkflowManagerHasApplicableWorkflowsMockExpectation($entity, $expects, $returnValue = true)
     {
-        $this->workflowManagerMock->expects(static::once())
+        $this->workflowManagerMock->expects($expects)
             ->method('hasApplicableWorkflows')
             ->with($entity)
-            ->willReturn(true);
+            ->willReturn($returnValue);
     }
 }
diff --git a/src/Marello/Bundle/OrderBundle/Tests/Unit/Provider/OrderDashboardOrderItemsByStatusProviderTest.php b/src/Marello/Bundle/OrderBundle/Tests/Unit/Provider/OrderDashboardOrderItemsByStatusProviderTest.php
index 89c66f008..2582ac55a 100644
--- a/src/Marello/Bundle/OrderBundle/Tests/Unit/Provider/OrderDashboardOrderItemsByStatusProviderTest.php
+++ b/src/Marello/Bundle/OrderBundle/Tests/Unit/Provider/OrderDashboardOrderItemsByStatusProviderTest.php
@@ -148,6 +148,7 @@ public function getOrderItemsGroupedByStatusDQLDataProvider()
                     'SELECT IDENTITY (oi.status) status, COUNT(oi.id) as quantity '
                     . 'FROM MarelloOrderBundle:Order o '
                     . 'INNER JOIN o.items oi '
+                    . 'WHERE IDENTITY (oi.status) IS NOT NULL '
                     . 'GROUP BY oi.status '
                     . 'ORDER BY quantity DESC'
             ],
@@ -160,6 +161,7 @@ public function getOrderItemsGroupedByStatusDQLDataProvider()
                     'SELECT IDENTITY (oi.status) status, COUNT(oi.id) as quantity '
                     . 'FROM MarelloOrderBundle:Order o '
                     . 'INNER JOIN o.items oi '
+                    . 'WHERE IDENTITY (oi.status) IS NOT NULL '
                     . 'GROUP BY oi.status '
                     . 'ORDER BY quantity DESC'
             ],
diff --git a/src/Marello/Bundle/OrderBundle/Tests/Unit/Validator/AvailableInventoryValidatorTest.php b/src/Marello/Bundle/OrderBundle/Tests/Unit/Validator/AvailableInventoryValidatorTest.php
index 852e967a2..54c1164ce 100644
--- a/src/Marello/Bundle/OrderBundle/Tests/Unit/Validator/AvailableInventoryValidatorTest.php
+++ b/src/Marello/Bundle/OrderBundle/Tests/Unit/Validator/AvailableInventoryValidatorTest.php
@@ -135,34 +135,6 @@ public function testValidateWithInvalidEntityMapping()
         $this->getValidator()->validate(new \StdClass(), $this->getConstraint());
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function testValidateNoValueForProperty()
-    {
-        $entity = new \StdClass();
-        $entity->test = null;
-
-        $this->doctrineHelper->expects($this->once())
-            ->method('getEntityManagerForClass')
-            ->willReturn($this->objectManager);
-
-        $this->objectManager->expects($this->once())
-            ->method('getClassMetadata')
-            ->willReturn($this->classMetaData);
-
-        $this->classMetaData->expects($this->atLeastOnce())
-            ->method('hasField')
-            ->willReturn(true);
-
-        $this->expectException(ConstraintDefinitionException::class);
-        $this->expectExceptionMessage(
-            'Cannot get inventory when not all required values are set'
-        );
-
-        $this->getValidator()->validate($entity, $this->getConstraint(['fields' => ['test']]));
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -220,50 +192,6 @@ public function testValidateViolationIsBuild()
         $this->getValidator()->validate($entity, $constraint);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function testQuantityFieldIsNotSet()
-    {
-        $orderMock = $this->createMock(Order::class);
-        $salesChannelMock = $this->createMock(SalesChannel::class);
-        $entity = new \StdClass();
-        $entity->product = $this->createMock(Product::class);
-        $entity->order = $orderMock;
-        $constraint = $this->getConstraint([
-            'fields' => ['product', 'order'],
-            'errorPath' => 'quantity'
-        ]);
-
-        $this->doctrineHelper->expects($this->once())
-            ->method('getEntityManagerForClass')
-            ->willReturn($this->objectManager);
-
-        $this->objectManager->expects($this->once())
-            ->method('getClassMetadata')
-            ->willReturn($this->classMetaData);
-
-        $this->classMetaData->expects($this->atLeastOnce())
-            ->method('hasField')
-            ->willReturn(true);
-
-        $orderMock->expects($this->atLeastOnce())
-            ->method('getSalesChannel')
-            ->willReturn($salesChannelMock);
-
-        $this->inventoryProvider->expects($this->exactly(1))
-            ->method('getAvailableInventory')
-            ->with($entity->product, $salesChannelMock)
-            ->willReturn(100);
-
-        $this->expectException(ConstraintDefinitionException::class);
-        $this->expectExceptionMessage(
-            'Cannot compare values if because there nothing to compare'
-        );
-
-        $this->getValidator()->validate($entity, $constraint);
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/src/Marello/Bundle/OrderBundle/Validator/AvailableInventoryValidator.php b/src/Marello/Bundle/OrderBundle/Validator/AvailableInventoryValidator.php
index 538152e1e..8d86d1122 100644
--- a/src/Marello/Bundle/OrderBundle/Validator/AvailableInventoryValidator.php
+++ b/src/Marello/Bundle/OrderBundle/Validator/AvailableInventoryValidator.php
@@ -90,9 +90,13 @@ public function validate($entity, Constraint $constraint)
         }
 
         $values = $this->entityGetFieldValues($entity, $fields);
-        if ((!isset($values[self::PRODUCT_FIELD]) || $values[self::PRODUCT_FIELD] === null) ||
-            (!isset($values[self::SALES_CHANNEL_FIELD]) || $values[self::SALES_CHANNEL_FIELD] === null)) {
-            throw new ConstraintDefinitionException('Cannot get inventory when not all required values are set');
+
+        /**
+         * In case when some required data is not available we skip validation because specific validators
+         * for these fields must catch them
+         */
+        if (!$this->isAllRequiredFieldsHasValue($values)) {
+            return;
         }
 
         $result = $this->availableInventoryProvider
@@ -103,10 +107,6 @@ public function validate($entity, Constraint $constraint)
             $values[self::QUANTITY_FIELD] += $this->collection[$productSku];
         }
 
-        if (!isset($values[self::QUANTITY_FIELD])) {
-            throw new ConstraintDefinitionException('Cannot compare values if because there nothing to compare');
-        }
-
         if (!$this->compareValues($result, $values[self::QUANTITY_FIELD])) {
             if (isset($values[self::PRODUCT_FIELD])) {
                 $violation = true;
@@ -331,6 +331,22 @@ private function entityGetFieldValues($entity, $fields)
         return $results;
     }
 
+    /**
+     * @param array $values
+     * @return bool
+     */
+    protected function isAllRequiredFieldsHasValue(array $values): bool
+    {
+        $requiredFields = [self::PRODUCT_FIELD, self::SALES_CHANNEL_FIELD, self::SALES_CHANNEL_FIELD];
+        foreach ($requiredFields as $requiredField) {
+            if (!\array_key_exists($requiredField, $values)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Get field to display Error from config or use the first field in the array
      * @param Constraint $constraint
diff --git a/src/Marello/Bundle/PaymentBundle/Method/Provider/CompositePaymentMethodProvider.php b/src/Marello/Bundle/PaymentBundle/Method/Provider/CompositePaymentMethodProvider.php
index e4dab80d6..432e014aa 100644
--- a/src/Marello/Bundle/PaymentBundle/Method/Provider/CompositePaymentMethodProvider.php
+++ b/src/Marello/Bundle/PaymentBundle/Method/Provider/CompositePaymentMethodProvider.php
@@ -2,8 +2,14 @@
 
 namespace Marello\Bundle\PaymentBundle\Method\Provider;
 
-class CompositePaymentMethodProvider implements PaymentMethodProviderInterface
+use Marello\Bundle\PaymentBundle\Method\RemotePaymentMethod;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerAwareTrait;
+
+class CompositePaymentMethodProvider implements PaymentMethodProviderInterface, LoggerAwareInterface
 {
+    use LoggerAwareTrait;
+
     /**
      * @var PaymentMethodProviderInterface[]
      */
@@ -40,8 +46,15 @@ public function getPaymentMethod($identifier)
                 return $provider->getPaymentMethod($identifier);
             }
         }
-        
-        throw new \InvalidArgumentException('There is no payment method for "' . $identifier . '" identifier');
+
+        $this->logger->warning(
+            'There is no payment method found for given identifier.',
+            [
+                'identifier' => $identifier
+            ]
+        );
+
+        return new RemotePaymentMethod($identifier);
     }
 
     /**
diff --git a/src/Marello/Bundle/PaymentBundle/Method/RemotePaymentMethod.php b/src/Marello/Bundle/PaymentBundle/Method/RemotePaymentMethod.php
new file mode 100644
index 000000000..d6b33120f
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Method/RemotePaymentMethod.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Marello\Bundle\PaymentBundle\Method;
+
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+
+class RemotePaymentMethod implements PaymentMethodInterface
+{
+    /** @var string */
+    protected $identifier;
+
+    /**
+     * @param string $identifier
+     */
+    public function __construct(string $identifier)
+    {
+        $this->identifier = $identifier;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isEnabled()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getIdentifier()
+    {
+        return $this->identifier;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getLabel()
+    {
+        return $this->identifier;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOptionsConfigurationFormType()
+    {
+        return HiddenType::class;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSortOrder()
+    {
+        return 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOptions()
+    {
+        return [];
+    }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Resources/config/services.yml b/src/Marello/Bundle/PaymentBundle/Resources/config/services.yml
index bb1201e89..676361ab8 100644
--- a/src/Marello/Bundle/PaymentBundle/Resources/config/services.yml
+++ b/src/Marello/Bundle/PaymentBundle/Resources/config/services.yml
@@ -41,6 +41,8 @@ services:
     marello_payment.payment_method.composite_provider:
         class: 'Marello\Bundle\PaymentBundle\Method\Provider\CompositePaymentMethodProvider'
         public: true
+        calls:
+            - ['setLogger', ['@logger']]
 
     marello_payment.context.doctrine_line_item_collection_factory:
         class: 'Marello\Bundle\PaymentBundle\Context\LineItem\Collection\Doctrine\Factory\DoctrinePaymentLineItemCollectionFactory'
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/CompositePaymentMethodProviderTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/CompositePaymentMethodProviderTest.php
index 4edb2f374..26172ca21 100644
--- a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/CompositePaymentMethodProviderTest.php
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/CompositePaymentMethodProviderTest.php
@@ -25,9 +25,7 @@ protected function setUp()
     {
         $this->paymentMethodProvider = new CompositePaymentMethodProvider();
 
-        $this->provider = $this->getMockBuilder(PaymentMethodProviderInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->provider = $this->createMock(PaymentMethodProviderInterface::class);
     }
 
     public function testGetMethods()
@@ -59,13 +57,4 @@ public function testRegistry()
         $this->assertEquals($method, $this->paymentMethodProvider->getPaymentMethod('test_name'));
         $this->assertEquals(['test_name' => $method], $this->paymentMethodProvider->getPaymentMethods());
     }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage There is no payment method for "wrong_name" identifier
-     */
-    public function testRegistryWrongMethod()
-    {
-        $this->paymentMethodProvider->getPaymentMethod('wrong_name');
-    }
 }
diff --git a/src/Marello/Bundle/PricingBundle/Form/EventListener/ChannelPricingSubscriber.php b/src/Marello/Bundle/PricingBundle/Form/EventListener/ChannelPricingSubscriber.php
index 94b7572c8..008353a15 100644
--- a/src/Marello/Bundle/PricingBundle/Form/EventListener/ChannelPricingSubscriber.php
+++ b/src/Marello/Bundle/PricingBundle/Form/EventListener/ChannelPricingSubscriber.php
@@ -146,14 +146,19 @@ public function postSubmit(FormEvent $event)
             $assembledChannelPriceList->getDefaultPrice()
                 ->setType($this->getPriceType(PriceTypeInterface::DEFAULT_PRICE))
                 ->setCurrency($assembledChannelPriceList->getCurrency());
-            if ($assembledChannelPriceList->getSpecialPrice() !== null &&
-                $assembledChannelPriceList->getSpecialPrice()->getValue() === null) {
-                $assembledChannelPriceList->setSpecialPrice(null);
-            } elseif ($assembledChannelPriceList->getSpecialPrice() !== null) {
+
+            /** Restores currency in case if product price exists */
+            if ($assembledChannelPriceList->getSpecialPrice() !== null) {
                 $assembledChannelPriceList->getSpecialPrice()
                     ->setType($this->getPriceType(PriceTypeInterface::SPECIAL_PRICE))
                     ->setCurrency($assembledChannelPriceList->getCurrency());
             }
+
+            /** Removes product price from price list in case if user clear its value */
+            if ($assembledChannelPriceList->getSpecialPrice() !== null &&
+                $assembledChannelPriceList->getSpecialPrice()->getValue() === null) {
+                $assembledChannelPriceList->setSpecialPrice(null);
+            }
         }
 
         if ($form->has('removeSalesChannels') && !empty($form->get('removeSalesChannels')->getData())) {
@@ -190,7 +195,9 @@ public function postSubmit(FormEvent $event)
     protected function getPricingEnabled(FormInterface $form)
     {
         if (!$form->has(PricingAwareInterface::CHANNEL_PRICING_STATE_KEY)) {
-            throw new \InvalidArgumentException(sprintf('%s form child is missing'));
+            throw new \InvalidArgumentException(
+                sprintf('%s form child is missing', PricingAwareInterface::CHANNEL_PRICING_STATE_KEY)
+            );
         }
 
         $data = $form->get(PricingAwareInterface::CHANNEL_PRICING_STATE_KEY)->getData();
diff --git a/src/Marello/Bundle/PricingBundle/Form/EventListener/PricingSubscriber.php b/src/Marello/Bundle/PricingBundle/Form/EventListener/PricingSubscriber.php
index 33ee0d1d3..24a0c00cc 100644
--- a/src/Marello/Bundle/PricingBundle/Form/EventListener/PricingSubscriber.php
+++ b/src/Marello/Bundle/PricingBundle/Form/EventListener/PricingSubscriber.php
@@ -116,21 +116,31 @@ public function postSubmit(FormEvent $event)
             $assembledPriceList->getDefaultPrice()
                 ->setType($this->getPriceType(PriceTypeInterface::DEFAULT_PRICE))
                 ->setCurrency($assembledPriceList->getCurrency());
+
+            /** Restores currency in case if product price exists */
+            if ($assembledPriceList->getSpecialPrice() !== null) {
+                $assembledPriceList->getSpecialPrice()
+                    ->setType($this->getPriceType(PriceTypeInterface::SPECIAL_PRICE))
+                    ->setCurrency($assembledPriceList->getCurrency());
+            }
+
+            /** Removes product price from price list in case if user clear its value */
             if ($assembledPriceList->getSpecialPrice() !== null &&
                 $assembledPriceList->getSpecialPrice()->getValue() === null) {
                 $assembledPriceList->setSpecialPrice(null);
-            } elseif ($assembledPriceList->getSpecialPrice() !== null) {
-                $assembledPriceList->getSpecialPrice()
-                    ->setType($this->getPriceType(PriceTypeInterface::SPECIAL_PRICE))
+            }
+
+            /** Restores currency in case if product price exists */
+            if ($assembledPriceList->getMsrpPrice() !== null) {
+                $assembledPriceList->getMsrpPrice()
+                    ->setType($this->getPriceType(PriceTypeInterface::MSRP_PRICE))
                     ->setCurrency($assembledPriceList->getCurrency());
             }
+
+            /** Removes product price from price list in case if user clear its value */
             if ($assembledPriceList->getMsrpPrice() !== null &&
                 $assembledPriceList->getMsrpPrice()->getValue() === null) {
                 $assembledPriceList->setMsrpPrice(null);
-            } elseif ($assembledPriceList->getMsrpPrice() !== null) {
-                $assembledPriceList->getMsrpPrice()
-                    ->setType($this->getPriceType(PriceTypeInterface::MSRP_PRICE))
-                    ->setCurrency($assembledPriceList->getCurrency());
             }
         }
         
diff --git a/src/Marello/Bundle/ProductBundle/DependencyInjection/Compiler/EmailTwigSandboxConfigurationPass.php b/src/Marello/Bundle/ProductBundle/DependencyInjection/Compiler/EmailTwigSandboxConfigurationPass.php
new file mode 100644
index 000000000..2aeb666b8
--- /dev/null
+++ b/src/Marello/Bundle/ProductBundle/DependencyInjection/Compiler/EmailTwigSandboxConfigurationPass.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Marello\Bundle\ProductBundle\DependencyInjection\Compiler;
+
+use Oro\Bundle\EmailBundle\DependencyInjection\Compiler\AbstractTwigSandboxConfigurationPass;
+
+class EmailTwigSandboxConfigurationPass extends AbstractTwigSandboxConfigurationPass
+{
+    const PRODUCT_UNIT_EXTENSION = 'marello_product.twig.product_unit_extension';
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function getFilters()
+    {
+        return [
+            'marello_format_product_unit'
+        ];
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function getFunctions()
+    {
+        return [
+            'get_product_unit_value_by_id'
+        ];
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function getExtensions()
+    {
+        return [
+            self::PRODUCT_UNIT_EXTENSION
+        ];
+    }
+}
diff --git a/src/Marello/Bundle/ProductBundle/Entity/Product.php b/src/Marello/Bundle/ProductBundle/Entity/Product.php
index 1ab9af4b8..5737f4c11 100644
--- a/src/Marello/Bundle/ProductBundle/Entity/Product.php
+++ b/src/Marello/Bundle/ProductBundle/Entity/Product.php
@@ -439,7 +439,7 @@ class Product extends ExtendProduct implements
      *      }
      * )
      */
-    protected $data;
+    protected $data = [];
 
     /**
      * @var ArrayCollection|ProductSupplierRelation[]
diff --git a/src/Marello/Bundle/ProductBundle/Entity/Repository/ProductRepository.php b/src/Marello/Bundle/ProductBundle/Entity/Repository/ProductRepository.php
index d46be6ff7..fdcf6b0e2 100644
--- a/src/Marello/Bundle/ProductBundle/Entity/Repository/ProductRepository.php
+++ b/src/Marello/Bundle/ProductBundle/Entity/Repository/ProductRepository.php
@@ -210,7 +210,7 @@ public function getPurchaseOrderItemsCandidates()
             ->where("sup.name <> ''")
             ->andWhere("s.name = 'enabled'")
             ->andWhere("i.replenishment = 'never_out_of_stock'")
-            ->groupBy('p.sku, sup.name')
+            ->groupBy('p.sku, sup.name, i.desiredInventory, i.purchaseInventory')
             ->having('SUM(l.inventory - l.allocatedInventory) < i.purchaseInventory');
 
         return $this->aclHelper->apply($qb->getQuery())->getResult();
diff --git a/src/Marello/Bundle/ProductBundle/MarelloProductBundle.php b/src/Marello/Bundle/ProductBundle/MarelloProductBundle.php
index 9ef1989da..9348df379 100644
--- a/src/Marello/Bundle/ProductBundle/MarelloProductBundle.php
+++ b/src/Marello/Bundle/ProductBundle/MarelloProductBundle.php
@@ -2,11 +2,14 @@
 
 namespace Marello\Bundle\ProductBundle;
 
-use Marello\Bundle\ProductBundle\DependencyInjection\Compiler\ProductTypesPass;
-use Marello\Bundle\ProductBundle\Entity\Product;
-use Oro\Bundle\LocaleBundle\DependencyInjection\Compiler\DefaultFallbackExtensionPass;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+use Oro\Bundle\LocaleBundle\DependencyInjection\Compiler\DefaultFallbackExtensionPass;
+
+use Marello\Bundle\ProductBundle\Entity\Product;
+use Marello\Bundle\ProductBundle\DependencyInjection\Compiler\ProductTypesPass;
+use Marello\Bundle\ProductBundle\DependencyInjection\Compiler\EmailTwigSandboxConfigurationPass;
 
 class MarelloProductBundle extends Bundle
 {
@@ -23,6 +26,7 @@ public function build(ContainerBuilder $container)
                 Product::class => [
                     'name' => 'names'
                 ]
-            ]));
+            ]))
+            ->addCompilerPass(new EmailTwigSandboxConfigurationPass());
     }
 }
diff --git a/src/Marello/Bundle/ProductBundle/Resources/config/services.yml b/src/Marello/Bundle/ProductBundle/Resources/config/services.yml
index 0103e2a0a..836153d56 100644
--- a/src/Marello/Bundle/ProductBundle/Resources/config/services.yml
+++ b/src/Marello/Bundle/ProductBundle/Resources/config/services.yml
@@ -42,6 +42,19 @@ services:
         tags:
             - { name: twig.extension }
 
+    marello_product.twig.product_unit_extension:
+        class: Marello\Bundle\ProductBundle\Twig\ProductUnitExtension
+        arguments:
+            - '@oro_entity.doctrine_helper'
+        tags:
+            - { name: twig.extension }
+
+    marello_product.twig.provider.product_unit_variables:
+        class: Marello\Bundle\ProductBundle\Twig\Provider\ProductUnitVariablesProvider
+        public: false
+        tags:
+            - { name: oro_email.emailtemplate.variable_provider, scope: entity }
+
     marello_product.listener.datagrid.product_categories_column_listener:
         class: Marello\Bundle\ProductBundle\EventListener\Datagrid\ProductCategoriesColumnListener
         arguments:
diff --git a/src/Marello/Bundle/ProductBundle/Tests/Unit/Twig/ProductUnitExtensionTest.php b/src/Marello/Bundle/ProductBundle/Tests/Unit/Twig/ProductUnitExtensionTest.php
new file mode 100644
index 000000000..7abc24aa4
--- /dev/null
+++ b/src/Marello/Bundle/ProductBundle/Tests/Unit/Twig/ProductUnitExtensionTest.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace Marello\Bundle\ProductBundle\Tests\Unit\Twig;
+
+use Doctrine\ORM\EntityRepository;
+
+use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
+use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase;
+use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper;
+use Oro\Bundle\EntityExtendBundle\Tests\Unit\Fixtures\TestEnumValue;
+
+use Marello\Bundle\ProductBundle\Twig\ProductUnitExtension;
+use Marello\Bundle\ProductBundle\Migrations\Data\ORM\LoadProductUnitData;
+
+class ProductUnitExtensionTest extends WebTestCase
+{
+    /**
+     * @var ProductUnitExtension
+     */
+    protected $extension;
+
+    /** @var DoctrineHelper|\PHPUnit_Framework_MockObject_MockObject $doctrineHelperMock */
+    protected $doctrineHelperMock;
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->doctrineHelperMock = $this->createMock(DoctrineHelper::class);
+        $this->extension = new ProductUnitExtension($this->doctrineHelperMock);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function tearDown()
+    {
+        unset($this->extension);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function testNameIsCorrectlySetAndReturnedFromConstant()
+    {
+        $this->assertEquals(ProductUnitExtension::NAME, $this->extension->getName());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function testGetFunctionsAreRegisteredInExtension()
+    {
+        $functions = $this->extension->getFunctions();
+        $this->assertCount(1, $functions);
+
+        $expectedFunctions = array(
+            'get_product_unit_value_by_id'
+        );
+
+        /** @var \Twig_SimpleFunction $function */
+        foreach ($functions as $function) {
+            $this->assertInstanceOf('\Twig_SimpleFunction', $function);
+            $this->assertContains($function->getName(), $expectedFunctions);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function testGetFiltersAreRegisteredInExtension()
+    {
+        $filters = $this->extension->getFilters();
+        $this->assertCount(1, $filters);
+
+        $expectedFilters = array(
+            'marello_format_product_unit'
+        );
+
+        /** @var \Twig_SimpleFilter $filter */
+        foreach ($filters as $filter) {
+            $this->assertInstanceOf('\Twig_SimpleFilter', $filter);
+            $this->assertContains($filter->getName(), $expectedFilters);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function testNoProductUnitIdIsGiven()
+    {
+         $this->doctrineHelperMock
+            ->expects($this->never())
+            ->method('getEntityRepositoryForClass');
+
+        self::assertNull($this->extension->getProductUnitValueById(null));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function testProductUnitIsNotFound()
+    {
+        $productUnitClass = ExtendHelper::buildEnumValueClassName(LoadProductUnitData::PRODUCT_UNIT_ENUM_CLASS);
+        $entityRepositoryMock = $this->createMock(EntityRepository::class);
+        $this->doctrineHelperMock
+            ->expects($this->once())
+            ->method('getEntityRepositoryForClass')
+            ->with($productUnitClass)
+            ->willReturn($entityRepositoryMock);
+
+        $entityRepositoryMock
+            ->expects($this->once())
+            ->method('find')
+            ->with('someUnit')
+            ->willReturn(null);
+
+        self::assertNull($this->extension->getProductUnitValueById('someUnit'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function testProductUnitIsFoundAndValue()
+    {
+        $productUnitClass = ExtendHelper::buildEnumValueClassName(LoadProductUnitData::PRODUCT_UNIT_ENUM_CLASS);
+        $productUnitEnumValue =  new TestEnumValue('someUnit', 'someUnit');
+        $entityRepositoryMock = $this->createMock(EntityRepository::class);
+        $this->doctrineHelperMock
+            ->expects($this->once())
+            ->method('getEntityRepositoryForClass')
+            ->with($productUnitClass)
+            ->willReturn($entityRepositoryMock);
+
+        $entityRepositoryMock
+            ->expects($this->once())
+            ->method('find')
+            ->with('someUnit')
+            ->willReturn($productUnitEnumValue);
+
+        self::assertEquals($productUnitEnumValue->getName(), $this->extension->getProductUnitValueById('someUnit'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function testFormatProductUnitWithoutCorrectValue()
+    {
+        self::assertNull($this->extension->formatProductUnit(null));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function testFormatProductUnitValue()
+    {
+        $productUnitEnumValue =  new TestEnumValue('someUnit', 'someUnit');
+        self::assertEquals($productUnitEnumValue->getName(), $this->extension->formatProductUnit($productUnitEnumValue));
+    }
+}
diff --git a/src/Marello/Bundle/ProductBundle/Twig/ProductUnitExtension.php b/src/Marello/Bundle/ProductBundle/Twig/ProductUnitExtension.php
new file mode 100644
index 000000000..03e92c459
--- /dev/null
+++ b/src/Marello/Bundle/ProductBundle/Twig/ProductUnitExtension.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace Marello\Bundle\ProductBundle\Twig;
+
+use Twig\TwigFilter;
+use Twig\TwigFunction;
+use Twig\Extension\AbstractExtension;
+
+use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
+use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper;
+use Oro\Bundle\EntityExtendBundle\Entity\AbstractEnumValue;
+
+use Marello\Bundle\ProductBundle\Migrations\Data\ORM\LoadProductUnitData;
+
+class ProductUnitExtension extends AbstractExtension
+{
+    const NAME = 'marello_product_unit_value_formatter';
+
+    /** @var DoctrineHelper $doctrineHelper */
+    protected $doctrineHelper;
+
+    /**
+     * ProductUnitExtension constructor.
+     *
+     * @param DoctrineHelper $doctrineHelper
+     */
+    public function __construct(DoctrineHelper $doctrineHelper)
+    {
+        $this->doctrineHelper = $doctrineHelper;
+    }
+
+    /**
+     * Returns the name of the extension.
+     *
+     * @return string The extension name
+     */
+    public function getName()
+    {
+        return self::NAME;
+    }
+
+    /**
+     * Returns a list of functions to add to the existing list.
+     *
+     * @return array An array of functions
+     */
+    public function getFunctions()
+    {
+        return [
+            new TwigFunction(
+                'get_product_unit_value_by_id',
+                [$this, 'getProductUnitValueById']
+            )
+        ];
+    }
+
+    /**
+     * Returns a list of functions to add to the existing list.
+     *
+     * @return array An array of functions
+     */
+    public function getFilters()
+    {
+        return [
+            new TwigFilter(
+                'marello_format_product_unit',
+                [$this, 'formatProductUnit']
+            )
+        ];
+    }
+
+    /**
+     * @param string $id
+     * @return null|string
+     */
+    public function getProductUnitValueById($id)
+    {
+        if (!$id) {
+            return null;
+        }
+
+        $productUnitClass = ExtendHelper::buildEnumValueClassName(LoadProductUnitData::PRODUCT_UNIT_ENUM_CLASS);
+        $productUnit = $this->doctrineHelper
+            ->getEntityRepositoryForClass($productUnitClass)
+            ->find($id);
+
+        if ($productUnit) {
+            return $productUnit->getName();
+        }
+
+        return null;
+    }
+
+    /**
+     * @param $productUnit
+     * @return null|string
+     */
+    public function formatProductUnit($productUnit)
+    {
+        if ($productUnit instanceof AbstractEnumValue) {
+            return $productUnit->getName();
+        }
+
+        return null;
+    }
+}
diff --git a/src/Marello/Bundle/ProductBundle/Twig/Provider/ProductUnitVariablesProvider.php b/src/Marello/Bundle/ProductBundle/Twig/Provider/ProductUnitVariablesProvider.php
new file mode 100644
index 000000000..7761d6d1e
--- /dev/null
+++ b/src/Marello/Bundle/ProductBundle/Twig/Provider/ProductUnitVariablesProvider.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Marello\Bundle\ProductBundle\Twig\Provider;
+
+use Extend\Entity\EV_Marello_Product_Unit;
+use Proxies\__CG__\Extend\Entity\EV_Marello_Product_Unit as PROX_EV_Marello_Product_Unit;
+use Oro\Bundle\EntityBundle\Twig\Sandbox\EntityVariablesProviderInterface;
+
+class ProductUnitVariablesProvider implements EntityVariablesProviderInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getVariableDefinitions(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getVariableGetters(): array
+    {
+        return [
+            EV_Marello_Product_Unit::class => [
+                'name' => 'getName',
+                'id' => 'getId'
+            ],
+            PROX_EV_Marello_Product_Unit::class => [
+                'name' => 'getName',
+                'id' => 'getId'
+            ]
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getVariableProcessors(string $entityClass): array
+    {
+        return [];
+    }
+}
diff --git a/src/Marello/Bundle/PurchaseOrderBundle/Entity/PurchaseOrder.php b/src/Marello/Bundle/PurchaseOrderBundle/Entity/PurchaseOrder.php
index 8eeec6901..0a285825d 100644
--- a/src/Marello/Bundle/PurchaseOrderBundle/Entity/PurchaseOrder.php
+++ b/src/Marello/Bundle/PurchaseOrderBundle/Entity/PurchaseOrder.php
@@ -158,7 +158,7 @@ class PurchaseOrder implements DerivedPropertyAwareInterface
      *      }
      * )
      */
-    protected $data;
+    protected $data = [];
 
     /**
      * Creates order using products
diff --git a/src/Marello/Bundle/PurchaseOrderBundle/Entity/PurchaseOrderItem.php b/src/Marello/Bundle/PurchaseOrderBundle/Entity/PurchaseOrderItem.php
index ca8daf4b6..273dec853 100644
--- a/src/Marello/Bundle/PurchaseOrderBundle/Entity/PurchaseOrderItem.php
+++ b/src/Marello/Bundle/PurchaseOrderBundle/Entity/PurchaseOrderItem.php
@@ -187,7 +187,7 @@ class PurchaseOrderItem implements
      *
      * @ORM\Column(name="data", type="json_array", nullable=true)
      */
-    protected $data;
+    protected $data = [];
 
     /**
      * @var string
diff --git a/src/Marello/Bundle/PurchaseOrderBundle/Migrations/Data/ORM/UpdateEmailTemplatesHtmlEscapeTags.php b/src/Marello/Bundle/PurchaseOrderBundle/Migrations/Data/ORM/UpdateEmailTemplatesHtmlEscapeTags.php
index 0596331bf..b1e2e23ad 100644
--- a/src/Marello/Bundle/PurchaseOrderBundle/Migrations/Data/ORM/UpdateEmailTemplatesHtmlEscapeTags.php
+++ b/src/Marello/Bundle/PurchaseOrderBundle/Migrations/Data/ORM/UpdateEmailTemplatesHtmlEscapeTags.php
@@ -42,6 +42,6 @@ public function getEmailsDir()
      */
     public function getVersion()
     {
-        return '1.2';
+        return '1.3';
     }
 }
diff --git a/src/Marello/Bundle/PurchaseOrderBundle/Migrations/Data/ORM/data/emails/marello_purchase_order_advice.html.twig b/src/Marello/Bundle/PurchaseOrderBundle/Migrations/Data/ORM/data/emails/marello_purchase_order_advice.html.twig
index 58eee127e..a3ebb8d64 100644
--- a/src/Marello/Bundle/PurchaseOrderBundle/Migrations/Data/ORM/data/emails/marello_purchase_order_advice.html.twig
+++ b/src/Marello/Bundle/PurchaseOrderBundle/Migrations/Data/ORM/data/emails/marello_purchase_order_advice.html.twig
@@ -10,7 +10,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+	    @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +46,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +70,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +232,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +311,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +319,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +335,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +399,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +425,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,55 +440,65 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
+                                <tr class="email-intro">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
+
+                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">Purchase Order Advise Notification</p>
+                                    </td>
+                                </tr>
+                                <tr class="email-summary">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;"><p style="font-size: 16px; margin: 1em 0;">The following product(s) have a low stock. It's recommended considering to purchase new inventory.</p>
+                                    </td>
+                                </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
                                             <thead>
                                             <tr>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Supplier
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SUPPLIER
                                                 </th>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product SKU
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
                                                 </th>
-                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Order Amount
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    ORDER AMOUNT
                                                 </th>
                                             </tr>
                                             </thead>
                                             <tbody>
-                                            {% for item in entity.items %}
+                                            <!--{% for item in entity.items %}-->
                                                 <tr>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.supplier }}
                                                     </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.productSku }}
                                                     </td>
-                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.orderedAmount }}
                                                     </td>
                                                 </tr>
-                                            {% endfor %}
+                                            <!--{% endfor %}-->
                                             </tbody>
                                         </table>
                                     </td>
diff --git a/src/Marello/Bundle/PurchaseOrderBundle/Migrations/Data/ORM/data/emails/marello_purchase_order_supplier.html.twig b/src/Marello/Bundle/PurchaseOrderBundle/Migrations/Data/ORM/data/emails/marello_purchase_order_supplier.html.twig
index 53be79ef4..8dfa0493a 100644
--- a/src/Marello/Bundle/PurchaseOrderBundle/Migrations/Data/ORM/data/emails/marello_purchase_order_supplier.html.twig
+++ b/src/Marello/Bundle/PurchaseOrderBundle/Migrations/Data/ORM/data/emails/marello_purchase_order_supplier.html.twig
@@ -10,7 +10,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+	    @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +46,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +70,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +232,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +311,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +319,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +335,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +399,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +425,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,73 +440,79 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
+                                <tr class="email-intro">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
+                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">Purchase Order Number <span class="no-link">#{{ entity.purchaseOrderNumber }} has been created.</span></p>
+                                    </td>
+                                </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <p style="font-size: 16px; margin: 1em 0;">Purchase Order Number <span class="no-link">#{{ entity.purchaseOrderNumber }}</span></p>
-                                        <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.createdAt|date('d-m-Y H:i:s') }}</p>
+                                            <p style="font-size: 16px; margin: 1em 0;">Placed on {{ entity.createdAt|date('d-m-Y H:i:s') }}</p>
                                         <!--{% if entity.dueDate %}-->
                                             <p style="font-size: 16px; margin: 1em 0;">Due date {{ entity.dueDate|date('d-m-Y') }}</p>
                                         <!--{% endif %}-->
-                                        <div class="control-group attribute-row" style="font-size: 16px; margin: 1em 0;">
-                                            <label class="control-label">Shipping Address:</label>
-                                            <div class="controls">
-                                                <div class="control-label">{{ entity.warehouse.address|oro_format_address|escape|nl2br }}
-                                                </div>
-                                            </div>
-                                        </div>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
+	                                    <table class="order-details" style="border-collapse: collapse; width: 100%;">
+                                            <tr>
+                                                <td class="address-details" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px 16px 16px 0; width: 50%;">
+                                                    <h3 style="display: block; font-size: 16px; font-weight: 400; margin: 0; margin-bottom: 16px; margin-top: 0; padding: 0;">SHIPPING ADDRESS:</h3>
+                                                    <p style="font-size: 16px; margin: 1em 0;">{{ entity.warehouse.address|oro_format_address|escape|nl2br }}</p>
+                                                </td>
+                                            </tr>
+                                        </table>
                                         <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
                                             <thead>
                                             <tr>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product Name
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
                                                 </th>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product SKU
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
                                                 </th>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Manufacturing Code
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    MANUFACTURING CODE
                                                 </th>
-                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Quantity
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
                                                 </th>
                                             </tr>
                                             </thead>
                                             <tbody>
                                             <!--{% for item in entity.items %}-->
                                                 <tr>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.productName }}
                                                     </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.productSku }}
                                                     </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.product.manufacturingCode }}
                                                     </td>
-                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.orderedAmount }}
                                                     </td>
                                                 </tr>
diff --git a/src/Marello/Bundle/RefundBundle/Migrations/Data/ORM/UpdateEmailTemplates.php b/src/Marello/Bundle/RefundBundle/Migrations/Data/ORM/UpdateEmailTemplates.php
new file mode 100644
index 000000000..fe0e7cdf4
--- /dev/null
+++ b/src/Marello/Bundle/RefundBundle/Migrations/Data/ORM/UpdateEmailTemplates.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Marello\Bundle\RefundBundle\Migrations\Data\ORM;
+
+use Doctrine\Common\Persistence\ObjectManager;
+
+use Oro\Bundle\EmailBundle\Migrations\Data\ORM\AbstractEmailFixture;
+use Oro\Bundle\MigrationBundle\Fixture\VersionedFixtureInterface;
+
+class UpdateEmailTemplates extends AbstractEmailFixture implements
+    VersionedFixtureInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function findExistingTemplate(ObjectManager $manager, array $template)
+    {
+        $name = $template['params']['name'];
+        if (empty($name)) {
+            return null;
+        }
+
+        return $manager->getRepository('OroEmailBundle:EmailTemplate')->findOneBy([
+            'name' => $template['params']['name'],
+            'entityName' => 'Marello\Bundle\RefundBundle\Entity\Refund'
+        ]);
+    }
+
+    /**
+     * Return path to email templates
+     *
+     * @return string
+     */
+    public function getEmailsDir()
+    {
+        return $this->container
+            ->get('kernel')
+            ->locateResource('@MarelloRefundBundle/Migrations/Data/ORM/data/emails');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getVersion()
+    {
+        return '1.1';
+    }
+}
diff --git a/src/Marello/Bundle/RefundBundle/Migrations/Data/ORM/data/emails/marello_refund_credited.html.twig b/src/Marello/Bundle/RefundBundle/Migrations/Data/ORM/data/emails/marello_refund_credited.html.twig
index 10ba5d025..2e4e23354 100644
--- a/src/Marello/Bundle/RefundBundle/Migrations/Data/ORM/data/emails/marello_refund_credited.html.twig
+++ b/src/Marello/Bundle/RefundBundle/Migrations/Data/ORM/data/emails/marello_refund_credited.html.twig
@@ -10,7 +10,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+	    @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +46,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +70,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +232,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +311,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +319,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +335,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +399,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -421,8 +420,12 @@
             text-align: right; }
         .email-items .item-extra {
             padding-top: 0; }
+        .email-items .item-info-left {
+            text-align: left; }
+        .email-items .item-info-right {
+            text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -437,35 +440,38 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <h1>Dear {{ entity.customer.firstName ~ ' ' ~ entity.customer.middleName ~ ' ' ~ entity.customer.lastName }},</h1>
+                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">This message is to confirm you that the amount of {{ entity.currency ~ '' ~  entity.refundAmount }} has been refunded to your account. Please note that it may take a few days for the refund to appear on your bank statement.</p>
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
-                                        <p style="font-size: 16px; margin: 1em 0;">Your refund <span class="no-link">#{{ entity.refundNumber }}</span> has been credited.</p>
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
+                                        <p style="font-size: 16px; margin: 1em 0;">Your order <span class="no-link">#{{ entity.order.orderNumber }}</span></p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Your refund <span class="no-link">#{{ entity.refundNumber }}</span></p>
                                     </td>
                                 </tr>
+
                             </table>
                             <!-- End Content -->
                         </td>
diff --git a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/UpdateEmailTemplatesProductUnit.php b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/UpdateEmailTemplatesProductUnit.php
index 6f9800911..7fba5d798 100644
--- a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/UpdateEmailTemplatesProductUnit.php
+++ b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/UpdateEmailTemplatesProductUnit.php
@@ -42,6 +42,6 @@ public function getEmailsDir()
      */
     public function getVersion()
     {
-        return '1.2';
+        return '1.4';
     }
 }
diff --git a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_created.html.twig b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_created.html.twig
index d603dd20a..874bcb4b7 100644
--- a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_created.html.twig
+++ b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_created.html.twig
@@ -10,7 +10,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+	    @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +46,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +70,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +232,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +311,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +319,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +335,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +399,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +425,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,71 +440,73 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <h1>Dear {{ entity.order.customer.firstName ~ ' ' ~ entity.order.customer.middleName ~ ' ' ~ entity.order.customer.lastName }},</h1>
+                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">Your return <span class="no-link">#{{ entity.returnNumber }}</span> has been created.</p>
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
-                                        <p style="font-size: 16px; margin: 1em 0;">Your return <span class="no-link">#{{ entity.returnNumber }}</span> has been created.</p>
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
+                                        <p style="font-size: 16px; margin: 1em 0;">Your return <span class="no-link">#{{ entity.returnNumber }}</span></p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Your order <span class="no-link">#{{ entity.order.orderNumber }}</span></p>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
                                             <thead>
+                                            <tr>
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
+                                                </th>
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
+                                                </th>
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
+                                                </th>
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    UNIT
+                                                </th>
+                                            </tr>
+                                            </thead>
+                                            <tbody>
+                                            <!--{% for item in entity.returnItems %}-->
                                                 <tr>
-                                                    <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Product Name
-                                                    </th>
-                                                    <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Product SKU
-                                                    </th>
-                                                    <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Quantity
-                                                    </th>
-                                                    <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                        Unit
-                                                    </th>
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                        {{ item.orderItem.productName }}
+                                                    </td>
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                        {{ item.orderItem.productSku }}
+                                                    </td>
+                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                        {{ item.quantity }}
+                                                    </td>
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                        {{ item.orderItem.productUnit.name }}
+                                                    </td>
                                                 </tr>
-                                            </thead>
-                                                <tbody>
-                                                <!--{% for item in entity.returnItems %}-->
-                                                    <tr>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.orderItem.productName }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.orderItem.productSku }}
-                                                        </td>
-                                                        <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.quantity }}
-                                                        </td>
-                                                        <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                            {{ item.orderItem.productUnit }}
-                                                        </td>
-                                                    </tr>
-                                                <!--{% endfor %}-->
+                                            <!--{% endfor %}-->
                                             </tbody>
                                         </table>
                                     </td>
@@ -521,4 +522,4 @@
     <!-- End wrapper table -->
 </center>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_inspection_not_ok.html.twig b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_inspection_not_ok.html.twig
index 2c421b080..3f6c22428 100644
--- a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_inspection_not_ok.html.twig
+++ b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_inspection_not_ok.html.twig
@@ -10,7 +10,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+	    @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +46,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +70,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +232,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +311,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +319,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +335,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +399,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +425,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,68 +440,70 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <h1>Dear {{ entity.order.customer.firstName ~ ' ' ~ entity.order.customer.middleName ~ ' ' ~ entity.order.customer.lastName }},</h1>
+                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">An issue has been found during an inspection of you return <span class="no-link">#{{ entity.returnNumber }}</span>.</p>
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
-                                        <p style="font-size: 16px; margin: 1em 0;">An issue has been found during an inspection of you return <span class="no-link">#{{ entity.returnNumber }}</span>.</p>
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
+                                        <p style="font-size: 16px; margin: 1em 0;">Your return <span class="no-link">#{{ entity.returnNumber }}</span></p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Your order <span class="no-link">#{{ entity.order.orderNumber }}</span></p>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
                                             <thead>
                                             <tr>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product Name
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
                                                 </th>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product SKU
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
                                                 </th>
-                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Quantity
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Unit
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    UNIT
                                                 </th>
                                             </tr>
                                             </thead>
                                             <tbody>
                                             <!--{% for item in entity.returnItems %}-->
                                                 <tr>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.orderItem.productName }}
                                                     </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.orderItem.productSku }}
                                                     </td>
-                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.quantity }}
                                                     </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.orderItem.productUnit }}
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                        {{ item.orderItem.productUnit.name }}
                                                     </td>
                                                 </tr>
                                             <!--{% endfor %}-->
@@ -521,4 +522,4 @@
     <!-- End wrapper table -->
 </center>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_not_verified.html.twig b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_not_verified.html.twig
index d36ab6f9b..1a461dcbf 100644
--- a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_not_verified.html.twig
+++ b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_not_verified.html.twig
@@ -10,7 +10,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+	    @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +46,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +70,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +232,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +311,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +319,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +335,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +399,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +425,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,68 +440,70 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <h1>Dear {{ entity.order.customer.firstName ~ ' ' ~ entity.order.customer.middleName ~ ' ' ~ entity.order.customer.lastName }},</h1>
+                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">Contents of your return <span class="no-link">#{{ entity.returnNumber }}</span> have not been verified.</p>
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
-                                        <p style="font-size: 16px; margin: 1em 0;">Contents of your return <span class="no-link">#{{ entity.returnNumber }}</span> have not been verified.</p>
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
+                                        <p style="font-size: 16px; margin: 1em 0;">Your return <span class="no-link">#{{ entity.returnNumber }}</span></p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Your order <span class="no-link">#{{ entity.order.orderNumber }}</span></p>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
                                             <thead>
                                             <tr>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product Name
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
                                                 </th>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product SKU
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
                                                 </th>
-                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Quantity
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Unit
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    UNIT
                                                 </th>
                                             </tr>
                                             </thead>
                                             <tbody>
                                             <!--{% for item in entity.returnItems %}-->
                                                 <tr>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.orderItem.productName }}
                                                     </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.orderItem.productSku }}
                                                     </td>
-                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.quantity }}
                                                     </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.orderItem.productUnit }}
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                        {{ item.orderItem.productUnit.name }}
                                                     </td>
                                                 </tr>
                                             <!--{% endfor %}-->
@@ -521,5 +522,4 @@
     <!-- End wrapper table -->
 </center>
 </body>
-</html>
-
+</html>
\ No newline at end of file
diff --git a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_received.html.twig b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_received.html.twig
index 65bc3cc94..4921650e1 100644
--- a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_received.html.twig
+++ b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_received.html.twig
@@ -10,7 +10,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+	    @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +46,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +70,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +232,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +311,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +319,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +335,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +399,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +425,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,68 +440,70 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <h1>Dear {{ entity.order.customer.firstName ~ ' ' ~ entity.order.customer.middleName ~ ' ' ~ entity.order.customer.lastName }},</h1>
+                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">Your return <span class="no-link">#{{ entity.returnNumber }}</span> has been received.</p>
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
-                                        <p style="font-size: 16px; margin: 1em 0;">Your return <span class="no-link">#{{ entity.returnNumber }}</span> has been received.</p>
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
+                                        <p style="font-size: 16px; margin: 1em 0;">Your return <span class="no-link">#{{ entity.returnNumber }}</span></p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Your order <span class="no-link">#{{ entity.order.orderNumber }}</span></p>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
                                             <thead>
                                             <tr>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product Name
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
                                                 </th>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product SKU
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
                                                 </th>
-                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Quantity
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Unit
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    UNIT
                                                 </th>
                                             </tr>
                                             </thead>
                                             <tbody>
                                             <!--{% for item in entity.returnItems %}-->
                                                 <tr>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.orderItem.productName }}
                                                     </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.orderItem.productSku }}
                                                     </td>
-                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.quantity }}
                                                     </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.orderItem.productUnit }}
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                        {{ item.orderItem.productUnit.name }}
                                                     </td>
                                                 </tr>
                                             <!--{% endfor %}-->
@@ -521,5 +522,4 @@
     <!-- End wrapper table -->
 </center>
 </body>
-</html>
-
+</html>
\ No newline at end of file
diff --git a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_reminder.html.twig b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_reminder.html.twig
index 2d584a7bc..450c7288d 100644
--- a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_reminder.html.twig
+++ b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_reminder.html.twig
@@ -10,7 +10,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+	    @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +46,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +70,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +232,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +311,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +319,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +335,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +399,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +425,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,68 +440,70 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <h1>Dear {{ entity.order.customer.firstName ~ ' ' ~ entity.order.customer.middleName ~ ' ' ~ entity.order.customer.lastName }},</h1>
+                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">Your return <span class="no-link">#{{ entity.returnNumber }}</span> has not yet been received.</p>
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
-                                        <p style="font-size: 16px; margin: 1em 0;">Your return <span class="no-link">#{{ entity.returnNumber }}</span> has not yet been received.</p>
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
+                                        <p style="font-size: 16px; margin: 1em 0;">Your return <span class="no-link">#{{ entity.returnNumber }}</span></p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Your order <span class="no-link">#{{ entity.order.orderNumber }}</span></p>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
                                             <thead>
                                             <tr>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product Name
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
                                                 </th>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product SKU
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
                                                 </th>
-                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Quantity
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Unit
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    UNIT
                                                 </th>
                                             </tr>
                                             </thead>
                                             <tbody>
                                             <!--{% for item in entity.returnItems %}-->
                                                 <tr>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.orderItem.productName }}
                                                     </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.orderItem.productSku }}
                                                     </td>
-                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.quantity }}
                                                     </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.orderItem.productUnit }}
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                        {{ item.orderItem.productUnit.name }}
                                                     </td>
                                                 </tr>
                                             <!--{% endfor %}-->
@@ -521,4 +522,4 @@
     <!-- End wrapper table -->
 </center>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_shipping_label_warehouse.html.twig b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_shipping_label_warehouse.html.twig
index 5f21a7088..185cdcf7f 100644
--- a/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_shipping_label_warehouse.html.twig
+++ b/src/Marello/Bundle/ReturnBundle/Migrations/Data/ORM/data/emails/marello_return_shipping_label_warehouse.html.twig
@@ -10,7 +10,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <style>@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600");
+    <style>
+	    @import url('https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap');
         p {
             margin: 1em 0; }
 
@@ -45,21 +46,23 @@
             width: 100%; }
 
         body {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;
             font-weight: normal;
             text-align: left;
-            font-size: 16px; }
+            font-size: 12px; }
 
         th,
         td {
-            font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; }
+            font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; }
 
         a {
             color: #3d3d3d;
             text-decoration: underline; }
 
         p {
-            font-size: 16px; }
+            font-size: 12px;
+            font-weight: 300;
+            color: #666666; }
 
         h1,
         h2,
@@ -67,28 +70,24 @@
         h4,
         h5 {
             margin-bottom: 16px;
-            font-weight: 500; }
+            font-weight: 400; }
 
-        h3,
-        h4,
-        h5 {
-            font-weight: 600; }
 
         strong,
         th {
-            font-weight: 600; }
+            font-weight: 400; }
 
         h1 {
-            font-size: 28px; }
+            font-size: 20px; }
 
         h2 {
-            font-size: 24px; }
+            font-size: 18px; }
 
         h3 {
-            font-size: 20px; }
+            font-size: 16px; }
 
         h4 {
-            font-size: 16px; }
+            font-size: 12px; }
 
         html,
         body {
@@ -233,7 +232,7 @@
             .header p,
             .button,
             .footer p {
-                font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif !important; } }
+                font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif !important; } }
 
         @media only screen and (max-width: 639px) {
             html,
@@ -312,7 +311,7 @@
         @media only screen and (max-width: 639px) {
             .rma-items td,
             .rma-items th {
-                font-size: 14px !important;
+                font-size: 12px !important;
                 padding: 4px !important; } }
 
         .email-summary h1 {
@@ -320,7 +319,7 @@
 
         @media only screen and (max-width: 479px) {
             .email-summary h1 {
-                font-size: 24px; } }
+                font-size: 20px; } }
 
         .order-details {
             width: 100%; }
@@ -336,7 +335,7 @@
         .order-details .payment-method {
             margin-bottom: 8px; }
         .order-details .payment-method .title {
-            font-weight: 600; }
+            font-weight: 400; }
         .order-details .payment-method .data.table > caption {
             display: none; }
         .order-details .payment-method .data.table th {
@@ -400,9 +399,9 @@
         .email-items > tfoot > tr + tr > td {
             border-top: 0; }
         .email-items p {
-            margin-bottom: 0; }
+            margin-bottom: 0}
         .email-items .product-name {
-            font-weight: 600;
+            font-weight: 400;
             margin-bottom: 8px; }
         .email-items .has-extra .sku {
             margin-bottom: 8px; }
@@ -426,7 +425,7 @@
         .email-items .item-info-right {
             text-align: right; }
         .email-items .order-totals > tr > th {
-            font-weight: 600; }
+            font-weight: 400; }
         .email-items .order-totals > tr > th,
         .email-items .order-totals > tr > td {
             padding: 4px 8px;
@@ -441,68 +440,70 @@
 
 
 
-<body style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
+<body style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-size: 16px; font-weight: normal; height: 100%; margin: 0; padding: 0; text-align: left; width: 100%;">
 <center>
     <!-- Begin wrapper table -->
     <table class="wrapper" width="100%" style="border-collapse: collapse; height: 100%; margin: 0 auto; padding: 0; width: 100%;">
         <tr>
-            <td class="wrapper-inner" align="center" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
+            <td class="wrapper-inner" align="center" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding-bottom: 16px; width: 100%;">
                 <table class="main" align="center" style="border-collapse: collapse; margin: 0 auto; text-align: left; width: 660px;">
                     <tr>
-                        <td class="header" style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="header" style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <a class="logo" href="http://www.marello.com" style="color: #3d3d3d; text-decoration: underline; word-wrap: break-word;">
                                 <img width="128" height="53" src="{{ system.appURL ~ '/bundles/marellocore/img/marello-logo.png' }}" alt="marello.com" border="0" style="border: 0; height: auto; outline: none; text-decoration: none;">
                             </a>
                         </td>
                     </tr>
                     <tr>
-                        <td class="main-content" style="background-color: #fff; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 16px;">
+                        <td class="main-content" style="background-color: #fff; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 16px;">
                             <!-- Begin Content -->
 
                             <table style="border-collapse: collapse; width: 100%;">
                                 <tr class="email-intro">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <h1>Dear {{ entity.order.customer.firstName ~ ' ' ~ entity.order.customer.middleName ~ ' ' ~ entity.order.customer.lastName }},</h1>
+                                        <p class="greeting" style="font-size: 16px; margin: 1em 0;">You can return the products of return #{{ entity.returnNumber }} to the address of our warehouse</p>
                                     </td>
                                 </tr>
                                 <tr class="email-summary">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
-                                        <p style="font-size: 16px; margin: 1em 0;">Your can ship the good of your return <span class="no-link">#{{ entity.returnNumber }}</span> to our Warehouse address.</p>
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
+                                        <p style="font-size: 16px; margin: 1em 0;">Your return <span class="no-link">#{{ entity.returnNumber }}</span></p>
+                                        <p style="font-size: 16px; margin: 1em 0;">Your order <span class="no-link">#{{ entity.order.orderNumber }}</span></p>
                                     </td>
                                 </tr>
                                 <tr class="email-information">
-                                    <td style="font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
+                                    <td style="font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif;">
                                         <table class="email-items" style="border: 1px solid #d6d7d7; border-collapse: collapse; width: 100%;">
                                             <thead>
                                             <tr>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product Name
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    NAME
                                                 </th>
-                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Product SKU
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    SKU
                                                 </th>
-                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Quantity
+                                                <th class="item-info item-info-right" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    QTY
                                                 </th>
-                                                <th class="item-info" style="background-color: #f8f8f8; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; padding: 4px 8px;">
-                                                    Unit
+                                                <th class="item-info item-info-left" style="background-color: #f8f8f8; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; font-weight: 400; padding: 10px 8px; font-size:13px;">
+                                                    UNIT
                                                 </th>
                                             </tr>
                                             </thead>
                                             <tbody>
                                             <!--{% for item in entity.returnItems %}-->
                                                 <tr>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.orderItem.productName }}
                                                     </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.orderItem.productSku }}
                                                     </td>
-                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
+                                                    <td class="item-info item-info-right" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
                                                         {{ item.quantity }}
                                                     </td>
-                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; padding: 4px 8px;">
-                                                        {{ item.orderItem.productUnit }}
+                                                    <td class="item-info" style="border-top: 1px solid #d6d7d7; font-family: Roboto Condensed, Arial Narrow, Arial, sans-serif; padding: 10px 8px; font-size:13px; font-weight: 300;">
+                                                        {{ item.orderItem.productUnit.name }}
                                                     </td>
                                                 </tr>
                                             <!--{% endfor %}-->
@@ -521,4 +522,4 @@
     <!-- End wrapper table -->
 </center>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/Marello/Bundle/SalesBundle/Acl/Voter/SalesChannelGroupVoter.php b/src/Marello/Bundle/SalesBundle/Acl/Voter/SalesChannelGroupVoter.php
index b20cce1d7..9f9523046 100644
--- a/src/Marello/Bundle/SalesBundle/Acl/Voter/SalesChannelGroupVoter.php
+++ b/src/Marello/Bundle/SalesBundle/Acl/Voter/SalesChannelGroupVoter.php
@@ -8,7 +8,7 @@
 use Oro\Bundle\SecurityBundle\Acl\Voter\AbstractEntityVoter;
 
 /**
- * Disables deleting the sales channel group in case when it has attached integration
+ * Disable deletion of the sales channel group in the case when it has been attached integration
  */
 class SalesChannelGroupVoter extends AbstractEntityVoter
 {
diff --git a/src/Marello/Bundle/SalesBundle/Autocomplete/GroupSalesChannelHandler.php b/src/Marello/Bundle/SalesBundle/Autocomplete/GroupSalesChannelHandler.php
index e1ac4eb22..d7ceda575 100644
--- a/src/Marello/Bundle/SalesBundle/Autocomplete/GroupSalesChannelHandler.php
+++ b/src/Marello/Bundle/SalesBundle/Autocomplete/GroupSalesChannelHandler.php
@@ -5,9 +5,6 @@
 use Doctrine\ORM\QueryBuilder;
 use Oro\Bundle\FormBundle\Autocomplete\SearchHandler;
 
-/**
- * @todo Cover with functional test
- */
 class GroupSalesChannelHandler extends SearchHandler
 {
     /**
@@ -22,18 +19,14 @@ protected function checkAllDependenciesInjected()
 
     /**
      * @param string $searchTerm
-     * @param int    $firstResult
-     * @param int    $maxResults
+     * @param int $firstResult
+     * @param int $maxResults
      * @return QueryBuilder
      */
     protected function prepareQueryBuilder($searchTerm, $firstResult, $maxResults)
     {
-        $queryBuilder = $this->entityRepository->createQueryBuilder('scg');
+        $queryBuilder = $this->entityRepository->getNonSystemSalesChannelBySearchTermQB($searchTerm);
         $queryBuilder
-            ->where($queryBuilder->expr()->like('LOWER(scg.name)', ':searchTerm'))
-            ->andWhere(($queryBuilder->expr()->eq('scg.system', $queryBuilder->expr()->literal(false))))
-            ->setParameter('searchTerm', '%' . mb_strtolower($searchTerm) . '%')
-            ->orderBy('scg.name', 'ASC')
             ->setFirstResult($firstResult)
             ->setMaxResults($maxResults);
 
@@ -41,26 +34,11 @@ protected function prepareQueryBuilder($searchTerm, $firstResult, $maxResults)
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     protected function searchEntities($search, $firstResult, $maxResults)
     {
         $queryBuilder = $this->prepareQueryBuilder($search, $firstResult, $maxResults);
-        $query = $this->aclHelper->apply($queryBuilder, 'VIEW');
-
-        return $query->getResult();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function findById($query)
-    {
-        $parts = explode(';', $query);
-        $id = $parts[0];
-
-        $criteria = [$this->idFieldName => $id];
-
-        return [$this->entityRepository->findOneBy($criteria, null)];
+        return $this->aclHelper->apply($queryBuilder->getQuery())->getResult();
     }
 }
diff --git a/src/Marello/Bundle/SalesBundle/Entity/Repository/SalesChannelGroupRepository.php b/src/Marello/Bundle/SalesBundle/Entity/Repository/SalesChannelGroupRepository.php
index 463fd70aa..168307466 100644
--- a/src/Marello/Bundle/SalesBundle/Entity/Repository/SalesChannelGroupRepository.php
+++ b/src/Marello/Bundle/SalesBundle/Entity/Repository/SalesChannelGroupRepository.php
@@ -3,6 +3,7 @@
 namespace Marello\Bundle\SalesBundle\Entity\Repository;
 
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
 use Marello\Bundle\SalesBundle\Entity\SalesChannelGroup;
 use Oro\Bundle\IntegrationBundle\Entity\Channel as IntegrationChannel;
 use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
@@ -60,4 +61,20 @@ public function hasAttachedIntegration(int $salesChannelGroupId): bool
 
         return (bool) $qb->getQuery()->getResult();
     }
+
+    /**
+     * @param string $searchTerm
+     * @return QueryBuilder
+     */
+    public function getNonSystemSalesChannelBySearchTermQB(string $searchTerm): QueryBuilder
+    {
+        $qb = $this->createQueryBuilder('scg');
+        $qb
+            ->where($qb->expr()->like('LOWER(scg.name)', ':searchTerm'))
+            ->andWhere(($qb->expr()->eq('scg.system', $qb->expr()->literal(false))))
+            ->setParameter('searchTerm', '%' . mb_strtolower($searchTerm) . '%')
+            ->orderBy('scg.name', 'ASC');
+
+        return $qb;
+    }
 }
diff --git a/src/Marello/Bundle/SalesBundle/Entity/Repository/SalesChannelRepository.php b/src/Marello/Bundle/SalesBundle/Entity/Repository/SalesChannelRepository.php
index 593a575bc..e376fafa2 100644
--- a/src/Marello/Bundle/SalesBundle/Entity/Repository/SalesChannelRepository.php
+++ b/src/Marello/Bundle/SalesBundle/Entity/Repository/SalesChannelRepository.php
@@ -23,6 +23,34 @@ public function setAclHelper(AclHelper $aclHelper)
         $this->aclHelper = $aclHelper;
     }
 
+    /**
+     * @param string $searchTerm
+     * @param int $groupId
+     * @param array $skippedSalesChannelIds
+     * @return QueryBuilder
+     */
+    public function getActiveSalesChannelBySearchTermLimitedWithGroupIdQB(
+        string $searchTerm,
+        int $groupId,
+        array $skippedSalesChannelIds = []
+    ): QueryBuilder {
+        $qb = $this->getActiveChannelsQuery();
+        $qb
+            ->andWhere($qb->expr()->like('LOWER(sc.name)', ':searchTerm'))
+            ->andWhere($qb->expr()->eq('sc.group', ':salesChannelGroupId'))
+            ->setParameter('searchTerm', '%' . mb_strtolower($searchTerm) . '%')
+            ->setParameter('salesChannelGroupId', $groupId)
+            ->orderBy('sc.name', 'ASC');
+
+        if (!empty($skippedSalesChannelIds)) {
+            $qb
+                ->andWhere($qb->expr()->notIn('sc.id', ':skippedSalesChannelIds'))
+                ->setParameter('skippedSalesChannelIds', $skippedSalesChannelIds);
+        }
+
+        return $qb;
+    }
+
     /**
      * Return product prices for specified channel and productId
      *
diff --git a/src/Marello/Bundle/SalesBundle/Entity/SalesChannelGroup.php b/src/Marello/Bundle/SalesBundle/Entity/SalesChannelGroup.php
index b4993f49f..3ee0f21e8 100644
--- a/src/Marello/Bundle/SalesBundle/Entity/SalesChannelGroup.php
+++ b/src/Marello/Bundle/SalesBundle/Entity/SalesChannelGroup.php
@@ -110,8 +110,6 @@ class SalesChannelGroup extends ExtendSalesChannelGroup
     protected $system = false;
     
     /**
-     * @todo Add restriction on removing sales channel from the group in case when it attached to the integration
-     *
      * @var SalesChannel[]
      *
      * @ORM\OneToMany(targetEntity="SalesChannel", mappedBy="group", cascade={"persist"}, fetch="EAGER")
diff --git a/src/Marello/Bundle/SalesBundle/Form/Type/SalesChannelType.php b/src/Marello/Bundle/SalesBundle/Form/Type/SalesChannelType.php
index f313eddbb..b44f0cec5 100644
--- a/src/Marello/Bundle/SalesBundle/Form/Type/SalesChannelType.php
+++ b/src/Marello/Bundle/SalesBundle/Form/Type/SalesChannelType.php
@@ -5,7 +5,6 @@
 use Marello\Bundle\PricingBundle\Form\EventListener\CurrencySubscriber;
 use Marello\Bundle\SalesBundle\Entity\SalesChannel;
 use Oro\Bundle\CurrencyBundle\Form\Type\CurrencyType;
-use Oro\Bundle\FormBundle\Utils\FormUtils;
 use Oro\Bundle\LocaleBundle\Form\Type\LocalizationSelectType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
diff --git a/src/Marello/Bundle/SalesBundle/Migrations/Schema/MarelloSalesBundleInstaller.php b/src/Marello/Bundle/SalesBundle/Migrations/Schema/MarelloSalesBundleInstaller.php
index 557bd34f2..33d575856 100644
--- a/src/Marello/Bundle/SalesBundle/Migrations/Schema/MarelloSalesBundleInstaller.php
+++ b/src/Marello/Bundle/SalesBundle/Migrations/Schema/MarelloSalesBundleInstaller.php
@@ -17,7 +17,7 @@ class MarelloSalesBundleInstaller implements Installation
      */
     public function getMigrationVersion()
     {
-        return 'v1_3';
+        return 'v1_3_1';
     }
 
     /**
diff --git a/src/Marello/Bundle/SalesBundle/Migrations/Schema/v1_3_1/MarelloSalesBundle.php b/src/Marello/Bundle/SalesBundle/Migrations/Schema/v1_3_1/MarelloSalesBundle.php
new file mode 100644
index 000000000..9f6cc0f48
--- /dev/null
+++ b/src/Marello/Bundle/SalesBundle/Migrations/Schema/v1_3_1/MarelloSalesBundle.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Marello\Bundle\SalesBundle\Migrations\Schema\v1_3_1;
+
+use Doctrine\DBAL\Schema\Schema;
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+/**
+ * @SuppressWarnings(PHPMD.TooManyMethods)
+ * @SuppressWarnings(PHPMD.ExcessiveClassLength)
+ */
+class MarelloSalesBundle implements Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        /** Tables generation **/
+        $this->modifyMarelloSalesSalesChannelGroupTable($schema);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function modifyMarelloSalesSalesChannelGroupTable(Schema $schema)
+    {
+        $table = $schema->getTable('marello_sales_channel_group');
+        if (!$table->hasColumn('integration_channel_id')) {
+            $table->addColumn('integration_channel_id', 'integer', ['notnull' => false]);
+        }
+
+        if (!$table->hasIndex('UNIQ_759DCFAB3D6A9E29')) {
+            $table->addUniqueIndex(['integration_channel_id'], 'UNIQ_759DCFAB3D6A9E29');
+        }
+
+        if ($table->hasForeignKey('FK_759DCFAB3D6A9E29')) {
+            $table->addForeignKeyConstraint(
+                $schema->getTable('oro_integration_channel'),
+                ['integration_channel_id'],
+                ['id'],
+                ['onDelete' => 'SET NULL', 'onUpdate' => null]
+            );
+        }
+    }
+}
diff --git a/src/Marello/Bundle/SalesBundle/Resources/config/form.yml b/src/Marello/Bundle/SalesBundle/Resources/config/form.yml
index b1d16637b..8d52c4a82 100644
--- a/src/Marello/Bundle/SalesBundle/Resources/config/form.yml
+++ b/src/Marello/Bundle/SalesBundle/Resources/config/form.yml
@@ -11,7 +11,7 @@ services:
         class: 'Marello\Bundle\SalesBundle\Form\Type\SalesChannelGroupType'
         tags:
             - { name: form.type }
-             
+
     marello_sales_form_type.saleschannel_multi_select:
         class: 'Marello\Bundle\SalesBundle\Form\Type\SalesChannelMultiSelectType'
         arguments:
diff --git a/src/Marello/Bundle/SalesBundle/Resources/config/services.yml b/src/Marello/Bundle/SalesBundle/Resources/config/services.yml
index 413301c39..3603147bf 100644
--- a/src/Marello/Bundle/SalesBundle/Resources/config/services.yml
+++ b/src/Marello/Bundle/SalesBundle/Resources/config/services.yml
@@ -47,7 +47,7 @@ services:
             - 'Marello\Bundle\SalesBundle\Entity\SalesChannelGroup'
             - ['name']
         tags:
-            - { name: oro_form.autocomplete.search_handler, alias: group_saleschannels }
+            - { name: oro_form.autocomplete.search_handler, alias: group_saleschannels, acl_resource: marello_product_view }
 
     marello_sales.active_saleschannels.form.autocomplete.search_handler:
         class: 'Marello\Bundle\SalesBundle\Autocomplete\ActiveSalesChannelHandler'
diff --git a/src/Marello/Bundle/TaxBundle/Entity/TaxCode.php b/src/Marello/Bundle/TaxBundle/Entity/TaxCode.php
index 4515a1d36..fa340d3b0 100644
--- a/src/Marello/Bundle/TaxBundle/Entity/TaxCode.php
+++ b/src/Marello/Bundle/TaxBundle/Entity/TaxCode.php
@@ -83,7 +83,7 @@ class TaxCode extends ExtendTaxCode
      *      }
      * )
      */
-    protected $data;
+    protected $data = [];
 
     /**
      * @return string
diff --git a/src/Marello/Bundle/TaxBundle/Entity/TaxJurisdiction.php b/src/Marello/Bundle/TaxBundle/Entity/TaxJurisdiction.php
index 43cb50412..156d6ab9b 100755
--- a/src/Marello/Bundle/TaxBundle/Entity/TaxJurisdiction.php
+++ b/src/Marello/Bundle/TaxBundle/Entity/TaxJurisdiction.php
@@ -155,7 +155,7 @@ class TaxJurisdiction implements DatesAwareInterface
      *      }
      * )
      */
-    protected $data;
+    protected $data = [];
 
     /**
      * Constructor
diff --git a/src/Marello/Bundle/TaxBundle/Entity/TaxRate.php b/src/Marello/Bundle/TaxBundle/Entity/TaxRate.php
index 6757214b3..8edbb7c58 100644
--- a/src/Marello/Bundle/TaxBundle/Entity/TaxRate.php
+++ b/src/Marello/Bundle/TaxBundle/Entity/TaxRate.php
@@ -79,7 +79,7 @@ class TaxRate
      *      }
      * )
      */
-    protected $data;
+    protected $data = [];
 
     /**
      * @return string
diff --git a/src/Marello/Bundle/TaxBundle/Entity/TaxRule.php b/src/Marello/Bundle/TaxBundle/Entity/TaxRule.php
index b88bdd830..2c3d3c516 100644
--- a/src/Marello/Bundle/TaxBundle/Entity/TaxRule.php
+++ b/src/Marello/Bundle/TaxBundle/Entity/TaxRule.php
@@ -93,7 +93,7 @@ class TaxRule
      *      }
      * )
      */
-    protected $data;
+    protected $data = [];
 
     /**
      * @return string