diff --git a/src/Features/ThemeChange/ThemeChange.js b/src/Features/ThemeChange/ThemeChange.js
index 2acb6a0..44bc209 100644
--- a/src/Features/ThemeChange/ThemeChange.js
+++ b/src/Features/ThemeChange/ThemeChange.js
@@ -2607,6 +2607,7 @@ const ThemeSlice = createSlice({
             'UnpaidBill',
             'OverallBackground',
             'CreditCustomer',
+            'PreviousBillFetch'
           ];
           const bookingBillingOptionsArray = tempDic['BookingBilling'][1];
           const sortedBillingOptions = desiredOrder
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BST1Payment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BST1Payment.jsx
index adb7a6b..8a51da2 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BST1Payment.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BST1Payment.jsx
@@ -3859,7 +3859,8 @@ export default function BST1Payment() {
             )}
 
             {/* Customer Orders */}
-            {SelCustId && (
+            {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+                .length === 1) && (
               <Tooltip title="Customer Orders" isMobile={isMobile}>
                 {' '}
                 <div
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable2/BSBillingTable2.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable2/BSBillingTable2.jsx
index b8ff8df..a1e506f 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable2/BSBillingTable2.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable2/BSBillingTable2.jsx
@@ -4178,7 +4178,8 @@ const BSBillingTable2 = () => {
             )}
 
             {/* Customer Orders */}
-            {SelCustId && (
+            {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+                .length === 1) && (
               <Tooltip title="Customer Orders" isMobile={isMobile}>
                 {' '}
                 <div
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3pay.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3pay.jsx
index a7100cf..4a936f4 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3pay.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3pay.jsx
@@ -3809,7 +3809,8 @@ const BSBillingTable3Pay = () => {
                 </div>
               )}
               {/* Customer Orders */}
-              {SelCustId && (
+              {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+                .length === 1) && (
                 <Tooltip title="Customer Orders" isMobile={isMobile}>
                   {' '}
                   <div
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx
index 47011ad..0bc7c84 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBilling4Payment.jsx
@@ -3920,7 +3920,8 @@ const BSBilling4Payment = () => {
                 )}
 
                 {/* Customer Orders */}
-                {SelCustId && (
+                {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+                .length === 1) && (
                   <Tooltip title="Customer Orders" isMobile={isMobile}>
                     {' '}
                     <div
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable5/BSBillingTable5.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable5/BSBillingTable5.jsx
index e0d3571..792cd64 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable5/BSBillingTable5.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable5/BSBillingTable5.jsx
@@ -4163,7 +4163,8 @@ const BSBillingTable5 = () => {
                 ''
               )}
               {/* Customer Orders */}
-              {SelCustId && (
+              {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+                .length === 1) && (
                 <Tooltip title="Customer Orders" isMobile={isMobile}>
                   {' '}
                   <div
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx
index e9afb8d..bf21da6 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx
@@ -4152,7 +4152,8 @@ const BST6Payment = () => {
                 ''
               )}
               {/* Customer Orders */}
-              {SelCustId && (
+              {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+                .length === 1) && (
                 <Tooltip title="Customer Orders" isMobile={isMobile}>
                   {' '}
                   <div
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBilling7Payment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBilling7Payment.jsx
index e6836fc..1df3fce 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBilling7Payment.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBilling7Payment.jsx
@@ -3651,7 +3651,8 @@ const BSBilling7Payment = () => {
             )}
 
             {/* Customer Orders */}
-            {SelCustId && (
+            {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+                .length === 1) && (
               <Tooltip title="Customer Orders" isMobile={isMobile}>
                 {' '}
                 <div
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx
index 56e39ff..5df19c0 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTablePayment.jsx
@@ -3525,7 +3525,8 @@ const StandardTablePayment = () => {
             )}
 
             {/* Customer Orders */}
-            {SelCustId && (
+            {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+                .length === 1) && (
               <Tooltip title="Customer Orders" isMobile={isMobile}>
                 {' '}
                 <div
diff --git a/src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx b/src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx
index dba22c1..e6fef5c 100644
--- a/src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx
+++ b/src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx
@@ -4403,7 +4403,8 @@ const BSC1Payment = (props) => {
               </>
             )}
             {/* Customer Orders */}
-            {SelCustId && (
+            {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
+                .length === 1) && (
               <Tooltip title="Customer Orders" isMobile={isMobile}>
                 {' '}
                 <div
diff --git a/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable1/BSBPayment.scss b/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable1/BSBPayment.scss
index b8d1122..749f34d 100644
--- a/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable1/BSBPayment.scss
+++ b/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable1/BSBPayment.scss
@@ -144,7 +144,7 @@ input::-webkit-inner-spin-button {
   justify-content: center;
   gap: 0.2rem;
   background-color: #dbdbdb;
-  font-family: "Poppins", sans-serif;
+  font-family: 'Poppins', sans-serif;
 }
 
 .payment-div-0-userplus {
@@ -243,6 +243,7 @@ input::-webkit-inner-spin-button {
   background-color: var(--DEFAULT_SELECTED_COLOR);
   font-size: 14px;
   font-weight: 500;
+  border: none;
   height: 40px;
   width: 75px;
   border-radius: 7.2px;
@@ -251,17 +252,20 @@ input::-webkit-inner-spin-button {
   display: flex;
   gap: 0.2rem;
   align-items: center;
-  font-family: "Poppins";
+  font-family: 'Poppins';
   justify-content: center;
   cursor: pointer;
   text-transform: capitalize;
+  outline: none;
 }
 
 .Btn-payment-mode {
   background-color: var(--SELECTED_COLOR);
   font-size: 14px;
+  border: none;
   font-weight: 500;
   height: 40px;
+  outline: none;
   width: 75px;
   border-radius: 7.2px;
   color: #fff;
@@ -269,8 +273,9 @@ input::-webkit-inner-spin-button {
   display: flex;
   gap: 0.2rem;
   align-items: center;
-  font-family: "Poppins";
+  font-family: 'Poppins';
   justify-content: center;
   cursor: pointer;
   text-transform: capitalize;
+  outline: none;
 }
diff --git a/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.scss b/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.scss
index 55e5bde..9356a46 100644
--- a/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.scss
+++ b/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.scss
@@ -205,8 +205,9 @@ input::-webkit-inner-spin-button {
 .Btn-payment-mode {
   background-color: var(--SELECTED_COLOR);
   font-size: 13px !important;
-  font-weight: 500;
+  font-weight: 500;border: none;
   height: 40px;
+  outline: none;
   flex-grow: 1;
   flex: 1;
   width: max-content !important;
@@ -242,6 +243,7 @@ input::-webkit-inner-spin-button {
   background-color: var(--DEFAULT_SELECTED_COLOR);
   font-size: 13px !important;
   font-weight: 500;
+  outline: none;border: none;
   height: 40px;
   width: max-content !important;
   flex: 1;
diff --git a/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss b/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss
index 6abc975..ad64d5c 100644
--- a/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss
+++ b/src/Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss
@@ -109,6 +109,7 @@
 .Btn-payment-mode {
   background-color: var(--SELECTED_COLOR);
   color: #ffffff;
+  outline: none;border: none;
   font-size: 12px;
   display: flex;
   flex-direction: row;
@@ -126,6 +127,8 @@
   background-color: var(--DEFAULT_SELECTED_COLOR);
   color: rgb(255, 255, 255);
   font-size: 12px;
+  outline: none;
+  border: none;
   cursor: pointer;
   display: flex;
   flex-direction: row;