diff --git a/web/src/components/InsertModal.tsx b/web/src/components/InsertModal.tsx
index f9385b2..518a297 100644
--- a/web/src/components/InsertModal.tsx
+++ b/web/src/components/InsertModal.tsx
@@ -91,7 +91,7 @@ export function InsertModal<
           <div className="flex justify-end">
             <AutoFormSubmit>
               Save Changes
-              <span className="ml-2">{isLoading && <LoadingIcon />}</span>
+              {isLoading && <LoadingIcon />}
             </AutoFormSubmit>
           </div>
         </AutoForm>
diff --git a/web/src/components/Navbar.tsx b/web/src/components/Navbar.tsx
index 7d737dd..47d539f 100644
--- a/web/src/components/Navbar.tsx
+++ b/web/src/components/Navbar.tsx
@@ -38,9 +38,9 @@ export function Navbar() {
         {!isDesktop && (
           <Sheet>
             <SheetTrigger asChild>
-              <Button variant="ghost" className="w-8 h-8 p-2">
+              <button className="flex items-center justify-center w-8 h-8 p-2">
                 <Menu />
-              </Button>
+              </button>
             </SheetTrigger>
             <SheetContent side="left" className="flex flex-col gap-4">
               <SheetHeader>
diff --git a/web/src/components/RunWorkflowInline.tsx b/web/src/components/RunWorkflowInline.tsx
index 7033a37..cf1f94b 100644
--- a/web/src/components/RunWorkflowInline.tsx
+++ b/web/src/components/RunWorkflowInline.tsx
@@ -92,9 +92,7 @@ export function RunWorkflowInline({
           <div className="flex justify-end">
             <AutoFormSubmit disabled={isLoading || loading}>
               Run
-              <span className="ml-2">
-                {isLoading || loading ? <LoadingIcon /> : <Play size={14} />}
-              </span>
+              {isLoading || loading ? <LoadingIcon /> : <Play size={14} />}
             </AutoFormSubmit>
           </div>
         </AutoForm>
diff --git a/web/src/components/VersionSelect.tsx b/web/src/components/VersionSelect.tsx
index 9d99036..cc53da2 100644
--- a/web/src/components/VersionSelect.tsx
+++ b/web/src/components/VersionSelect.tsx
@@ -281,9 +281,7 @@ export function RunWorkflowButton({
             <div className="flex justify-end">
               <AutoFormSubmit>
                 Run
-                <span className="ml-2">
-                  {isLoading ? <LoadingIcon /> : <Play size={14} />}
-                </span>
+                {isLoading ? <LoadingIcon /> : <Play size={14} />}
               </AutoFormSubmit>
             </div>
           </AutoForm>
diff --git a/web/src/components/ui/auto-form/index.tsx b/web/src/components/ui/auto-form/index.tsx
index b3b7ae8..db4403f 100644
--- a/web/src/components/ui/auto-form/index.tsx
+++ b/web/src/components/ui/auto-form/index.tsx
@@ -21,7 +21,7 @@ export function AutoFormSubmit({
   disabled?: boolean;
 }) {
   return (
-    <Button type="submit" disabled={disabled}>
+    <Button type="submit" disabled={disabled} className="flex gap-2">
       {children ?? "Submit"}
     </Button>
   );
diff --git a/web/src/components/ui/button.tsx b/web/src/components/ui/button.tsx
index 669b444..c8018d2 100644
--- a/web/src/components/ui/button.tsx
+++ b/web/src/components/ui/button.tsx
@@ -184,7 +184,7 @@ const buttonVariants = cva(styles.base, {
       outline: styles.outline,
       secondary: "bg-secondary text-secondary-foreground hover:bg-secondary/80",
       ghost: styles.plain,
-      link: "text-primary underline-offset-4 hover:underline",
+      link: "border-none text-primary underline-offset-4 hover:underline",
     },
     size: {
       default: "h-10 px-4 py-2",