diff --git a/ui/src/components/core/button/button.stories.tsx b/ui/src/components/core/button/button.stories.tsx
index 23dddc6..dcb66d9 100644
--- a/ui/src/components/core/button/button.stories.tsx
+++ b/ui/src/components/core/button/button.stories.tsx
@@ -24,14 +24,14 @@ export const Default = () => (
     <Button
       colorScheme="blue"
       variant="outline"
-      css={{ py: '$1', borderRadius: '$md' }}
+      css={{ py: '$1', height: '$5', borderRadius: '$md' }}
     >
       Use for NFA
     </Button>
     <Button
       colorScheme="gray"
       variant="outline"
-      css={{ py: '$1', borderRadius: '$md' }}
+      css={{ py: '$1', height: '$5', borderRadius: '$md' }}
     >
       NFA Repo
     </Button>
diff --git a/ui/src/components/core/button/button.styled.ts b/ui/src/components/core/button/button.styles.ts
similarity index 100%
rename from ui/src/components/core/button/button.styled.ts
rename to ui/src/components/core/button/button.styles.ts
diff --git a/ui/src/components/core/button/button.tsx b/ui/src/components/core/button/button.tsx
index 592372b..4766bc9 100644
--- a/ui/src/components/core/button/button.tsx
+++ b/ui/src/components/core/button/button.tsx
@@ -1,4 +1,4 @@
-import { ButtonProps, StyledButton } from './button.styled';
+import { ButtonProps, StyledButton } from './button.styles';
 import { ButtonContent } from './button-content';
 import { ButtonSpinner } from './button-spinner';
 import { forwardRef } from 'react';
@@ -38,6 +38,7 @@ export const Button = forwardRef<ButtonProps, 'button'>((props, ref) => {
       data-loading={isLoading}
       css={{
         width: isFullWidth ? '100%' : undefined,
+        ...(ownProps?.css || {}),
       }}
       {...ownProps}
     >
diff --git a/ui/src/components/core/button/icon-button.tsx b/ui/src/components/core/button/icon-button.tsx
index 9baf9f8..9ba21a5 100644
--- a/ui/src/components/core/button/icon-button.tsx
+++ b/ui/src/components/core/button/icon-button.tsx
@@ -1,7 +1,7 @@
 import React, { forwardRef, useMemo } from 'react';
 
 import { Button } from './button';
-import { ButtonProps } from './button.styled';
+import { ButtonProps } from './button.styles';
 
 type OmittedProps =
   | 'leftIcon'
diff --git a/ui/src/components/core/button/index.ts b/ui/src/components/core/button/index.ts
index 3925955..b1eb04d 100644
--- a/ui/src/components/core/button/index.ts
+++ b/ui/src/components/core/button/index.ts
@@ -1,2 +1,2 @@
-export * from './button.styled';
+export * from './button.styles';
 export * from './button';
diff --git a/ui/src/components/layout/flex.styled.ts b/ui/src/components/layout/flex.styles.ts
similarity index 100%
rename from ui/src/components/layout/flex.styled.ts
rename to ui/src/components/layout/flex.styles.ts
diff --git a/ui/src/components/layout/grid.styled.ts b/ui/src/components/layout/grid.styles.ts
similarity index 100%
rename from ui/src/components/layout/grid.styled.ts
rename to ui/src/components/layout/grid.styles.ts
diff --git a/ui/src/components/layout/index.ts b/ui/src/components/layout/index.ts
index baec0ec..9f9e3ea 100644
--- a/ui/src/components/layout/index.ts
+++ b/ui/src/components/layout/index.ts
@@ -1,2 +1,2 @@
-export * from './grid.styled';
-export * from './flex.styled';
+export * from './grid.styles';
+export * from './flex.styles';