diff --git a/apps/dashboard/src/@/components/contract-components/contract-deploy-form/custom-contract.tsx b/apps/dashboard/src/@/components/contract-components/contract-deploy-form/custom-contract.tsx
index d2327140858..c2b8d7af0d6 100644
--- a/apps/dashboard/src/@/components/contract-components/contract-deploy-form/custom-contract.tsx
+++ b/apps/dashboard/src/@/components/contract-components/contract-deploy-form/custom-contract.tsx
@@ -1,9 +1,6 @@
 "use client";
-import { Flex, FormControl } from "@chakra-ui/react";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { verifyContract } from "app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/ContractSourcesPage";
-import { FormHelperText, FormLabel } from "chakra/form";
-import { Text } from "chakra/text";
 import {
   ArrowUpFromLineIcon,
   CircleAlertIcon,
@@ -27,6 +24,7 @@ import {
   reportContractDeployed,
   reportContractDeployFailed,
 } from "@/analytics/report";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { NetworkSelectorButton } from "@/components/misc/NetworkSelectorButton";
 import { SolidityInput } from "@/components/solidity-inputs";
 import {
@@ -932,14 +930,17 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
           <Fieldset legend="Deploy Options">
             <div className="flex flex-col gap-6">
               {/* Chain */}
-              <FormControl isRequired>
-                <FormLabel>Chain</FormLabel>
-
-                <p className="mb-3 text-muted-foreground text-sm">
-                  Select a network to deploy this contract on. We recommend
-                  starting with a testnet
-                </p>
-
+              <FormFieldSetup
+                isRequired
+                label="Chain"
+                errorMessage={undefined}
+                helperText={
+                  <span>
+                    Select a network to deploy this contract on. We recommend
+                    starting with a testnet
+                  </span>
+                }
+              >
                 <div className="flex flex-col gap-3">
                   <div className="flex flex-col gap-4 md:flex-row">
                     <NetworkSelectorButton
@@ -953,7 +954,6 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
                           : metadata?.networksForDeployment?.networksEnabled
                       }
                     />
-
                     <Button asChild variant="outline">
                       <Link
                         className="gap-3"
@@ -967,12 +967,11 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
                     </Button>
                   </div>
                 </div>
-              </FormControl>
+              </FormFieldSetup>
 
               {metadata?.deployType === "standard" && (
                 <>
                   {/* Deterministic deploy */}
-
                   <div className="flex flex-col gap-3">
                     <CheckboxWithLabel>
                       <Checkbox
@@ -1006,16 +1005,21 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
 
                   {/*  Optional Salt Input */}
                   {isCreate2Deployment && (
-                    <FormControl>
-                      <Flex alignItems="center" my={1}>
-                        <FormLabel display="flex" flex="1" mb={0}>
-                          <Flex alignItems="baseline" gap={1}>
-                            Optional Salt Input
-                            <Text size="label.sm">(saltForCreate2)</Text>
-                          </Flex>
-                        </FormLabel>
-                        <FormHelperText mt={0}>string</FormHelperText>
-                      </Flex>
+                    <FormFieldSetup
+                      isRequired={false}
+                      label={
+                        <span className="flex items-center gap-1">
+                          Optional Salt Input
+                          <span className="font-normal text-muted-foreground text-xs">
+                            (saltForCreate2)
+                          </span>
+                        </span>
+                      }
+                      errorMessage={
+                        form.getFieldState("saltForCreate2", form.formState)
+                          .error?.message
+                      }
+                    >
                       <SolidityInput
                         solidityType="string"
                         {...form.register("saltForCreate2")}
@@ -1034,7 +1038,7 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
                           Include deployer wallet address in salt (recommended)
                         </span>
                       </CheckboxWithLabel>
-                    </FormControl>
+                    </FormFieldSetup>
                   )}
                 </>
               )}
diff --git a/apps/dashboard/src/@/components/contract-components/contract-deploy-form/modular-contract-default-modules-fieldset.tsx b/apps/dashboard/src/@/components/contract-components/contract-deploy-form/modular-contract-default-modules-fieldset.tsx
index 001190074a8..2ded81f78e2 100644
--- a/apps/dashboard/src/@/components/contract-components/contract-deploy-form/modular-contract-default-modules-fieldset.tsx
+++ b/apps/dashboard/src/@/components/contract-components/contract-deploy-form/modular-contract-default-modules-fieldset.tsx
@@ -1,8 +1,7 @@
-import { FormControl } from "@chakra-ui/react";
-import { FormErrorMessage, FormLabel } from "chakra/form";
 import { useMemo } from "react";
 import type { ThirdwebClient } from "thirdweb";
 import type { FetchDeployMetadataResult } from "thirdweb/contract";
+import { FormFieldSetup } from "@/components/blocks/FormFieldSetup";
 import { SolidityInput } from "@/components/solidity-inputs";
 import type { CustomContractDeploymentForm } from "./custom-contract";
 import { PrimarySaleFieldset } from "./primary-sale-fieldset";
@@ -104,14 +103,15 @@ function RenderModule(props: {
             `moduleData.${module.name}.${param.name}` as const;
 
           return (
-            <FormControl
-              isInvalid={
-                !!form.getFieldState(formFieldKey, form.formState).error
-              }
-              isRequired
+            <FormFieldSetup
               key={formFieldKey}
+              htmlFor={formFieldKey}
+              label={param.name}
+              isRequired={true}
+              errorMessage={
+                form.getFieldState(formFieldKey, form.formState).error?.message
+              }
             >
-              <FormLabel> {param.name}</FormLabel>
               <SolidityInput
                 client={props.client}
                 // @ts-expect-error - old types, need to update
@@ -119,13 +119,7 @@ function RenderModule(props: {
                 solidityType={param.type}
                 {...form.register(formFieldKey)}
               />
-              <FormErrorMessage>
-                {
-                  form.getFieldState(formFieldKey, form.formState).error
-                    ?.message
-                }
-              </FormErrorMessage>
-            </FormControl>
+            </FormFieldSetup>
           );
         })}
       </div>
diff --git a/apps/dashboard/src/@/components/solidity-inputs/button.tsx b/apps/dashboard/src/@/components/solidity-inputs/button.tsx
index 13d169d4bc7..890cdef900d 100644
--- a/apps/dashboard/src/@/components/solidity-inputs/button.tsx
+++ b/apps/dashboard/src/@/components/solidity-inputs/button.tsx
@@ -1,9 +1,9 @@
 import type { UseMutationResult } from "@tanstack/react-query";
-import { Button, type ButtonProps } from "chakra/button";
 import { UploadIcon } from "lucide-react";
 import { toast } from "sonner";
 import type { ThirdwebClient } from "thirdweb";
 import { FileInput } from "@/components/blocks/FileInput";
+import { Button, type ButtonProps } from "@/components/ui/button";
 import { useErrorHandler } from "@/contexts/error-handler";
 import type { ComponentWithChildren } from "@/types/component-with-children";
 
@@ -39,12 +39,13 @@ export const IpfsUploadButton: ComponentWithChildren<IpfsUploadButtonProps> = ({
     <FileInput client={client} setValue={handleUpload}>
       <Button
         aria-label="Upload to IPFS"
-        isLoading={storageUpload.isPending}
-        rightIcon={<UploadIcon className="size-4" />}
+        variant="secondary"
+        disabled={storageUpload.isPending}
         size="sm"
-        variant="solid"
+        className="h-auto py-1.5 text-xs -translate-x-0.5 rounded-sm"
         {...buttonProps}
       >
+        <UploadIcon className="size-3 mr-2 text-muted-foreground" />
         {children}
       </Button>
     </FileInput>
diff --git a/apps/dashboard/src/chakra/button.tsx b/apps/dashboard/src/chakra/button.tsx
index 1ed8d9955ad..242ec153afb 100644
--- a/apps/dashboard/src/chakra/button.tsx
+++ b/apps/dashboard/src/chakra/button.tsx
@@ -30,7 +30,7 @@ const buttonSizesMap = {
 
 type PossibleButtonSize = keyof typeof buttonSizesMap;
 
-export interface ButtonProps extends Omit<ChakraButtonProps, "size"> {
+interface ButtonProps extends Omit<ChakraButtonProps, "size"> {
   size?: PossibleButtonSize;
   fromcolor?: string;
   tocolor?: string;