diff --git a/apps/main/src/lend/components/PageLoanManage/index.tsx b/apps/main/src/lend/components/PageLoanManage/index.tsx
index dacd14a3b..6fbdbfb48 100644
--- a/apps/main/src/lend/components/PageLoanManage/index.tsx
+++ b/apps/main/src/lend/components/PageLoanManage/index.tsx
@@ -5,11 +5,16 @@ import LoanCollateralRemove from '@/lend/components/PageLoanManage/LoanCollatera
 import LoanRepay from '@/lend/components/PageLoanManage/LoanRepay'
 import LoanSelfLiquidation from '@/lend/components/PageLoanManage/LoanSelfLiquidation'
 import type { CollateralFormType, LeverageFormType, LoanFormType } from '@/lend/components/PageLoanManage/types'
+import networks from '@/lend/networks'
 import { type MarketUrlParams, PageContentProps } from '@/lend/types/lend.types'
 import { getLoanManagePathname } from '@/lend/utils/utilsRouter'
+import { AddCollateralForm } from '@/llamalend/features/manage-loan/components/AddCollateralForm'
+import { RemoveCollateralForm } from '@/llamalend/features/manage-loan/components/RemoveCollateralForm'
+import { RepayForm } from '@/llamalend/features/manage-loan/components/RepayForm'
 import Stack from '@mui/material/Stack'
 import { AppFormContentWrapper } from '@ui/AppForm'
 import { useNavigate } from '@ui-kit/hooks/router'
+import { useManageLoanMuiForm } from '@ui-kit/hooks/useFeatureFlags'
 import { t } from '@ui-kit/lib/i18n'
 import { type TabOption, TabsSwitcher } from '@ui-kit/shared/ui/TabsSwitcher'
 import { SizesAndSpaces } from '@ui-kit/themes/design/1_sizes_spaces'
@@ -28,8 +33,10 @@ const tabsCollateral: TabOption<CollateralFormType>[] = [
 ]
 
 const ManageLoan = (pageProps: PageContentProps & { params: MarketUrlParams }) => {
-  const { rOwmId, rFormType, market, params } = pageProps
+  const { rChainId, rOwmId, rFormType, market, params, isLoaded } = pageProps
   const push = useNavigate()
+  const shouldUseManageLoanMuiForm = useManageLoanMuiForm()
+  const useMuiForm = shouldUseManageLoanMuiForm && !!market
 
   type Tab = 'loan' | 'collateral' | 'leverage'
   const tabs: TabOption<Tab>[] = useMemo(
@@ -65,26 +72,84 @@ const ManageLoan = (pageProps: PageContentProps & { params: MarketUrlParams }) =
         onChange={(key) => push(getLoanManagePathname(params, rOwmId, key))}
         options={tabs}
       />
-      <Stack sx={{ backgroundColor: (t) => t.design.Layer[1].Fill }}>
-        <TabsSwitcher
-          variant="underlined"
-          size="small"
-          value={subTab}
-          onChange={setSubTab}
-          options={subTabs}
-          fullWidth
-        />
+      {useMuiForm ? (
+        <>
+          <TabsSwitcher
+            variant="underlined"
+            size="small"
+            value={subTab}
+            onChange={setSubTab}
+            options={subTabs}
+            fullWidth
+          />
 
-        <AppFormContentWrapper>
-          {subTab === 'loan-increase' && <LoanBorrowMore {...pageProps} />}
-          {subTab === 'loan-decrease' && <LoanRepay {...pageProps} />}
+          {subTab === 'loan-increase' && (
+            <Stack sx={{ backgroundColor: (t) => t.design.Layer[1].Fill }}>
+              <AppFormContentWrapper>
+                <LoanBorrowMore {...pageProps} />
+              </AppFormContentWrapper>
+            </Stack>
+          )}
+          {subTab === 'loan-decrease' && market && (
+            <RepayForm
+              networks={networks}
+              chainId={rChainId}
+              market={market}
+              enabled={isLoaded}
+              // No extra side effects required for legacy store; llamalend hooks handle cache invalidation.
+              onRepaid={async () => {}}
+            />
+          )}
           {subTab === 'loan-liquidate' && <LoanSelfLiquidation {...pageProps} />}
-          {subTab === 'collateral-increase' && <LoanCollateralAdd {...pageProps} />}
-          {subTab === 'collateral-decrease' && <LoanCollateralRemove {...pageProps} />}
+          {subTab === 'collateral-increase' && market && (
+            <AddCollateralForm
+              networks={networks}
+              chainId={rChainId}
+              market={market}
+              enabled={isLoaded}
+              onAdded={async () => {}}
+            />
+          )}
+          {subTab === 'collateral-decrease' && market && (
+            <RemoveCollateralForm
+              networks={networks}
+              chainId={rChainId}
+              market={market}
+              enabled={isLoaded}
+              onRemoved={async () => {}}
+            />
+          )}
           {/** Leverage has no subtabs */}
-          {rFormType === 'leverage' && <LoanBorrowMore isLeverage {...pageProps} />}
-        </AppFormContentWrapper>
-      </Stack>
+          {rFormType === 'leverage' && (
+            <Stack sx={{ backgroundColor: (t) => t.design.Layer[1].Fill }}>
+              <AppFormContentWrapper>
+                <LoanBorrowMore isLeverage {...pageProps} />
+              </AppFormContentWrapper>
+            </Stack>
+          )}
+        </>
+      ) : (
+        <Stack sx={{ backgroundColor: (t) => t.design.Layer[1].Fill }}>
+          <TabsSwitcher
+            variant="underlined"
+            size="small"
+            value={subTab}
+            onChange={setSubTab}
+            options={subTabs}
+            fullWidth
+          />
+
+          <AppFormContentWrapper>
+            {subTab === 'loan-increase' && <LoanBorrowMore {...pageProps} />}
+            {subTab === 'loan-decrease' && <LoanRepay {...pageProps} />}
+            {subTab === 'loan-liquidate' && <LoanSelfLiquidation {...pageProps} />}
+            {subTab === 'collateral-increase' && <LoanCollateralAdd {...pageProps} />}
+            {subTab === 'collateral-decrease' && <LoanCollateralRemove {...pageProps} />}
+            {/** Leverage has no subtabs */}
+            {rFormType === 'leverage' && <LoanBorrowMore isLeverage {...pageProps} />}
+          </AppFormContentWrapper>
+        </Stack>
+      )}
     </Stack>
   )
 }
diff --git a/apps/main/src/llamalend/features/borrow/components/CreateLoanForm.tsx b/apps/main/src/llamalend/features/borrow/components/CreateLoanForm.tsx
index 907b79291..7cd13a2bf 100644
--- a/apps/main/src/llamalend/features/borrow/components/CreateLoanForm.tsx
+++ b/apps/main/src/llamalend/features/borrow/components/CreateLoanForm.tsx
@@ -14,9 +14,9 @@ import Stack from '@mui/material/Stack'
 import { useBorrowPreset } from '@ui-kit/hooks/useLocalStorage'
 import { t } from '@ui-kit/lib/i18n'
 import { InputDivider } from '../../../widgets/InputDivider'
+import { useCreateLoanForm } from '../hooks/useCreateLoanForm'
 import { setValueOptions } from '../react-form.utils'
 import { type BorrowFormExternalFields, type OnBorrowFormUpdate } from '../types'
-import { useBorrowForm } from '../useBorrowForm'
 import { AdvancedBorrowOptions } from './AdvancedBorrowOptions'
 import { CreateLoanInfoAccordion } from './CreateLoanInfoAccordion'
 import { LeverageInput } from './LeverageInput'
@@ -70,7 +70,7 @@ export const CreateLoanForm = <ChainId extends IChainId>({
     formErrors,
     tooMuchDebt,
     isApproved,
-  } = useBorrowForm({ market, network, preset, onCreated })
+  } = useCreateLoanForm({ market, network, preset, onCreated })
   const setRange = useCallback((range: number) => form.setValue('range', range, setValueOptions), [form])
   useFormSync(values, onUpdate)
 
@@ -97,12 +97,9 @@ export const CreateLoanForm = <ChainId extends IChainId>({
           blockchainId={network.id}
           name="userCollateral"
           form={form}
-          isLoading={maxTokenValues.isCollateralLoading}
-          isError={maxTokenValues.isCollateralError}
-          max={values.maxCollateral}
+          max={{ ...maxTokenValues.collateral, fieldName: 'maxCollateral' }}
           testId="borrow-collateral-input"
           network={network}
-          maxFieldName="maxCollateral"
         />
         <LoanFormTokenInput
           label={t`Borrow`}
@@ -110,12 +107,9 @@ export const CreateLoanForm = <ChainId extends IChainId>({
           blockchainId={network.id}
           name="debt"
           form={form}
-          isLoading={maxTokenValues.isDebtLoading}
-          isError={maxTokenValues.isDebtError}
-          max={values.maxDebt}
+          max={{ ...maxTokenValues.debt, fieldName: 'maxDebt' }}
           testId="borrow-debt-input"
           network={network}
-          maxFieldName="maxDebt"
           message={
             values.maxDebt && <FormMessage label={t`Max borrow:`} value={values.maxDebt} symbol={borrowToken?.symbol} />
           }
@@ -124,12 +118,10 @@ export const CreateLoanForm = <ChainId extends IChainId>({
 
       {market && hasLeverage(market) && (
         <LeverageInput
-          leverageEnabled={values.leverageEnabled}
+          checked={values.leverageEnabled}
           form={form}
           params={params}
           maxLeverage={maxTokenValues.maxLeverage}
-          isError={maxTokenValues.isLeverageError}
-          isLoading={maxTokenValues.isLeverageLoading}
         />
       )}
 
diff --git a/apps/main/src/llamalend/features/borrow/components/LeverageInput.tsx b/apps/main/src/llamalend/features/borrow/components/LeverageInput.tsx
index d7740970a..062d32128 100644
--- a/apps/main/src/llamalend/features/borrow/components/LeverageInput.tsx
+++ b/apps/main/src/llamalend/features/borrow/components/LeverageInput.tsx
@@ -1,5 +1,6 @@
 import { type ChangeEvent, useCallback } from 'react'
 import type { UseFormReturn } from 'react-hook-form'
+import type { Query } from '@/llamalend/widgets/manage-loan/loan.types'
 import Checkbox from '@mui/material/Checkbox'
 import FormControlLabel from '@mui/material/FormControlLabel'
 import Stack from '@mui/material/Stack'
@@ -17,18 +18,14 @@ const { Spacing } = SizesAndSpaces
 
 export const LeverageInput = ({
   form,
-  leverageEnabled,
+  checked,
   params,
-  maxLeverage,
-  isError,
-  isLoading,
+  maxLeverage: { data: maxLeverage, error, isLoading },
 }: {
-  leverageEnabled: boolean
+  checked: boolean
   form: UseFormReturn<BorrowForm>
   params: BorrowFormQueryParams
-  maxLeverage: Decimal | undefined
-  isError: boolean
-  isLoading: boolean
+  maxLeverage: Query<Decimal>
 }) => {
   const { leverage } = useCreateLoanExpectedCollateral(params).data ?? {}
 
@@ -44,7 +41,7 @@ export const LeverageInput = ({
           <>
             <Typography variant="headingXsBold">{t`Enable leverage`}</Typography>
             <WithSkeleton loading={isLoading}>
-              <Typography {...(isError && { color: 'error.main' })} variant="bodyXsRegular">
+              <Typography {...(error && { color: 'error.main' })} variant="bodyXsRegular">
                 {t`up to ${formatNumber(maxLeverage, { maximumFractionDigits: 1 })}x 🔥`}
               </Typography>
             </WithSkeleton>
@@ -55,7 +52,7 @@ export const LeverageInput = ({
             data-testid="leverage-checkbox"
             size="small"
             disabled={!maxLeverage}
-            checked={leverageEnabled}
+            checked={checked}
             onChange={onLeverageChanged}
             sx={{ padding: 0, paddingInlineEnd: Spacing.xs, alignSelf: 'start' }}
           />
@@ -64,9 +61,9 @@ export const LeverageInput = ({
       <ActionInfo
         label={t`Leverage`}
         value={leverage == null ? '–' : `${formatNumber(leverage, { maximumFractionDigits: 2 })}x`}
-        valueColor={isError ? 'error' : undefined}
+        valueColor={error ? 'error' : undefined}
         loading={isLoading}
-        error={isError}
+        error={error}
         size="medium"
         data-testid="leverage-value"
       />
diff --git a/apps/main/src/llamalend/features/borrow/useBorrowForm.tsx b/apps/main/src/llamalend/features/borrow/hooks/useCreateLoanForm.tsx
similarity index 84%
rename from apps/main/src/llamalend/features/borrow/useBorrowForm.tsx
rename to apps/main/src/llamalend/features/borrow/hooks/useCreateLoanForm.tsx
index d60d2db98..bb099b56c 100644
--- a/apps/main/src/llamalend/features/borrow/useBorrowForm.tsx
+++ b/apps/main/src/llamalend/features/borrow/hooks/useCreateLoanForm.tsx
@@ -10,18 +10,18 @@ import { useDebouncedValue } from '@ui-kit/hooks/useDebounce'
 import { formDefaultOptions } from '@ui-kit/lib/model'
 import { Decimal } from '@ui-kit/utils'
 import { SLIPPAGE_PRESETS } from '@ui-kit/widgets/SlippageSettings/slippage.utils'
-import { BORROW_PRESET_RANGES, BorrowPreset } from '../../constants'
-import { type CreateLoanOptions, useCreateLoanMutation } from '../../mutations/create-loan.mutation'
-import { useBorrowCreateLoanIsApproved } from '../../queries/create-loan/borrow-create-loan-approved.query'
-import { borrowFormValidationSuite } from '../../queries/validation/borrow.validation'
-import { useMaxTokenValues } from './hooks/useMaxTokenValues'
-import { useFormErrors } from './react-form.utils'
-import { type BorrowForm } from './types'
+import { BORROW_PRESET_RANGES, BorrowPreset } from '../../../constants'
+import { type CreateLoanOptions, useCreateLoanMutation } from '../../../mutations/create-loan.mutation'
+import { useBorrowCreateLoanIsApproved } from '../../../queries/create-loan/borrow-create-loan-approved.query'
+import { borrowFormValidationSuite } from '../../../queries/validation/borrow.validation'
+import { useFormErrors } from '../react-form.utils'
+import { type BorrowForm } from '../types'
+import { useMaxTokenValues } from './useMaxTokenValues'
 
 const useCallbackAfterFormUpdate = (form: UseFormReturn<BorrowForm>, callback: () => void) =>
   useEffect(() => form.subscribe({ formState: { values: true }, callback }), [form, callback])
 
-export function useBorrowForm<ChainId extends LlamaChainId>({
+export function useCreateLoanForm<ChainId extends LlamaChainId>({
   market,
   network,
   network: { chainId },
diff --git a/apps/main/src/llamalend/features/borrow/hooks/useMaxTokenValues.tsx b/apps/main/src/llamalend/features/borrow/hooks/useMaxTokenValues.tsx
index 38c93ba2d..eda3daceb 100644
--- a/apps/main/src/llamalend/features/borrow/hooks/useMaxTokenValues.tsx
+++ b/apps/main/src/llamalend/features/borrow/hooks/useMaxTokenValues.tsx
@@ -24,13 +24,13 @@ export function useMaxTokenValues(
 ) {
   const {
     data: userBalance,
-    isError: isBalanceError,
+    error: balanceError,
     isLoading: isBalanceLoading,
   } = useTokenBalance(params, collateralToken)
-  const { data: maxBorrow, isError: isErrorMaxBorrow, isLoading: isLoadingMaxBorrow } = useCreateLoanMaxReceive(params)
+  const { data: maxBorrow, error: maxBorrowError, isLoading: isLoadingMaxBorrow } = useCreateLoanMaxReceive(params)
   const {
     data: maxTotalLeverage,
-    isError: isErrorMaxLeverage,
+    error: maxLeverageError,
     isLoading: isLoadingMaxLeverage,
   } = useMarketMaxLeverage(params)
 
@@ -46,12 +46,20 @@ export function useMaxTokenValues(
   useEffect(() => form.setValue('maxCollateral', maxCollateral, setValueOptions), [form, maxCollateral])
 
   return {
-    isCollateralLoading: !collateralToken || isLoadingMaxBorrow || isBalanceLoading,
-    isDebtLoading: !collateralToken || isLoadingMaxBorrow,
-    isCollateralError: isErrorMaxBorrow || isBalanceError,
-    isDebtError: isErrorMaxBorrow,
-    isLeverageError: isErrorMaxLeverage || isErrorMaxBorrow,
-    isLeverageLoading: isLoadingMaxLeverage || isLoadingMaxBorrow,
-    maxLeverage,
+    collateral: {
+      data: maxCollateral,
+      isLoading: !collateralToken || isLoadingMaxBorrow || isBalanceLoading,
+      error: maxBorrowError || balanceError,
+    },
+    debt: {
+      data: maxDebt,
+      isLoading: !collateralToken || isLoadingMaxBorrow,
+      error: maxBorrowError,
+    },
+    maxLeverage: {
+      data: maxLeverage,
+      isLoading: isLoadingMaxLeverage || isLoadingMaxBorrow,
+      error: maxLeverageError || maxBorrowError,
+    },
   }
 }
diff --git a/apps/main/src/llamalend/features/borrow/types.ts b/apps/main/src/llamalend/features/borrow/types.ts
index ab1f2f912..6fe6eb12b 100644
--- a/apps/main/src/llamalend/features/borrow/types.ts
+++ b/apps/main/src/llamalend/features/borrow/types.ts
@@ -6,7 +6,7 @@ import type { MakeOptional } from '@ui-kit/types/util'
 import { Decimal } from '@ui-kit/utils'
 
 /** Complete borrow creation form with all fields already filled in (after validation) */
-export type CompleteBorrowForm = {
+type CompleteBorrowForm = {
   userCollateral: Decimal
   userBorrowed: Decimal // currently hidden and always 0
   debt: Decimal
@@ -33,5 +33,3 @@ export type BorrowFormQueryParams<T = IChainId> = FieldsOf<BorrowFormQuery<T>>
 
 /** A simple token representation */
 export type Token = { symbol: string; address: Address }
-
-export type BorrowFormErrors = (readonly [keyof BorrowForm | 'root', string])[]
diff --git a/apps/main/src/llamalend/features/manage-loan/components/AddCollateralForm.tsx b/apps/main/src/llamalend/features/manage-loan/components/AddCollateralForm.tsx
new file mode 100644
index 000000000..665729397
--- /dev/null
+++ b/apps/main/src/llamalend/features/manage-loan/components/AddCollateralForm.tsx
@@ -0,0 +1,117 @@
+import { useLoanToValueFromUserState } from '@/llamalend/features/manage-loan/hooks/useLoanToValueFromUserState'
+import type { LlamaMarketTemplate, NetworkDict } from '@/llamalend/llamalend.types'
+import type { AddCollateralOptions } from '@/llamalend/mutations/add-collateral.mutation'
+import { useMarketRates } from '@/llamalend/queries/market-rates'
+import { LoanFormAlerts } from '@/llamalend/widgets/manage-loan/LoanFormAlerts'
+import { LoanFormTokenInput } from '@/llamalend/widgets/manage-loan/LoanFormTokenInput'
+import { LoanFormWrapper } from '@/llamalend/widgets/manage-loan/LoanFormWrapper'
+import { LoanInfoAccordion } from '@/llamalend/widgets/manage-loan/LoanInfoAccordion'
+import type { IChainId } from '@curvefi/llamalend-api/lib/interfaces'
+import Button from '@mui/material/Button'
+import Stack from '@mui/material/Stack'
+import { useSwitch } from '@ui-kit/hooks/useSwitch'
+import { t } from '@ui-kit/lib/i18n'
+import { InputDivider } from '../../../widgets/InputDivider'
+import { useAddCollateralForm } from '../hooks/useAddCollateralForm'
+
+export const AddCollateralForm = <ChainId extends IChainId>({
+  market,
+  networks,
+  chainId,
+  enabled,
+  onAdded,
+}: {
+  market: LlamaMarketTemplate | undefined
+  networks: NetworkDict<ChainId>
+  chainId: ChainId
+  enabled?: boolean
+  onAdded: NonNullable<AddCollateralOptions['onAdded']>
+}) => {
+  const network = networks[chainId]
+  const [isOpen, , , toggle] = useSwitch(false)
+
+  const {
+    form,
+    isPending,
+    onSubmit,
+    action,
+    params,
+    values,
+    bands,
+    healthFull,
+    prices,
+    gas,
+    isApproved,
+    formErrors,
+    collateralToken,
+    borrowToken,
+    txHash,
+  } = useAddCollateralForm({
+    market,
+    network,
+    networks,
+    enabled,
+    onAdded,
+  })
+
+  const marketRates = useMarketRates(params, isOpen)
+
+  return (
+    <LoanFormWrapper
+      {...form}
+      onSubmit={onSubmit}
+      infoAccordion={
+        <LoanInfoAccordion
+          isOpen={isOpen}
+          toggle={toggle}
+          health={healthFull}
+          bands={bands}
+          prices={prices}
+          rates={marketRates}
+          futureRates={marketRates}
+          loanToValue={useLoanToValueFromUserState({
+            chainId: params.chainId!,
+            marketId: params.marketId,
+            userAddress: params.userAddress,
+            collateralToken,
+            borrowToken,
+            enabled: isOpen,
+            collateralDelta: values.userCollateral,
+          })}
+          gas={gas}
+        />
+      }
+    >
+      <Stack divider={<InputDivider />}>
+        <LoanFormTokenInput
+          label={t`Collateral`}
+          token={collateralToken}
+          blockchainId={network.id}
+          name="userCollateral"
+          form={form}
+          testId="add-collateral-input"
+          network={network}
+        />
+      </Stack>
+
+      <Button
+        type="submit"
+        loading={isPending || !market}
+        disabled={formErrors.length > 0}
+        data-testid="add-collateral-submit-button"
+      >
+        {isPending ? t`Processing...` : isApproved.data ? t`Add collateral` : t`Approve & Add collateral`}
+      </Button>
+
+      <LoanFormAlerts
+        isSuccess={action.isSuccess}
+        error={action.error}
+        txHash={txHash}
+        formErrors={formErrors}
+        network={network}
+        handledErrors={['userCollateral']}
+        successTitle={t`Collateral added`}
+      />
+    </LoanFormWrapper>
+  )
+}
diff --git a/apps/main/src/llamalend/features/manage-loan/components/RemoveCollateralForm.tsx b/apps/main/src/llamalend/features/manage-loan/components/RemoveCollateralForm.tsx
new file mode 100644
index 000000000..24634fef2
--- /dev/null
+++ b/apps/main/src/llamalend/features/manage-loan/components/RemoveCollateralForm.tsx
@@ -0,0 +1,127 @@
+import { useLoanToValueFromUserState } from '@/llamalend/features/manage-loan/hooks/useLoanToValueFromUserState'
+import type { LlamaMarketTemplate, NetworkDict } from '@/llamalend/llamalend.types'
+import type { RemoveCollateralOptions } from '@/llamalend/mutations/remove-collateral.mutation'
+import { useMarketRates } from '@/llamalend/queries/market-rates'
+import { FormMessage } from '@/llamalend/widgets/manage-loan/FormMessage'
+import { LoanFormAlerts } from '@/llamalend/widgets/manage-loan/LoanFormAlerts'
+import { LoanFormTokenInput } from '@/llamalend/widgets/manage-loan/LoanFormTokenInput'
+import { LoanFormWrapper } from '@/llamalend/widgets/manage-loan/LoanFormWrapper'
+import { LoanInfoAccordion } from '@/llamalend/widgets/manage-loan/LoanInfoAccordion'
+import type { IChainId } from '@curvefi/llamalend-api/lib/interfaces'
+import Button from '@mui/material/Button'
+import Stack from '@mui/material/Stack'
+import { useSwitch } from '@ui-kit/hooks/useSwitch'
+import { t } from '@ui-kit/lib/i18n'
+import { InputDivider } from '../../../widgets/InputDivider'
+import { useRemoveCollateralForm } from '../hooks/useRemoveCollateralForm'
+
+export const RemoveCollateralForm = <ChainId extends IChainId>({
+  market,
+  networks,
+  chainId,
+  enabled,
+  onRemoved,
+}: {
+  market: LlamaMarketTemplate | undefined
+  networks: NetworkDict<ChainId>
+  chainId: ChainId
+  enabled?: boolean
+  onRemoved: NonNullable<RemoveCollateralOptions['onRemoved']>
+}) => {
+  const network = networks[chainId]
+  const [isOpen, , , toggle] = useSwitch(false)
+
+  const {
+    form,
+    isPending,
+    onSubmit,
+    action,
+    maxRemovable,
+    params,
+    values,
+    bands,
+    healthFull,
+    prices,
+    gas,
+    formErrors,
+    collateralToken,
+    borrowToken,
+    txHash,
+  } = useRemoveCollateralForm({
+    market,
+    network,
+    networks,
+    enabled,
+    onRemoved,
+  })
+
+  const marketRates = useMarketRates(params, isOpen)
+
+  return (
+    <LoanFormWrapper
+      {...form}
+      onSubmit={onSubmit}
+      infoAccordion={
+        <LoanInfoAccordion
+          isOpen={isOpen}
+          toggle={toggle}
+          health={healthFull}
+          bands={bands}
+          prices={prices}
+          rates={marketRates}
+          futureRates={marketRates}
+          loanToValue={useLoanToValueFromUserState({
+            chainId: params.chainId!,
+            marketId: params.marketId,
+            userAddress: params.userAddress,
+            collateralToken,
+            borrowToken,
+            enabled: isOpen,
+            collateralDelta:
+              values.userCollateral != null
+                ? (`-${values.userCollateral}` as unknown as import('@ui-kit/utils').Decimal)
+                : undefined,
+          })}
+          gas={gas}
+        />
+      }
+    >
+      <Stack divider={<InputDivider />}>
+        <LoanFormTokenInput
+          label={t`Collateral`}
+          token={collateralToken}
+          blockchainId={network.id}
+          name="userCollateral"
+          form={form}
+          max={maxRemovable}
+          testId="remove-collateral-input"
+          network={network}
+          message={
+            maxRemovable.data && (
+              <FormMessage label={t`Max removable:`} value={maxRemovable.data} symbol={collateralToken?.symbol} />
+            )
+          }
+        />
+      </Stack>
+
+      <Button
+        type="submit"
+        loading={isPending || !market}
+        disabled={formErrors.length > 0}
+        data-testid="remove-collateral-submit-button"
+      >
+        {isPending ? t`Processing...` : t`Remove collateral`}
+      </Button>
+
+      <LoanFormAlerts
+        isSuccess={action.isSuccess}
+        error={action.error}
+        txHash={txHash}
+        formErrors={formErrors}
+        network={network}
+        handledErrors={['userCollateral']}
+        successTitle={t`Collateral removed`}
+      />
+    </LoanFormWrapper>
+  )
+}
diff --git a/apps/main/src/llamalend/features/manage-loan/components/RepayForm.tsx b/apps/main/src/llamalend/features/manage-loan/components/RepayForm.tsx
new file mode 100644
index 000000000..6715ab584
--- /dev/null
+++ b/apps/main/src/llamalend/features/manage-loan/components/RepayForm.tsx
@@ -0,0 +1,134 @@
+import { useLoanToValueFromUserState } from '@/llamalend/features/manage-loan/hooks/useLoanToValueFromUserState'
+import type { LlamaMarketTemplate, NetworkDict } from '@/llamalend/llamalend.types'
+import type { RepayOptions } from '@/llamalend/mutations/repay.mutation'
+import { useMarketRates } from '@/llamalend/queries/market-rates'
+import { LoanFormAlerts } from '@/llamalend/widgets/manage-loan/LoanFormAlerts'
+import { LoanFormTokenInput } from '@/llamalend/widgets/manage-loan/LoanFormTokenInput'
+import { LoanFormWrapper } from '@/llamalend/widgets/manage-loan/LoanFormWrapper'
+import { LoanInfoAccordion } from '@/llamalend/widgets/manage-loan/LoanInfoAccordion'
+import type { IChainId } from '@curvefi/llamalend-api/lib/interfaces'
+import Button from '@mui/material/Button'
+import Stack from '@mui/material/Stack'
+import { useSwitch } from '@ui-kit/hooks/useSwitch'
+import { t } from '@ui-kit/lib/i18n'
+import type { Decimal } from '@ui-kit/utils'
+import { InputDivider } from '../../../widgets/InputDivider'
+import { useRepayForm } from '../hooks/useRepayForm'
+
+export const RepayForm = <ChainId extends IChainId>({
+  market,
+  networks,
+  chainId,
+  enabled,
+  onRepaid,
+}: {
+  market: LlamaMarketTemplate | undefined
+  networks: NetworkDict<ChainId>
+  chainId: ChainId
+  enabled?: boolean
+  onRepaid: NonNullable<RepayOptions['onRepaid']>
+}) => {
+  const network = networks[chainId]
+  const [isOpen, , , toggle] = useSwitch(false)
+
+  const {
+    form,
+    isPending,
+    onSubmit,
+    action,
+    bands,
+    healthFull,
+    prices,
+    gas,
+    isAvailable,
+    isFull,
+    formErrors,
+    collateralToken,
+    borrowToken,
+    params,
+    values,
+    txHash,
+  } = useRepayForm({
+    market,
+    network,
+    networks,
+    enabled,
+    onRepaid,
+  })
+
+  const marketRates = useMarketRates(params, isOpen)
+
+  const isDisabled = formErrors.length > 0 || isAvailable.data === false
+
+  return (
+    <LoanFormWrapper
+      {...form}
+      onSubmit={onSubmit}
+      infoAccordion={
+        <LoanInfoAccordion
+          isOpen={isOpen}
+          toggle={toggle}
+          health={healthFull}
+          bands={bands}
+          prices={prices}
+          rates={marketRates}
+          futureRates={marketRates}
+          loanToValue={useLoanToValueFromUserState({
+            chainId,
+            marketId: params.marketId,
+            userAddress: params.userAddress,
+            collateralToken,
+            borrowToken,
+            enabled: isOpen,
+            debtDelta: values.userBorrowed == null ? undefined : (`-${values.userBorrowed}` as Decimal),
+          })}
+          gas={gas}
+        />
+      }
+    >
+      <Stack divider={<InputDivider />}>
+        <LoanFormTokenInput
+          label={t`From collateral (position)`}
+          token={collateralToken}
+          blockchainId={network.id}
+          name="stateCollateral"
+          form={form}
+          testId="repay-state-collateral-input"
+          network={network}
+        />
+        <LoanFormTokenInput
+          label={t`From collateral (wallet)`}
+          token={collateralToken}
+          blockchainId={network.id}
+          name="userCollateral"
+          form={form}
+          testId="repay-user-collateral-input"
+          network={network}
+        />
+        <LoanFormTokenInput
+          label={t`From borrowed token`}
+          token={borrowToken}
+          blockchainId={network.id}
+          name="userBorrowed"
+          form={form}
+          testId="repay-user-borrowed-input"
+          network={network}
+        />
+      </Stack>
+
+      <Button type="submit" loading={isPending || !market} disabled={isDisabled} data-testid="repay-submit-button">
+        {isPending ? t`Processing...` : isFull.data ? t`Repay full` : t`Repay`}
+      </Button>
+
+      <LoanFormAlerts
+        isSuccess={action.isSuccess}
+        error={action.error}
+        txHash={txHash}
+        formErrors={formErrors}
+        network={network}
+        handledErrors={['stateCollateral', 'userCollateral', 'userBorrowed']}
+        successTitle={t`Loan repaid`}
+      />
+    </LoanFormWrapper>
+  )
+}
diff --git a/apps/main/src/llamalend/features/manage-loan/hooks/useAddCollateralForm.ts b/apps/main/src/llamalend/features/manage-loan/hooks/useAddCollateralForm.ts
index e20f1412b..f49e726d9 100644
--- a/apps/main/src/llamalend/features/manage-loan/hooks/useAddCollateralForm.ts
+++ b/apps/main/src/llamalend/features/manage-loan/hooks/useAddCollateralForm.ts
@@ -2,7 +2,8 @@ import { useEffect, useMemo } from 'react'
 import type { UseFormReturn } from 'react-hook-form'
 import { useForm } from 'react-hook-form'
 import { useAccount } from 'wagmi'
-import type { LlamaMarketTemplate, NetworkDict } from '@/llamalend/llamalend.types'
+import { getTokens } from '@/llamalend/llama.utils'
+import type { LlamaMarketTemplate, LlamaNetwork, NetworkDict } from '@/llamalend/llamalend.types'
 import { type AddCollateralOptions, useAddCollateralMutation } from '@/llamalend/mutations/add-collateral.mutation'
 import { useAddCollateralIsApproved } from '@/llamalend/queries/add-collateral/add-collateral-approved.query'
 import { useAddCollateralBands } from '@/llamalend/queries/add-collateral/add-collateral-bands.query'
@@ -14,9 +15,8 @@ import {
   collateralFormValidationSuite,
   type CollateralForm,
 } from '@/llamalend/queries/validation/manage-loan.validation'
-import type { IChainId as LlamaChainId, INetworkName as LlamaNetworkId } from '@curvefi/llamalend-api/lib/interfaces'
+import type { IChainId as LlamaChainId } from '@curvefi/llamalend-api/lib/interfaces'
 import { vestResolver } from '@hookform/resolvers/vest'
-import type { BaseConfig } from '@ui/utils'
 import { useDebouncedValue } from '@ui-kit/hooks/useDebounce'
 import { formDefaultOptions } from '@ui-kit/lib/model'
 import { useFormErrors } from '../../borrow/react-form.utils'
@@ -24,7 +24,7 @@ import { useFormErrors } from '../../borrow/react-form.utils'
 const useCallbackAfterFormUpdate = (form: UseFormReturn<CollateralForm>, callback: () => void) =>
   useEffect(() => form.subscribe({ formState: { values: true }, callback }), [form, callback])
 
-export const useAddCollateralForm = ({
+export const useAddCollateralForm = <ChainId extends LlamaChainId>({
   market,
   network,
   networks,
@@ -32,8 +32,8 @@ export const useAddCollateralForm = ({
   onAdded,
 }: {
   market: LlamaMarketTemplate | undefined
-  network: BaseConfig<LlamaNetworkId, LlamaChainId>
-  networks: NetworkDict<LlamaChainId>
+  network: LlamaNetwork<ChainId>
+  networks: NetworkDict<ChainId>
   enabled?: boolean
   onAdded: NonNullable<AddCollateralOptions['onAdded']>
 }) => {
@@ -41,6 +41,10 @@ export const useAddCollateralForm = ({
   const { chainId } = network
   const marketId = market?.id
 
+  const tokens = market && getTokens(market)
+  const collateralToken = tokens?.collateralToken
+  const borrowToken = tokens?.borrowToken
+
   const form = useForm<CollateralForm>({
     ...formDefaultOptions,
     resolver: vestResolver(collateralFormValidationSuite),
@@ -59,7 +63,7 @@ export const useAddCollateralForm = ({
           marketId,
           userAddress,
           userCollateral: values.userCollateral,
-        }) as CollateralParams<LlamaChainId>,
+        }) as CollateralParams<ChainId>,
       [chainId, marketId, userAddress, values.userCollateral],
     ),
   )
@@ -98,5 +102,8 @@ export const useAddCollateralForm = ({
     gas,
     isApproved,
     formErrors,
+    collateralToken,
+    borrowToken,
+    txHash: action.data?.hash,
   }
 }
diff --git a/apps/main/src/llamalend/features/manage-loan/hooks/useLoanToValueFromUserState.ts b/apps/main/src/llamalend/features/manage-loan/hooks/useLoanToValueFromUserState.ts
new file mode 100644
index 000000000..8f85f4c38
--- /dev/null
+++ b/apps/main/src/llamalend/features/manage-loan/hooks/useLoanToValueFromUserState.ts
@@ -0,0 +1,77 @@
+import BigNumber from 'bignumber.js'
+import type { Address } from 'viem'
+import { useUserState } from '@/llamalend/queries/user-state.query'
+import type { IChainId } from '@curvefi/llamalend-api/lib/interfaces'
+import { useTokenUsdRate } from '@ui-kit/lib/model/entities/token-usd-rate'
+import type { Decimal } from '@ui-kit/utils'
+import type { Token } from '../../borrow/types'
+
+type Params<ChainId extends IChainId> = {
+  chainId: ChainId
+  marketId: string | null | undefined
+  userAddress: Address | null | undefined
+  collateralToken: Token | undefined
+  borrowToken: Token | undefined
+  enabled: boolean
+  /** Net change applied to on-chain collateral (positive = adding, negative = removing). */
+  collateralDelta?: Decimal | null
+  /** Net change applied to on-chain debt (positive = increasing, negative = repaying). */
+  debtDelta?: Decimal | null
+}
+
+/**
+ * Computes current Loan-to-Value (LTV) ratio from the user's on-chain state:
+ * LTV = (debt in USD) / (collateral in USD) * 100
+ *
+ * It uses the generic userState query so it can be reused across
+ * add-collateral, remove-collateral and repay flows.
+ */
+export const useLoanToValueFromUserState = <ChainId extends IChainId>({
+  chainId,
+  marketId,
+  userAddress,
+  collateralToken,
+  borrowToken,
+  enabled,
+  collateralDelta,
+  debtDelta,
+}: Params<ChainId>) => {
+  const {
+    data: userState,
+    isLoading: isUserLoading,
+    error: userError,
+  } = useUserState({ chainId, marketId, userAddress }, enabled)
+
+  const {
+    data: collateralUsdRate,
+    isLoading: isCollateralUsdRateLoading,
+    error: collateralUsdRateError,
+  } = useTokenUsdRate({ chainId, tokenAddress: collateralToken?.address }, enabled && !!collateralToken?.address)
+
+  const {
+    data: borrowUsdRate,
+    isLoading: isBorrowUsdRateLoading,
+    error: borrowUsdRateError,
+  } = useTokenUsdRate({ chainId, tokenAddress: borrowToken?.address }, enabled && !!borrowToken?.address)
+
+  const baseDebt = userState?.debt
+  const baseCollateral = userState?.collateral
+
+  const debt = baseDebt == null ? null : new BigNumber(baseDebt).plus(debtDelta ?? '0')
+
+  const collateral = baseCollateral == null ? null : new BigNumber(baseCollateral).plus(collateralDelta ?? '0')
+
+  return {
+    data:
+      !enabled ||
+      debt == null ||
+      collateral == null ||
+      collateralUsdRate == null ||
+      borrowUsdRate == null ||
+      collateral.isZero()
+        ? null
+        : (debt.times(borrowUsdRate).div(collateral).div(collateralUsdRate).times(100).toString() as Decimal),
+    isLoading: enabled && (isUserLoading || isCollateralUsdRateLoading || isBorrowUsdRateLoading),
+    error: userError ?? collateralUsdRateError ?? borrowUsdRateError,
+  }
+}
diff --git a/apps/main/src/llamalend/features/manage-loan/hooks/useRemoveCollateralForm.ts b/apps/main/src/llamalend/features/manage-loan/hooks/useRemoveCollateralForm.ts
index 021fa33db..b4b7c6355 100644
--- a/apps/main/src/llamalend/features/manage-loan/hooks/useRemoveCollateralForm.ts
+++ b/apps/main/src/llamalend/features/manage-loan/hooks/useRemoveCollateralForm.ts
@@ -2,6 +2,7 @@ import { useEffect, useMemo } from 'react'
 import type { UseFormReturn } from 'react-hook-form'
 import { useForm } from 'react-hook-form'
 import { useAccount } from 'wagmi'
+import { getTokens } from '@/llamalend/llama.utils'
 import type { LlamaMarketTemplate, NetworkDict } from '@/llamalend/llamalend.types'
 import {
   type RemoveCollateralOptions,
@@ -27,7 +28,10 @@ import { useFormErrors } from '../../borrow/react-form.utils'
 const useCallbackAfterFormUpdate = (form: UseFormReturn<CollateralForm>, callback: () => void) =>
   useEffect(() => form.subscribe({ formState: { values: true }, callback }), [form, callback])
 
-export const useRemoveCollateralForm = ({
+export const useRemoveCollateralForm = <
+  ChainId extends LlamaChainId,
+  NetworkName extends LlamaNetworkId = LlamaNetworkId,
+>({
   market,
   network,
   networks,
@@ -35,8 +39,8 @@ export const useRemoveCollateralForm = ({
   onRemoved,
 }: {
   market: LlamaMarketTemplate | undefined
-  network: BaseConfig<LlamaNetworkId, LlamaChainId>
-  networks: NetworkDict<LlamaChainId>
+  network: BaseConfig<NetworkName, ChainId>
+  networks: NetworkDict<ChainId>
   enabled?: boolean
   onRemoved: NonNullable<RemoveCollateralOptions['onRemoved']>
 }) => {
@@ -44,6 +48,10 @@ export const useRemoveCollateralForm = ({
   const { chainId } = network
   const marketId = market?.id
 
+  const tokens = market && getTokens(market)
+  const collateralToken = tokens?.collateralToken
+  const borrowToken = tokens?.borrowToken
+
   const form = useForm<CollateralForm>({
     ...formDefaultOptions,
     resolver: vestResolver(collateralFormValidationSuite),
@@ -62,7 +70,7 @@ export const useRemoveCollateralForm = ({
           marketId,
           userAddress,
           userCollateral: values.userCollateral,
-        }) as CollateralParams<LlamaChainId>,
+        }) as CollateralParams<ChainId>,
       [chainId, marketId, userAddress, values.userCollateral],
     ),
   )
@@ -99,6 +107,9 @@ export const useRemoveCollateralForm = ({
     healthNotFull,
     prices,
     gas,
+    txHash: action.data?.hash,
+    collateralToken,
+    borrowToken,
     formErrors,
   }
 }
diff --git a/apps/main/src/llamalend/features/manage-loan/hooks/useRepayForm.ts b/apps/main/src/llamalend/features/manage-loan/hooks/useRepayForm.ts
index 832cbd73f..c0e9d966d 100644
--- a/apps/main/src/llamalend/features/manage-loan/hooks/useRepayForm.ts
+++ b/apps/main/src/llamalend/features/manage-loan/hooks/useRepayForm.ts
@@ -2,6 +2,7 @@ import { useEffect, useMemo } from 'react'
 import type { UseFormReturn } from 'react-hook-form'
 import { useForm } from 'react-hook-form'
 import { useAccount } from 'wagmi'
+import { getTokens } from '@/llamalend/llama.utils'
 import type { LlamaMarketTemplate, NetworkDict } from '@/llamalend/llamalend.types'
 import { type RepayOptions, useRepayMutation } from '@/llamalend/mutations/repay.mutation'
 import { useRepayBands } from '@/llamalend/queries/repay/repay-bands.query'
@@ -24,7 +25,7 @@ import { useFormErrors } from '../../borrow/react-form.utils'
 const useCallbackAfterFormUpdate = (form: UseFormReturn<RepayForm>, callback: () => void) =>
   useEffect(() => form.subscribe({ formState: { values: true }, callback }), [form, callback])
 
-export const useRepayForm = ({
+export const useRepayForm = <ChainId extends LlamaChainId, NetworkName extends LlamaNetworkId = LlamaNetworkId>({
   market,
   network,
   networks,
@@ -32,8 +33,8 @@ export const useRepayForm = ({
   onRepaid,
 }: {
   market: LlamaMarketTemplate | undefined
-  network: { id: LlamaNetworkId; chainId: LlamaChainId }
-  networks: NetworkDict<LlamaChainId>
+  network: { id: LlamaNetworkId; chainId: ChainId }
+  networks: NetworkDict<ChainId>
   enabled?: boolean
   onRepaid: NonNullable<RepayOptions['onRepaid']>
 }) => {
@@ -41,6 +42,10 @@ export const useRepayForm = ({
   const { chainId } = network
   const marketId = market?.id
 
+  const tokens = market && getTokens(market)
+  const collateralToken = tokens?.collateralToken
+  const borrowToken = tokens?.borrowToken
+
   const form = useForm<RepayForm>({
     ...formDefaultOptions,
     resolver: vestResolver(repayFormValidationSuite),
@@ -63,7 +68,7 @@ export const useRepayForm = ({
           stateCollateral: values.stateCollateral,
           userCollateral: values.userCollateral,
           userBorrowed: values.userBorrowed,
-        }) as RepayFromCollateralParams<LlamaChainId>,
+        }) as RepayFromCollateralParams<ChainId>,
       [chainId, marketId, userAddress, values.stateCollateral, values.userCollateral, values.userBorrowed],
     ),
   )
@@ -104,6 +109,9 @@ export const useRepayForm = ({
     prices,
     routeImage,
     gas,
+    txHash: action.data?.hash,
+    collateralToken,
+    borrowToken,
     formErrors,
   }
 }
diff --git a/apps/main/src/llamalend/mutations/add-collateral.mutation.ts b/apps/main/src/llamalend/mutations/add-collateral.mutation.ts
index 325cf3dd7..64c4ad553 100644
--- a/apps/main/src/llamalend/mutations/add-collateral.mutation.ts
+++ b/apps/main/src/llamalend/mutations/add-collateral.mutation.ts
@@ -59,5 +59,5 @@ export const useAddCollateralMutation = ({
 
   const onSubmit = useCallback((form: CollateralForm) => mutateAsync(form as AddCollateralMutation), [mutateAsync])
 
-  return { onSubmit, mutateAsync, error, txHash: data, isPending, isSuccess, reset }
+  return { onSubmit, mutateAsync, error, data, isPending, isSuccess, reset }
 }
diff --git a/apps/main/src/llamalend/mutations/remove-collateral.mutation.ts b/apps/main/src/llamalend/mutations/remove-collateral.mutation.ts
index 2d34907b5..3b2f7f940 100644
--- a/apps/main/src/llamalend/mutations/remove-collateral.mutation.ts
+++ b/apps/main/src/llamalend/mutations/remove-collateral.mutation.ts
@@ -43,5 +43,5 @@ export const useRemoveCollateralMutation = ({
 
   const onSubmit = useCallback((form: CollateralForm) => mutateAsync(form as RemoveCollateralMutation), [mutateAsync])
 
-  return { onSubmit, mutateAsync, error, txHash: data, isPending, isSuccess, reset }
+  return { onSubmit, mutateAsync, error, data, isPending, isSuccess, reset }
 }
diff --git a/apps/main/src/llamalend/queries/add-collateral/add-collateral-gas-estimate.query.ts b/apps/main/src/llamalend/queries/add-collateral/add-collateral-gas-estimate.query.ts
index 1368c3552..c9787f0fd 100644
--- a/apps/main/src/llamalend/queries/add-collateral/add-collateral-gas-estimate.query.ts
+++ b/apps/main/src/llamalend/queries/add-collateral/add-collateral-gas-estimate.query.ts
@@ -30,7 +30,15 @@ export const useAddCollateralEstimateGas = <ChainId extends IChainId>(
   enabled?: boolean,
 ) => {
   const { chainId } = query
-  const { data: estimate, isLoading: estimateLoading } = useAddCollateralGasEstimate(query, enabled)
-  const { data, isLoading: conversionLoading } = useEstimateGas<ChainId>(networks, chainId, estimate, enabled)
-  return { data, isLoading: estimateLoading || conversionLoading }
+  const {
+    data: estimate,
+    isLoading: estimateLoading,
+    error: estimateError,
+  } = useAddCollateralGasEstimate(query, enabled)
+  const {
+    data,
+    isLoading: conversionLoading,
+    error: conversionError,
+  } = useEstimateGas<ChainId>(networks, chainId, estimate, enabled)
+  return { data, isLoading: estimateLoading || conversionLoading, error: estimateError ?? conversionError }
 }
diff --git a/apps/main/src/llamalend/queries/create-loan/create-loan-health.query.ts b/apps/main/src/llamalend/queries/create-loan/create-loan-health.query.ts
index 94ff364d3..24ec01561 100644
--- a/apps/main/src/llamalend/queries/create-loan/create-loan-health.query.ts
+++ b/apps/main/src/llamalend/queries/create-loan/create-loan-health.query.ts
@@ -1,6 +1,8 @@
 import { getLlamaMarket } from '@/llamalend/llama.utils'
 import { LendMarketTemplate } from '@curvefi/llamalend-api/lib/lendMarkets'
 import { queryFactory, rootKeys } from '@ui-kit/lib/model'
+import type { Decimal } from '@ui-kit/utils'
+import { decimal } from '@ui-kit/utils'
 import type { BorrowFormQuery, BorrowFormQueryParams } from '../../features/borrow/types'
 import { borrowQueryValidationSuite } from '../validation/borrow.validation'
 import { createLoanExpectedCollateralQueryKey } from './create-loan-expected-collateral.query'
@@ -32,15 +34,17 @@ export const { useQuery: useCreateLoanHealth } = queryFactory({
     debt = '0',
     leverageEnabled,
     range,
-  }: BorrowFormQuery): Promise<number> => {
+  }: BorrowFormQuery): Promise<Decimal> => {
     const market = getLlamaMarket(marketId)
-    return leverageEnabled
-      ? market instanceof LendMarketTemplate
-        ? +(await market.leverage.createLoanHealth(userCollateral, userBorrowed, debt, range))
-        : market.leverageV2.hasLeverage()
-          ? +(await market.leverageV2.createLoanHealth(userCollateral, userBorrowed, debt, range))
-          : +(await market.leverage.createLoanHealth(userCollateral, debt, range))
-      : +(await market.createLoanHealth(userCollateral, debt, range))
+    return decimal(
+      leverageEnabled
+        ? market instanceof LendMarketTemplate
+          ? await market.leverage.createLoanHealth(userCollateral, userBorrowed, debt, range)
+          : market.leverageV2.hasLeverage()
+            ? await market.leverageV2.createLoanHealth(userCollateral, userBorrowed, debt, range)
+            : await market.leverage.createLoanHealth(userCollateral, debt, range)
+        : await market.createLoanHealth(userCollateral, debt, range),
+    )!
   },
   staleTime: '1m',
   validationSuite: borrowQueryValidationSuite,
diff --git a/apps/main/src/llamalend/queries/remove-collateral/remove-collateral-gas-estimate.query.ts b/apps/main/src/llamalend/queries/remove-collateral/remove-collateral-gas-estimate.query.ts
index dd5246c30..b7679db0a 100644
--- a/apps/main/src/llamalend/queries/remove-collateral/remove-collateral-gas-estimate.query.ts
+++ b/apps/main/src/llamalend/queries/remove-collateral/remove-collateral-gas-estimate.query.ts
@@ -32,7 +32,15 @@ export const useRemoveCollateralEstimateGas = <ChainId extends IChainId>(
   enabled?: boolean,
 ) => {
   const { chainId } = query
-  const { data: estimate, isLoading: estimateLoading } = useRemoveCollateralGasEstimate(query, enabled)
-  const { data, isLoading: conversionLoading } = useEstimateGas<ChainId>(networks, chainId, estimate, enabled)
-  return { data, isLoading: estimateLoading || conversionLoading }
+  const {
+    data: estimate,
+    isLoading: estimateLoading,
+    error: estimateError,
+  } = useRemoveCollateralGasEstimate(query, enabled)
+  const {
+    data,
+    isLoading: conversionLoading,
+    error: conversionError,
+  } = useEstimateGas<ChainId>(networks, chainId, estimate, enabled)
+  return { data, isLoading: estimateLoading || conversionLoading, error: estimateError ?? conversionError }
 }
diff --git a/apps/main/src/llamalend/queries/remove-collateral/remove-collateral-prices.query.ts b/apps/main/src/llamalend/queries/remove-collateral/remove-collateral-prices.query.ts
index c7324ff5c..65dbb480b 100644
--- a/apps/main/src/llamalend/queries/remove-collateral/remove-collateral-prices.query.ts
+++ b/apps/main/src/llamalend/queries/remove-collateral/remove-collateral-prices.query.ts
@@ -1,5 +1,6 @@
 import { getLlamaMarket } from '@/llamalend/llama.utils'
 import { queryFactory, rootKeys } from '@ui-kit/lib/model'
+import type { Decimal } from '@ui-kit/utils'
 import { type CollateralParams, type CollateralQuery } from '../validation/manage-loan.types'
 import { collateralValidationSuite } from '../validation/manage-loan.validation'
 import { maxRemovableCollateralKey } from './remove-collateral-max-removable.query'
@@ -8,7 +9,7 @@ export const { useQuery: useRemoveCollateralPrices } = queryFactory({
   queryKey: ({ chainId, marketId, userAddress, userCollateral }: CollateralParams) =>
     [...rootKeys.userMarket({ chainId, marketId, userAddress }), 'removeCollateralPrices', { userCollateral }] as const,
   queryFn: async ({ marketId, userCollateral }: CollateralQuery) =>
-    await getLlamaMarket(marketId).removeCollateralPrices(userCollateral),
+    (await getLlamaMarket(marketId).removeCollateralPrices(userCollateral)) as Decimal[],
   validationSuite: collateralValidationSuite,
   dependencies: (params) => [maxRemovableCollateralKey(params)],
 })
diff --git a/apps/main/src/llamalend/queries/repay/repay-gas-estimate.query.ts b/apps/main/src/llamalend/queries/repay/repay-gas-estimate.query.ts
index 6d91f2ee6..0a45f8be8 100644
--- a/apps/main/src/llamalend/queries/repay/repay-gas-estimate.query.ts
+++ b/apps/main/src/llamalend/queries/repay/repay-gas-estimate.query.ts
@@ -44,7 +44,11 @@ export const useRepayEstimateGas = <ChainId extends IChainId>(
   enabled?: boolean,
 ) => {
   const { chainId } = query
-  const { data: estimate, isLoading: estimateLoading } = useRepayGasEstimate(query, enabled)
-  const { data, isLoading: conversionLoading } = useEstimateGas<ChainId>(networks, chainId, estimate, enabled)
-  return { data, isLoading: estimateLoading || conversionLoading }
+  const { data: estimate, isLoading: estimateLoading, error: estimateError } = useRepayGasEstimate(query, enabled)
+  const {
+    data,
+    isLoading: conversionLoading,
+    error: conversionError,
+  } = useEstimateGas<ChainId>(networks, chainId, estimate, enabled)
+  return { data, isLoading: estimateLoading || conversionLoading, error: estimateError ?? conversionError }
 }
diff --git a/apps/main/src/llamalend/widgets/manage-loan/LoanFormTokenInput.tsx b/apps/main/src/llamalend/widgets/manage-loan/LoanFormTokenInput.tsx
index f87e0216b..8b99e2226 100644
--- a/apps/main/src/llamalend/widgets/manage-loan/LoanFormTokenInput.tsx
+++ b/apps/main/src/llamalend/widgets/manage-loan/LoanFormTokenInput.tsx
@@ -4,6 +4,7 @@ import type { Address } from 'viem'
 import { useAccount } from 'wagmi'
 import { setValueOptions } from '@/llamalend/features/borrow/react-form.utils'
 import type { LlamaNetwork } from '@/llamalend/llamalend.types'
+import type { Query } from '@/llamalend/widgets/manage-loan/loan.types'
 import type { INetworkName } from '@curvefi/llamalend-api/lib/interfaces'
 import type { PartialRecord } from '@curvefi/prices-api/objects.util'
 import { useTokenBalance } from '@ui-kit/hooks/useTokenBalance'
@@ -14,44 +15,45 @@ import { Decimal } from '@ui-kit/utils'
 /**
  * A large token input field for loan forms, with balance and max handling.
  */
-export const LoanFormTokenInput = <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>>({
+export const LoanFormTokenInput = <
+  TFieldValues extends FieldValues,
+  TFieldName extends FieldPath<TFieldValues>,
+  TMaxFieldName extends FieldPath<TFieldValues>,
+>({
   label,
   token,
   blockchainId,
   name,
   max,
-  isLoading: isMaxLoading,
-  isError,
   form,
   testId,
   message,
   network,
-  maxFieldName,
 }: {
   label: string
   token: { address: Address; symbol?: string } | undefined
   blockchainId: INetworkName | undefined
-  isError: boolean
-  isLoading: boolean
-  max: Decimal | undefined
+  /**
+   * Optional max-value query for this field, including loading and error state.
+   * When present, it also carries an optional related max-field name whose errors should be reflected here.
+   */
+  max?: Query<Decimal> & { fieldName?: TMaxFieldName }
   name: TFieldName
   form: UseFormReturn<TFieldValues> // the form, used to set the value and get errors
   testId: string
   message?: ReactNode
   network: LlamaNetwork
-  /** Optional related max-field name whose errors should be reflected here */
-  maxFieldName?: FieldPath<TFieldValues>
 }) => {
   const { address: userAddress } = useAccount()
   const {
     data: balance,
     isLoading: isBalanceLoading,
-    isError: isBalanceError,
+    error: balanceError,
   } = useTokenBalance({ chainId: network?.chainId, userAddress }, token)
 
   const errors = form.formState.errors as PartialRecord<FieldPath<TFieldValues>, Error>
-  const relatedMaxFieldError = maxFieldName && errors[maxFieldName]
-
+  const relatedMaxFieldError = max?.fieldName && errors[max.fieldName]
+  const error = errors[name] || max?.error || balanceError || relatedMaxFieldError
   return (
     <LargeTokenInput
       name={name}
@@ -69,14 +71,14 @@ export const LoanFormTokenInput = <TFieldValues extends FieldValues, TFieldName
         (v?: Decimal) => form.setValue(name, v as FieldPathValue<TFieldValues, TFieldName>, setValueOptions),
         [form, name],
       )}
-      isError={isError || isBalanceError || !!errors[name] || !!relatedMaxFieldError}
-      message={errors[name]?.message ?? relatedMaxFieldError?.message ?? message}
+      isError={!!error}
+      message={error?.message ?? message}
       walletBalance={useMemo(
-        // todo: separate isLoading for balance and for maxBalance
-        () => ({ balance, symbol: token?.symbol, loading: isBalanceLoading || isMaxLoading }),
-        [balance, isMaxLoading, isBalanceLoading, token?.symbol],
+        // todo: support separate isLoading for balance and for maxBalance in LargeTokenInput
+        () => ({ balance, symbol: token?.symbol, loading: isBalanceLoading }),
+        [balance, isBalanceLoading, token?.symbol],
       )}
-      maxBalance={useMemo(() => ({ balance: max, chips: 'max' }), [max])}
+      maxBalance={useMemo(() => max && { balance: max.data, chips: 'max' }, [max])}
     />
   )
 }
diff --git a/apps/main/src/llamalend/widgets/manage-loan/LoanInfoAccordion.tsx b/apps/main/src/llamalend/widgets/manage-loan/LoanInfoAccordion.tsx
index a6d8b9c04..57590102f 100644
--- a/apps/main/src/llamalend/widgets/manage-loan/LoanInfoAccordion.tsx
+++ b/apps/main/src/llamalend/widgets/manage-loan/LoanInfoAccordion.tsx
@@ -24,18 +24,21 @@ export type LoanLeverageMaxReceive = {
   maxLeverage?: Decimal
 }
 
+// Note: AddCollateral / RemoveCollateral / Repay manage-loan forms
+// do not provide range, rates, futureRates or loanToValue,
+// so these props are optional for those forms.
 type LoanInfoAccordionProps = {
   isOpen: boolean
   toggle: () => void
-  range: number
-  health: Query<number>
+  range?: number
+  health: Query<Decimal>
   bands: Query<[number, number]>
   prices: Query<readonly Decimal[]>
   rates: Query<{ borrowApr?: Decimal } | null>
-  futureRates: Query<{ borrowApr?: Decimal } | null>
   loanToValue: Query<Decimal | null>
+  futureRates?: Query<{ borrowApr?: Decimal } | null>
   gas: Query<LoanInfoGasData | null>
-  leverage: LoanLeverageActionInfoProps & { enabled: boolean }
+  leverage?: LoanLeverageActionInfoProps & { enabled: boolean }
 }
 
 export const LoanInfoAccordion = ({
@@ -50,67 +53,70 @@ export const LoanInfoAccordion = ({
   loanToValue,
   gas,
   leverage,
-}: LoanInfoAccordionProps) => {
-  const theme = useTheme()
-  return (
-    // error tooltip isn't displayed correctly because accordion takes the mouse focus. Use title for now.
-    <Box title={health.error?.message ?? undefined}>
-      <Accordion
-        ghost
-        title={t`Health`}
-        info={
-          <ActionInfo
-            label=""
-            value={health.data == null ? '∞' : formatNumber(health.data, { abbreviate: false })}
-            valueColor={getHealthValueColor(health.data ?? 100, theme)}
-            error={health.error ?? undefined}
-            loading={health.isLoading}
-            testId="borrow-health"
-          />
-        }
-        expanded={isOpen}
-        toggle={toggle}
-      >
-        <Stack>
-          {leverage.enabled && <LoanLeverageActionInfo {...leverage} />}
-          <ActionInfo
-            label={t`Band range`}
-            value={bands.data ? `${bands.data[0]} to ${bands.data[1]}` : '-'}
-            error={bands.error ?? undefined}
-            loading={bands.isLoading}
-            testId="borrow-band-range"
-          />
-          <ActionInfo
-            label={t`Price range`}
-            value={prices.data?.map((p) => formatNumber(p, { abbreviate: false })).join(' - ') ?? '-'}
-            error={prices.error ?? undefined}
-            loading={prices.isLoading}
-            testId="borrow-price-range"
-          />
+}: LoanInfoAccordionProps) => (
+  // error tooltip isn't displayed correctly because accordion takes the mouse focus. Use title for now.
+  <Box title={health.error?.message}>
+    <Accordion
+      ghost
+      title={t`Health`}
+      info={
+        <ActionInfo
+          label=""
+          value={health.data == null ? '∞' : formatNumber(health.data, { abbreviate: false })}
+          valueColor={getHealthValueColor(Number(health.data ?? 100), useTheme())}
+          error={health.error}
+          loading={health.isLoading}
+          testId="borrow-health"
+        />
+      }
+      expanded={isOpen}
+      toggle={toggle}
+    >
+      <Stack>
+        {leverage?.enabled && <LoanLeverageActionInfo {...leverage} />}
+        <ActionInfo
+          label={t`Band range`}
+          value={bands.data ? `${bands.data[0]} to ${bands.data[1]}` : '-'}
+          error={bands.error}
+          loading={bands.isLoading}
+          testId="borrow-band-range"
+        />
+        <ActionInfo
+          label={t`Price range`}
+          value={prices.data?.map((p) => formatNumber(p, { abbreviate: false })).join(' - ') ?? '-'}
+          error={prices.error}
+          loading={prices.isLoading}
+          testId="borrow-price-range"
+        />
+        {range != null && (
           <ActionInfo label={t`N`} value={formatNumber(range, { decimals: 0, abbreviate: false })} testId="borrow-n" />
+        )}
+        {rates && futureRates && (
           <ActionInfo
             label={t`Borrow APR`}
             prevValue={formatPercent(rates.data?.borrowApr)}
             value={futureRates.data?.borrowApr ? formatPercent(futureRates.data.borrowApr) : '-'}
-            error={(rates.error || futureRates.error) ?? undefined}
+            error={rates.error || futureRates.error}
             loading={rates.isLoading || futureRates.isLoading}
             testId="borrow-apr"
           />
+        )}
+        {loanToValue && (
           <ActionInfo
             label={t`Loan to value ratio`}
             value={loanToValue.data ? formatPercent(loanToValue.data) : '-'}
             testId="borrow-ltv"
-            error={loanToValue.error ?? undefined}
+            error={loanToValue.error}
             loading={loanToValue.isLoading}
           />
-          <ActionInfo
-            label={t`Estimated tx cost (step 1 of 2)`}
-            value={gas.data?.estGasCostUsd == null ? '-' : formatUsd(gas.data.estGasCostUsd)}
-            valueTooltip={gas.data?.tooltip}
-            loading={gas.isLoading}
-          />
-        </Stack>
-      </Accordion>
-    </Box>
-  )
-}
+        )}
+        <ActionInfo
+          label={t`Estimated tx cost (step 1 of 2)`}
+          value={gas.data?.estGasCostUsd == null ? '-' : formatUsd(gas.data.estGasCostUsd)}
+          valueTooltip={gas.data?.tooltip}
+          loading={gas.isLoading}
+        />
+      </Stack>
+    </Accordion>
+  </Box>
+)
diff --git a/apps/main/src/loan/components/PageLoanManage/index.tsx b/apps/main/src/loan/components/PageLoanManage/index.tsx
index e29d4768f..999d555be 100644
--- a/apps/main/src/loan/components/PageLoanManage/index.tsx
+++ b/apps/main/src/loan/components/PageLoanManage/index.tsx
@@ -1,4 +1,7 @@
 import { useEffect, useMemo, useState } from 'react'
+import { AddCollateralForm } from '@/llamalend/features/manage-loan/components/AddCollateralForm'
+import { RemoveCollateralForm } from '@/llamalend/features/manage-loan/components/RemoveCollateralForm'
+import { RepayForm } from '@/llamalend/features/manage-loan/components/RepayForm'
 import CollateralDecrease from '@/loan/components/PageLoanManage/CollateralDecrease'
 import CollateralIncrease from '@/loan/components/PageLoanManage/CollateralIncrease'
 import LoanDecrease from '@/loan/components/PageLoanManage/LoanDecrease'
@@ -12,10 +15,12 @@ import type {
   PageLoanManageProps,
 } from '@/loan/components/PageLoanManage/types'
 import { hasDeleverage } from '@/loan/utils/leverage'
+import networks from '@/loan/networks'
 import { getLoanManagePathname } from '@/loan/utils/utilsRouter'
 import Stack from '@mui/material/Stack'
 import { AppFormContentWrapper } from '@ui/AppForm'
 import { useNavigate } from '@ui-kit/hooks/router'
+import { useManageLoanMuiForm } from '@ui-kit/hooks/useFeatureFlags'
 import { t } from '@ui-kit/lib/i18n'
 import { type TabOption, TabsSwitcher } from '@ui-kit/shared/ui/TabsSwitcher'
 import { SizesAndSpaces } from '@ui-kit/themes/design/1_sizes_spaces'
@@ -37,6 +42,8 @@ const tabsCollateral: TabOption<CollateralFormType>[] = [
 
 const LoanManage = ({ curve, isReady, llamma, llammaId, params, rChainId, rCollateralId, rFormType }: Props) => {
   const push = useNavigate()
+  const shouldUseManageLoanMuiForm = useManageLoanMuiForm()
+  const useMuiForm = shouldUseManageLoanMuiForm && !!llamma
 
   type Tab = 'loan' | 'collateral' | 'deleverage'
   const tabs: TabOption<Tab>[] = [
@@ -71,26 +78,77 @@ const LoanManage = ({ curve, isReady, llamma, llammaId, params, rChainId, rColla
         options={tabs}
       />
 
-      <Stack sx={{ backgroundColor: (t) => t.design.Layer[1].Fill }}>
-        <TabsSwitcher
-          variant="underlined"
-          size="small"
-          value={subTab}
-          onChange={setSubTab}
-          options={subTabs}
-          fullWidth
-        />
+      {useMuiForm ? (
+        <>
+          <TabsSwitcher
+            variant="underlined"
+            size="small"
+            value={subTab}
+            onChange={setSubTab}
+            options={subTabs}
+            fullWidth
+          />
 
-        <AppFormContentWrapper>
-          {subTab === 'loan-increase' && <LoanIncrease {...formProps} />}
-          {subTab === 'loan-decrease' && <LoanDecrease {...formProps} params={params} />}
+          {subTab === 'loan-increase' && (
+            <Stack sx={{ backgroundColor: (t) => t.design.Layer[1].Fill }}>
+              <AppFormContentWrapper>
+                <LoanIncrease {...formProps} />
+              </AppFormContentWrapper>
+            </Stack>
+          )}
+          {subTab === 'loan-decrease' && llamma && (
+            <RepayForm
+              networks={networks}
+              chainId={rChainId}
+              market={llamma}
+              enabled={isReady}
+              onRepaid={async () => {}}
+            />
+          )}
           {subTab === 'loan-liquidate' && <LoanLiquidate {...formProps} params={params} />}
-          {subTab === 'collateral-increase' && <CollateralIncrease {...formProps} />}
-          {subTab === 'collateral-decrease' && <CollateralDecrease {...formProps} />}
+          {subTab === 'collateral-increase' && llamma && (
+            <AddCollateralForm
+              networks={networks}
+              chainId={rChainId}
+              market={llamma}
+              enabled={isReady}
+              onAdded={async () => {}}
+            />
+          )}
+          {subTab === 'collateral-decrease' && llamma && (
+            <RemoveCollateralForm
+              networks={networks}
+              chainId={rChainId}
+              market={llamma}
+              enabled={isReady}
+              onRemoved={async () => {}}
+            />
+          )}
           {/** Deleverage has no subtabs */}
           {rFormType === 'deleverage' && <LoanDeleverage {...formProps} params={params} />}
-        </AppFormContentWrapper>
-      </Stack>
+        </>
+      ) : (
+        <Stack sx={{ backgroundColor: (t) => t.design.Layer[1].Fill }}>
+          <TabsSwitcher
+            variant="underlined"
+            size="small"
+            value={subTab}
+            onChange={setSubTab}
+            options={subTabs}
+            fullWidth
+          />
+
+          <AppFormContentWrapper>
+            {subTab === 'loan-increase' && <LoanIncrease {...formProps} />}
+            {subTab === 'loan-decrease' && <LoanDecrease {...formProps} params={params} />}
+            {subTab === 'loan-liquidate' && <LoanLiquidate {...formProps} params={params} />}
+            {subTab === 'collateral-increase' && <CollateralIncrease {...formProps} />}
+            {subTab === 'collateral-decrease' && <CollateralDecrease {...formProps} />}
+            {/** Deleverage has no subtabs */}
+            {rFormType === 'deleverage' && <LoanDeleverage {...formProps} params={params} />}
+          </AppFormContentWrapper>
+        </Stack>
+      )}
     </Stack>
   )
 }
diff --git a/packages/curve-ui-kit/src/hooks/useFeatureFlags.ts b/packages/curve-ui-kit/src/hooks/useFeatureFlags.ts
index b5bd43bf6..0fe7645fe 100644
--- a/packages/curve-ui-kit/src/hooks/useFeatureFlags.ts
+++ b/packages/curve-ui-kit/src/hooks/useFeatureFlags.ts
@@ -3,12 +3,18 @@
  * These return booleans indicating whether a new experience is enabled.
  */
 
-import { ReleaseChannel } from '@ui-kit/utils'
+import { defaultReleaseChannel, ReleaseChannel } from '@ui-kit/utils'
 import { useReleaseChannel } from './useLocalStorage'
 
 const useBetaChannel = () => useReleaseChannel()[0] === ReleaseChannel.Beta
 const useStableChannel = () => useReleaseChannel()[0] !== ReleaseChannel.Legacy
 
+/**
+ * Pre-Beta channel works like beta for preview/localhost urls, but completely hidden in production.
+ * This is used for features actively under development that are known not to be ready.
+ *  */
+const useAlphaChannel = () => useBetaChannel() && defaultReleaseChannel === ReleaseChannel.Beta
+
 /** LargeTokenInput replaces legacy amount inputs */
 const useLargeTokenInput = useStableChannel
 
@@ -24,12 +30,11 @@ export const useDexMarketList = useBetaChannel
 /** New unified create loan form */
 export const useCreateLoanMuiForm = useBetaChannel
 
+/** New manage loan forms (add/remove/repay) */
+export const useManageLoanMuiForm = useAlphaChannel
+
 /** New bands chart (BandsChart) */
 export const useNewBandsChart = useBetaChannel
 
-/**
- * New card for managing soft liquidations
- * Temporarily disabled until we have a Tenderly account again so we can test for lend markets,
- * but also I want to see the feature implementation to be progressed further along.
- */
-export const useManageSoftLiquidation = () => false
+/** New card for managing soft liquidations */
+export const useManageSoftLiquidation = useAlphaChannel
diff --git a/packages/curve-ui-kit/src/hooks/useTokenBalance.tsx b/packages/curve-ui-kit/src/hooks/useTokenBalance.tsx
index 9765d3792..6cc664cd4 100644
--- a/packages/curve-ui-kit/src/hooks/useTokenBalance.tsx
+++ b/packages/curve-ui-kit/src/hooks/useTokenBalance.tsx
@@ -19,10 +19,10 @@ export function useTokenBalance(
   { chainId, userAddress }: FieldsOf<{ chainId: number; userAddress: Address }>,
   token: { address: Address } | undefined,
 ) {
-  const { data, isError, isLoading } = useBalance({
+  const { data, error, isLoading } = useBalance({
     ...(userAddress && { address: userAddress }),
     ...(chainId && { chainId: chainId }),
     ...(token && token.address != ethAddress && { token: token.address }),
   })
-  return { ...(data && { data: convertBalance(data) }), isError, isLoading }
+  return { ...(data && { data: convertBalance(data) }), error, isLoading }
 }