diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx
index 9f76aaaaf..f20239fce 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx
@@ -19,7 +19,6 @@ import {
   Row,
   FeatureCan,
   BranchSelect,
-  BranchSelectButton,
   FInputGroup,
   FFormGroup,
   FTextArea,
@@ -60,7 +59,6 @@ export default function OtherIncomeFormFields() {
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
-                input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
             </FFormGroup>
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx
index 8c6d29358..42c57f6a9 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx
@@ -11,7 +11,6 @@ import {
   Col,
   Row,
   BranchSelect,
-  BranchSelectButton,
   FeatureCan,
   FFormGroup,
   FMoneyInputGroup,
@@ -56,7 +55,6 @@ export default function OwnerContributionFormFields() {
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
-                input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
             </FFormGroup>
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.tsx
index 2a659a19a..f2341ec11 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.tsx
@@ -11,7 +11,6 @@ import {
   Row,
   FeatureCan,
   BranchSelect,
-  BranchSelectButton,
   FMoneyInputGroup,
   FFormGroup,
   FTextArea,
@@ -49,7 +48,6 @@ export default function TransferFromAccountFormFields() {
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
-                input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
             </FFormGroup>
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.tsx
index 56d8d719b..84942e41a 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.tsx
@@ -11,7 +11,6 @@ import {
   Row,
   FeatureCan,
   BranchSelect,
-  BranchSelectButton,
   FTextArea,
   FFormGroup,
   FInputGroup,
@@ -47,7 +46,6 @@ export default function OtherExpnseFormFields() {
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
-                input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
             </FFormGroup>
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.tsx
index 5c7a73c4d..c9ef8c3f7 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.tsx
@@ -11,7 +11,6 @@ import {
   Row,
   FeatureCan,
   BranchSelect,
-  BranchSelectButton,
   FFormGroup,
   FTextArea,
   FInputGroup,
@@ -49,7 +48,6 @@ export default function OwnerDrawingsFormFields() {
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
-                input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
             </FFormGroup>
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.tsx
index 2856341f7..b965548b6 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.tsx
@@ -12,7 +12,6 @@ import {
   Row,
   FeatureCan,
   BranchSelect,
-  BranchSelectButton,
   FFormGroup,
   FTextArea,
   FMoneyInputGroup,
@@ -52,7 +51,6 @@ export default function TransferToAccountFormFields() {
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
-                input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
             </FFormGroup>
diff --git a/packages/webapp/src/containers/Dialogs/CustomerOpeningBalanceDialog/CustomerOpeningBalanceFields.tsx b/packages/webapp/src/containers/Dialogs/CustomerOpeningBalanceDialog/CustomerOpeningBalanceFields.tsx
index 5ed0fad27..8ba14f41c 100644
--- a/packages/webapp/src/containers/Dialogs/CustomerOpeningBalanceDialog/CustomerOpeningBalanceFields.tsx
+++ b/packages/webapp/src/containers/Dialogs/CustomerOpeningBalanceDialog/CustomerOpeningBalanceFields.tsx
@@ -14,7 +14,6 @@ import {
   FormattedMessage as T,
   ExchangeRateMutedField,
   BranchSelect,
-  BranchSelectButton,
   FeatureCan,
   InputPrependText,
 } from '@/components';
@@ -105,7 +104,6 @@ function CustomerOpeningBalanceFields({
           <BranchSelect
             name={'opening_balance_branch_id'}
             branches={branches}
-            input={BranchSelectButton}
             popoverProps={{ minimal: true }}
           />
         </FFormGroup>
diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.tsx
index c7157e0b5..3f8f1a280 100644
--- a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.tsx
+++ b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.tsx
@@ -22,7 +22,6 @@ import {
   FeatureCan,
   ExchangeRateMutedField,
   BranchSelect,
-  BranchSelectButton,
   FFormGroup,
   FInputGroup,
   FDateInput,
@@ -62,7 +61,6 @@ function QuickPaymentMadeFormFields({
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
-                input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
             </FFormGroup>
diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.tsx
index 39309f07e..59bddb53a 100644
--- a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.tsx
+++ b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.tsx
@@ -21,7 +21,6 @@ import {
   FeatureCan,
   ExchangeRateMutedField,
   BranchSelect,
-  BranchSelectButton,
   FFormGroup,
   FInputGroup,
   FTextArea,
@@ -62,7 +61,6 @@ function QuickPaymentReceiveFormFields({
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
-                input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
             </FFormGroup>
diff --git a/packages/webapp/src/containers/Dialogs/RefundCreditNoteDialog/RefundCreditNoteFormFields.tsx b/packages/webapp/src/containers/Dialogs/RefundCreditNoteDialog/RefundCreditNoteFormFields.tsx
index 3eb670646..1f167b47f 100644
--- a/packages/webapp/src/containers/Dialogs/RefundCreditNoteDialog/RefundCreditNoteFormFields.tsx
+++ b/packages/webapp/src/containers/Dialogs/RefundCreditNoteDialog/RefundCreditNoteFormFields.tsx
@@ -27,7 +27,6 @@ import {
   FormattedMessage as T,
   ExchangeRateMutedField,
   BranchSelect,
-  BranchSelectButton,
   FeatureCan,
   FInputGroup,
   FMoneyInputGroup,
diff --git a/packages/webapp/src/containers/Dialogs/VendorOpeningBalanceDialog/VendorOpeningBalanceFormFields.tsx b/packages/webapp/src/containers/Dialogs/VendorOpeningBalanceDialog/VendorOpeningBalanceFormFields.tsx
index def2316e9..87f9a02c9 100644
--- a/packages/webapp/src/containers/Dialogs/VendorOpeningBalanceDialog/VendorOpeningBalanceFormFields.tsx
+++ b/packages/webapp/src/containers/Dialogs/VendorOpeningBalanceDialog/VendorOpeningBalanceFormFields.tsx
@@ -14,7 +14,6 @@ import {
   FormattedMessage as T,
   ExchangeRateMutedField,
   BranchSelect,
-  BranchSelectButton,
   FeatureCan,
   InputPrependText,
 } from '@/components';
@@ -103,7 +102,6 @@ function VendorOpeningBalanceFormFields({
           <BranchSelect
             name={'opening_balance_branch_id'}
             branches={branches}
-            input={BranchSelectButton}
             popoverProps={{ minimal: true }}
           />
         </FFormGroup>
diff --git a/packages/webapp/src/containers/Drawers/AccountDrawer/AccountDrawerTable.tsx b/packages/webapp/src/containers/Drawers/AccountDrawer/AccountDrawerTable.tsx
index c6a4c88a3..d40745eb3 100644
--- a/packages/webapp/src/containers/Drawers/AccountDrawer/AccountDrawerTable.tsx
+++ b/packages/webapp/src/containers/Drawers/AccountDrawer/AccountDrawerTable.tsx
@@ -70,9 +70,14 @@ function AccountDrawerDataTable() {
 export default compose(withDrawerActions)(AccountDrawerTable);
 
 const TableFooter = styled.div`
+  --x-border-color: #d2dde2;
+
+  .bp4-dark & {
+    --x-border-color: var(--color-dark-gray5);
+  }
   padding: 6px 14px;
   display: block;
-  border-top: 1px solid #d2dde2;
-  border-bottom: 1px solid #d2dde2;
+  border-top: 1px solid var(--x-border-color);
+  border-bottom: 1px solid var(--x-border-color);
   font-size: 12px;
 `;
diff --git a/packages/webapp/src/hooks/query/accounts.tsx b/packages/webapp/src/hooks/query/accounts.tsx
index bae640bf4..66f73c228 100644
--- a/packages/webapp/src/hooks/query/accounts.tsx
+++ b/packages/webapp/src/hooks/query/accounts.tsx
@@ -205,7 +205,7 @@ export function useAccountTransactions(id, props) {
     [t.ACCOUNT_TRANSACTION, id],
     { method: 'get', url: `accounts/transactions?account_id=${id}` },
     {
-      select: (res) => res.data.transactions,
+      select: (res) => res.data,
       defaultData: [],
       ...props,
     },