diff --git a/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailFooter.js b/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailFooter.js
index cc5b2f01a..c97691e78 100644
--- a/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailFooter.js
+++ b/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailFooter.js
@@ -1,43 +1,35 @@
 import React from 'react';
-import styled from 'styled-components';
 
 import {
+  CommercialDocFooter,
   T,
-  TotalLines,
-  TotalLine,
-  TotalLineBorderStyle,
-  TotalLineTextStyle,
-  FormatNumber,
+  If,
+  DetailsMenu,
+  DetailItem,
 } from 'components';
 import { useEstimateDetailDrawerContext } from './EstimateDetailDrawerProvider';
 
 /**
- * Estimate details panel footer content.
+ * Estimate details footer.
+ * @returns {React.JSX}
  */
 export default function EstimateDetailFooter() {
   const { estimate } = useEstimateDetailDrawerContext();
-
+  
   return (
-    <EstimateDetailsFooterRoot>
-      <EstimateTotalLines labelColWidth={'180px'} amountColWidth={'180px'}>
-        <TotalLine
-          title={<T id={'estimate.details.subtotal'} />}
-          value={<FormatNumber value={estimate.amount} />}
-          borderStyle={TotalLineBorderStyle.SingleDark}
-        />
-        <TotalLine
-          title={<T id={'estimate.details.total'} />}
-          value={estimate.formatted_amount}
-          borderStyle={TotalLineBorderStyle.DoubleDark}
-          textStyle={TotalLineTextStyle.Bold}
-        />
-      </EstimateTotalLines>
-    </EstimateDetailsFooterRoot>
+    <CommercialDocFooter>
+      <DetailsMenu direction={'horizantal'} minLabelSize={'180px'}>
+        <If condition={estimate.terms_conditions}>
+          <DetailItem label={<T id={'estimate.details.terms_conditions'} />}>
+            {estimate.terms_conditions}
+          </DetailItem>
+        </If>
+        <If condition={estimate.note}>
+          <DetailItem label={<T id={'estimate.details.note'} />}>
+            {estimate.note}
+          </DetailItem>
+        </If>
+      </DetailsMenu>
+    </CommercialDocFooter>
   );
 }
-
-export const EstimateDetailsFooterRoot = styled.div``;
-
-export const EstimateTotalLines = styled(TotalLines)`
-  margin-left: auto;
-`;
diff --git a/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailPanel.js b/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailPanel.js
index a2ed72a4d..def91b3d6 100644
--- a/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailPanel.js
+++ b/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailPanel.js
@@ -4,13 +4,16 @@ import { CommercialDocBox } from 'components';
 
 import EstimateDetailHeader from './EstimateDetailHeader';
 import EstimateDetailTable from './EstimateDetailTable';
+import EstimateDetailTableFooter from './EstimateDetailTableFooter';
 import EstimateDetailFooter from './EstimateDetailFooter';
 
+
 export default function EstimateDetailTab() {
   return (
     <CommercialDocBox>
       <EstimateDetailHeader />
       <EstimateDetailTable />
+      <EstimateDetailTableFooter />
       <EstimateDetailFooter />
     </CommercialDocBox>
   );
diff --git a/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailTableFooter.js b/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailTableFooter.js
new file mode 100644
index 000000000..38c877917
--- /dev/null
+++ b/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailTableFooter.js
@@ -0,0 +1,43 @@
+import React from 'react';
+import styled from 'styled-components';
+
+import {
+  T,
+  TotalLines,
+  TotalLine,
+  TotalLineBorderStyle,
+  TotalLineTextStyle,
+  FormatNumber,
+} from 'components';
+import { useEstimateDetailDrawerContext } from './EstimateDetailDrawerProvider';
+
+/**
+ * Estimate details panel footer content.
+ */
+export default function EstimateDetailTableFooter() {
+  const { estimate } = useEstimateDetailDrawerContext();
+
+  return (
+    <EstimateDetailsFooterRoot>
+      <EstimateTotalLines labelColWidth={'180px'} amountColWidth={'180px'}>
+        <TotalLine
+          title={<T id={'estimate.details.subtotal'} />}
+          value={<FormatNumber value={estimate.amount} />}
+          borderStyle={TotalLineBorderStyle.SingleDark}
+        />
+        <TotalLine
+          title={<T id={'estimate.details.total'} />}
+          value={estimate.formatted_amount}
+          borderStyle={TotalLineBorderStyle.DoubleDark}
+          textStyle={TotalLineTextStyle.Bold}
+        />
+      </EstimateTotalLines>
+    </EstimateDetailsFooterRoot>
+  );
+}
+
+export const EstimateDetailsFooterRoot = styled.div``;
+
+export const EstimateTotalLines = styled(TotalLines)`
+  margin-left: auto;
+`;