diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/CreditNotePaperTemplate.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/CreditNotePaperTemplate.tsx
index d50c7d9ac..f594ba551 100644
--- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/CreditNotePaperTemplate.tsx
+++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/CreditNotePaperTemplate.tsx
@@ -5,8 +5,12 @@ import {
 } from '../../Invoices/InvoiceCustomize/PaperTemplate';
 
 export interface CreditNotePaperTemplateProps extends PaperTemplateProps {
+  // Address
   billedToAddress?: Array<string>;
   billedFromAddress?: Array<string>;
+  showBilledToAddress?: boolean;
+  showBilledFromAddress?: boolean;
+  billedToLabel?: string;
 
   // Total
   total?: string;
@@ -28,6 +32,7 @@ export interface CreditNotePaperTemplateProps extends PaperTemplateProps {
   termsConditions?: string;
   termsConditionsLabel?: string;
 
+  // Lines
   lines?: Array<{
     item: string;
     description: string;
@@ -52,7 +57,9 @@ export function CreditNotePaperTemplate({
   secondaryColor,
   showCompanyLogo = true,
   companyLogo,
+  companyName = 'Bigcapital Technology, Inc.',
 
+  // Address
   billedToAddress = [
     'Bigcapital Technology, Inc.',
     '131 Continental Dr Suite 305 Newark,',
@@ -68,18 +75,26 @@ export function CreditNotePaperTemplate({
     '+1 762-339-5634',
     'ahmed@bigcapital.app',
   ],
+  showBilledToAddress = true,
+  showBilledFromAddress = true,
+  billedToLabel = 'Billed To',
+
+  // Total
   total = '$1000.00',
   totalLabel = 'Total',
   showTotal = true,
 
+  // Subtotal
   subtotal = '1000/00',
   subtotalLabel = 'Subtotal',
   showSubtotal = true,
 
+  // Customer note
   showCustomerNote = true,
   customerNote = 'It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.',
   customerNoteLabel = 'Customer Note',
 
+  // Terms & conditions
   showTermsConditions = true,
   termsConditions = 'It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.',
   termsConditionsLabel = 'Terms & Conditions',
@@ -93,10 +108,12 @@ export function CreditNotePaperTemplate({
       total: '$1000.00',
     },
   ],
+  // Credit note number.
   showCreditNoteNumber = true,
   creditNoteNumberLabel = 'Credit Note Number',
   creditNoteNumebr = '346D3D40-0001',
 
+  // Credit note date.
   creditNoteDate = 'September 3, 2024',
   showCreditNoteDate = true,
   creditNoteDateLabel = 'Credit Note Date',
@@ -116,7 +133,6 @@ export function CreditNotePaperTemplate({
               {creditNoteNumebr}
             </PaperTemplate.TermsItem>
           )}
-
           {showCreditNoteDate && (
             <PaperTemplate.TermsItem label={creditNoteDateLabel}>
               {creditNoteDate}
@@ -125,8 +141,16 @@ export function CreditNotePaperTemplate({
         </PaperTemplate.TermsList>
 
         <Group spacing={10}>
-          <PaperTemplate.Address items={billedToAddress} />
-          <PaperTemplate.Address items={billedFromAddress} />
+          {showBilledFromAddress && (
+            <PaperTemplate.Address
+              items={[<strong>{companyName}</strong>, ...billedFromAddress]}
+            />
+          )}
+          {showBilledToAddress && (
+            <PaperTemplate.Address
+              items={[<strong>{billedToLabel}</strong>, ...billedToAddress]}
+            />
+          )}
         </Group>
 
         <Stack spacing={0}>
diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/constants.ts b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/constants.ts
index 987303fa6..e1beac48f 100644
--- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/constants.ts
+++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/constants.ts
@@ -10,6 +10,11 @@ export const initialValues = {
   companyLogo:
     'https://cdn-development.mercury.com/demo-assets/avatars/mercury-demo-dark.png',
 
+  // Address
+  showBilledToAddress: true,
+  showBilledFromAddress: true,
+  billedToLabel: 'Bill To',
+
   // Entries
   itemNameLabel: 'Item',
   itemDescriptionLabel: 'Description',
@@ -55,6 +60,15 @@ export const fieldsGroups = [
         enableKey: 'showCreditNoteNumber',
         label: 'Credit Note #',
       },
+      {
+        enableKey: 'showBilledToAddress',
+        labelKey: 'billedToLabel',
+        label: 'Bill To',
+      },
+      {
+        enableKey: 'showBilledFromAddress',
+        label: 'Billed From',
+      },
     ],
   },
   {
diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimatePaperTemplate.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimatePaperTemplate.tsx
index f1375b8d0..09517d495 100644
--- a/packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimatePaperTemplate.tsx
+++ b/packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimatePaperTemplate.tsx
@@ -25,6 +25,7 @@ export interface EstimatePaperTemplateProps extends PaperTemplateProps {
 
   showBilledFromAddress?: boolean;
   billedFromAddress?: Array<string>;
+  billedToLabel?: string;
 
   // Totals
   total?: string;
@@ -77,6 +78,7 @@ export function EstimatePaperTemplate({
   ],
   showBilledFromAddress = true,
   showBilledToAddress = true,
+  billedToLabel = 'Billed To',
 
   total = '$1000.00',
   totalLabel = 'Total',
@@ -151,7 +153,9 @@ export function EstimatePaperTemplate({
             />
           )}
           {showBilledToAddress && (
-            <PaperTemplate.Address items={billedToAddress} />
+            <PaperTemplate.Address
+              items={[<strong>{billedToLabel}</strong>, ...billedToAddress]}
+            />
           )}
         </Group>
 
diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeContent.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeContent.tsx
index e6bc0dbd6..0346b989c 100644
--- a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeContent.tsx
+++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeContent.tsx
@@ -18,7 +18,6 @@ import { initialValues } from './constants';
 export function InvoiceCustomizeContent() {
   const { payload, name } = useDrawerContext();
   const { closeDrawer } = useDrawerActions();
-
   const templateId = payload?.templateId || null;
 
   const handleSuccess = () => {
diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoicePaperTemplate.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoicePaperTemplate.tsx
index 7a24f9685..b191b0875 100644
--- a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoicePaperTemplate.tsx
+++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoicePaperTemplate.tsx
@@ -214,7 +214,9 @@ export function InvoicePaperTemplate({
             />
           )}
           {showBillingToAddress && (
-            <PaperTemplate.Address items={billedToAddress} />
+            <PaperTemplate.Address
+              items={[<strong>{billedToLabel}</strong>, ...billedToAddress]}
+            />
           )}
         </Group>