diff --git a/.eslintrc.js b/.eslintrc.js
index c89dc2f4f65..9b20e7bb39f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -249,6 +249,7 @@ module.exports = {
         // './packages/desktop-client/src/components/accounts/**/*',
         // './packages/desktop-client/src/components/autocomplete/**/*',
         // './packages/desktop-client/src/components/budget/**/*',
+        './packages/desktop-client/src/components/common/Button.tsx',
         // './packages/desktop-client/src/components/common/**/*',
         // './packages/desktop-client/src/components/filters/**/*',
         // './packages/desktop-client/src/components/gocardless/**/*',
diff --git a/packages/desktop-client/src/components/FatalError.tsx b/packages/desktop-client/src/components/FatalError.tsx
index a982251535c..6fb0c803187 100644
--- a/packages/desktop-client/src/components/FatalError.tsx
+++ b/packages/desktop-client/src/components/FatalError.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 
 import Block from './common/Block';
-import Button from './common/Button';
+import { Button } from './common/Button';
 import ExternalLink from './common/ExternalLink';
 import LinkButton from './common/LinkButton';
 import Modal from './common/Modal';
diff --git a/packages/desktop-client/src/components/LoggedInUser.tsx b/packages/desktop-client/src/components/LoggedInUser.tsx
index 02db70b5d38..c834b88ca57 100644
--- a/packages/desktop-client/src/components/LoggedInUser.tsx
+++ b/packages/desktop-client/src/components/LoggedInUser.tsx
@@ -4,7 +4,7 @@ import { useSelector } from 'react-redux';
 import { useActions } from '../hooks/useActions';
 import { theme, styles, type CSSProperties } from '../style';
 
-import Button from './common/Button';
+import { Button } from './common/Button';
 import Menu from './common/Menu';
 import Text from './common/Text';
 import View from './common/View';
diff --git a/packages/desktop-client/src/components/ManageRules.tsx b/packages/desktop-client/src/components/ManageRules.tsx
index 5d921053e3c..8caa447a81a 100644
--- a/packages/desktop-client/src/components/ManageRules.tsx
+++ b/packages/desktop-client/src/components/ManageRules.tsx
@@ -20,7 +20,7 @@ import useCategories from '../hooks/useCategories';
 import useSelected, { SelectedProvider } from '../hooks/useSelected';
 import { theme } from '../style';
 
-import Button from './common/Button';
+import { Button } from './common/Button';
 import ExternalLink from './common/ExternalLink';
 import Search from './common/Search';
 import Stack from './common/Stack';
diff --git a/packages/desktop-client/src/components/MobileBackButton.tsx b/packages/desktop-client/src/components/MobileBackButton.tsx
index 061e8f03dfa..3aa576bba78 100644
--- a/packages/desktop-client/src/components/MobileBackButton.tsx
+++ b/packages/desktop-client/src/components/MobileBackButton.tsx
@@ -4,7 +4,7 @@ import useNavigate from '../hooks/useNavigate';
 import CheveronLeft from '../icons/v1/CheveronLeft';
 import { type CSSProperties, styles, theme } from '../style';
 
-import Button from './common/Button';
+import { Button } from './common/Button';
 import Text from './common/Text';
 
 type MobileBackButtonProps = {
diff --git a/packages/desktop-client/src/components/MobileWebMessage.tsx b/packages/desktop-client/src/components/MobileWebMessage.tsx
index 98c15d41455..65f9b875001 100644
--- a/packages/desktop-client/src/components/MobileWebMessage.tsx
+++ b/packages/desktop-client/src/components/MobileWebMessage.tsx
@@ -6,7 +6,7 @@ import { savePrefs } from 'loot-core/src/client/actions';
 import { useResponsive } from '../ResponsiveProvider';
 import { theme, styles } from '../style';
 
-import Button from './common/Button';
+import { Button } from './common/Button';
 import Text from './common/Text';
 import View from './common/View';
 import { Checkbox } from './forms';
diff --git a/packages/desktop-client/src/components/NotesButton.tsx b/packages/desktop-client/src/components/NotesButton.tsx
index be331d834a0..f034f919f0b 100644
--- a/packages/desktop-client/src/components/NotesButton.tsx
+++ b/packages/desktop-client/src/components/NotesButton.tsx
@@ -7,7 +7,7 @@ import { send } from 'loot-core/src/platform/client/fetch';
 import CustomNotesPaper from '../icons/v2/CustomNotesPaper';
 import { type CSSProperties, theme } from '../style';
 
-import Button from './common/Button';
+import { Button } from './common/Button';
 import View from './common/View';
 import { Notes } from './Notes';
 import { Tooltip, type TooltipPosition, useTooltip } from './tooltips';
diff --git a/packages/desktop-client/src/components/Notifications.tsx b/packages/desktop-client/src/components/Notifications.tsx
index 912486a28fc..881b562c648 100644
--- a/packages/desktop-client/src/components/Notifications.tsx
+++ b/packages/desktop-client/src/components/Notifications.tsx
@@ -13,7 +13,7 @@ import AnimatedLoading from '../icons/AnimatedLoading';
 import Delete from '../icons/v0/Delete';
 import { styles, theme, type CSSProperties } from '../style';
 
-import Button, { ButtonWithLoading } from './common/Button';
+import { Button, ButtonWithLoading } from './common/Button';
 import ExternalLink from './common/ExternalLink';
 import LinkButton from './common/LinkButton';
 import Stack from './common/Stack';
diff --git a/packages/desktop-client/src/components/ThemeSelector.tsx b/packages/desktop-client/src/components/ThemeSelector.tsx
index be05f21d69f..45987b63099 100644
--- a/packages/desktop-client/src/components/ThemeSelector.tsx
+++ b/packages/desktop-client/src/components/ThemeSelector.tsx
@@ -9,7 +9,7 @@ import System from '../icons/v2/System';
 import { useResponsive } from '../ResponsiveProvider';
 import { type CSSProperties, themeOptions, useTheme } from '../style';
 
-import Button from './common/Button';
+import { Button } from './common/Button';
 import Menu from './common/Menu';
 import { Tooltip } from './tooltips';
 
diff --git a/packages/desktop-client/src/components/Titlebar.tsx b/packages/desktop-client/src/components/Titlebar.tsx
index 85d1608d0c2..34d61014b40 100644
--- a/packages/desktop-client/src/components/Titlebar.tsx
+++ b/packages/desktop-client/src/components/Titlebar.tsx
@@ -28,7 +28,7 @@ import { theme, type CSSProperties, styles } from '../style';
 import AccountSyncCheck from './accounts/AccountSyncCheck';
 import { AnimatedRefresh } from './AnimatedRefresh';
 import { MonthCountSelector } from './budget/MonthCountSelector';
-import Button, { ButtonWithLoading } from './common/Button';
+import { Button, ButtonWithLoading } from './common/Button';
 import ExternalLink from './common/ExternalLink';
 import Link from './common/Link';
 import Paragraph from './common/Paragraph';
diff --git a/packages/desktop-client/src/components/UpdateNotification.tsx b/packages/desktop-client/src/components/UpdateNotification.tsx
index 682b3086286..f6d224accbc 100644
--- a/packages/desktop-client/src/components/UpdateNotification.tsx
+++ b/packages/desktop-client/src/components/UpdateNotification.tsx
@@ -5,7 +5,7 @@ import { useActions } from '../hooks/useActions';
 import Close from '../icons/v1/Close';
 import { theme } from '../style';
 
-import Button from './common/Button';
+import { Button } from './common/Button';
 import LinkButton from './common/LinkButton';
 import Text from './common/Text';
 import View from './common/View';
diff --git a/packages/desktop-client/src/components/accounts/Account.jsx b/packages/desktop-client/src/components/accounts/Account.jsx
index f9fcda5d5ef..f10886551c0 100644
--- a/packages/desktop-client/src/components/accounts/Account.jsx
+++ b/packages/desktop-client/src/components/accounts/Account.jsx
@@ -29,7 +29,7 @@ import { authorizeBank } from '../../gocardless';
 import useCategories from '../../hooks/useCategories';
 import { SelectedProviderWithItems } from '../../hooks/useSelected';
 import { styles, theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Text from '../common/Text';
 import View from '../common/View';
 import TransactionList from '../transactions/TransactionList';
diff --git a/packages/desktop-client/src/components/accounts/AccountSyncCheck.jsx b/packages/desktop-client/src/components/accounts/AccountSyncCheck.jsx
index d7d3597b71d..7cb042e1083 100644
--- a/packages/desktop-client/src/components/accounts/AccountSyncCheck.jsx
+++ b/packages/desktop-client/src/components/accounts/AccountSyncCheck.jsx
@@ -6,7 +6,7 @@ import { authorizeBank } from '../../gocardless';
 import { useActions } from '../../hooks/useActions';
 import ExclamationOutline from '../../icons/v1/ExclamationOutline';
 import { theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import ExternalLink from '../common/ExternalLink';
 import View from '../common/View';
 import { Tooltip } from '../tooltips';
diff --git a/packages/desktop-client/src/components/accounts/Balance.jsx b/packages/desktop-client/src/components/accounts/Balance.jsx
index be53be1494a..e23ee1130d9 100644
--- a/packages/desktop-client/src/components/accounts/Balance.jsx
+++ b/packages/desktop-client/src/components/accounts/Balance.jsx
@@ -7,7 +7,7 @@ import { getScheduledAmount } from 'loot-core/src/shared/schedules';
 import { useSelectedItems } from '../../hooks/useSelected';
 import ArrowButtonRight1 from '../../icons/v2/ArrowButtonRight1';
 import { theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Text from '../common/Text';
 import View from '../common/View';
 import { PrivacyFilter } from '../PrivacyFilter';
diff --git a/packages/desktop-client/src/components/accounts/Header.jsx b/packages/desktop-client/src/components/accounts/Header.jsx
index 8cf6a44ab38..e9738eb401f 100644
--- a/packages/desktop-client/src/components/accounts/Header.jsx
+++ b/packages/desktop-client/src/components/accounts/Header.jsx
@@ -9,7 +9,7 @@ import DownloadThickBottom from '../../icons/v2/DownloadThickBottom';
 import Pencil1 from '../../icons/v2/Pencil1';
 import { theme, styles } from '../../style';
 import { AnimatedRefresh } from '../AnimatedRefresh';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import InitialFocus from '../common/InitialFocus';
 import Input from '../common/Input';
 import Menu from '../common/Menu';
diff --git a/packages/desktop-client/src/components/accounts/MobileAccounts.jsx b/packages/desktop-client/src/components/accounts/MobileAccounts.jsx
index ac71f9231e0..588ce46b26e 100644
--- a/packages/desktop-client/src/components/accounts/MobileAccounts.jsx
+++ b/packages/desktop-client/src/components/accounts/MobileAccounts.jsx
@@ -9,7 +9,7 @@ import useNavigate from '../../hooks/useNavigate';
 import { useSetThemeColor } from '../../hooks/useSetThemeColor';
 import Add from '../../icons/v1/Add';
 import { theme, styles } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Text from '../common/Text';
 import TextOneLine from '../common/TextOneLine';
 import View from '../common/View';
diff --git a/packages/desktop-client/src/components/accounts/Reconcile.jsx b/packages/desktop-client/src/components/accounts/Reconcile.jsx
index d01ad8ef3f2..0efd70f36cb 100644
--- a/packages/desktop-client/src/components/accounts/Reconcile.jsx
+++ b/packages/desktop-client/src/components/accounts/Reconcile.jsx
@@ -5,7 +5,7 @@ import { currencyToInteger } from 'loot-core/src/shared/util';
 
 import CheckCircle1 from '../../icons/v2/CheckCircle1';
 import { styles, theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import InitialFocus from '../common/InitialFocus';
 import Input from '../common/Input';
 import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx b/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx
index afe50adb4d2..81b838b725c 100644
--- a/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx
+++ b/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx
@@ -15,7 +15,7 @@ import { css } from 'glamor';
 
 import Remove from '../../icons/v2/Remove';
 import { theme, type CSSProperties } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Input from '../common/Input';
 import View from '../common/View';
 import { Tooltip } from '../tooltips';
diff --git a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx
index 1c908d0be68..53078937284 100644
--- a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx
+++ b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx
@@ -23,7 +23,7 @@ import {
 import Add from '../../icons/v1/Add';
 import { useResponsive } from '../../ResponsiveProvider';
 import { type CSSProperties, theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import View from '../common/View';
 
 import Autocomplete, {
diff --git a/packages/desktop-client/src/components/budget/BudgetTotals.tsx b/packages/desktop-client/src/components/budget/BudgetTotals.tsx
index 52fb650727d..11e42842688 100644
--- a/packages/desktop-client/src/components/budget/BudgetTotals.tsx
+++ b/packages/desktop-client/src/components/budget/BudgetTotals.tsx
@@ -2,7 +2,7 @@ import React, { type ComponentProps, memo, useState } from 'react';
 
 import DotsHorizontalTriple from '../../icons/v1/DotsHorizontalTriple';
 import { theme, styles } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Menu from '../common/Menu';
 import View from '../common/View';
 import { Tooltip } from '../tooltips';
diff --git a/packages/desktop-client/src/components/budget/IncomeHeader.tsx b/packages/desktop-client/src/components/budget/IncomeHeader.tsx
index a797ceacc2b..4e30f3c613c 100644
--- a/packages/desktop-client/src/components/budget/IncomeHeader.tsx
+++ b/packages/desktop-client/src/components/budget/IncomeHeader.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import View from '../common/View';
 
 import RenderMonths from './RenderMonths';
diff --git a/packages/desktop-client/src/components/budget/MobileBudgetTable.jsx b/packages/desktop-client/src/components/budget/MobileBudgetTable.jsx
index d326e87ce3a..c3297e72c30 100644
--- a/packages/desktop-client/src/components/budget/MobileBudgetTable.jsx
+++ b/packages/desktop-client/src/components/budget/MobileBudgetTable.jsx
@@ -12,7 +12,7 @@ import ArrowThinRight from '../../icons/v1/ArrowThinRight';
 import DotsHorizontalTriple from '../../icons/v1/DotsHorizontalTriple';
 import { useResponsive } from '../../ResponsiveProvider';
 import { theme, styles } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Card from '../common/Card';
 import Label from '../common/Label';
 import Menu from '../common/Menu';
diff --git a/packages/desktop-client/src/components/budget/SidebarCategory.tsx b/packages/desktop-client/src/components/budget/SidebarCategory.tsx
index a868b9f06e8..52947951e4b 100644
--- a/packages/desktop-client/src/components/budget/SidebarCategory.tsx
+++ b/packages/desktop-client/src/components/budget/SidebarCategory.tsx
@@ -4,7 +4,7 @@ import { type CategoryEntity } from 'loot-core/src/types/models';
 
 import CheveronDown from '../../icons/v1/CheveronDown';
 import { theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Menu from '../common/Menu';
 import View from '../common/View';
 import { NotesButton } from '../NotesButton';
diff --git a/packages/desktop-client/src/components/budget/SidebarGroup.tsx b/packages/desktop-client/src/components/budget/SidebarGroup.tsx
index de624601f93..9621b2b5a1d 100644
--- a/packages/desktop-client/src/components/budget/SidebarGroup.tsx
+++ b/packages/desktop-client/src/components/budget/SidebarGroup.tsx
@@ -4,7 +4,7 @@ import { type ConnectDragSource } from 'react-dnd';
 import ExpandArrow from '../../icons/v0/ExpandArrow';
 import CheveronDown from '../../icons/v1/CheveronDown';
 import { theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Menu from '../common/Menu';
 import Text from '../common/Text';
 import View from '../common/View';
diff --git a/packages/desktop-client/src/components/budget/report/ReportComponents.tsx b/packages/desktop-client/src/components/budget/report/ReportComponents.tsx
index ed38d3bab9d..13f03a653d7 100644
--- a/packages/desktop-client/src/components/budget/report/ReportComponents.tsx
+++ b/packages/desktop-client/src/components/budget/report/ReportComponents.tsx
@@ -7,7 +7,7 @@ import { integerToCurrency, amountToInteger } from 'loot-core/src/shared/util';
 import useFeatureFlag from '../../../hooks/useFeatureFlag';
 import CheveronDown from '../../../icons/v1/CheveronDown';
 import { styles, theme, type CSSProperties } from '../../../style';
-import Button from '../../common/Button';
+import { Button } from '../../common/Button';
 import Menu from '../../common/Menu';
 import Text from '../../common/Text';
 import View from '../../common/View';
diff --git a/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetSummary.tsx
index 4eff7a47881..0bcc7e5ea09 100644
--- a/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetSummary.tsx
+++ b/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetSummary.tsx
@@ -9,7 +9,7 @@ import DotsHorizontalTriple from '../../../../icons/v1/DotsHorizontalTriple';
 import ArrowButtonDown1 from '../../../../icons/v2/ArrowButtonDown1';
 import ArrowButtonUp1 from '../../../../icons/v2/ArrowButtonUp1';
 import { theme, styles } from '../../../../style';
-import Button from '../../../common/Button';
+import { Button } from '../../../common/Button';
 import Menu from '../../../common/Menu';
 import Stack from '../../../common/Stack';
 import View from '../../../common/View';
diff --git a/packages/desktop-client/src/components/budget/rollover/CoverTooltip.tsx b/packages/desktop-client/src/components/budget/rollover/CoverTooltip.tsx
index 2605e5df23b..6cbc8be7b70 100644
--- a/packages/desktop-client/src/components/budget/rollover/CoverTooltip.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/CoverTooltip.tsx
@@ -2,7 +2,7 @@ import React, { type ComponentProps, useState } from 'react';
 
 import useCategories from '../../../hooks/useCategories';
 import CategoryAutocomplete from '../../autocomplete/CategoryAutocomplete';
-import Button from '../../common/Button';
+import { Button } from '../../common/Button';
 import InitialFocus from '../../common/InitialFocus';
 import View from '../../common/View';
 import { Tooltip } from '../../tooltips';
diff --git a/packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx b/packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx
index 35f2ad1b39c..adf170f2e52 100644
--- a/packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx
@@ -10,7 +10,7 @@ import { useSpreadsheet } from 'loot-core/src/client/SpreadsheetProvider';
 import evalArithmetic from 'loot-core/src/shared/arithmetic';
 import { integerToCurrency, amountToInteger } from 'loot-core/src/shared/util';
 
-import Button from '../../common/Button';
+import { Button } from '../../common/Button';
 import InitialFocus from '../../common/InitialFocus';
 import Input from '../../common/Input';
 import View from '../../common/View';
diff --git a/packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx b/packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx
index fed7c8519ec..e29dbacf794 100644
--- a/packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx
@@ -7,7 +7,7 @@ import { integerToCurrency, amountToInteger } from 'loot-core/src/shared/util';
 import useFeatureFlag from '../../../hooks/useFeatureFlag';
 import CheveronDown from '../../../icons/v1/CheveronDown';
 import { styles, theme, type CSSProperties } from '../../../style';
-import Button from '../../common/Button';
+import { Button } from '../../common/Button';
 import Menu from '../../common/Menu';
 import Text from '../../common/Text';
 import View from '../../common/View';
diff --git a/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx b/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx
index 5e7c382165b..6b397bbc35b 100644
--- a/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx
@@ -11,7 +11,7 @@ import { integerToCurrency, amountToInteger } from 'loot-core/src/shared/util';
 
 import useCategories from '../../../hooks/useCategories';
 import CategoryAutocomplete from '../../autocomplete/CategoryAutocomplete';
-import Button from '../../common/Button';
+import { Button } from '../../common/Button';
 import InitialFocus from '../../common/InitialFocus';
 import Input from '../../common/Input';
 import View from '../../common/View';
diff --git a/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx
index 00b7adbe640..799fbbd81b9 100644
--- a/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx
@@ -8,7 +8,7 @@ import DotsHorizontalTriple from '../../../../icons/v1/DotsHorizontalTriple';
 import ArrowButtonDown1 from '../../../../icons/v2/ArrowButtonDown1';
 import ArrowButtonUp1 from '../../../../icons/v2/ArrowButtonUp1';
 import { theme, styles } from '../../../../style';
-import Button from '../../../common/Button';
+import { Button } from '../../../common/Button';
 import Menu from '../../../common/Menu';
 import View from '../../../common/View';
 import { NotesButton } from '../../../NotesButton';
diff --git a/packages/desktop-client/src/components/common/Button.tsx b/packages/desktop-client/src/components/common/Button.tsx
index f99e0adec7e..6f36a53ad7e 100644
--- a/packages/desktop-client/src/components/common/Button.tsx
+++ b/packages/desktop-client/src/components/common/Button.tsx
@@ -130,7 +130,7 @@ const _getActiveStyles = (type, bounce) => {
   }
 };
 
-const Button = forwardRef<HTMLButtonElement, ButtonProps>(
+export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
   (
     {
       children,
@@ -245,5 +245,3 @@ export const ButtonWithLoading = forwardRef<
     </Button>
   );
 });
-
-export default Button;
diff --git a/packages/desktop-client/src/components/common/ButtonLink.tsx b/packages/desktop-client/src/components/common/ButtonLink.tsx
index 1ab6215b61d..ad953ecb611 100644
--- a/packages/desktop-client/src/components/common/ButtonLink.tsx
+++ b/packages/desktop-client/src/components/common/ButtonLink.tsx
@@ -4,7 +4,7 @@ import { useMatch } from 'react-router-dom';
 import useNavigate from '../../hooks/useNavigate';
 import { type CSSProperties } from '../../style';
 
-import Button from './Button';
+import { Button } from './Button';
 
 type ButtonLinkProps = ComponentProps<typeof Button> & {
   to: string;
diff --git a/packages/desktop-client/src/components/common/Link.tsx b/packages/desktop-client/src/components/common/Link.tsx
index 17b146cf349..ce847a48f38 100644
--- a/packages/desktop-client/src/components/common/Link.tsx
+++ b/packages/desktop-client/src/components/common/Link.tsx
@@ -6,7 +6,7 @@ import { css } from 'glamor';
 import useNavigate from '../../hooks/useNavigate';
 import { type CSSProperties, styles } from '../../style';
 
-import Button from './Button';
+import { Button } from './Button';
 
 type ButtonLinkProps = ComponentProps<typeof Button> & {
   to: string;
diff --git a/packages/desktop-client/src/components/common/MenuButton.tsx b/packages/desktop-client/src/components/common/MenuButton.tsx
index 66d4b58ec23..52f96f5787f 100644
--- a/packages/desktop-client/src/components/common/MenuButton.tsx
+++ b/packages/desktop-client/src/components/common/MenuButton.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import DotsHorizontalTriple from '../../icons/v1/DotsHorizontalTriple';
 
-import Button from './Button';
+import { Button } from './Button';
 
 export default function MenuButton({ onClick }) {
   return (
diff --git a/packages/desktop-client/src/components/common/Modal.tsx b/packages/desktop-client/src/components/common/Modal.tsx
index a79e1bc4706..cf4a96f33a6 100644
--- a/packages/desktop-client/src/components/common/Modal.tsx
+++ b/packages/desktop-client/src/components/common/Modal.tsx
@@ -14,7 +14,7 @@ import Delete from '../../icons/v0/Delete';
 import { type CSSProperties, styles, theme } from '../../style';
 import { tokens } from '../../tokens';
 
-import Button from './Button';
+import { Button } from './Button';
 import Input from './Input';
 import Text from './Text';
 import View from './View';
diff --git a/packages/desktop-client/src/components/common/Search.tsx b/packages/desktop-client/src/components/common/Search.tsx
index 9281d75d57d..644be48f169 100644
--- a/packages/desktop-client/src/components/common/Search.tsx
+++ b/packages/desktop-client/src/components/common/Search.tsx
@@ -4,7 +4,7 @@ import SvgRemove from '../../icons/v2/Remove';
 import SearchAlternate from '../../icons/v2/SearchAlternate';
 import { theme } from '../../style';
 
-import Button from './Button';
+import { Button } from './Button';
 import InputWithContent from './InputWithContent';
 
 type SearchProps = {
diff --git a/packages/desktop-client/src/components/filters/CompactFiltersButton.tsx b/packages/desktop-client/src/components/filters/CompactFiltersButton.tsx
index 28f73ef9a1b..98661197bb7 100644
--- a/packages/desktop-client/src/components/filters/CompactFiltersButton.tsx
+++ b/packages/desktop-client/src/components/filters/CompactFiltersButton.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { Filter } from '../../icons/v1';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 
 type CompactFiltersButtonProps = {
   onClick: (newValue) => void;
diff --git a/packages/desktop-client/src/components/filters/FiltersButton.tsx b/packages/desktop-client/src/components/filters/FiltersButton.tsx
index 7aff00b7ad3..c368cc81d61 100644
--- a/packages/desktop-client/src/components/filters/FiltersButton.tsx
+++ b/packages/desktop-client/src/components/filters/FiltersButton.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { SettingsSliderAlternate } from '../../icons/v2';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 
 type FiltersButtonProps = {
   onClick: (newValue) => void;
diff --git a/packages/desktop-client/src/components/filters/FiltersMenu.jsx b/packages/desktop-client/src/components/filters/FiltersMenu.jsx
index e9382c1726a..95154f17003 100644
--- a/packages/desktop-client/src/components/filters/FiltersMenu.jsx
+++ b/packages/desktop-client/src/components/filters/FiltersMenu.jsx
@@ -25,7 +25,7 @@ import { titleFirst, integerToCurrency } from 'loot-core/src/shared/util';
 
 import DeleteIcon from '../../icons/v0/Delete';
 import { theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import HoverTarget from '../common/HoverTarget';
 import Menu from '../common/Menu';
 import Select from '../common/Select';
diff --git a/packages/desktop-client/src/components/filters/SavedFilters.jsx b/packages/desktop-client/src/components/filters/SavedFilters.jsx
index fce9af440cd..4cb2183f2e5 100644
--- a/packages/desktop-client/src/components/filters/SavedFilters.jsx
+++ b/packages/desktop-client/src/components/filters/SavedFilters.jsx
@@ -4,7 +4,7 @@ import { send, sendCatch } from 'loot-core/src/platform/client/fetch';
 
 import ExpandArrow from '../../icons/v0/ExpandArrow';
 import { theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Menu from '../common/Menu';
 import MenuTooltip from '../common/MenuTooltip';
 import Stack from '../common/Stack';
diff --git a/packages/desktop-client/src/components/manager/BudgetList.jsx b/packages/desktop-client/src/components/manager/BudgetList.jsx
index c42105615e6..42de48e86b5 100644
--- a/packages/desktop-client/src/components/manager/BudgetList.jsx
+++ b/packages/desktop-client/src/components/manager/BudgetList.jsx
@@ -15,7 +15,7 @@ import Key from '../../icons/v2/Key';
 import RefreshArrow from '../../icons/v2/RefreshArrow';
 import { styles, theme } from '../../style';
 import { tokens } from '../../tokens';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Menu from '../common/Menu';
 import Text from '../common/Text';
 import View from '../common/View';
diff --git a/packages/desktop-client/src/components/manager/ConfigServer.tsx b/packages/desktop-client/src/components/manager/ConfigServer.tsx
index 20cf42356f7..8c4b34a7646 100644
--- a/packages/desktop-client/src/components/manager/ConfigServer.tsx
+++ b/packages/desktop-client/src/components/manager/ConfigServer.tsx
@@ -9,7 +9,7 @@ import { useActions } from '../../hooks/useActions';
 import useNavigate from '../../hooks/useNavigate';
 import { useSetThemeColor } from '../../hooks/useSetThemeColor';
 import { theme } from '../../style';
-import Button, { ButtonWithLoading } from '../common/Button';
+import { Button, ButtonWithLoading } from '../common/Button';
 import { BigInput } from '../common/Input';
 import Text from '../common/Text';
 import View from '../common/View';
diff --git a/packages/desktop-client/src/components/manager/Import.tsx b/packages/desktop-client/src/components/manager/Import.tsx
index 823a565cdf0..a2022e8ba9a 100644
--- a/packages/desktop-client/src/components/manager/Import.tsx
+++ b/packages/desktop-client/src/components/manager/Import.tsx
@@ -4,7 +4,7 @@ import { type BoundActions } from '../../hooks/useActions';
 import { styles, theme } from '../../style';
 import { type CommonModalProps } from '../../types/modals';
 import Block from '../common/Block';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Modal from '../common/Modal';
 import Text from '../common/Text';
 import View from '../common/View';
diff --git a/packages/desktop-client/src/components/manager/WelcomeScreen.tsx b/packages/desktop-client/src/components/manager/WelcomeScreen.tsx
index 89f45cf1074..32761410859 100644
--- a/packages/desktop-client/src/components/manager/WelcomeScreen.tsx
+++ b/packages/desktop-client/src/components/manager/WelcomeScreen.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { useActions } from '../../hooks/useActions';
 import { styles, theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import ExternalLink from '../common/ExternalLink';
 import Paragraph from '../common/Paragraph';
 import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/manager/subscribe/Bootstrap.tsx b/packages/desktop-client/src/components/manager/subscribe/Bootstrap.tsx
index 479833542a3..7d5c62e8288 100644
--- a/packages/desktop-client/src/components/manager/subscribe/Bootstrap.tsx
+++ b/packages/desktop-client/src/components/manager/subscribe/Bootstrap.tsx
@@ -6,7 +6,7 @@ import { loggedIn } from 'loot-core/src/client/actions/user';
 import { send } from 'loot-core/src/platform/client/fetch';
 
 import { theme } from '../../../style';
-import Button from '../../common/Button';
+import { Button } from '../../common/Button';
 import ExternalLink from '../../common/ExternalLink';
 import Paragraph from '../../common/Paragraph';
 import Text from '../../common/Text';
diff --git a/packages/desktop-client/src/components/manager/subscribe/ChangePassword.tsx b/packages/desktop-client/src/components/manager/subscribe/ChangePassword.tsx
index 3988553ad6c..06b0594e606 100644
--- a/packages/desktop-client/src/components/manager/subscribe/ChangePassword.tsx
+++ b/packages/desktop-client/src/components/manager/subscribe/ChangePassword.tsx
@@ -4,7 +4,7 @@ import { send } from 'loot-core/src/platform/client/fetch';
 
 import useNavigate from '../../../hooks/useNavigate';
 import { theme } from '../../../style';
-import Button from '../../common/Button';
+import { Button } from '../../common/Button';
 import Text from '../../common/Text';
 import View from '../../common/View';
 
diff --git a/packages/desktop-client/src/components/manager/subscribe/Error.tsx b/packages/desktop-client/src/components/manager/subscribe/Error.tsx
index a26ff87c66b..242f6f53239 100644
--- a/packages/desktop-client/src/components/manager/subscribe/Error.tsx
+++ b/packages/desktop-client/src/components/manager/subscribe/Error.tsx
@@ -3,7 +3,7 @@ import { useLocation } from 'react-router-dom';
 
 import useNavigate from '../../../hooks/useNavigate';
 import { theme } from '../../../style';
-import Button from '../../common/Button';
+import { Button } from '../../common/Button';
 import Text from '../../common/Text';
 import View from '../../common/View';
 
diff --git a/packages/desktop-client/src/components/manager/subscribe/Login.tsx b/packages/desktop-client/src/components/manager/subscribe/Login.tsx
index 3ed5cef99a5..32cd1732ff7 100644
--- a/packages/desktop-client/src/components/manager/subscribe/Login.tsx
+++ b/packages/desktop-client/src/components/manager/subscribe/Login.tsx
@@ -6,7 +6,7 @@ import { loggedIn } from 'loot-core/src/client/actions/user';
 import { send } from 'loot-core/src/platform/client/fetch';
 
 import { theme } from '../../../style';
-import Button, { ButtonWithLoading } from '../../common/Button';
+import { Button, ButtonWithLoading } from '../../common/Button';
 import { BigInput } from '../../common/Input';
 import Text from '../../common/Text';
 import View from '../../common/View';
diff --git a/packages/desktop-client/src/components/mobile/MobileAmountInput.jsx b/packages/desktop-client/src/components/mobile/MobileAmountInput.jsx
index 0e89d2e98e0..c6275cb627f 100644
--- a/packages/desktop-client/src/components/mobile/MobileAmountInput.jsx
+++ b/packages/desktop-client/src/components/mobile/MobileAmountInput.jsx
@@ -8,7 +8,7 @@ import {
 
 import { useMergedRefs } from '../../hooks/useMergedRefs';
 import { theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Text from '../common/Text';
 import View from '../common/View';
 
diff --git a/packages/desktop-client/src/components/mobile/MobileForms.jsx b/packages/desktop-client/src/components/mobile/MobileForms.jsx
index 4a7334fbd84..8ebfda0a37f 100644
--- a/packages/desktop-client/src/components/mobile/MobileForms.jsx
+++ b/packages/desktop-client/src/components/mobile/MobileForms.jsx
@@ -3,7 +3,7 @@ import { forwardRef } from 'react';
 import { css } from 'glamor';
 
 import { theme, styles } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Input from '../common/Input';
 import Text from '../common/Text';
 import View from '../common/View';
diff --git a/packages/desktop-client/src/components/modals/CategoryGroupMenu.tsx b/packages/desktop-client/src/components/modals/CategoryGroupMenu.tsx
index e1d1d1c733b..1b753fec6aa 100644
--- a/packages/desktop-client/src/components/modals/CategoryGroupMenu.tsx
+++ b/packages/desktop-client/src/components/modals/CategoryGroupMenu.tsx
@@ -13,7 +13,7 @@ import ViewHide from '../../icons/v2/ViewHide';
 import ViewShow from '../../icons/v2/ViewShow';
 import { type CSSProperties, styles, theme } from '../../style';
 import { type CommonModalProps } from '../../types/modals';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Menu from '../common/Menu';
 import Modal from '../common/Modal';
 import View from '../common/View';
diff --git a/packages/desktop-client/src/components/modals/CategoryMenu.tsx b/packages/desktop-client/src/components/modals/CategoryMenu.tsx
index 58962df061a..84952aa9eb4 100644
--- a/packages/desktop-client/src/components/modals/CategoryMenu.tsx
+++ b/packages/desktop-client/src/components/modals/CategoryMenu.tsx
@@ -12,7 +12,7 @@ import ViewHide from '../../icons/v2/ViewHide';
 import ViewShow from '../../icons/v2/ViewShow';
 import { type CSSProperties, styles, theme } from '../../style';
 import { type CommonModalProps } from '../../types/modals';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Menu from '../common/Menu';
 import Modal from '../common/Modal';
 import View from '../common/View';
diff --git a/packages/desktop-client/src/components/modals/CloseAccount.tsx b/packages/desktop-client/src/components/modals/CloseAccount.tsx
index 2b58b0852d3..582ce0fe986 100644
--- a/packages/desktop-client/src/components/modals/CloseAccount.tsx
+++ b/packages/desktop-client/src/components/modals/CloseAccount.tsx
@@ -11,7 +11,7 @@ import { theme } from '../../style';
 import { type CommonModalProps } from '../../types/modals';
 import AccountAutocomplete from '../autocomplete/AccountAutocomplete';
 import CategoryAutocomplete from '../autocomplete/CategoryAutocomplete';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import FormError from '../common/FormError';
 import LinkButton from '../common/LinkButton';
 import Modal from '../common/Modal';
diff --git a/packages/desktop-client/src/components/modals/ConfirmCategoryDelete.tsx b/packages/desktop-client/src/components/modals/ConfirmCategoryDelete.tsx
index 6b8c9bde2c5..f86c7b66a44 100644
--- a/packages/desktop-client/src/components/modals/ConfirmCategoryDelete.tsx
+++ b/packages/desktop-client/src/components/modals/ConfirmCategoryDelete.tsx
@@ -6,7 +6,7 @@ import { theme } from '../../style';
 import { type CommonModalProps } from '../../types/modals';
 import CategoryAutocomplete from '../autocomplete/CategoryAutocomplete';
 import Block from '../common/Block';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Modal from '../common/Modal';
 import Text from '../common/Text';
 import View from '../common/View';
diff --git a/packages/desktop-client/src/components/modals/ConfirmTransactionEdit.tsx b/packages/desktop-client/src/components/modals/ConfirmTransactionEdit.tsx
index a15de63e2ad..096768a7270 100644
--- a/packages/desktop-client/src/components/modals/ConfirmTransactionEdit.tsx
+++ b/packages/desktop-client/src/components/modals/ConfirmTransactionEdit.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { type CommonModalProps } from '../../types/modals';
 import Block from '../common/Block';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Modal from '../common/Modal';
 import View from '../common/View';
 
diff --git a/packages/desktop-client/src/components/modals/CreateAccount.tsx b/packages/desktop-client/src/components/modals/CreateAccount.tsx
index dde2f32c854..a7ff9a680bf 100644
--- a/packages/desktop-client/src/components/modals/CreateAccount.tsx
+++ b/packages/desktop-client/src/components/modals/CreateAccount.tsx
@@ -6,7 +6,7 @@ import useGoCardlessStatus from '../../hooks/useGoCardlessStatus';
 import { type SyncServerStatus } from '../../hooks/useSyncServerStatus';
 import { theme } from '../../style';
 import { type CommonModalProps } from '../../types/modals';
-import Button, { ButtonWithLoading } from '../common/Button';
+import { Button, ButtonWithLoading } from '../common/Button';
 import ExternalLink from '../common/ExternalLink';
 import Modal from '../common/Modal';
 import Paragraph from '../common/Paragraph';
diff --git a/packages/desktop-client/src/components/modals/CreateLocalAccount.tsx b/packages/desktop-client/src/components/modals/CreateLocalAccount.tsx
index 5f5cc59e6ff..df1a5594785 100644
--- a/packages/desktop-client/src/components/modals/CreateLocalAccount.tsx
+++ b/packages/desktop-client/src/components/modals/CreateLocalAccount.tsx
@@ -6,7 +6,7 @@ import { type BoundActions } from '../../hooks/useActions';
 import useNavigate from '../../hooks/useNavigate';
 import { theme } from '../../style';
 import { type CommonModalProps } from '../../types/modals';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import ExternalLink from '../common/ExternalLink';
 import FormError from '../common/FormError';
 import InitialFocus from '../common/InitialFocus';
diff --git a/packages/desktop-client/src/components/modals/EditRule.jsx b/packages/desktop-client/src/components/modals/EditRule.jsx
index ee0707bad80..65e9404b2a1 100644
--- a/packages/desktop-client/src/components/modals/EditRule.jsx
+++ b/packages/desktop-client/src/components/modals/EditRule.jsx
@@ -30,7 +30,7 @@ import AddIcon from '../../icons/v0/Add';
 import SubtractIcon from '../../icons/v0/Subtract';
 import InformationOutline from '../../icons/v1/InformationOutline';
 import { theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Modal from '../common/Modal';
 import Select from '../common/Select';
 import Stack from '../common/Stack';
diff --git a/packages/desktop-client/src/components/modals/FixEncryptionKey.tsx b/packages/desktop-client/src/components/modals/FixEncryptionKey.tsx
index c7e0d96365a..a5335a52b65 100644
--- a/packages/desktop-client/src/components/modals/FixEncryptionKey.tsx
+++ b/packages/desktop-client/src/components/modals/FixEncryptionKey.tsx
@@ -7,7 +7,7 @@ import { getTestKeyError } from 'loot-core/src/shared/errors';
 import { type BoundActions } from '../../hooks/useActions';
 import { theme } from '../../style';
 import { type CommonModalProps } from '../../types/modals';
-import Button, { ButtonWithLoading } from '../common/Button';
+import { Button, ButtonWithLoading } from '../common/Button';
 import ExternalLink from '../common/ExternalLink';
 import InitialFocus from '../common/InitialFocus';
 import Input from '../common/Input';
diff --git a/packages/desktop-client/src/components/modals/GoCardlessExternalMsg.tsx b/packages/desktop-client/src/components/modals/GoCardlessExternalMsg.tsx
index ccdcad5a0a5..0ea0c279d71 100644
--- a/packages/desktop-client/src/components/modals/GoCardlessExternalMsg.tsx
+++ b/packages/desktop-client/src/components/modals/GoCardlessExternalMsg.tsx
@@ -15,7 +15,7 @@ import { theme } from '../../style';
 import { type CommonModalProps } from '../../types/modals';
 import { Error, Warning } from '../alerts';
 import Autocomplete from '../autocomplete/Autocomplete';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import ExternalLink from '../common/ExternalLink';
 import LinkButton from '../common/LinkButton';
 import Menu from '../common/Menu';
diff --git a/packages/desktop-client/src/components/modals/ImportTransactions.jsx b/packages/desktop-client/src/components/modals/ImportTransactions.jsx
index b66597e1125..072f58a3d9d 100644
--- a/packages/desktop-client/src/components/modals/ImportTransactions.jsx
+++ b/packages/desktop-client/src/components/modals/ImportTransactions.jsx
@@ -13,7 +13,7 @@ import {
 import { useActions } from '../../hooks/useActions';
 import useFeatureFlag from '../../hooks/useFeatureFlag';
 import { theme, styles } from '../../style';
-import Button, { ButtonWithLoading } from '../common/Button';
+import { Button, ButtonWithLoading } from '../common/Button';
 import Input from '../common/Input';
 import Modal from '../common/Modal';
 import Select from '../common/Select';
diff --git a/packages/desktop-client/src/components/modals/LoadBackup.jsx b/packages/desktop-client/src/components/modals/LoadBackup.jsx
index 64786e72407..1685baad181 100644
--- a/packages/desktop-client/src/components/modals/LoadBackup.jsx
+++ b/packages/desktop-client/src/components/modals/LoadBackup.jsx
@@ -4,7 +4,7 @@ import { send, listen, unlisten } from 'loot-core/src/platform/client/fetch';
 
 import { theme } from '../../style';
 import Block from '../common/Block';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Modal from '../common/Modal';
 import Text from '../common/Text';
 import View from '../common/View';
diff --git a/packages/desktop-client/src/components/modals/MergeUnusedPayees.jsx b/packages/desktop-client/src/components/modals/MergeUnusedPayees.jsx
index d857cdd6a90..dcada00ae9b 100644
--- a/packages/desktop-client/src/components/modals/MergeUnusedPayees.jsx
+++ b/packages/desktop-client/src/components/modals/MergeUnusedPayees.jsx
@@ -6,7 +6,7 @@ import { send } from 'loot-core/src/platform/client/fetch';
 
 import { theme } from '../../style';
 import { Information } from '../alerts';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Modal, { ModalButtons } from '../common/Modal';
 import Paragraph from '../common/Paragraph';
 import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/modals/Notes.tsx b/packages/desktop-client/src/components/modals/Notes.tsx
index 8d6e27abad9..79fb3149498 100644
--- a/packages/desktop-client/src/components/modals/Notes.tsx
+++ b/packages/desktop-client/src/components/modals/Notes.tsx
@@ -5,7 +5,7 @@ import q from 'loot-core/src/shared/query';
 
 import Check from '../../icons/v2/Check';
 import { type CommonModalProps } from '../../types/modals';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Modal from '../common/Modal';
 import View from '../common/View';
 import { Notes as NotesComponent } from '../Notes';
diff --git a/packages/desktop-client/src/components/modals/PlaidExternalMsg.tsx b/packages/desktop-client/src/components/modals/PlaidExternalMsg.tsx
index e9146a7e039..07afe4f3e85 100644
--- a/packages/desktop-client/src/components/modals/PlaidExternalMsg.tsx
+++ b/packages/desktop-client/src/components/modals/PlaidExternalMsg.tsx
@@ -4,7 +4,7 @@ import AnimatedLoading from '../../icons/AnimatedLoading';
 import { theme } from '../../style';
 import { type CommonModalProps } from '../../types/modals';
 import { Error } from '../alerts';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Modal, { ModalButtons } from '../common/Modal';
 import Paragraph from '../common/Paragraph';
 import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/modals/SelectLinkedAccounts.jsx b/packages/desktop-client/src/components/modals/SelectLinkedAccounts.jsx
index 132f346688c..3f78b65c874 100644
--- a/packages/desktop-client/src/components/modals/SelectLinkedAccounts.jsx
+++ b/packages/desktop-client/src/components/modals/SelectLinkedAccounts.jsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 
 import { theme } from '../../style';
 import Autocomplete from '../autocomplete/Autocomplete';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Modal from '../common/Modal';
 import Text from '../common/Text';
 import View from '../common/View';
diff --git a/packages/desktop-client/src/components/modals/SingleInput.tsx b/packages/desktop-client/src/components/modals/SingleInput.tsx
index db2ed81a088..a4046910ada 100644
--- a/packages/desktop-client/src/components/modals/SingleInput.tsx
+++ b/packages/desktop-client/src/components/modals/SingleInput.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 
 import { styles } from '../../style';
 import { type CommonModalProps } from '../../types/modals';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import FormError from '../common/FormError';
 import InitialFocus from '../common/InitialFocus';
 import Input from '../common/Input';
diff --git a/packages/desktop-client/src/components/modals/SwitchBudgetType.tsx b/packages/desktop-client/src/components/modals/SwitchBudgetType.tsx
index 814d8c75573..801127f78a8 100644
--- a/packages/desktop-client/src/components/modals/SwitchBudgetType.tsx
+++ b/packages/desktop-client/src/components/modals/SwitchBudgetType.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 
 import { type CommonModalProps } from '../../types/modals';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import ExternalLink from '../common/ExternalLink';
 import Modal from '../common/Modal';
 import Paragraph from '../common/Paragraph';
diff --git a/packages/desktop-client/src/components/payees/ManagePayees.jsx b/packages/desktop-client/src/components/payees/ManagePayees.jsx
index 3e60c6a7508..a95724fc61e 100644
--- a/packages/desktop-client/src/components/payees/ManagePayees.jsx
+++ b/packages/desktop-client/src/components/payees/ManagePayees.jsx
@@ -21,7 +21,7 @@ import useSelected, {
 import useStableCallback from '../../hooks/useStableCallback';
 import ExpandArrow from '../../icons/v0/ExpandArrow';
 import { theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Search from '../common/Search';
 import View from '../common/View';
 import { TableHeader, Cell, SelectCell, useTableNavigator } from '../table';
diff --git a/packages/desktop-client/src/components/reports/CategorySelector.tsx b/packages/desktop-client/src/components/reports/CategorySelector.tsx
index d83825eedb4..8033e6538f3 100644
--- a/packages/desktop-client/src/components/reports/CategorySelector.tsx
+++ b/packages/desktop-client/src/components/reports/CategorySelector.tsx
@@ -9,7 +9,7 @@ import { CheckAll, UncheckAll } from '../../icons/v2';
 import ViewHide from '../../icons/v2/ViewHide';
 import ViewShow from '../../icons/v2/ViewShow';
 import { type CategoryListProps } from '../autocomplete/CategoryAutocomplete';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Text from '../common/Text';
 import View from '../common/View';
 import { Checkbox } from '../forms';
diff --git a/packages/desktop-client/src/components/reports/GraphButton.tsx b/packages/desktop-client/src/components/reports/GraphButton.tsx
index 50c50297dd6..d7a06453e61 100644
--- a/packages/desktop-client/src/components/reports/GraphButton.tsx
+++ b/packages/desktop-client/src/components/reports/GraphButton.tsx
@@ -1,7 +1,7 @@
 import React, { type HTMLProps } from 'react';
 
 import { type CSSProperties, theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import HoverTarget from '../common/HoverTarget';
 import Text from '../common/Text';
 import { Tooltip } from '../tooltips';
diff --git a/packages/desktop-client/src/components/reports/Header.jsx b/packages/desktop-client/src/components/reports/Header.jsx
index dffee4321ca..a3db665b810 100644
--- a/packages/desktop-client/src/components/reports/Header.jsx
+++ b/packages/desktop-client/src/components/reports/Header.jsx
@@ -4,7 +4,7 @@ import * as monthUtils from 'loot-core/src/shared/months';
 
 import ArrowLeft from '../../icons/v1/ArrowLeft';
 import { styles } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import ButtonLink from '../common/ButtonLink';
 import Select from '../common/Select';
 import View from '../common/View';
diff --git a/packages/desktop-client/src/components/reports/ModeButton.tsx b/packages/desktop-client/src/components/reports/ModeButton.tsx
index e0f216d84fa..1cc1aed1f24 100644
--- a/packages/desktop-client/src/components/reports/ModeButton.tsx
+++ b/packages/desktop-client/src/components/reports/ModeButton.tsx
@@ -1,7 +1,7 @@
 import React, { type MouseEventHandler, type ReactNode } from 'react';
 
 import { type CSSProperties, theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 
 type ModeButtonProps = {
   selected: boolean;
diff --git a/packages/desktop-client/src/components/reports/SaveReport.tsx b/packages/desktop-client/src/components/reports/SaveReport.tsx
index a634223c004..ed0476b1e17 100644
--- a/packages/desktop-client/src/components/reports/SaveReport.tsx
+++ b/packages/desktop-client/src/components/reports/SaveReport.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 
 import ExpandArrow from '../../icons/v0/ExpandArrow';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Menu from '../common/Menu';
 import MenuTooltip from '../common/MenuTooltip';
 import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/rules/RuleRow.tsx b/packages/desktop-client/src/components/rules/RuleRow.tsx
index c9977fb19bf..60630b39879 100644
--- a/packages/desktop-client/src/components/rules/RuleRow.tsx
+++ b/packages/desktop-client/src/components/rules/RuleRow.tsx
@@ -6,7 +6,7 @@ import { type RuleEntity } from 'loot-core/src/types/models';
 import { useSelectedDispatch } from '../../hooks/useSelected';
 import ArrowRight from '../../icons/v0/RightArrow2';
 import { theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Stack from '../common/Stack';
 import Text from '../common/Text';
 import View from '../common/View';
diff --git a/packages/desktop-client/src/components/schedules/EditSchedule.jsx b/packages/desktop-client/src/components/schedules/EditSchedule.jsx
index 5beaa5968c8..7f9f0c89e8c 100644
--- a/packages/desktop-client/src/components/schedules/EditSchedule.jsx
+++ b/packages/desktop-client/src/components/schedules/EditSchedule.jsx
@@ -12,7 +12,7 @@ import useSelected, { SelectedProvider } from '../../hooks/useSelected';
 import { theme } from '../../style';
 import AccountAutocomplete from '../autocomplete/AccountAutocomplete';
 import PayeeAutocomplete from '../autocomplete/PayeeAutocomplete';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Modal from '../common/Modal';
 import Stack from '../common/Stack';
 import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/schedules/PostsOfflineNotification.jsx b/packages/desktop-client/src/components/schedules/PostsOfflineNotification.jsx
index 48c5c2d2edd..194d46cc5e1 100644
--- a/packages/desktop-client/src/components/schedules/PostsOfflineNotification.jsx
+++ b/packages/desktop-client/src/components/schedules/PostsOfflineNotification.jsx
@@ -4,7 +4,7 @@ import { useLocation } from 'react-router-dom';
 import { send } from 'loot-core/src/platform/client/fetch';
 
 import { theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Modal from '../common/Modal';
 import Paragraph from '../common/Paragraph';
 import Stack from '../common/Stack';
diff --git a/packages/desktop-client/src/components/schedules/SchedulesTable.tsx b/packages/desktop-client/src/components/schedules/SchedulesTable.tsx
index 3484e67c144..e16efa873c2 100644
--- a/packages/desktop-client/src/components/schedules/SchedulesTable.tsx
+++ b/packages/desktop-client/src/components/schedules/SchedulesTable.tsx
@@ -15,7 +15,7 @@ import { type ScheduleEntity } from 'loot-core/src/types/models';
 import DotsHorizontalTriple from '../../icons/v1/DotsHorizontalTriple';
 import Check from '../../icons/v2/Check';
 import { theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Menu from '../common/Menu';
 import Text from '../common/Text';
 import View from '../common/View';
diff --git a/packages/desktop-client/src/components/schedules/index.tsx b/packages/desktop-client/src/components/schedules/index.tsx
index a4fb235e77d..04171948ddd 100644
--- a/packages/desktop-client/src/components/schedules/index.tsx
+++ b/packages/desktop-client/src/components/schedules/index.tsx
@@ -6,7 +6,7 @@ import { type ScheduleEntity } from 'loot-core/src/types/models';
 
 import { useActions } from '../../hooks/useActions';
 import { theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Search from '../common/Search';
 import View from '../common/View';
 import { Page } from '../Page';
diff --git a/packages/desktop-client/src/components/select/RecurringSchedulePicker.jsx b/packages/desktop-client/src/components/select/RecurringSchedulePicker.jsx
index 0bfd696308d..f865328e81c 100644
--- a/packages/desktop-client/src/components/select/RecurringSchedulePicker.jsx
+++ b/packages/desktop-client/src/components/select/RecurringSchedulePicker.jsx
@@ -8,7 +8,7 @@ import { getRecurringDescription } from 'loot-core/src/shared/schedules';
 import AddIcon from '../../icons/v0/Add';
 import SubtractIcon from '../../icons/v0/Subtract';
 import { theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Input from '../common/Input';
 import Select from '../common/Select';
 import Stack from '../common/Stack';
diff --git a/packages/desktop-client/src/components/settings/Encryption.tsx b/packages/desktop-client/src/components/settings/Encryption.tsx
index 9c5636793b6..cca17a173e4 100644
--- a/packages/desktop-client/src/components/settings/Encryption.tsx
+++ b/packages/desktop-client/src/components/settings/Encryption.tsx
@@ -3,7 +3,7 @@ import { useSelector } from 'react-redux';
 
 import { useActions } from '../../hooks/useActions';
 import { theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import ExternalLink from '../common/ExternalLink';
 import Text from '../common/Text';
 import { useServerURL } from '../ServerContext';
diff --git a/packages/desktop-client/src/components/settings/Format.tsx b/packages/desktop-client/src/components/settings/Format.tsx
index 38511f84c18..a140d23b9cd 100644
--- a/packages/desktop-client/src/components/settings/Format.tsx
+++ b/packages/desktop-client/src/components/settings/Format.tsx
@@ -6,7 +6,7 @@ import { type LocalPrefs } from 'loot-core/src/types/prefs';
 
 import { useActions } from '../../hooks/useActions';
 import { tokens } from '../../tokens';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Select from '../common/Select';
 import Text from '../common/Text';
 import View from '../common/View';
diff --git a/packages/desktop-client/src/components/settings/Global.tsx b/packages/desktop-client/src/components/settings/Global.tsx
index 0a28d43d1c9..1b258becd59 100644
--- a/packages/desktop-client/src/components/settings/Global.tsx
+++ b/packages/desktop-client/src/components/settings/Global.tsx
@@ -4,7 +4,7 @@ import { useSelector } from 'react-redux';
 import { useActions } from '../../hooks/useActions';
 import { theme } from '../../style';
 import { Information } from '../alerts';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Text from '../common/Text';
 import View from '../common/View';
 
diff --git a/packages/desktop-client/src/components/settings/Themes.tsx b/packages/desktop-client/src/components/settings/Themes.tsx
index c43a1447e2c..f528735fe72 100644
--- a/packages/desktop-client/src/components/settings/Themes.tsx
+++ b/packages/desktop-client/src/components/settings/Themes.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { useActions } from '../../hooks/useActions';
 import { themeOptions, useTheme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Select from '../common/Select';
 import Text from '../common/Text';
 
diff --git a/packages/desktop-client/src/components/settings/UI.tsx b/packages/desktop-client/src/components/settings/UI.tsx
index ebdc6be7c10..82025dbb567 100644
--- a/packages/desktop-client/src/components/settings/UI.tsx
+++ b/packages/desktop-client/src/components/settings/UI.tsx
@@ -5,7 +5,7 @@ import { css, media } from 'glamor';
 
 import { type CSSProperties, theme } from '../../style';
 import { tokens } from '../../tokens';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import View from '../common/View';
 
 type SettingProps = {
diff --git a/packages/desktop-client/src/components/settings/index.tsx b/packages/desktop-client/src/components/settings/index.tsx
index 3744b612055..6d4c82adb2e 100644
--- a/packages/desktop-client/src/components/settings/index.tsx
+++ b/packages/desktop-client/src/components/settings/index.tsx
@@ -12,7 +12,7 @@ import { useSetThemeColor } from '../../hooks/useSetThemeColor';
 import { useResponsive } from '../../ResponsiveProvider';
 import { theme } from '../../style';
 import { tokens } from '../../tokens';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import ExternalLink from '../common/ExternalLink';
 import Input from '../common/Input';
 import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/sidebar/SidebarWithData.tsx b/packages/desktop-client/src/components/sidebar/SidebarWithData.tsx
index 3ea71ba13f9..06ec2c65101 100644
--- a/packages/desktop-client/src/components/sidebar/SidebarWithData.tsx
+++ b/packages/desktop-client/src/components/sidebar/SidebarWithData.tsx
@@ -11,7 +11,7 @@ import { useActions } from '../../hooks/useActions';
 import useNavigate from '../../hooks/useNavigate';
 import ExpandArrow from '../../icons/v0/ExpandArrow';
 import { styles, theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import InitialFocus from '../common/InitialFocus';
 import Input from '../common/Input';
 import Menu from '../common/Menu';
diff --git a/packages/desktop-client/src/components/sidebar/ToggleButton.tsx b/packages/desktop-client/src/components/sidebar/ToggleButton.tsx
index 69c7dfe4486..6e8f90f2a3a 100644
--- a/packages/desktop-client/src/components/sidebar/ToggleButton.tsx
+++ b/packages/desktop-client/src/components/sidebar/ToggleButton.tsx
@@ -3,7 +3,7 @@ import React, { type MouseEventHandler } from 'react';
 import Pin from '../../icons/v1/Pin';
 import ArrowButtonLeft1 from '../../icons/v2/ArrowButtonLeft1';
 import { type CSSProperties, theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import View from '../common/View';
 
 type ToggleButtonProps = {
diff --git a/packages/desktop-client/src/components/table.tsx b/packages/desktop-client/src/components/table.tsx
index 1337c85b973..28f5776aa9b 100644
--- a/packages/desktop-client/src/components/table.tsx
+++ b/packages/desktop-client/src/components/table.tsx
@@ -28,7 +28,7 @@ import ExpandArrow from '../icons/v0/ExpandArrow';
 import Checkmark from '../icons/v1/Checkmark';
 import { type CSSProperties, styles, theme } from '../style';
 
-import Button from './common/Button';
+import { Button } from './common/Button';
 import Input from './common/Input';
 import Menu from './common/Menu';
 import Text from './common/Text';
diff --git a/packages/desktop-client/src/components/transactions/MobileTransaction.jsx b/packages/desktop-client/src/components/transactions/MobileTransaction.jsx
index a0a9a676920..30573af4782 100644
--- a/packages/desktop-client/src/components/transactions/MobileTransaction.jsx
+++ b/packages/desktop-client/src/components/transactions/MobileTransaction.jsx
@@ -61,7 +61,7 @@ import CheckCircle1 from '../../icons/v2/CheckCircle1';
 import Lock from '../../icons/v2/LockClosed';
 import PencilWriteAlternate from '../../icons/v2/PencilWriteAlternate';
 import { styles, theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Text from '../common/Text';
 import TextOneLine from '../common/TextOneLine';
 import View from '../common/View';
diff --git a/packages/desktop-client/src/components/transactions/TransactionsTable.jsx b/packages/desktop-client/src/components/transactions/TransactionsTable.jsx
index d97d77dbd38..6a9f5d65648 100644
--- a/packages/desktop-client/src/components/transactions/TransactionsTable.jsx
+++ b/packages/desktop-client/src/components/transactions/TransactionsTable.jsx
@@ -57,7 +57,7 @@ import { styles, theme } from '../../style';
 import AccountAutocomplete from '../autocomplete/AccountAutocomplete';
 import CategoryAutocomplete from '../autocomplete/CategoryAutocomplete';
 import PayeeAutocomplete from '../autocomplete/PayeeAutocomplete';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import Text from '../common/Text';
 import View from '../common/View';
 import { getStatusProps } from '../schedules/StatusBadge';
diff --git a/packages/desktop-client/src/components/util/AmountInput.tsx b/packages/desktop-client/src/components/util/AmountInput.tsx
index 9adec5f3adb..848672b01e6 100644
--- a/packages/desktop-client/src/components/util/AmountInput.tsx
+++ b/packages/desktop-client/src/components/util/AmountInput.tsx
@@ -13,7 +13,7 @@ import { useMergedRefs } from '../../hooks/useMergedRefs';
 import Add from '../../icons/v1/Add';
 import Subtract from '../../icons/v1/Subtract';
 import { type CSSProperties, theme } from '../../style';
-import Button from '../common/Button';
+import { Button } from '../common/Button';
 import InputWithContent from '../common/InputWithContent';
 import View from '../common/View';
 import useFormat from '../spreadsheet/useFormat';
diff --git a/upcoming-release-notes/2116.md b/upcoming-release-notes/2116.md
new file mode 100644
index 00000000000..56222efbc89
--- /dev/null
+++ b/upcoming-release-notes/2116.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [joel-jeremy]
+---
+
+eslint: no default exports - part 2