diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeader.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeader.js
index c7fce181a..788a16ae8 100644
--- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeader.js
+++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeader.js
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import classNames from 'classnames';
 import { useFormikContext } from 'formik';
 import intl from 'react-intl-universal';
@@ -6,19 +6,19 @@ import intl from 'react-intl-universal';
 import { CLASSES } from 'common/classes';
 import InvoiceFormHeaderFields from './InvoiceFormHeaderFields';
 
-import { getEntriesTotal } from 'containers/Entries/utils';
 import { PageFormBigNumber } from 'components';
+import { useInvoiceTotal } from './utils';
 
 /**
  * Invoice form header section.
  */
 function InvoiceFormHeader() {
   const {
-    values: { currency_code, entries },
+    values: { currency_code },
   } = useFormikContext();
 
   // Calculate the total due amount of invoice entries.
-  const totalDueAmount = useMemo(() => getEntriesTotal(entries), [entries]);
+  const totalDueAmount = useInvoiceTotal();
 
   return (
     <div className={classNames(CLASSES.PAGE_FORM_HEADER)}>
diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js
index 658ab3549..00e99a23d 100644
--- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js
+++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js
@@ -7,22 +7,27 @@ import {
 } from '@blueprintjs/core';
 import { DateInput } from '@blueprintjs/datetime';
 import { FastField, Field, ErrorMessage } from 'formik';
-import { FormattedMessage as T, Col, Row, If } from 'components';
-import { momentFormatter, compose, tansformDateValue } from 'utils';
-
-import classNames from 'classnames';
 import styled from 'styled-components';
+import classNames from 'classnames';
+
+import {
+  FFormGroup,
+  FormattedMessage as T,
+  Col,
+  Row,
+  If,
+  CustomerDrawerLink,
+} from 'components';
+import { momentFormatter, compose, tansformDateValue } from 'utils';
 
 import {
   useObserveInvoiceNoSettings,
   customerNameFieldShouldUpdate,
-  useSetForeignCurrencyToEditForm,
 } from './utils';
 import { CLASSES } from 'common/classes';
 import {
   CustomerSelectField,
   FieldRequiredHint,
-  ListSelect,
   Icon,
   InputPrependButton,
   ExchangeRateInputGroup,
@@ -34,17 +39,6 @@ import withDialogActions from 'containers/Dialog/withDialogActions';
 import { inputIntent, handleDateChange } from 'utils';
 import InvoiceCurrencyTag from './InvoiceFormCurrencyTag';
 
-const Data = [
-  {
-    id: 10,
-    name: 'Due on Receipt',
-  },
-  {
-    id: 20,
-    name: 'Due on Receipt',
-  },
-];
-
 /**
  * Invoice form header fields.
  */
@@ -58,19 +52,13 @@ function InvoiceFormHeaderFields({
   invoiceNextNumber,
 }) {
   // Invoice form context.
-  const {
-    customers,
-    isForeignCustomer,
-    baseCurrency,
-    selectCustomer,
-    setSelectCustomer,
-  } = useInvoiceFormContext();
+  const { customers, isForeignCustomer, baseCurrency } =
+    useInvoiceFormContext();
 
   // Handle invoice number changing.
   const handleInvoiceNumberChange = () => {
     openDialog('invoice-number-form');
   };
-
   // Handle invoice no. field blur.
   const handleInvoiceNoBlur = (form, field) => (event) => {
     const newValue = event.target.value;
@@ -84,12 +72,11 @@ function InvoiceFormHeaderFields({
       });
     }
   };
-
-  useSetForeignCurrencyToEditForm();
-
   // Syncs invoice number settings with form.
   useObserveInvoiceNoSettings(invoiceNumberPrefix, invoiceNextNumber);
 
+  const handleCustomerLinkClick = (customerId) => (event) => {};
+
   return (
     <div className={classNames(CLASSES.PAGE_FORM_HEADER_FIELDS)}>
       {/* ----------- Customer name ----------- */}
@@ -99,7 +86,8 @@ function InvoiceFormHeaderFields({
         shouldUpdate={customerNameFieldShouldUpdate}
       >
         {({ form, field: { value }, meta: { error, touched } }) => (
-          <FormGroup
+          <FFormGroup
+            name={'customer_id'}
             label={<T id={'customer_name'} />}
             inline={true}
             className={classNames(
@@ -108,8 +96,6 @@ function InvoiceFormHeaderFields({
               CLASSES.FILL,
             )}
             labelInfo={<FieldRequiredHint />}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name={'customer_id'} />}
           >
             <ControlCustomerGroup>
               <CustomerSelectField
@@ -119,14 +105,18 @@ function InvoiceFormHeaderFields({
                 onContactSelected={(customer) => {
                   form.setFieldValue('customer_id', customer.id);
                   form.setFieldValue('currency_code', customer?.currency_code);
-                  setSelectCustomer(customer);
                 }}
                 popoverFill={true}
                 allowCreate={true}
               />
-              <InvoiceCurrencyTag />
+              {/* <InvoiceCurrencyTag /> */}
             </ControlCustomerGroup>
-          </FormGroup>
+            {value && (
+              <CustomerButtonLink customerId={value}>
+                View Customer Details
+              </CustomerButtonLink>
+            )}
+          </FFormGroup>
         )}
       </FastField>
 
@@ -134,7 +124,7 @@ function InvoiceFormHeaderFields({
       <If condition={isForeignCustomer}>
         <ExchangeRateInputGroup
           fromCurrency={baseCurrency}
-          toCurrency={selectCustomer?.currency_code}
+          toCurrency={'LYD'}
           name={'exchange_rate'}
           formGroupProps={{ label: ' ', inline: true }}
         />
@@ -163,38 +153,12 @@ function InvoiceFormHeaderFields({
                     position: Position.BOTTOM_LEFT,
                     minimal: true,
                   }}
-                  inputProps={{
-                    leftIcon: <Icon icon={'date-range'} />,
-                  }}
-                />
-              </FormGroup>
-            )}
-          </FastField>
-        </Col>
-        <Col className={'col--terms'}>
-          {/* ----------- Terms ----------- */}
-          <FastField name={'terms'}>
-            {({ form, field: { value }, meta: { error, touched } }) => (
-              <FormGroup
-                label={'Terms'}
-                inline={true}
-                intent={inputIntent({ error, touched })}
-                helperText={<ErrorMessage name="terms" />}
-              >
-                <ListSelect
-                  items={Data}
-                  onItemSelect={({ id }) => {
-                    form.setFieldValue('terms', id);
-                  }}
-                  selectedItem={value}
-                  selectedItemProp={'value'}
-                  textProp={'name'}
-                  popoverProps={{ minimal: true }}
                 />
               </FormGroup>
             )}
           </FastField>
         </Col>
+
         <Col className={'col--due-date'}>
           {/* ----------- Due date ----------- */}
           <FastField name={'due_date'}>
@@ -217,9 +181,6 @@ function InvoiceFormHeaderFields({
                     position: Position.BOTTOM_LEFT,
                     minimal: true,
                   }}
-                  inputProps={{
-                    leftIcon: <Icon icon={'date-range'} />,
-                  }}
                 />
               </FormGroup>
             )}
@@ -295,3 +256,8 @@ const ControlCustomerGroup = styled(ControlGroup)`
   align-items: center;
   transform: none;
 `;
+
+const CustomerButtonLink = styled(CustomerDrawerLink)`
+  font-size: 11px;
+  margin-top: 6px;
+`;