diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 10ed42f1..14acb10c 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -21,7 +21,7 @@ module.exports = {
     plugins: ["react", "@typescript-eslint", "prettier"],
     rules: {
         "import/prefer-default-export": "off",
-        "no-restricted-exports": ["error", {restrictDefaultExports: {direct: true}}],
+        "no-restricted-exports": ["error", { restrictDefaultExports: { direct: true } }],
         "react/react-in-jsx-scope": "off",
         "react/require-default-props": "off",
         "no-alert": "off",
@@ -39,6 +39,7 @@ module.exports = {
                 devDependencies: ["**/*.stories.tsx", "**/*.test.tsx", "**/*.test.ts"],
             },
         ],
+        "react/jsx-props-no-spreading": "off",
     },
     overrides: [
         {
@@ -56,13 +57,13 @@ module.exports = {
                 "no-restricted-exports": "off",
                 "react/jsx-props-no-spreading": "off",
                 "import/prefer-default-export": "off",
-            }
+            },
         },
         {
             files: ["src/util/class-names.tsx"],
             rules: {
                 "import/no-extraneous-dependencies": "off",
-            }
-        }
+            },
+        },
     ],
 };
diff --git a/src/components/button/button.stories.tsx b/src/components/button/button.stories.tsx
index f50c3c27..2f633cce 100644
--- a/src/components/button/button.stories.tsx
+++ b/src/components/button/button.stories.tsx
@@ -4,7 +4,7 @@ import { Button, ButtonProps } from "./button";
 import { ChatIcon, DiagramTreeIcon, LockIcon } from "../../icons";
 import { hiddenArgControl } from "../../util/storybook-utils";
 
-const types: ButtonProps["type"][] = [
+const variants: ButtonProps["variant"][] = [
     "primary",
     "secondary",
     "minimal",
@@ -55,8 +55,8 @@ export const Types: Story = {
     argTypes: { type: hiddenArgControl },
     render: ({ children, ...args }) => (
         <div className="flex flex-col gap-4">
-            {types.map((type) => (
-                <Button key={type} {...args} type={type}>
+            {variants.map((variant) => (
+                <Button key={variant} {...args} type="button" variant={variant}>
                     {children}
                 </Button>
             ))}
diff --git a/src/components/button/button.test.tsx b/src/components/button/button.test.tsx
index ad21bcf3..ba3d4c39 100644
--- a/src/components/button/button.test.tsx
+++ b/src/components/button/button.test.tsx
@@ -8,7 +8,11 @@ describe("Button", () => {
     it("renders a button with text and button type", () => {
         const text = "Button Type";
         // ARRANGE
-        render(<Button onClick={() => null}>{text}</Button>);
+        render(
+            <Button type="button" onClick={() => null}>
+                {text}
+            </Button>
+        );
 
         // ASSERT
         const button = screen.getByText(text);
@@ -20,7 +24,7 @@ describe("Button", () => {
         const text = "Submit Type";
         // ARRANGE
         render(
-            <Button isSubmitButton onClick={() => null}>
+            <Button type="submit" onClick={() => null}>
                 {text}
             </Button>
         );
@@ -35,7 +39,7 @@ describe("Button", () => {
         const text = "Left icon";
         // ARRANGE
         render(
-            <Button LeftIcon={AddIcon} onClick={() => null}>
+            <Button type="button" LeftIcon={AddIcon} onClick={() => null}>
                 {text}
             </Button>
         );
@@ -51,7 +55,7 @@ describe("Button", () => {
         const text = "Right icon";
         // ARRANGE
         render(
-            <Button RightIcon={AddIcon} onClick={() => null}>
+            <Button type="button" RightIcon={AddIcon} onClick={() => null}>
                 {text}
             </Button>
         );
@@ -67,7 +71,11 @@ describe("Button", () => {
         const text = "Onclick button";
         const mock = vi.fn();
         // ARRANGE
-        render(<Button onClick={mock}>{text}</Button>);
+        render(
+            <Button type="button" onClick={mock}>
+                {text}
+            </Button>
+        );
 
         // ASSERT
         const button = screen.getByText(text);
@@ -82,7 +90,7 @@ describe("Button", () => {
         const mock = vi.fn();
         // ARRANGE
         render(
-            <Button onClick={mock} disabled>
+            <Button type="button" onClick={mock} disabled>
                 {text}
             </Button>
         );
@@ -96,29 +104,12 @@ describe("Button", () => {
         expect(mock).toHaveBeenCalledTimes(0);
     });
 
-    it("renders a button with text and form", () => {
-        const text = "Form button";
-        const mock = vi.fn();
-        // ARRANGE
-        render(
-            <Button onClick={mock} form="form-test" isSubmitButton>
-                {text}
-            </Button>
-        );
-
-        // ASSERT
-        const button = screen.getByText(text);
-        expect(button).toBeInTheDocument();
-        expect(button).toHaveAttribute("type", "submit");
-        expect(button).toHaveAttribute("form", "form-test");
-    });
-
     it("renders a button with loading state", () => {
         const text = "Loading button";
         const mock = vi.fn();
         // ARRANGE
         render(
-            <Button onClick={mock} loading>
+            <Button type="button" onClick={mock} loading>
                 {text}
             </Button>
         );
diff --git a/src/components/button/button.tsx b/src/components/button/button.tsx
index 8ea05d3d..1de4d42d 100644
--- a/src/components/button/button.tsx
+++ b/src/components/button/button.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable react/button-has-type */
 import React from "react";
 import { classNames } from "../../util/class-names";
 import { Spinner } from "../spinner";
@@ -14,8 +15,6 @@ const buttonVariants = {
         "bg-neutral-0 text-danger-500 border border-danger-400 hover:bg-danger-50 hover:text-danger-600 active:border-danger-700 active:text-danger-700 active:bg-danger-100 focus:ring-2 focus:ring-danger-100 focus:text-danger-600 disabled:border-danger-100 disabled:text-danger-100 disabled:bg-neutral-0 fill-danger-600 disabled:fill-danger-100",
 };
 
-export type ButtonType = keyof typeof buttonVariants;
-
 const iconVariants = {
     primary: "text-neutral-0",
     secondary:
@@ -26,60 +25,42 @@ const iconVariants = {
     "danger-secondary": "",
 };
 
-export interface ButtonProps {
-    className?: string;
-    children: string;
-    type?: ButtonType;
-    onClick: () => void;
+export interface ButtonProps extends React.ComponentPropsWithoutRef<"button"> {
+    variant?: keyof typeof buttonVariants;
     loading?: boolean;
     LeftIcon?: React.ElementType;
     RightIcon?: React.ElementType;
-    disabled?: boolean;
-    isSubmitButton?: boolean;
-    form?: string;
 }
 
-const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
-    (
-        {
-            className,
-            children,
-            onClick,
-            loading,
-            LeftIcon,
-            RightIcon,
-            disabled = false,
-            type = "primary",
-            isSubmitButton,
-            form,
-        },
-        ref
-    ) => {
-        return (
-            <button
-                type={isSubmitButton ? "submit" : "button"}
-                className={classNames(
-                    `group flex h-8 items-center gap-2 whitespace-nowrap rounded px-4 text-xs font-semibold focus:outline-none disabled:cursor-not-allowed`,
-                    buttonVariants[type],
-                    className
-                )}
-                onClick={onClick}
-                disabled={disabled}
-                form={form}
-                ref={ref}
-            >
-                {loading ? <Spinner size="small" /> : null}
+const Button = ({
+    variant = "primary",
+    className,
+    children,
+    loading,
+    LeftIcon,
+    RightIcon,
+    ...props
+}: ButtonProps) => {
+    return (
+        <button
+            className={classNames(
+                `group flex h-8 items-center gap-2 whitespace-nowrap rounded px-4 text-xs font-semibold focus:outline-none disabled:cursor-not-allowed`,
+                buttonVariants[variant],
+                className
+            )}
+            {...props}
+        >
+            {loading ? <Spinner size="small" /> : null}
 
-                {LeftIcon && !loading ? (
-                    <LeftIcon className={`${iconVariants[type]} h-3 w-3`} />
-                ) : null}
+            {LeftIcon && !loading ? (
+                <LeftIcon className={`${iconVariants[variant]} h-3 w-3`} />
+            ) : null}
 
-                {children}
+            {children}
 
-                {RightIcon ? <RightIcon className={`${iconVariants[type]} h-3 w-3`} /> : null}
-            </button>
-        );
-    }
-);
+            {RightIcon ? <RightIcon className={`${iconVariants[variant]} h-3 w-3`} /> : null}
+        </button>
+    );
+};
 
 export { Button };