diff --git a/shared/email-components/src/lib/CreditNoteEmailTemplate.tsx b/shared/email-components/src/lib/CreditNoteEmailTemplate.tsx
index 898b5c1c3..3bccc11df 100644
--- a/shared/email-components/src/lib/CreditNoteEmailTemplate.tsx
+++ b/shared/email-components/src/lib/CreditNoteEmailTemplate.tsx
@@ -193,7 +193,6 @@ const listItemAmountStyle: CSSProperties = {
 
 const messageStyle: CSSProperties = {
   whiteSpace: 'pre-line',
-  color: '#252A31',
   margin: '0 0 20px 0',
   lineHeight: '20px',
 };
diff --git a/shared/email-components/src/lib/EmailTemplate.tsx b/shared/email-components/src/lib/EmailTemplate.tsx
index f12a7442e..20b4263f6 100644
--- a/shared/email-components/src/lib/EmailTemplate.tsx
+++ b/shared/email-components/src/lib/EmailTemplate.tsx
@@ -24,10 +24,9 @@ EmailTemplate.CompanyLogo = ({ src }: { src: string }) => {
 const containerStyle: CSSProperties = {
   backgroundColor: '#fff',
   width: '100%',
-  maxWidth: '500px',
-  padding: '35px 25px',
+  maxWidth: '450px',
+  padding: '30px 20px',
   color: '#000',
-  borderRadius: '5px',
 };
 
 const companyLogoStyle = {
diff --git a/shared/email-components/src/lib/EstimatePaymentEmail.tsx b/shared/email-components/src/lib/EstimatePaymentEmail.tsx
index 99ef54186..8bc3333bc 100644
--- a/shared/email-components/src/lib/EstimatePaymentEmail.tsx
+++ b/shared/email-components/src/lib/EstimatePaymentEmail.tsx
@@ -50,7 +50,7 @@ export const EstimatePaymentEmail: React.FC<
   preview,
 
   // # Company
-  companyName,
+  companyName = 'Bigcapital, Inc.',
   companyLogoUri,
 
   // # Colors
@@ -153,11 +153,13 @@ const estimateAmountStyle: CSSProperties = {
   color: '#383E47',
   fontWeight: 500,
 };
+
 const estimateNumberStyle: CSSProperties = {
   margin: 0,
   fontSize: '13px',
   color: '#404854',
 };
+
 const estimateExpirationStyle: CSSProperties = {
   margin: 0,
   fontSize: '13px',
@@ -194,7 +196,6 @@ const listItemAmountStyle: CSSProperties = {
 
 const estimateMessageStyle: CSSProperties = {
   whiteSpace: 'pre-line',
-  color: '#252A31',
   margin: '0 0 20px 0',
   lineHeight: '20px',
 };
diff --git a/shared/email-components/src/lib/InvoicePaymentEmail.tsx b/shared/email-components/src/lib/InvoicePaymentEmail.tsx
index 1e871dcc1..3c263ef9a 100644
--- a/shared/email-components/src/lib/InvoicePaymentEmail.tsx
+++ b/shared/email-components/src/lib/InvoicePaymentEmail.tsx
@@ -175,15 +175,6 @@ export const renderInvoicePaymentEmail = (props: InvoicePaymentEmailProps) => {
   return render(<InvoicePaymentEmail {...props} />);
 };
 
-const containerStyle: CSSProperties = {
-  backgroundColor: '#fff',
-  width: '100%',
-  maxWidth: '500px',
-  padding: '35px 25px',
-  color: '#000',
-  borderRadius: '5px',
-};
-
 const headerInfoStyle: CSSProperties = {
   textAlign: 'center',
   marginBottom: 20,
@@ -236,7 +227,7 @@ const listItemAmountStyle: CSSProperties = {
 
 const invoiceMessageStyle: CSSProperties = {
   whiteSpace: 'pre-line',
-  color: '#252A31',
+  color: '#000',
   margin: '0 0 20px 0',
   lineHeight: '20px',
 };
diff --git a/shared/email-components/src/lib/PaymentReceivedEmailTemplate.tsx b/shared/email-components/src/lib/PaymentReceivedEmailTemplate.tsx
index 0c4eb6217..f502ab4af 100644
--- a/shared/email-components/src/lib/PaymentReceivedEmailTemplate.tsx
+++ b/shared/email-components/src/lib/PaymentReceivedEmailTemplate.tsx
@@ -154,7 +154,6 @@ const viewInvoiceButtonStyle: CSSProperties = {
 
 const invoiceMessageStyle: CSSProperties = {
   whiteSpace: 'pre-line',
-  color: '#252A31',
   margin: '0 0 20px 0',
   lineHeight: '20px',
 };
diff --git a/shared/email-components/src/lib/ReceiptPaymentEmail.tsx b/shared/email-components/src/lib/ReceiptPaymentEmail.tsx
index a97e34799..e195ff357 100644
--- a/shared/email-components/src/lib/ReceiptPaymentEmail.tsx
+++ b/shared/email-components/src/lib/ReceiptPaymentEmail.tsx
@@ -194,7 +194,6 @@ const listItemAmountStyle: CSSProperties = {
 
 const messageStyle: CSSProperties = {
   whiteSpace: 'pre-line',
-  color: '#000000',
   margin: '0 0 20px 0',
   lineHeight: '20px',
 };