diff --git a/centrifuge-app/src/config.ts b/centrifuge-app/src/config.ts
index efd97fd75b..009171b5c0 100644
--- a/centrifuge-app/src/config.ts
+++ b/centrifuge-app/src/config.ts
@@ -1,6 +1,6 @@
 import { TransactionOptions } from '@centrifuge/centrifuge-js'
 import { EvmChains } from '@centrifuge/centrifuge-react'
-import { centrifugeLight } from '@centrifuge/fabric'
+import { centrifugeTheme } from '@centrifuge/fabric'
 import arbitrumLogo from '@centrifuge/fabric/assets/logos/arbitrum.svg'
 import assetHubLogo from '@centrifuge/fabric/assets/logos/assethub.svg'
 import baseLogo from '@centrifuge/fabric/assets/logos/base.svg'
@@ -23,17 +23,17 @@ export const FEATURED_COLLECTIONS = [
 ]
 
 const lightTheme: DefaultTheme = {
-  ...centrifugeLight,
+  ...centrifugeTheme,
   sizes: {
-    ...centrifugeLight.sizes,
+    ...centrifugeTheme.sizes,
     mainContent: 1800,
   },
   colors: {
-    ...centrifugeLight.colors,
-    placeholderBackground: centrifugeLight.colors.backgroundSecondary,
+    ...centrifugeTheme.colors,
+    placeholderBackground: centrifugeTheme.colors.backgroundSecondary,
   },
   typography: {
-    ...centrifugeLight.typography,
+    ...centrifugeTheme.typography,
     headingLarge: {
       fontSize: [24, 24, 36],
       lineHeight: 1.25,
diff --git a/fabric/.storybook/preview.jsx b/fabric/.storybook/preview.jsx
index 794f1ee64b..24da97cb2a 100644
--- a/fabric/.storybook/preview.jsx
+++ b/fabric/.storybook/preview.jsx
@@ -3,14 +3,12 @@ import { ThemeProvider } from 'styled-components'
 import { Box, GlobalStyle } from '../src'
 import altairDark from '../src/theme/altairDark'
 import altairLight from '../src/theme/altairLight'
-import centrifugeDark from '../src/theme/centrifugeDark'
-import centrifugeLight from '../src/theme/centrifugeLight'
+import centrifugeTheme from '../src/theme/centrifugeTheme'
 
 const themes = {
   altairDark,
   altairLight,
-  centrifugeDark,
-  centrifugeLight,
+  centrifugeTheme,
 }
 
 export const parameters = {
@@ -40,7 +38,7 @@ export const globalTypes = {
 
 export const decorators = [
   (Story, context) => (
-    <ThemeProvider theme={themes[context.globals.theme] || themes.centrifugeLight}>
+    <ThemeProvider theme={themes[context.globals.theme] || themes.centrifugeTheme}>
       <>
         <GlobalStyle />
         <Box p={3} bg="backgroundPage" minHeight="100vh">
diff --git a/fabric/src/components/CurrencyInput/index.tsx b/fabric/src/components/CurrencyInput/index.tsx
index 0e85ff87d0..9c866cf4ed 100644
--- a/fabric/src/components/CurrencyInput/index.tsx
+++ b/fabric/src/components/CurrencyInput/index.tsx
@@ -17,7 +17,7 @@ const StyledMaxButton = styled(Box)`
   padding: 0 8px;
   border: 0;
   border-radius: 12px;
-  color: ${({ theme }) => theme.colors.textPrimary};
+  color: ${({ theme }) => theme.colors.textInverted};
   background-color: ${({ theme }) => theme.colors.backgroundPrimary};
   cursor: pointer;
   appearance: none;
diff --git a/fabric/src/theme/centrifugeLight.ts b/fabric/src/theme/centrifugeTheme.ts
similarity index 90%
rename from fabric/src/theme/centrifugeLight.ts
rename to fabric/src/theme/centrifugeTheme.ts
index a6a52fda1f..faac679481 100644
--- a/fabric/src/theme/centrifugeLight.ts
+++ b/fabric/src/theme/centrifugeTheme.ts
@@ -4,7 +4,7 @@ import { blueScale, grayScale, yellowScale } from './tokens/colors'
 import { colorTheme } from './tokens/theme'
 import { FabricTheme } from './types'
 
-export const centrifugeLight: FabricTheme = {
+export const centrifugeTheme: FabricTheme = {
   ...baseTheme,
   scheme: 'light',
   colors: {
@@ -25,4 +25,4 @@ export const centrifugeLight: FabricTheme = {
   },
 }
 
-export default centrifugeLight
+export default centrifugeTheme
diff --git a/fabric/src/theme/index.ts b/fabric/src/theme/index.ts
index c4c0958018..7e00d5fcfe 100644
--- a/fabric/src/theme/index.ts
+++ b/fabric/src/theme/index.ts
@@ -1,4 +1,4 @@
 export * from './altairDark'
 export * from './altairLight'
-export * from './centrifugeLight'
+export * from './centrifugeTheme'
 export * from './types'
diff --git a/fabric/src/theme/tokens/theme.ts b/fabric/src/theme/tokens/theme.ts
index b32d928e19..c9d0ed0548 100644
--- a/fabric/src/theme/tokens/theme.ts
+++ b/fabric/src/theme/tokens/theme.ts
@@ -51,7 +51,7 @@ const colors = {
   backgroundButtonPrimaryFocus: gold,
   backgroundButtonPrimaryHover: gold,
   backgroundButtonPrimaryPressed: yellowScale[500],
-  backgroundButtonPrimaryDisabled: yellowScale[500],
+  backgroundButtonPrimaryDisabled: grayScale[300],
   textButtonPrimary: black,
   textButtonPrimaryFocus: black,
   textButtonPrimaryHover: black,