diff --git a/AGENTS.md b/AGENTS.md
index 76ac6776..b7ba3589 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -157,6 +157,7 @@ When touching transaction and position flows, validation MUST include all releva
 22. **Chain-scoped identity integrity**: all market/token/route identity checks must be chain-scoped and use canonical identifiers (`chainId + market.uniqueKey` or `chainId + address`), including matching, dedupe keys, routing, and trust/allowlist gates.
 23. **Bundler residual-asset integrity**: any flash-loan transaction path that routes assets through Bundler/adapter balances (especially ERC4626 unwind paths) must end with explicit trailing asset sweeps to the intended recipient and must keep execute-time slippage bounds consistent with quote-time slippage settings.
 
+
 ### REQUIRED: Regression Rule Capture
 
 After fixing any user-reported bug in a high-impact flow:
diff --git a/src/components/Input/Input.tsx b/src/components/Input/Input.tsx
index 58505688..7e53ca79 100644
--- a/src/components/Input/Input.tsx
+++ b/src/components/Input/Input.tsx
@@ -1,7 +1,7 @@
-import { useCallback, useState, useEffect } from 'react';
+import { useCallback, useState, useEffect, useRef } from 'react';
 
 import { formatUnits, parseUnits } from 'viem';
-import { isValidDecimalInput, sanitizeDecimalInput, toParseableDecimalInput } from '@/utils/decimal-input';
+import { hasExcessFractionDigits, isValidDecimalInput, sanitizeDecimalInput, toParseableDecimalInput } from '@/utils/decimal-input';
 
 type InputProps = {
   decimals: number;
@@ -15,6 +15,7 @@ type InputProps = {
   error?: string | null; // optional error message to render below the input
   endAdornment?: React.ReactNode;
   inputClassName?: string;
+  debounceSetValueMs?: number;
 };
 
 const formatInputAmount = (value: bigint, decimals: number): string => {
@@ -36,10 +37,45 @@ export default function Input({
   error,
   endAdornment,
   inputClassName,
+  debounceSetValueMs = 0,
 }: InputProps): JSX.Element {
   // State for the input text
   const [inputAmount, setInputAmount] = useState<string>(value ? formatInputAmount(value, decimals) : '0');
   const [isFocused, setIsFocused] = useState(false);
+  const setValueDebounceTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const pendingSetValueRef = useRef<bigint | null>(null);
+  const setValueRef = useRef(setValue);
+
+  const clearSetValueDebounce = useCallback(() => {
+    if (setValueDebounceTimerRef.current == null) return;
+    clearTimeout(setValueDebounceTimerRef.current);
+    setValueDebounceTimerRef.current = null;
+  }, []);
+
+  const flushPendingSetValue = useCallback(() => {
+    clearSetValueDebounce();
+    const pendingValue = pendingSetValueRef.current;
+    if (pendingValue == null) return;
+    pendingSetValueRef.current = null;
+    setValueRef.current(pendingValue);
+  }, [clearSetValueDebounce]);
+
+  const scheduleSetValue = useCallback(
+    (nextValue: bigint) => {
+      pendingSetValueRef.current = nextValue;
+      clearSetValueDebounce();
+
+      if (debounceSetValueMs <= 0) {
+        flushPendingSetValue();
+        return;
+      }
+
+      setValueDebounceTimerRef.current = setTimeout(() => {
+        flushPendingSetValue();
+      }, debounceSetValueMs);
+    },
+    [clearSetValueDebounce, debounceSetValueMs, flushPendingSetValue],
+  );
 
   // Update input text when value prop changes
   useEffect(() => {
@@ -49,6 +85,17 @@ export default function Input({
     }
   }, [value, decimals, isFocused]);
 
+  useEffect(() => {
+    setValueRef.current = setValue;
+  }, [setValue]);
+
+  useEffect(
+    () => () => {
+      clearSetValueDebounce();
+    },
+    [clearSetValueDebounce],
+  );
+
   const onInputChange = useCallback(
     (e: React.ChangeEvent<HTMLInputElement>) => {
       // update the shown input text regardless
@@ -56,11 +103,14 @@ export default function Input({
       if (!isValidDecimalInput(normalizedInput)) {
         return;
       }
+      if (hasExcessFractionDigits(normalizedInput, decimals)) {
+        return;
+      }
       setInputAmount(normalizedInput);
 
       const parseableInput = toParseableDecimalInput(normalizedInput);
       if (!parseableInput) {
-        setValue(BigInt(0));
+        scheduleSetValue(BigInt(0));
         if (setError) setError(null);
         return;
       }
@@ -71,36 +121,40 @@ export default function Input({
         if (max !== undefined && inputBigInt > max) {
           if (setError) setError(exceedMaxErrMessage ?? 'Input exceeds max');
           if (allowExceedMax) {
-            setValue(inputBigInt);
+            scheduleSetValue(inputBigInt);
           }
           return;
         }
 
-        setValue(inputBigInt);
+        scheduleSetValue(inputBigInt);
         if (setError) setError(null);
       } catch {
         if (setError) setError('Invalid input');
       }
     },
-    [decimals, setError, setInputAmount, setValue, max, exceedMaxErrMessage, allowExceedMax],
+    [decimals, setError, setInputAmount, max, exceedMaxErrMessage, allowExceedMax, scheduleSetValue],
   );
 
   // if max is clicked, set the input to the max value
   const handleMax = useCallback(() => {
+    clearSetValueDebounce();
+    pendingSetValueRef.current = null;
     if (max) {
       setValue(max);
       // set readable input
       setInputAmount(formatInputAmount(max, decimals));
+      if (setError) setError(null);
     }
     if (onMaxClick) onMaxClick();
-  }, [max, decimals, setInputAmount, setValue, onMaxClick]);
+  }, [clearSetValueDebounce, max, decimals, setInputAmount, setValue, setError, onMaxClick]);
 
   const handleBlur = useCallback(() => {
+    flushPendingSetValue();
     setIsFocused(false);
     if (value !== undefined) {
       setInputAmount(formatInputAmount(value, decimals));
     }
-  }, [value, decimals]);
+  }, [flushPendingSetValue, value, decimals]);
 
   return (
     <div className="flex-grow">
diff --git a/src/features/market-detail/components/pull-liquidity-modal.tsx b/src/features/market-detail/components/pull-liquidity-modal.tsx
index 9449a9e8..fc2956a7 100644
--- a/src/features/market-detail/components/pull-liquidity-modal.tsx
+++ b/src/features/market-detail/components/pull-liquidity-modal.tsx
@@ -1,9 +1,10 @@
 'use client';
 
 import { useState, useMemo, useCallback } from 'react';
-import { type Address, formatUnits, parseUnits } from 'viem';
+import { type Address, formatUnits } from 'viem';
 import { BsArrowRepeat } from 'react-icons/bs';
 import { Modal, ModalHeader, ModalBody, ModalFooter } from '@/components/common/Modal';
+import Input from '@/components/Input/Input';
 import { Button } from '@/components/ui/button';
 import { Spinner } from '@/components/ui/spinner';
 import { TokenIcon } from '@/components/shared/token-icon';
@@ -41,7 +42,7 @@ type PullLiquidityModalProps = {
  */
 export function PullLiquidityModal({ market, network, onOpenChange, onSuccess }: PullLiquidityModalProps) {
   const [selectedVaultAddress, setSelectedVaultAddress] = useState<string | null>(null);
-  const [pullAmount, setPullAmount] = useState('');
+  const [pullAmount, setPullAmount] = useState<bigint>(0n);
 
   const supplyingVaults = market.supplyingVaults ?? [];
   const supplyingVaultAddresses = useMemo(() => supplyingVaults.map((v) => v.address), [supplyingVaults]);
@@ -88,15 +89,7 @@ export function PullLiquidityModal({ market, network, onOpenChange, onSuccess }:
 
   const maxPullable = liveMaxPullable ?? apiMaxPullable;
 
-  // Parse pull amount
-  const parsedAmount = useMemo(() => {
-    if (!pullAmount || pullAmount === '' || pullAmount === '0') return 0n;
-    try {
-      return parseUnits(pullAmount, decimals);
-    } catch {
-      return 0n;
-    }
-  }, [pullAmount, decimals]);
+  const parsedAmount = pullAmount;
 
   // Auto-compute withdrawals using live data when available
   const autoWithdrawals = useMemo(() => {
@@ -131,15 +124,9 @@ export function PullLiquidityModal({ market, network, onOpenChange, onSuccess }:
 
   const handleVaultSelect = useCallback((address: string) => {
     setSelectedVaultAddress(address);
-    setPullAmount('');
+    setPullAmount(0n);
   }, []);
 
-  const handleSetMax = useCallback(() => {
-    if (maxPullable > 0n) {
-      setPullAmount(formatUnits(maxPullable, decimals));
-    }
-  }, [maxPullable, decimals]);
-
   const handlePullLiquidity = useCallback(async () => {
     if (!market.collateralAsset || !selectedVault || autoWithdrawals.length === 0) return;
 
@@ -260,7 +247,7 @@ export function PullLiquidityModal({ market, network, onOpenChange, onSuccess }:
                     <p className="mb-2 text-xs uppercase tracking-wider text-secondary">Pull Amount</p>
                     <button
                       type="button"
-                      onClick={handleSetMax}
+                      onClick={() => setPullAmount(maxPullable)}
                       className="cursor-pointer font-inter text-xs opacity-50 transition hover:opacity-100"
                     >
                       Liquidity: {Number(formatUnits(maxPullable, decimals)).toLocaleString(undefined, { maximumFractionDigits: 4 })}{' '}
@@ -273,27 +260,14 @@ export function PullLiquidityModal({ market, network, onOpenChange, onSuccess }:
                     </button>
                   </div>
                   <div className="relative">
-                    <input
-                      type="number"
-                      min="0"
-                      step="any"
-                      placeholder="0.0"
+                    <Input
+                      decimals={decimals}
+                      max={maxPullable}
+                      setValue={setPullAmount}
+                      exceedMaxErrMessage="Exceeds available liquidity"
                       value={pullAmount}
-                      onChange={(e) => setPullAmount(e.target.value)}
-                      onKeyDown={(e) => {
-                        if (e.key === '-' || e.key === 'e') e.preventDefault();
-                      }}
-                      className="bg-hovered h-10 w-full rounded p-2 focus:border-primary focus:outline-none"
+                      inputClassName="h-10 rounded bg-hovered px-3 py-2 text-base font-medium tabular-nums"
                     />
-                    {maxPullable > 0n && (
-                      <button
-                        type="button"
-                        onClick={handleSetMax}
-                        className="bg-surface absolute right-2 top-1/2 -translate-y-1/2 transform rounded p-1 text-sm text-secondary opacity-80 duration-300 ease-in-out hover:scale-105 hover:opacity-100"
-                      >
-                        Max
-                      </button>
-                    )}
                   </div>
                   {validationError && parsedAmount > 0n && <p className="mt-1 text-sm text-red-500">{validationError}</p>}
                 </div>
diff --git a/src/modals/borrow/components/add-collateral-and-borrow.tsx b/src/modals/borrow/components/add-collateral-and-borrow.tsx
index 4ca363c4..d65c0b87 100644
--- a/src/modals/borrow/components/add-collateral-and-borrow.tsx
+++ b/src/modals/borrow/components/add-collateral-and-borrow.tsx
@@ -21,11 +21,9 @@ import {
   clampTargetLtv,
   computeLtv,
   computeTargetCollateralAmount,
-  formatEditableLtvPercent,
   formatLtvPercent,
   getCollateralValueInLoan,
   ltvWadToPercent,
-  normalizeEditablePercentInput,
   percentToLtvWad,
 } from './helpers';
 
@@ -54,8 +52,6 @@ export function AddCollateralAndBorrow({
   const [borrowAmount, setBorrowAmount] = useState<bigint>(0n);
   const [showLtvInput, setShowLtvInput] = useState(false);
   const [lastEditedField, setLastEditedField] = useState<'collateral' | 'borrow'>('borrow');
-  const [ltvInput, setLtvInput] = useState<string>('0');
-  const [isEditingLtvInput, setIsEditingLtvInput] = useState(false);
   const [ltvBorrowHint, setLtvBorrowHint] = useState<string | null>(null);
   const [collateralInputError, setCollateralInputError] = useState<string | null>(null);
   const [borrowInputError, setBorrowInputError] = useState<string | null>(null);
@@ -112,11 +108,6 @@ export function AddCollateralAndBorrow({
 
   const maxTargetLtvPercent = useMemo(() => Math.min(100, ltvWadToPercent(clampTargetLtv(lltv, lltv))), [lltv]);
 
-  useEffect(() => {
-    if (isEditingLtvInput) return;
-    setLtvInput(formatEditableLtvPercent(ltvWadToPercent(projectedLTV), maxTargetLtvPercent));
-  }, [projectedLTV, maxTargetLtvPercent, isEditingLtvInput]);
-
   useEffect(() => {
     if (!showLtvInput) {
       setLtvBorrowHint(null);
@@ -156,19 +147,9 @@ export function AddCollateralAndBorrow({
     setBorrowAmount(value);
   }, []);
 
-  const handleLtvInputChange = useCallback(
-    (value: string) => {
-      const normalizedInput = normalizeEditablePercentInput(value);
-      if (normalizedInput == null) return;
-      setLtvInput(normalizedInput);
+  const applyTargetLtv = useCallback(
+    (clampedTargetLtv: bigint) => {
       setLtvBorrowHint(null);
-      if (normalizedInput === '') return;
-
-      const parsedPercent = Number.parseFloat(normalizedInput);
-      if (!Number.isFinite(parsedPercent)) return;
-      const clampedPercent = clampEditablePercent(parsedPercent, maxTargetLtvPercent);
-
-      const clampedTargetLtv = clampTargetLtv(percentToLtvWad(clampedPercent), lltv);
       if (clampedTargetLtv <= 0n) return;
 
       if (lastEditedField === 'borrow') {
@@ -197,13 +178,9 @@ export function AddCollateralAndBorrow({
         }
         setBorrowAmount(signedBorrowDelta);
         setBorrowInputError(signedBorrowDelta > effectiveAvailableLiquidity ? 'Exceeds available liquidity' : null);
-        return;
       }
-
-      setLtvBorrowHint(null);
     },
     [
-      lltv,
       lastEditedField,
       currentBorrowAssets,
       borrowAmount,
@@ -214,21 +191,8 @@ export function AddCollateralAndBorrow({
       collateralTokenBalance,
       projectedCollateralAssets,
       effectiveAvailableLiquidity,
-      maxTargetLtvPercent,
     ],
   );
-
-  const handleLtvInputBlur = useCallback(() => {
-    setIsEditingLtvInput(false);
-    const parsedPercent = Number.parseFloat(ltvInput.replace(',', '.'));
-    if (!Number.isFinite(parsedPercent)) {
-      setLtvInput(formatEditableLtvPercent(ltvWadToPercent(projectedLTV), maxTargetLtvPercent));
-      return;
-    }
-    const clampedPercent = clampEditablePercent(parsedPercent, maxTargetLtvPercent);
-    const clampedTargetLtv = clampTargetLtv(percentToLtvWad(clampedPercent), lltv);
-    setLtvInput(formatEditableLtvPercent(ltvWadToPercent(clampedTargetLtv), maxTargetLtvPercent));
-  }, [ltvInput, projectedLTV, lltv, maxTargetLtvPercent]);
   const amountInputClassName = 'h-10 rounded bg-surface px-3 py-2 text-base font-medium tabular-nums';
   const ltvInputClassName =
     'h-10 w-full rounded bg-hovered p-2 pr-8 text-base font-medium tabular-nums focus:border-primary focus:outline-none';
@@ -374,27 +338,23 @@ export function AddCollateralAndBorrow({
               <div className="rounded border border-white/10 bg-hovered px-3 py-2.5">
                 <p className="mb-1 font-monospace text-[11px] uppercase tracking-[0.12em] text-secondary">Target LTV</p>
                 <div className="relative min-w-0">
-                  <input
-                    type="text"
-                    inputMode="decimal"
-                    min={0}
-                    max={maxTargetLtvPercent}
-                    step={0.01}
-                    value={ltvInput}
-                    onFocus={() => setIsEditingLtvInput(true)}
-                    onChange={(event) => handleLtvInputChange(event.target.value)}
-                    onBlur={handleLtvInputBlur}
-                    className={ltvInputClassName}
+                  <Input
+                    decimals={2}
+                    setValue={(nextTargetLtvBps) => {
+                      setLtvBorrowHint(null);
+                      const clampedPercent = clampEditablePercent(Number(nextTargetLtvBps) / 100, maxTargetLtvPercent);
+                      applyTargetLtv(clampTargetLtv(percentToLtvWad(clampedPercent), lltv));
+                    }}
+                    value={BigInt(Math.round(clampEditablePercent(ltvWadToPercent(projectedLTV), maxTargetLtvPercent) * 100))}
+                    inputClassName={ltvInputClassName}
+                    endAdornment={<span className="text-xs text-secondary">%</span>}
                   />
-                  <span className="pointer-events-none absolute right-3 top-1/2 -translate-y-1/2 text-xs text-secondary">%</span>
                 </div>
                 {ltvBorrowHint && lastEditedField === 'collateral' && (
                   <button
                     type="button"
                     onClick={() =>
-                      handleLtvInputChange(
-                        formatEditableLtvPercent(Math.min(maxTargetLtvPercent, ltvWadToPercent(currentLTV) + 1), maxTargetLtvPercent),
-                      )
+                      applyTargetLtv(clampTargetLtv(percentToLtvWad(Math.min(maxTargetLtvPercent, ltvWadToPercent(currentLTV) + 1)), lltv))
                     }
                     className="mt-2 inline-flex text-left text-xs text-secondary hover:text-primary"
                   >
diff --git a/src/modals/borrow/components/withdraw-collateral-and-repay.tsx b/src/modals/borrow/components/withdraw-collateral-and-repay.tsx
index 1da26c29..16c142cb 100644
--- a/src/modals/borrow/components/withdraw-collateral-and-repay.tsx
+++ b/src/modals/borrow/components/withdraw-collateral-and-repay.tsx
@@ -16,9 +16,7 @@ import {
   computeLtv,
   computeTargetRepayAmount,
   computeTargetWithdrawAmount,
-  formatEditableLtvPercent,
   ltvWadToPercent,
-  normalizeEditablePercentInput,
   percentToLtvWad,
 } from './helpers';
 
@@ -46,8 +44,6 @@ export function WithdrawCollateralAndRepay({
   const [repayShares, setRepayShares] = useState<bigint>(0n);
   const [showLtvInput, setShowLtvInput] = useState(false);
   const [lastEditedField, setLastEditedField] = useState<'withdraw' | 'repay'>('repay');
-  const [ltvInput, setLtvInput] = useState<string>('0');
-  const [isEditingLtvInput, setIsEditingLtvInput] = useState(false);
   const [withdrawInputError, setWithdrawInputError] = useState<string | null>(null);
   const [repayInputError, setRepayInputError] = useState<string | null>(null);
 
@@ -138,11 +134,6 @@ export function WithdrawCollateralAndRepay({
 
   const maxTargetLtvPercent = useMemo(() => Math.min(100, ltvWadToPercent(clampTargetLtv(lltv, lltv))), [lltv]);
 
-  useEffect(() => {
-    if (isEditingLtvInput) return;
-    setLtvInput(formatEditableLtvPercent(ltvWadToPercent(projectedLTV), maxTargetLtvPercent));
-  }, [projectedLTV, maxTargetLtvPercent, isEditingLtvInput]);
-
   const handleRefresh = useCallback(() => {
     if (!onSuccess) return;
     try {
@@ -170,18 +161,8 @@ export function WithdrawCollateralAndRepay({
     [applyRepayAssets],
   );
 
-  const handleLtvInputChange = useCallback(
-    (value: string) => {
-      const normalizedInput = normalizeEditablePercentInput(value);
-      if (normalizedInput == null) return;
-      setLtvInput(normalizedInput);
-      if (normalizedInput === '') return;
-
-      const parsedPercent = Number.parseFloat(normalizedInput);
-      if (!Number.isFinite(parsedPercent)) return;
-      const clampedPercent = clampEditablePercent(parsedPercent, maxTargetLtvPercent);
-
-      const clampedTargetLtv = clampTargetLtv(percentToLtvWad(clampedPercent), lltv);
+  const applyTargetLtv = useCallback(
+    (clampedTargetLtv: bigint) => {
       if (clampedTargetLtv <= 0n) return;
 
       if (lastEditedField === 'repay') {
@@ -207,7 +188,6 @@ export function WithdrawCollateralAndRepay({
       setRepayInputError(nextRepayAssets > maxToRepay ? 'Exceeds current debt or insufficient balance' : null);
     },
     [
-      lltv,
       lastEditedField,
       repayAssets,
       repayShares,
@@ -217,22 +197,9 @@ export function WithdrawCollateralAndRepay({
       maxWithdrawAssets,
       projectedCollateralAssets,
       maxToRepay,
-      maxTargetLtvPercent,
       applyRepayAssets,
     ],
   );
-
-  const handleLtvInputBlur = useCallback(() => {
-    setIsEditingLtvInput(false);
-    const parsedPercent = Number.parseFloat(ltvInput.replace(',', '.'));
-    if (!Number.isFinite(parsedPercent)) {
-      setLtvInput(formatEditableLtvPercent(ltvWadToPercent(projectedLTV), maxTargetLtvPercent));
-      return;
-    }
-    const clampedPercent = clampEditablePercent(parsedPercent, maxTargetLtvPercent);
-    const clampedTargetLtv = clampTargetLtv(percentToLtvWad(clampedPercent), lltv);
-    setLtvInput(formatEditableLtvPercent(ltvWadToPercent(clampedTargetLtv), maxTargetLtvPercent));
-  }, [ltvInput, projectedLTV, lltv, maxTargetLtvPercent]);
   const amountInputClassName = 'h-10 rounded bg-surface px-3 py-2 text-base font-medium tabular-nums';
   const ltvInputClassName =
     'h-10 w-full rounded bg-hovered p-2 pr-8 text-base font-medium tabular-nums focus:border-primary focus:outline-none';
@@ -339,19 +306,16 @@ export function WithdrawCollateralAndRepay({
             <div className="rounded border border-white/10 bg-hovered px-3 py-2.5">
               <p className="mb-1 font-monospace text-[11px] uppercase tracking-[0.12em] text-secondary">Target LTV</p>
               <div className="relative min-w-0">
-                <input
-                  type="text"
-                  inputMode="decimal"
-                  min={0}
-                  max={maxTargetLtvPercent}
-                  step={0.01}
-                  value={ltvInput}
-                  onFocus={() => setIsEditingLtvInput(true)}
-                  onChange={(event) => handleLtvInputChange(event.target.value)}
-                  onBlur={handleLtvInputBlur}
-                  className={ltvInputClassName}
+                <Input
+                  decimals={2}
+                  setValue={(nextTargetLtvBps) => {
+                    const clampedPercent = clampEditablePercent(Number(nextTargetLtvBps) / 100, maxTargetLtvPercent);
+                    applyTargetLtv(clampTargetLtv(percentToLtvWad(clampedPercent), lltv));
+                  }}
+                  value={BigInt(Math.round(clampEditablePercent(ltvWadToPercent(projectedLTV), maxTargetLtvPercent) * 100))}
+                  inputClassName={ltvInputClassName}
+                  endAdornment={<span className="text-xs text-secondary">%</span>}
                 />
-                <span className="pointer-events-none absolute right-3 top-1/2 -translate-y-1/2 text-xs text-secondary">%</span>
               </div>
             </div>
           )}
diff --git a/src/modals/leverage/components/add-collateral-and-leverage.tsx b/src/modals/leverage/components/add-collateral-and-leverage.tsx
index 52e8321e..93a600c2 100644
--- a/src/modals/leverage/components/add-collateral-and-leverage.tsx
+++ b/src/modals/leverage/components/add-collateral-and-leverage.tsx
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { erc20Abi, formatUnits } from 'viem';
 import { useConnection, useReadContract } from 'wagmi';
 import { BorrowPositionRiskCard } from '@/modals/borrow/components/borrow-position-risk-card';
-import { LTV_WAD, clampEditablePercent, computeLtv, formatEditableLtvPercent } from '@/modals/borrow/components/helpers';
+import { LTV_WAD, computeLtv } from '@/modals/borrow/components/helpers';
 import { HelpTooltipIcon } from '@/components/shared/help-tooltip-icon';
 import { RateFormatted } from '@/components/shared/rate-formatted';
 import { TooltipContent as SharedTooltipContent } from '@/components/shared/tooltip-content';
@@ -18,13 +18,9 @@ import {
   computeMaxMultiplierBpsForTargetLtv,
   convertVaultSharesToUnderlyingAssets,
   computeLeverageProjectedPosition,
-  formatPercentFromBps,
-  formatMultiplierBps,
   formatTokenAmountPreview,
   ltvWadToBps,
   multiplierBpsFromTargetLtv,
-  parsePercentToBps,
-  parseMultiplierToBps,
   parseUnsignedBigInt,
   toScaledRatio,
   targetLtvBpsFromMultiplier,
@@ -55,8 +51,8 @@ type AddCollateralAndLeverageProps = {
   isRefreshing?: boolean;
 };
 
-const EDITABLE_DECIMAL_INPUT_REGEX = /^\d*[.,]?\d*$/;
 const LEVERAGE_SAFE_LTV_BUFFER_BPS = 100n; // keep a 1% buffer below liquidation LTV
+const TARGET_INPUT_DEBOUNCE_MS = 300;
 
 export function AddCollateralAndLeverage({
   market,
@@ -80,15 +76,16 @@ export function AddCollateralAndLeverage({
   const maxTargetLtvBps = useMemo(() => (lltvBps > LEVERAGE_SAFE_LTV_BUFFER_BPS ? lltvBps - LEVERAGE_SAFE_LTV_BUFFER_BPS : 0n), [lltvBps]);
   const maxMultiplierBps = useMemo(() => computeMaxMultiplierBpsForTargetLtv(maxTargetLtvBps), [maxTargetLtvBps]);
   const defaultMultiplierBps = useMemo(() => clampMultiplierBps(LEVERAGE_DEFAULT_MULTIPLIER_BPS, maxMultiplierBps), [maxMultiplierBps]);
+  const defaultTargetLtvIntentBps = useMemo(
+    () => clampTargetLtvBps(targetLtvBpsFromMultiplier(defaultMultiplierBps), maxTargetLtvBps),
+    [defaultMultiplierBps, maxTargetLtvBps],
+  );
 
   const [collateralAmount, setCollateralAmount] = useState<bigint>(0n);
   const [collateralInputError, setCollateralInputError] = useState<string | null>(null);
-  const [multiplierInput, setMultiplierInput] = useState<string>(formatMultiplierBps(LEVERAGE_DEFAULT_MULTIPLIER_BPS, maxMultiplierBps));
-  const [targetLtvInput, setTargetLtvInput] = useState<string>(
-    formatPercentFromBps(clampTargetLtvBps(targetLtvBpsFromMultiplier(LEVERAGE_DEFAULT_MULTIPLIER_BPS), maxTargetLtvBps)),
-  );
   const [useLoanAssetInput, setUseLoanAssetInput] = useState(false);
   const [targetMultiplierBps, setTargetMultiplierBps] = useState<bigint>(defaultMultiplierBps);
+  const [targetLtvIntentBps, setTargetLtvIntentBps] = useState<bigint>(defaultTargetLtvIntentBps);
   const [swapSlippagePercent, setSwapSlippagePercent] = useState<number>(DEFAULT_SLIPPAGE_PERCENT);
 
   const multiplierBps = useMemo(() => clampMultiplierBps(targetMultiplierBps, maxMultiplierBps), [targetMultiplierBps, maxMultiplierBps]);
@@ -97,7 +94,6 @@ export function AddCollateralAndLeverage({
     [multiplierBps, maxTargetLtvBps],
   );
   const swapSlippageBps = useMemo(() => slippagePercentToBps(swapSlippagePercent), [swapSlippagePercent]);
-  const maxTargetLtvPercent = useMemo(() => Number(maxTargetLtvBps) / 100, [maxTargetLtvBps]);
   const isErc4626Route = route?.kind === 'erc4626';
   const isSwapRoute = route?.kind === 'swap';
   const canUseLoanAssetInput = isErc4626Route || isSwapRoute;
@@ -126,11 +122,16 @@ export function AddCollateralAndLeverage({
 
   useEffect(() => {
     const clampedMultiplier = clampMultiplierBps(targetMultiplierBps, maxMultiplierBps);
-    if (clampedMultiplier === targetMultiplierBps) return;
-    setTargetMultiplierBps(clampedMultiplier);
-    setMultiplierInput(formatMultiplierBps(clampedMultiplier, maxMultiplierBps));
-    setTargetLtvInput(formatPercentFromBps(clampTargetLtvBps(targetLtvBpsFromMultiplier(clampedMultiplier), maxTargetLtvBps)));
-  }, [targetMultiplierBps, maxMultiplierBps, maxTargetLtvBps]);
+    if (clampedMultiplier !== targetMultiplierBps) {
+      setTargetMultiplierBps(clampedMultiplier);
+    }
+
+    if (useTargetLtvInput) return;
+    const derivedTargetLtvBps = clampTargetLtvBps(targetLtvBpsFromMultiplier(clampedMultiplier), maxTargetLtvBps);
+    if (derivedTargetLtvBps !== targetLtvIntentBps) {
+      setTargetLtvIntentBps(derivedTargetLtvBps);
+    }
+  }, [targetMultiplierBps, maxMultiplierBps, maxTargetLtvBps, useTargetLtvInput, targetLtvIntentBps]);
 
   const quote = useLeverageQuote({
     chainId: market.morphoBlue.chain.id,
@@ -246,10 +247,8 @@ export function AddCollateralAndLeverage({
     (nextMultiplierBps: bigint) => {
       const clampedMultiplier = clampMultiplierBps(nextMultiplierBps, maxMultiplierBps);
       const derivedTargetLtvBps = clampTargetLtvBps(targetLtvBpsFromMultiplier(clampedMultiplier), maxTargetLtvBps);
-
       setTargetMultiplierBps(clampedMultiplier);
-      setMultiplierInput(formatMultiplierBps(clampedMultiplier, maxMultiplierBps));
-      setTargetLtvInput(formatPercentFromBps(derivedTargetLtvBps));
+      setTargetLtvIntentBps(derivedTargetLtvBps);
     },
     [maxMultiplierBps, maxTargetLtvBps],
   );
@@ -288,37 +287,15 @@ export function AddCollateralAndLeverage({
     onSuccess: handleTransactionSuccess,
   });
 
-  const handleMultiplierInputChange = useCallback((value: string) => {
-    if (!EDITABLE_DECIMAL_INPUT_REGEX.test(value)) return;
-    setMultiplierInput(value);
-  }, []);
-
-  const handleMultiplierInputBlur = useCallback(() => {
-    syncInputFieldsFromMultiplier(parseMultiplierToBps(multiplierInput, maxMultiplierBps));
-  }, [multiplierInput, maxMultiplierBps, syncInputFieldsFromMultiplier]);
-
-  const handleTargetLtvInputChange = useCallback((value: string) => {
-    if (!EDITABLE_DECIMAL_INPUT_REGEX.test(value)) return;
-    setTargetLtvInput(value);
-  }, []);
-
-  const handleTargetLtvInputBlur = useCallback(() => {
-    const parsedPercent = Number.parseFloat(targetLtvInput.replace(',', '.'));
-    if (!Number.isFinite(parsedPercent)) {
-      setTargetLtvInput(formatEditableLtvPercent(Number(targetLtvBps) / 100, maxTargetLtvPercent));
-      return;
-    }
-    const clampedPercent = clampEditablePercent(parsedPercent, maxTargetLtvPercent);
-    const clampedTargetLtvBps = clampTargetLtvBps(parsePercentToBps(clampedPercent.toString(), maxTargetLtvBps), maxTargetLtvBps);
-    syncInputFieldsFromMultiplier(multiplierBpsFromTargetLtv(clampedTargetLtvBps, maxMultiplierBps));
-  }, [targetLtvInput, targetLtvBps, maxMultiplierBps, maxTargetLtvBps, maxTargetLtvPercent, syncInputFieldsFromMultiplier]);
-
   const handleTargetInputModeChange = useCallback(
     (nextUseTargetLtvInput: boolean) => {
       setLeverageUseTargetLtvInput(nextUseTargetLtvInput);
+      if (nextUseTargetLtvInput) {
+        setTargetLtvIntentBps(targetLtvBps);
+      }
       syncInputFieldsFromMultiplier(targetMultiplierBps);
     },
-    [setLeverageUseTargetLtvInput, syncInputFieldsFromMultiplier, targetMultiplierBps],
+    [setLeverageUseTargetLtvInput, syncInputFieldsFromMultiplier, targetMultiplierBps, targetLtvBps],
   );
 
   const handleLeverage = useCallback(() => {
@@ -351,6 +328,22 @@ export function AddCollateralAndLeverage({
     if (!isLeverageFeeReady || leverageTransferFee == null) return null;
     return formatTokenAmountPreview(leverageTransferFee, market.collateralAsset.decimals);
   }, [isLeverageFeeReady, leverageTransferFee, market.collateralAsset.decimals]);
+  const leverageFeeUsdPreview = useMemo(() => {
+    if (!isLeverageFeeReady || leverageTransferFee == null || collateralAssetPriceUsd == null) return null;
+
+    const feeAmount = Number(formatUnits(leverageTransferFee, market.collateralAsset.decimals));
+    if (!Number.isFinite(feeAmount) || feeAmount < 0) return null;
+
+    const feeUsdValue = feeAmount * collateralAssetPriceUsd;
+    if (!Number.isFinite(feeUsdValue) || feeUsdValue < 0) return null;
+
+    return new Intl.NumberFormat('en-US', {
+      style: 'currency',
+      currency: 'USD',
+      minimumFractionDigits: 0,
+      maximumFractionDigits: 3,
+    }).format(feeUsdValue);
+  }, [isLeverageFeeReady, leverageTransferFee, collateralAssetPriceUsd, market.collateralAsset.decimals]);
   const swapCollateralOutPreview = useMemo(
     () => formatTokenAmountPreview(quote.flashCollateralAmount, market.collateralAsset.decimals),
     [quote.flashCollateralAmount, market.collateralAsset.decimals],
@@ -690,30 +683,29 @@ export function AddCollateralAndLeverage({
               <div className="relative min-w-0">
                 {useTargetLtvInput ? (
                   <>
-                    <input
-                      type="text"
-                      inputMode="decimal"
-                      min={0}
-                      max={maxTargetLtvPercent}
-                      step={0.01}
-                      value={targetLtvInput}
-                      onChange={(event) => handleTargetLtvInputChange(event.target.value)}
-                      onBlur={handleTargetLtvInputBlur}
-                      className="h-10 w-full rounded bg-hovered px-3 py-2 pr-10 text-base font-medium tabular-nums focus:border-primary focus:outline-none"
+                    <Input
+                      decimals={2}
+                      setValue={(nextTargetLtvBps) => {
+                        const clampedTargetLtvBps = clampTargetLtvBps(nextTargetLtvBps, maxTargetLtvBps);
+                        setTargetLtvIntentBps(clampedTargetLtvBps);
+                        setTargetMultiplierBps(multiplierBpsFromTargetLtv(clampedTargetLtvBps, maxMultiplierBps));
+                      }}
+                      value={targetLtvIntentBps}
+                      inputClassName="h-10 rounded bg-hovered px-3 py-2 pr-10 text-base font-medium tabular-nums"
+                      endAdornment={<span className="text-xs text-secondary">%</span>}
+                      debounceSetValueMs={TARGET_INPUT_DEBOUNCE_MS}
                     />
-                    <span className="pointer-events-none absolute right-3 top-1/2 -translate-y-1/2 text-xs text-secondary">%</span>
                   </>
                 ) : (
                   <>
-                    <input
-                      type="text"
-                      inputMode="decimal"
-                      value={multiplierInput}
-                      onChange={(event) => handleMultiplierInputChange(event.target.value)}
-                      onBlur={handleMultiplierInputBlur}
-                      className="h-10 w-full rounded bg-hovered px-3 py-2 pr-10 text-base font-medium tabular-nums focus:border-primary focus:outline-none"
+                    <Input
+                      decimals={4}
+                      setValue={syncInputFieldsFromMultiplier}
+                      value={multiplierBps}
+                      inputClassName="h-10 rounded bg-hovered px-3 py-2 pr-10 text-base font-medium tabular-nums"
+                      endAdornment={<span className="text-xs text-secondary">x</span>}
+                      debounceSetValueMs={TARGET_INPUT_DEBOUNCE_MS}
                     />
-                    <span className="pointer-events-none absolute right-3 top-1/2 -translate-y-1/2 text-xs text-secondary">x</span>
                   </>
                 )}
               </div>
@@ -771,6 +763,7 @@ export function AddCollateralAndLeverage({
                       <Tooltip content={<span className="text-xs">{leverageFeePreview.full}</span>}>
                         <span className="cursor-help border-b border-dotted border-white/40">{leverageFeePreview.compact}</span>
                       </Tooltip>
+                      {leverageFeeUsdPreview != null && <span className="text-secondary">({leverageFeeUsdPreview})</span>}
                       <TokenIcon
                         address={market.collateralAsset.address}
                         chainId={market.morphoBlue.chain.id}
diff --git a/src/modals/leverage/components/remove-collateral-and-deleverage.tsx b/src/modals/leverage/components/remove-collateral-and-deleverage.tsx
index 76764cf8..6658cd39 100644
--- a/src/modals/leverage/components/remove-collateral-and-deleverage.tsx
+++ b/src/modals/leverage/components/remove-collateral-and-deleverage.tsx
@@ -3,7 +3,6 @@ import { useConnection } from 'wagmi';
 import Input from '@/components/Input/Input';
 import { ExecuteTransactionButton } from '@/components/ui/ExecuteTransactionButton';
 import { Tooltip } from '@/components/ui/tooltip';
-import { IconSwitch } from '@/components/ui/icon-switch';
 import { LTVWarning } from '@/components/shared/ltv-warning';
 import { TokenIcon } from '@/components/shared/token-icon';
 import { SlippageInlineEditor } from '@/features/swap/components/SlippageInlineEditor';
@@ -12,20 +11,12 @@ import { formatSwapRatePreview } from '@/features/swap/utils/quote-preview';
 import { computeDeleverageProjectedPosition, formatTokenAmountPreview, parseUnsignedBigInt } from '@/hooks/leverage/math';
 import { useDeleverageQuote } from '@/hooks/useDeleverageQuote';
 import { useDeleverageTransaction } from '@/hooks/useDeleverageTransaction';
-import { useAppSettings } from '@/stores/useAppSettings';
 import type { Market, MarketPosition } from '@/utils/types';
 import type { LeverageRoute } from '@/hooks/leverage/types';
 import {
-  clampEditablePercent,
-  clampTargetLtv,
   computeLtv,
-  formatEditableLtvPercent,
   formatLtvPercent,
-  getCollateralValueInLoan,
   getLTVColor,
-  ltvWadToPercent,
-  normalizeEditablePercentInput,
-  percentToLtvWad,
 } from '@/modals/borrow/components/helpers';
 import { BorrowPositionRiskCard } from '@/modals/borrow/components/borrow-position-risk-card';
 
@@ -38,104 +29,6 @@ type RemoveCollateralAndDeleverageProps = {
   isRefreshing?: boolean;
 };
 
-const TARGET_LTV_SEARCH_STEPS = 40n;
-
-const absDiffBigInt = (a: bigint, b: bigint): bigint => (a >= b ? a - b : b - a);
-
-const estimateRepayAmountFromWithdraw = ({
-  withdrawCollateralAmount,
-  currentBorrowAssets,
-  referenceWithdrawAmount,
-  referenceRepayAmount,
-  oraclePrice,
-}: {
-  withdrawCollateralAmount: bigint;
-  currentBorrowAssets: bigint;
-  referenceWithdrawAmount: bigint;
-  referenceRepayAmount: bigint;
-  oraclePrice: bigint;
-}): bigint => {
-  if (withdrawCollateralAmount <= 0n || currentBorrowAssets <= 0n) return 0n;
-  if (referenceWithdrawAmount > 0n && referenceRepayAmount > 0n) {
-    const estimatedRepayFromRatio = (withdrawCollateralAmount * referenceRepayAmount) / referenceWithdrawAmount;
-    return estimatedRepayFromRatio > currentBorrowAssets ? currentBorrowAssets : estimatedRepayFromRatio;
-  }
-  const estimatedRepayFromOracle = getCollateralValueInLoan(withdrawCollateralAmount, oraclePrice);
-  return estimatedRepayFromOracle > currentBorrowAssets ? currentBorrowAssets : estimatedRepayFromOracle;
-};
-
-const estimateWithdrawAmountForTargetLtv = ({
-  targetLtv,
-  currentCollateralAssets,
-  currentBorrowAssets,
-  currentBorrowShares,
-  maxWithdrawCollateral,
-  referenceWithdrawAmount,
-  referenceRepayAmount,
-  maxCollateralForDebtRepay,
-  closeRouteAvailable,
-  closeBoundIsInputCap,
-  slippageBps,
-  oraclePrice,
-}: {
-  targetLtv: bigint;
-  currentCollateralAssets: bigint;
-  currentBorrowAssets: bigint;
-  currentBorrowShares: bigint;
-  maxWithdrawCollateral: bigint;
-  referenceWithdrawAmount: bigint;
-  referenceRepayAmount: bigint;
-  maxCollateralForDebtRepay: bigint;
-  closeRouteAvailable: boolean;
-  closeBoundIsInputCap: boolean;
-  slippageBps: number;
-  oraclePrice: bigint;
-}): bigint => {
-  if (targetLtv <= 0n || maxWithdrawCollateral <= 0n || currentCollateralAssets <= 0n) return 0n;
-
-  const evaluateProjectedLtv = (candidateWithdrawAmount: bigint): bigint => {
-    const estimatedRepayAmount = estimateRepayAmountFromWithdraw({
-      withdrawCollateralAmount: candidateWithdrawAmount,
-      currentBorrowAssets,
-      referenceWithdrawAmount,
-      referenceRepayAmount,
-      oraclePrice,
-    });
-    const projectedPosition = computeDeleverageProjectedPosition({
-      currentCollateralAssets,
-      currentBorrowAssets,
-      currentBorrowShares,
-      withdrawCollateralAmount: candidateWithdrawAmount,
-      repayAmount: estimatedRepayAmount,
-      maxCollateralForDebtRepay,
-      closeRouteAvailable,
-      closeBoundIsInputCap,
-      slippageBps,
-    });
-
-    return computeLtv({
-      borrowAssets: projectedPosition.projectedBorrowAssets,
-      collateralAssets: projectedPosition.projectedCollateralAssets,
-      oraclePrice,
-    });
-  };
-
-  let bestCandidate = 0n;
-  let bestDistance = absDiffBigInt(evaluateProjectedLtv(0n), targetLtv);
-
-  for (let step = 1n; step <= TARGET_LTV_SEARCH_STEPS; step += 1n) {
-    const candidateWithdrawAmount = (maxWithdrawCollateral * step) / TARGET_LTV_SEARCH_STEPS;
-    const projectedLtv = evaluateProjectedLtv(candidateWithdrawAmount);
-    const distance = absDiffBigInt(projectedLtv, targetLtv);
-    if (distance < bestDistance) {
-      bestDistance = distance;
-      bestCandidate = candidateWithdrawAmount;
-    }
-  }
-
-  return bestCandidate;
-};
-
 export function RemoveCollateralAndDeleverage({
   market,
   route,
@@ -145,11 +38,8 @@ export function RemoveCollateralAndDeleverage({
   isRefreshing = false,
 }: RemoveCollateralAndDeleverageProps): JSX.Element {
   const { address: account } = useConnection();
-  const { deleverageUseTargetLtvInput: useTargetLtvInput, setDeleverageUseTargetLtvInput } = useAppSettings();
   const isSwapRoute = route?.kind === 'swap';
   const [withdrawCollateralAmount, setWithdrawCollateralAmount] = useState<bigint>(0n);
-  const [targetLtvInput, setTargetLtvInput] = useState<string>('0');
-  const [isEditingTargetLtvInput, setIsEditingTargetLtvInput] = useState(false);
   const [swapSlippagePercent, setSwapSlippagePercent] = useState<number>(DEFAULT_SLIPPAGE_PERCENT);
   const [withdrawInputError, setWithdrawInputError] = useState<string | null>(null);
 
@@ -163,7 +53,6 @@ export function RemoveCollateralAndDeleverage({
   const currentBorrowAssets = currentBorrowAssetsRaw ?? 0n;
   const currentBorrowShares = currentBorrowSharesRaw ?? 0n;
   const lltv = lltvRaw ?? 0n;
-  const maxTargetLtvPercent = useMemo(() => Math.min(100, ltvWadToPercent(clampTargetLtv(lltv, lltv))), [lltv]);
   const quoteWithdrawCollateralAmount = hasInvalidPositionData ? 0n : withdrawCollateralAmount;
   const swapSlippageBps = useMemo(() => slippagePercentToBps(swapSlippagePercent), [swapSlippagePercent]);
 
@@ -304,8 +193,6 @@ export function RemoveCollateralAndDeleverage({
     [withdrawCollateralAmount, market.collateralAsset.decimals],
   );
   const collateralFlowLabel = isSwapRoute ? 'Collateral Sold' : 'Collateral Unwound';
-  const ltvInputClassName =
-    'h-10 w-full rounded bg-hovered px-3 py-2 pr-10 text-base font-medium tabular-nums focus:border-primary focus:outline-none';
 
   const handleWithdrawAmountChange = useCallback(
     (nextWithdrawAmount: bigint) => {
@@ -323,82 +210,6 @@ export function RemoveCollateralAndDeleverage({
     [clearExecutionError],
   );
 
-  const handleTargetLtvInputChange = useCallback(
-    (value: string) => {
-      clearExecutionError();
-      const normalizedInput = normalizeEditablePercentInput(value);
-      if (normalizedInput == null) return;
-      setTargetLtvInput(normalizedInput);
-      if (normalizedInput === '') return;
-      const parsedPercent = Number.parseFloat(normalizedInput);
-      if (!Number.isFinite(parsedPercent)) return;
-      const clampedPercent = clampEditablePercent(parsedPercent, maxTargetLtvPercent);
-      const clampedTargetLtv = clampTargetLtv(percentToLtvWad(clampedPercent), lltv);
-      if (clampedTargetLtv <= 0n) {
-        setWithdrawCollateralAmount(0n);
-        setWithdrawInputError(null);
-        return;
-      }
-      const nextWithdrawAmount = estimateWithdrawAmountForTargetLtv({
-        targetLtv: clampedTargetLtv,
-        currentCollateralAssets,
-        currentBorrowAssets,
-        currentBorrowShares,
-        maxWithdrawCollateral: projection.maxWithdrawCollateral,
-        referenceWithdrawAmount: withdrawCollateralAmount,
-        referenceRepayAmount: quote.repayAmount,
-        maxCollateralForDebtRepay: quote.maxCollateralForDebtRepay,
-        closeRouteAvailable: quote.closeRouteAvailable,
-        closeBoundIsInputCap: route?.kind !== 'swap',
-        slippageBps: swapSlippageBps,
-        oraclePrice,
-      });
-      setWithdrawCollateralAmount(nextWithdrawAmount);
-      setWithdrawInputError(nextWithdrawAmount > projection.maxWithdrawCollateral ? 'Exceeds deleverageable collateral' : null);
-    },
-    [
-      maxTargetLtvPercent,
-      lltv,
-      currentCollateralAssets,
-      currentBorrowAssets,
-      currentBorrowShares,
-      projection.maxWithdrawCollateral,
-      withdrawCollateralAmount,
-      quote.repayAmount,
-      quote.maxCollateralForDebtRepay,
-      quote.closeRouteAvailable,
-      swapSlippageBps,
-      route,
-      oraclePrice,
-      clearExecutionError,
-    ],
-  );
-
-  const handleTargetLtvInputBlur = useCallback(() => {
-    setIsEditingTargetLtvInput(false);
-    const parsedPercent = Number.parseFloat(targetLtvInput.replace(',', '.'));
-    if (!Number.isFinite(parsedPercent)) {
-      setTargetLtvInput(formatEditableLtvPercent(ltvWadToPercent(displayProjectedLTV), maxTargetLtvPercent));
-      return;
-    }
-    const clampedPercent = clampEditablePercent(parsedPercent, maxTargetLtvPercent);
-    const clampedTargetLtv = clampTargetLtv(percentToLtvWad(clampedPercent), lltv);
-    setTargetLtvInput(formatEditableLtvPercent(ltvWadToPercent(clampedTargetLtv), maxTargetLtvPercent));
-  }, [targetLtvInput, displayProjectedLTV, maxTargetLtvPercent, lltv]);
-
-  const handleInputModeChange = useCallback(
-    (nextUseTargetLtvInput: boolean) => {
-      clearExecutionError();
-      setDeleverageUseTargetLtvInput(nextUseTargetLtvInput);
-      setWithdrawInputError(null);
-    },
-    [clearExecutionError, setDeleverageUseTargetLtvInput],
-  );
-
-  useEffect(() => {
-    if (isEditingTargetLtvInput) return;
-    setTargetLtvInput(formatEditableLtvPercent(ltvWadToPercent(displayProjectedLTV), maxTargetLtvPercent));
-  }, [isEditingTargetLtvInput, displayProjectedLTV, maxTargetLtvPercent]);
   const swapRatePreviewText = useMemo(() => {
     if (!isSwapRoute || !quote.swapSellPriceRoute) return null;
 
@@ -447,65 +258,30 @@ export function RemoveCollateralAndDeleverage({
 
           <div className="mt-2 space-y-3">
             <div className="rounded border border-white/10 bg-hovered px-3 py-2.5">
-              <div className="mb-1 flex items-center justify-between gap-2">
-                <p className="font-monospace text-[11px] uppercase tracking-[0.12em] text-secondary">
-                  {useTargetLtvInput ? 'Target LTV' : `Collateral To Unwind ${market.collateralAsset.symbol}`}
-                </p>
-                <div className="flex items-center gap-2">
-                  <div className="text-xs text-secondary">Use LTV</div>
-                  <IconSwitch
-                    size="sm"
-                    selected={useTargetLtvInput}
-                    onChange={handleInputModeChange}
-                    thumbIcon={null}
-                    classNames={{
-                      wrapper: 'mr-0 h-4 w-9',
-                      thumb: 'h-3 w-3',
-                    }}
+              <p className="mb-1 font-monospace text-[11px] uppercase tracking-[0.12em] text-secondary">
+                Collateral To Unwind {market.collateralAsset.symbol}
+              </p>
+              <Input
+                decimals={market.collateralAsset.decimals}
+                max={projection.maxWithdrawCollateral}
+                setValue={handleWithdrawAmountChange}
+                setError={setWithdrawInputError}
+                exceedMaxErrMessage="Exceeds deleverageable collateral"
+                value={withdrawCollateralAmount}
+                inputClassName="h-10 rounded bg-surface px-3 py-2 text-base font-medium tabular-nums"
+                endAdornment={
+                  <TokenIcon
+                    address={market.collateralAsset.address}
+                    chainId={market.morphoBlue.chain.id}
+                    symbol={market.collateralAsset.symbol}
+                    width={16}
+                    height={16}
                   />
-                </div>
-              </div>
-              {useTargetLtvInput ? (
-                <div className="relative min-w-0">
-                  <input
-                    type="text"
-                    inputMode="decimal"
-                    min={0}
-                    max={maxTargetLtvPercent}
-                    step={0.01}
-                    value={targetLtvInput}
-                    onFocus={() => setIsEditingTargetLtvInput(true)}
-                    onChange={(event) => handleTargetLtvInputChange(event.target.value)}
-                    onBlur={handleTargetLtvInputBlur}
-                    className={ltvInputClassName}
-                  />
-                  <span className="pointer-events-none absolute right-3 top-1/2 -translate-y-1/2 text-xs text-secondary">%</span>
-                </div>
-              ) : (
-                <>
-                  <Input
-                    decimals={market.collateralAsset.decimals}
-                    max={projection.maxWithdrawCollateral}
-                    setValue={handleWithdrawAmountChange}
-                    setError={setWithdrawInputError}
-                    exceedMaxErrMessage="Exceeds deleverageable collateral"
-                    value={withdrawCollateralAmount}
-                    inputClassName="h-10 rounded bg-surface px-3 py-2 text-base font-medium tabular-nums"
-                    endAdornment={
-                      <TokenIcon
-                        address={market.collateralAsset.address}
-                        chainId={market.morphoBlue.chain.id}
-                        symbol={market.collateralAsset.symbol}
-                        width={16}
-                        height={16}
-                      />
-                    }
-                  />
-                  {withdrawInputError && <p className="mt-1 text-right text-xs text-red-500">{withdrawInputError}</p>}
-                  {!withdrawInputError && exceedsMaxWithdraw && (
-                    <p className="mt-1 text-right text-xs text-red-500">Exceeds deleverageable collateral</p>
-                  )}
-                </>
+                }
+              />
+              {withdrawInputError && <p className="mt-1 text-right text-xs text-red-500">{withdrawInputError}</p>}
+              {!withdrawInputError && exceedsMaxWithdraw && (
+                <p className="mt-1 text-right text-xs text-red-500">Exceeds deleverageable collateral</p>
               )}
             </div>
 
diff --git a/src/stores/useAppSettings.ts b/src/stores/useAppSettings.ts
index 2803cad6..4448fffe 100644
--- a/src/stores/useAppSettings.ts
+++ b/src/stores/useAppSettings.ts
@@ -25,7 +25,6 @@ type AppSettingsState = {
 
   // Leverage modal preferences
   leverageUseTargetLtvInput: boolean;
-  deleverageUseTargetLtvInput: boolean;
 
   // Rebalance modal preferences
   rebalanceDefaultMode: RebalanceDefaultMode;
@@ -42,7 +41,6 @@ type AppSettingsActions = {
   setShowDeveloperOptions: (show: boolean) => void;
   setUsePublicAllocator: (show: boolean) => void;
   setLeverageUseTargetLtvInput: (useTargetLtvInput: boolean) => void;
-  setDeleverageUseTargetLtvInput: (useTargetLtvInput: boolean) => void;
   setRebalanceDefaultMode: (mode: RebalanceDefaultMode) => void;
 
   // Bulk update for migration
@@ -74,7 +72,6 @@ export const useAppSettings = create<AppSettingsStore>()(
       showDeveloperOptions: false,
       usePublicAllocator: true,
       leverageUseTargetLtvInput: true,
-      deleverageUseTargetLtvInput: true,
       rebalanceDefaultMode: 'smart',
 
       // Actions
@@ -94,7 +91,6 @@ export const useAppSettings = create<AppSettingsStore>()(
       setShowDeveloperOptions: (show) => set({ showDeveloperOptions: show }),
       setUsePublicAllocator: (show) => set({ usePublicAllocator: show }),
       setLeverageUseTargetLtvInput: (useTargetLtvInput) => set({ leverageUseTargetLtvInput: useTargetLtvInput }),
-      setDeleverageUseTargetLtvInput: (useTargetLtvInput) => set({ deleverageUseTargetLtvInput: useTargetLtvInput }),
       setRebalanceDefaultMode: (mode) => set({ rebalanceDefaultMode: mode }),
       setAll: (state) => set(state),
     }),
diff --git a/src/utils/decimal-input.ts b/src/utils/decimal-input.ts
index 4739bf8d..973164bf 100644
--- a/src/utils/decimal-input.ts
+++ b/src/utils/decimal-input.ts
@@ -24,3 +24,14 @@ export const toParseableDecimalInput = (value: string): string | null => {
   const trimmedTrailingDot = withLeadingZero.endsWith('.') ? withLeadingZero.slice(0, -1) : withLeadingZero;
   return trimmedTrailingDot.length > 0 ? trimmedTrailingDot : null;
 };
+
+export const getFractionDigitsCount = (value: string): number => {
+  const dotIndex = value.indexOf('.');
+  if (dotIndex < 0) return 0;
+  return value.length - dotIndex - 1;
+};
+
+export const hasExcessFractionDigits = (value: string, maxFractionDigits: number): boolean => {
+  if (maxFractionDigits < 0) return false;
+  return getFractionDigitsCount(value) > maxFractionDigits;
+};