diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/CreditNotePaperTemplate.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/CreditNotePaperTemplate.tsx
index f594ba551..90644193b 100644
--- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/CreditNotePaperTemplate.tsx
+++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/CreditNotePaperTemplate.tsx
@@ -140,7 +140,7 @@ export function CreditNotePaperTemplate({
           )}
         </PaperTemplate.TermsList>
 
-        <Group spacing={10}>
+        <PaperTemplate.AddressesGroup>
           {showBilledFromAddress && (
             <PaperTemplate.Address
               items={[<strong>{companyName}</strong>, ...billedFromAddress]}
@@ -151,7 +151,7 @@ export function CreditNotePaperTemplate({
               items={[<strong>{billedToLabel}</strong>, ...billedToAddress]}
             />
           )}
-        </Group>
+        </PaperTemplate.AddressesGroup>
 
         <Stack spacing={0}>
           <PaperTemplate.Table
diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimatePaperTemplate.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimatePaperTemplate.tsx
index 09517d495..6a93a2a72 100644
--- a/packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimatePaperTemplate.tsx
+++ b/packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimatePaperTemplate.tsx
@@ -146,7 +146,7 @@ export function EstimatePaperTemplate({
           )}
         </PaperTemplate.TermsList>
 
-        <Group spacing={10}>
+        <PaperTemplate.AddressesGroup>
           {showBilledFromAddress && (
             <PaperTemplate.Address
               items={[<strong>{companyName}</strong>, ...billedFromAddress]}
@@ -157,7 +157,7 @@ export function EstimatePaperTemplate({
               items={[<strong>{billedToLabel}</strong>, ...billedToAddress]}
             />
           )}
-        </Group>
+        </PaperTemplate.AddressesGroup>
 
         <Stack spacing={0}>
           <PaperTemplate.Table
diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoicePaperTemplate.module.scss b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoicePaperTemplate.module.scss
index 2d562e31a..8603e6fb7 100644
--- a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoicePaperTemplate.module.scss
+++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoicePaperTemplate.module.scss
@@ -37,16 +37,9 @@
 }
 
 .addressRoot{
-  display: flex;
-  flex-direction: row;
-}
-
-.addressBillTo{
-  flex: 1;
-}
-
-.addressFrom{
-  flex: 1;
+  > div{
+    flex: 1;
+  }
 }
 
 .table {
diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoicePaperTemplate.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoicePaperTemplate.tsx
index bc67bb7eb..ec6fd7f5c 100644
--- a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoicePaperTemplate.tsx
+++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoicePaperTemplate.tsx
@@ -207,7 +207,7 @@ export function InvoicePaperTemplate({
           )}
         </PaperTemplate.TermsList>
 
-        <Group spacing={10}>
+        <PaperTemplate.AddressesGroup>
           {showBilledFromAddress && (
             <PaperTemplate.Address
               items={[<strong>{companyName}</strong>, ...billedFromAddres]}
@@ -218,7 +218,7 @@ export function InvoicePaperTemplate({
               items={[<strong>{billedToLabel}</strong>, ...billedToAddress]}
             />
           )}
-        </Group>
+        </PaperTemplate.AddressesGroup>
 
         <Stack spacing={0}>
           <PaperTemplate.Table
diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/PaperTemplate.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/PaperTemplate.tsx
index 571f3c753..c8daf0715 100644
--- a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/PaperTemplate.tsx
+++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/PaperTemplate.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import clsx from 'classnames';
 import { get } from 'lodash';
-import { Stack } from '@/components';
+import { Group, GroupProps, Stack } from '@/components';
 import styles from './InvoicePaperTemplate.module.scss';
 
 export interface PaperTemplateProps {
@@ -119,6 +119,9 @@ PaperTemplate.MutedText = () => {};
 
 PaperTemplate.Text = () => {};
 
+PaperTemplate.AddressesGroup = (props: GroupProps) => {
+  return <Group spacing={10} {...props} className={styles.addressRoot} />
+}
 PaperTemplate.Address = ({
   items,
 }: {
diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedCustomize/PaymentReceivedPaperTemplate.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedCustomize/PaymentReceivedPaperTemplate.tsx
index 52318be2e..51a9bbb3f 100644
--- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedCustomize/PaymentReceivedPaperTemplate.tsx
+++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedCustomize/PaymentReceivedPaperTemplate.tsx
@@ -112,7 +112,7 @@ export function PaymentReceivedPaperTemplate({
           )}
         </PaperTemplate.TermsList>
 
-        <Group spacing={10}>
+        <PaperTemplate.AddressesGroup>
           {showBilledFromAddress && (
             <PaperTemplate.Address
               items={[<strong>{companyName}</strong>, ...billedFromAddress]}
@@ -123,7 +123,7 @@ export function PaymentReceivedPaperTemplate({
               items={[<strong>{billedToLabel}</strong>, ...billedToAddress]}
             />
           )}
-        </Group>
+        </PaperTemplate.AddressesGroup>
 
         <Stack spacing={0}>
           <PaperTemplate.Table
diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/ReceiptPaperTemplate.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/ReceiptPaperTemplate.tsx
index 62631c155..3e0c5f3e4 100644
--- a/packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/ReceiptPaperTemplate.tsx
+++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/ReceiptPaperTemplate.tsx
@@ -134,7 +134,7 @@ export function ReceiptPaperTemplate({
           )}
         </PaperTemplate.TermsList>
 
-        <Group spacing={10}>
+        <PaperTemplate.AddressesGroup>
           {showBilledFromAddress && (
             <PaperTemplate.Address
               items={[<strong>{companyName}</strong>, ...billedFromAddress]}
@@ -145,7 +145,7 @@ export function ReceiptPaperTemplate({
               items={[<strong>{billedToLabel}</strong>, ...billedToAddress]}
             />
           )}
-        </Group>
+        </PaperTemplate.AddressesGroup>
 
         <Stack spacing={0}>
           <PaperTemplate.Table