diff --git a/src/app/components/button/button.tsx b/src/app/components/button/button.tsx
index 80b5945eb97..f1864c38dd9 100644
--- a/src/app/components/button/button.tsx
+++ b/src/app/components/button/button.tsx
@@ -10,9 +10,9 @@ export type ButtonProps = Omit<
   ButtonVariantProps;
 
 export function LeatherButton(props: ButtonProps) {
-  const { children, variant, fullWidth, invert, ...rest } = props;
+  const { children, variant, fullWidth, invert, type = 'button', ...rest } = props;
   return (
-    <StyledButton className={buttonRecipe({ variant, fullWidth, invert })} {...rest}>
+    <StyledButton className={buttonRecipe({ variant, fullWidth, invert })} type={type} {...rest}>
       {children}
     </StyledButton>
   );
diff --git a/src/app/components/preview-button.tsx b/src/app/components/preview-button.tsx
index 6242497e0a0..01355c5addc 100644
--- a/src/app/components/preview-button.tsx
+++ b/src/app/components/preview-button.tsx
@@ -15,6 +15,7 @@ export function PreviewButton({ text = 'Continue', isDisabled, ...props }: Previ
       data-testid={SendCryptoAssetSelectors.PreviewSendTxBtn}
       disabled={isDisabled}
       onClick={() => handleSubmit()}
+      type="submit"
       {...props}
     >
       {text}
diff --git a/src/app/features/add-network/add-network.tsx b/src/app/features/add-network/add-network.tsx
index fecd6d57c6e..0ea73dfe0ad 100644
--- a/src/app/features/add-network/add-network.tsx
+++ b/src/app/features/add-network/add-network.tsx
@@ -178,6 +178,7 @@ export function AddNetwork() {
                 disabled={loading}
                 aria-busy={loading}
                 data-testid={NetworkSelectors.BtnAddNetwork}
+                type="submit"
               >
                 Add network
               </LeatherButton>
diff --git a/src/app/pages/send/send-crypto-asset-form/family/bitcoin/components/bitcoin-send-max-button.tsx b/src/app/pages/send/send-crypto-asset-form/family/bitcoin/components/bitcoin-send-max-button.tsx
index e9dbdb5cf35..da6aad99024 100644
--- a/src/app/pages/send/send-crypto-asset-form/family/bitcoin/components/bitcoin-send-max-button.tsx
+++ b/src/app/pages/send/send-crypto-asset-form/family/bitcoin/components/bitcoin-send-max-button.tsx
@@ -46,7 +46,6 @@ export function BitcoinSendMaxButton({
     >
       <Box>
         <LeatherButton
-          type="button"
           data-testid={SendCryptoAssetSelectors.SendMaxBtn}
           onClick={() => onSendMax()}
           variant="link"
diff --git a/src/app/pages/swap/components/swap-selected-asset.layout.tsx b/src/app/pages/swap/components/swap-selected-asset.layout.tsx
index 7def032844c..67744f7c936 100644
--- a/src/app/pages/swap/components/swap-selected-asset.layout.tsx
+++ b/src/app/pages/swap/components/swap-selected-asset.layout.tsx
@@ -60,7 +60,7 @@ export function SwapSelectedAssetLayout({
       </HStack>
       <SelectedAssetField
         contentLeft={
-          <LeatherButton onClick={onChooseAsset} p="space.02" type="button" variant="ghost">
+          <LeatherButton onClick={onChooseAsset} p="space.02" variant="ghost">
             <HStack>
               {icon && <styled.img src={icon} width="32px" height="32px" alt="Swap asset" />}
               <styled.span textStyle="label.01">{symbol}</styled.span>
@@ -87,7 +87,6 @@ export function SwapSelectedAssetLayout({
             _focus={{ _before: { color: 'unset' } }}
             cursor={onClickHandler ? 'pointer' : 'unset'}
             onClick={onClickHandler ? onClickHandler : noop}
-            type="button"
             variant={onClickHandler ? 'link' : 'text'}
           >
             <styled.span textStyle="caption.02">{value}</styled.span>
diff --git a/src/app/pages/swap/swap.tsx b/src/app/pages/swap/swap.tsx
index 1f270291d39..90979a896fd 100644
--- a/src/app/pages/swap/swap.tsx
+++ b/src/app/pages/swap/swap.tsx
@@ -36,7 +36,11 @@ export function Swap() {
         <SwapSelectedAssets />
       </SwapContentLayout>
       <SwapFooterLayout>
-        <LeatherButton disabled={!(dirty && isValid) || isFetchingExchangeRate} width="100%">
+        <LeatherButton
+          disabled={!(dirty && isValid) || isFetchingExchangeRate}
+          type="submit"
+          width="100%"
+        >
           Review and swap
         </LeatherButton>
       </SwapFooterLayout>