diff --git a/.gitignore b/.gitignore
index 8cd357d0..33a7761f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,4 +54,4 @@ next-env.d.ts
 CLAUDE.md
 FULLAUTO_CONTEXT.md
 
-.claude/settings.local.json
+.claude/settings.local.json
\ No newline at end of file
diff --git a/app/layout.tsx b/app/layout.tsx
index 52ef6b7b..f60005f6 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -7,6 +7,7 @@ import RiskNotificationModal from '@/modals/risk-notification-modal';
 import { VaultRegistryProvider } from '@/contexts/VaultRegistryContext';
 import OnchainProviders from '@/OnchainProviders';
 import { ModalRenderer } from '@/components/modals/ModalRenderer';
+import { StorageMigrator } from '@/components/StorageMigrator';
 
 import { initAnalytics } from '@/utils/analytics';
 import { ThemeProviders } from '../src/components/providers/ThemeProvider';
@@ -37,6 +38,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
             <OnchainProviders>
               <VaultRegistryProvider>
                 <ClientProviders>
+                  <StorageMigrator />
                   {children}
                   <RiskNotificationModal />
                   <ModalRenderer />
diff --git a/app/settings/page.tsx b/app/settings/page.tsx
index 49a5ecb4..8929dbfd 100644
--- a/app/settings/page.tsx
+++ b/app/settings/page.tsx
@@ -7,19 +7,22 @@ import { IconSwitch } from '@/components/ui/icon-switch';
 import Header from '@/components/layout/header/Header';
 import { AdvancedRpcSettings } from '@/modals/settings/custom-rpc-settings';
 import { VaultIdentity } from '@/features/autovault/components/vault-identity';
-import { defaultTrustedVaults, type TrustedVault } from '@/constants/vaults/known_vaults';
-import { useLocalStorage } from '@/hooks/useLocalStorage';
-import { useMarkets } from '@/hooks/useMarkets';
+import { defaultTrustedVaults } from '@/constants/vaults/known_vaults';
 import { useModal } from '@/hooks/useModal';
-import { storageKeys } from '@/utils/storageKeys';
+import { useTrustedVaults } from '@/stores/useTrustedVaults';
+import { useAppSettings } from '@/stores/useAppSettings';
+import { useMarketPreferences } from '@/stores/useMarketPreferences';
 
 export default function SettingsPage() {
-  const [usePermit2, setUsePermit2] = useLocalStorage('usePermit2', true);
-  const [includeUnknownTokens, setIncludeUnknownTokens] = useLocalStorage('includeUnknownTokens', false);
-  const [showUnknownOracle, setShowUnknownOracle] = useLocalStorage('showUnknownOracle', false);
-  const [userTrustedVaults, setUserTrustedVaults] = useLocalStorage<TrustedVault[]>(storageKeys.UserTrustedVaultsKey, defaultTrustedVaults);
+  // App settings from Zustand store
+  const { usePermit2, setUsePermit2, showUnwhitelistedMarkets, setShowUnwhitelistedMarkets, isAprDisplay, setIsAprDisplay } =
+    useAppSettings();
+
+  // Market preferences from Zustand store
+  const { includeUnknownTokens, setIncludeUnknownTokens, showUnknownOracle, setShowUnknownOracle } = useMarketPreferences();
+
+  const { vaults: userTrustedVaults } = useTrustedVaults();
 
-  const { showUnwhitelistedMarkets, setShowUnwhitelistedMarkets, isAprDisplay, setIsAprDisplay } = useMarkets();
   const { open: openModal } = useModal();
   const [mounted, setMounted] = React.useState(false);
 
@@ -184,12 +187,7 @@ export default function SettingsPage() {
                 <Button
                   size="sm"
                   variant="default"
-                  onClick={() =>
-                    openModal('trustedVaults', {
-                      userTrustedVaults,
-                      setUserTrustedVaults,
-                    })
-                  }
+                  onClick={() => openModal('trustedVaults', {})}
                 >
                   Edit
                 </Button>
diff --git a/src/components/StorageMigrator.tsx b/src/components/StorageMigrator.tsx
new file mode 100644
index 00000000..13d07e9f
--- /dev/null
+++ b/src/components/StorageMigrator.tsx
@@ -0,0 +1,438 @@
+'use client';
+
+import { useEffect } from 'react';
+import storage from 'local-storage-fallback';
+import type { TrustedVault } from '@/constants/vaults/known_vaults';
+import { useTrustedVaults } from '@/stores/useTrustedVaults';
+import { useMarketPreferences } from '@/stores/useMarketPreferences';
+import { useAppSettings } from '@/stores/useAppSettings';
+import { useHistoryPreferences } from '@/stores/useHistoryPreferences';
+import { usePositionsPreferences } from '@/stores/usePositionsPreferences';
+import { useBlacklistedMarkets, type BlacklistedMarket } from '@/stores/useBlacklistedMarkets';
+import { useCustomRpc, type CustomRpcUrls } from '@/stores/useCustomRpc';
+import { useTransactionFiltersStore } from '@/stores/useTransactionFilters';
+import { useUserMarketsCacheStore } from '@/stores/useUserMarketsCache';
+import { SortColumn } from '@/features/markets/components/constants';
+import { DEFAULT_MIN_SUPPLY_USD } from '@/constants/markets';
+import { DEFAULT_COLUMN_VISIBILITY } from '@/features/markets/components/column-visibility';
+import {
+  type MigrationDefinition,
+  isMigrationComplete,
+  isMigrationExpired,
+  markMigrationComplete,
+  executeAllMigrations,
+} from '@/utils/storage-migration';
+
+/**
+ * One-Time Storage Migrator Component
+ *
+ * **Purpose:** Migrate user data from old useLocalStorage format to new Zustand stores
+ *
+ * **Timeline:**
+ * - Created: January 2025
+ * - Expires: February 1, 2025
+ *
+ *
+ * **To delete (after Feb 2025):**
+ * 1. Remove `<StorageMigrator />` from `app/layout.tsx`
+ * 2. Delete this file: `src/components/StorageMigrator.tsx`
+ * 3. Delete `src/utils/storage-migration.ts`
+ *
+ * @returns null - This component renders nothing
+ */
+
+// Type definitions for migrations
+type SymbolFilters = Record<
+  string,
+  {
+    minSupplyAmount: string;
+    minBorrowAmount: string;
+  }
+>;
+
+type MarketIdentifier = {
+  marketUniqueKey: string;
+  chainId: number;
+};
+
+type UserMarketsCache = Record<string, MarketIdentifier[]>;
+
+/**
+ * Helper: Safely parse JSON from localStorage
+ */
+function _safeParseJSON<T>(value: string | null, defaultValue: T): T {
+  if (!value) return defaultValue;
+  try {
+    return JSON.parse(value) as T;
+  } catch {
+    return defaultValue;
+  }
+}
+
+/**
+ * Helper: Get localStorage value or default
+ */
+function getStorageValue<T>(key: string, defaultValue: T): T {
+  const value = storage.getItem(key);
+  if (value === null) return defaultValue;
+
+  // If default is a boolean/number, parse accordingly
+  if (typeof defaultValue === 'boolean') {
+    return (value === 'true') as T;
+  }
+  if (typeof defaultValue === 'number') {
+    const parsed = Number(value);
+    return (Number.isNaN(parsed) ? defaultValue : parsed) as T;
+  }
+
+  // Try JSON parse
+  try {
+    return JSON.parse(value) as T;
+  } catch {
+    return value as T;
+  }
+}
+
+export function StorageMigrator() {
+  useEffect(() => {
+    // Skip if already completed
+    if (isMigrationComplete()) {
+      console.log('✅ Storage migrations already completed - skipping');
+      return;
+    }
+
+    // Skip if expired (with warning)
+    if (isMigrationExpired()) {
+      return;
+    }
+
+    // Define all migrations
+    const migrations: MigrationDefinition[] = [
+      // ========================================
+      // Migration 1: Trusted Vaults
+      // ========================================
+      {
+        oldKey: 'userTrustedVaults',
+        newKey: 'monarch_store_trustedVaults',
+        storeName: 'useTrustedVaults',
+        description: 'Migrated Trusted Vaults to Zustand store',
+        validate: (data): data is TrustedVault[] => {
+          if (!Array.isArray(data)) return false;
+          return data.every(
+            (item) =>
+              item &&
+              typeof item === 'object' &&
+              'address' in item &&
+              'chainId' in item &&
+              typeof item.address === 'string' &&
+              typeof item.chainId === 'number',
+          );
+        },
+        migrate: (oldData: TrustedVault[]) => {
+          try {
+            const store = useTrustedVaults.getState();
+            store.setVaults(oldData);
+            return true;
+          } catch (error) {
+            console.error('Error migrating trusted vaults:', error);
+            return false;
+          }
+        },
+      },
+
+      // ========================================
+      // Migration 2: Market Preferences (MULTI-KEY)
+      // ========================================
+      {
+        oldKey: 'monarch_marketsSortColumn', // Primary key to check
+        newKey: 'monarch_store_marketPreferences',
+        storeName: 'useMarketPreferences',
+        description: 'Migrated Market Preferences to Zustand store (15 keys)',
+        // No validate function - we handle all keys ourselves
+        migrate: () => {
+          try {
+            // Read all old market preference keys
+            const sortColumn = getStorageValue('monarch_marketsSortColumn', SortColumn.Supply);
+            const sortDirection = getStorageValue('monarch_marketsSortDirection', -1);
+            const entriesPerPage = getStorageValue('monarch_marketsEntriesPerPage', 8);
+            const includeUnknownTokens = getStorageValue('includeUnknownTokens', false);
+            const showUnknownOracle = getStorageValue('showUnknownOracle', false);
+            const trustedVaultsOnly = getStorageValue('monarch_marketsTrustedVaultsOnly', false);
+            const columnVisibility = getStorageValue('monarch_marketsColumnVisibility', DEFAULT_COLUMN_VISIBILITY);
+            const tableViewMode = getStorageValue('monarch_marketsTableViewMode', 'compact');
+            const usdMinSupply = getStorageValue('monarch_marketsUsdMinSupply_2', DEFAULT_MIN_SUPPLY_USD.toString());
+            const usdMinBorrow = getStorageValue('monarch_marketsUsdMinBorrow', '');
+            const usdMinLiquidity = getStorageValue('monarch_marketsUsdMinLiquidity', '');
+            const minSupplyEnabled = getStorageValue('monarch_minSupplyEnabled', false);
+            const minBorrowEnabled = getStorageValue('monarch_minBorrowEnabled', false);
+            const minLiquidityEnabled = getStorageValue('monarch_minLiquidityEnabled', false);
+            const starredMarkets = getStorageValue('monarch_marketsFavorites', []);
+
+            // Write to store
+            const store = useMarketPreferences.getState();
+            store.setAll({
+              sortColumn,
+              sortDirection,
+              entriesPerPage,
+              includeUnknownTokens,
+              showUnknownOracle,
+              trustedVaultsOnly,
+              columnVisibility,
+              tableViewMode,
+              usdMinSupply,
+              usdMinBorrow,
+              usdMinLiquidity,
+              minSupplyEnabled,
+              minBorrowEnabled,
+              minLiquidityEnabled,
+              starredMarkets,
+            });
+
+            return true;
+          } catch (error) {
+            console.error('Error migrating market preferences:', error);
+            return false;
+          }
+        },
+      },
+
+      // ========================================
+      // Migration 3: App Settings (MULTI-KEY)
+      // ========================================
+      {
+        oldKey: 'usePermit2', // Primary key to check
+        newKey: 'monarch_store_appSettings',
+        storeName: 'useAppSettings',
+        description: 'Migrated App Settings to Zustand store (5 keys)',
+        // No validate function - we handle all keys ourselves
+        migrate: () => {
+          try {
+            // Read all old app setting keys
+            const usePermit2 = getStorageValue('usePermit2', true);
+            const useEth = getStorageValue('useEth', false);
+            const showUnwhitelistedMarkets = getStorageValue('showUnwhitelistedMarkets', false);
+            const showFullRewardAPY = getStorageValue('showFullRewardAPY', false);
+            const isAprDisplay = getStorageValue('settings-apr-display', false);
+
+            // Write to store
+            const store = useAppSettings.getState();
+            store.setAll({
+              usePermit2,
+              useEth,
+              showUnwhitelistedMarkets,
+              showFullRewardAPY,
+              isAprDisplay,
+            });
+
+            return true;
+          } catch (error) {
+            console.error('Error migrating app settings:', error);
+            return false;
+          }
+        },
+      },
+
+      // ========================================
+      // Migration 4: History Preferences (MULTI-KEY)
+      // ========================================
+      {
+        oldKey: 'monarch_historyEntriesPerPage', // Primary key to check
+        newKey: 'monarch_store_historyPreferences',
+        storeName: 'useHistoryPreferences',
+        description: 'Migrated History Preferences to Zustand store (2 keys)',
+        // No validate function - we handle all keys ourselves
+        migrate: () => {
+          try {
+            // Read all old history preference keys
+            const entriesPerPage = getStorageValue('monarch_historyEntriesPerPage', 10);
+            const isGroupedView = getStorageValue('monarch_historyGroupedView', true);
+
+            // Write to store
+            const store = useHistoryPreferences.getState();
+            store.setAll({
+              entriesPerPage,
+              isGroupedView,
+            });
+
+            return true;
+          } catch (error) {
+            console.error('Error migrating history preferences:', error);
+            return false;
+          }
+        },
+      },
+
+      // ========================================
+      // Migration 5: Positions Preferences
+      // ========================================
+      {
+        oldKey: 'positions:show-collateral-exposure',
+        newKey: 'monarch_store_positionsPreferences',
+        storeName: 'usePositionsPreferences',
+        description: 'Migrated Positions Preferences to Zustand store',
+        // No validate function - we handle it ourselves
+        migrate: () => {
+          try {
+            const showCollateralExposure = getStorageValue('positions:show-collateral-exposure', true);
+
+            const store = usePositionsPreferences.getState();
+            store.setShowCollateralExposure(showCollateralExposure);
+
+            return true;
+          } catch (error) {
+            console.error('Error migrating positions preferences:', error);
+            return false;
+          }
+        },
+      },
+
+      // ========================================
+      // Migration 6: Blacklisted Markets
+      // ========================================
+      {
+        oldKey: 'customBlacklistedMarkets',
+        newKey: 'monarch_store_blacklistedMarkets',
+        storeName: 'useBlacklistedMarkets',
+        description: 'Migrated Blacklisted Markets to Zustand store',
+        validate: (data): data is BlacklistedMarket[] => {
+          if (!Array.isArray(data)) return false;
+          return data.every(
+            (item) =>
+              item &&
+              typeof item === 'object' &&
+              'uniqueKey' in item &&
+              'chainId' in item &&
+              'addedAt' in item &&
+              typeof item.uniqueKey === 'string' &&
+              typeof item.chainId === 'number' &&
+              typeof item.addedAt === 'number',
+          );
+        },
+        migrate: (oldData: BlacklistedMarket[]) => {
+          try {
+            const store = useBlacklistedMarkets.getState();
+            store.setAll({ customBlacklistedMarkets: oldData });
+            return true;
+          } catch (error) {
+            console.error('Error migrating blacklisted markets:', error);
+            return false;
+          }
+        },
+      },
+
+      // ========================================
+      // Migration 7: Custom RPC URLs
+      // ========================================
+      {
+        oldKey: 'customRpcUrls',
+        newKey: 'monarch_store_customRpc',
+        storeName: 'useCustomRpc',
+        description: 'Migrated Custom RPC URLs to Zustand store',
+        validate: (data): data is CustomRpcUrls => {
+          return typeof data === 'object' && data !== null;
+        },
+        migrate: (oldData: CustomRpcUrls) => {
+          try {
+            const store = useCustomRpc.getState();
+            store.setAll({ customRpcUrls: oldData });
+            return true;
+          } catch (error) {
+            console.error('Error migrating custom RPC URLs:', error);
+            return false;
+          }
+        },
+      },
+
+      // ========================================
+      // Migration 8: Transaction Filters
+      // ========================================
+      {
+        oldKey: 'monarch_transaction_filters_v2',
+        newKey: 'monarch_store_transactionFilters',
+        storeName: 'useTransactionFilters',
+        description: 'Migrated Transaction Filters to Zustand store',
+        validate: (data): data is SymbolFilters => {
+          return typeof data === 'object' && data !== null;
+        },
+        migrate: (oldData: SymbolFilters) => {
+          try {
+            const store = useTransactionFiltersStore.getState();
+            store.setAll({ filters: oldData });
+            return true;
+          } catch (error) {
+            console.error('Error migrating transaction filters:', error);
+            return false;
+          }
+        },
+      },
+
+      // ========================================
+      // Migration 9: User Markets Cache
+      // ========================================
+      {
+        oldKey: 'monarch_cache_market_unique_keys',
+        newKey: 'monarch_store_userMarketsCache',
+        storeName: 'useUserMarketsCache',
+        description: 'Migrated User Markets Cache to Zustand store',
+        validate: (data): data is UserMarketsCache => {
+          return typeof data === 'object' && data !== null;
+        },
+        migrate: (oldData: UserMarketsCache) => {
+          try {
+            const store = useUserMarketsCacheStore.getState();
+            store.setAll({ cache: oldData });
+            return true;
+          } catch (error) {
+            console.error('Error migrating user markets cache:', error);
+            return false;
+          }
+        },
+      },
+    ];
+
+    // Execute all migrations
+    const results = executeAllMigrations(migrations);
+
+    // Clean up ALL old localStorage keys after migrations
+    // (executeMigration only deletes the primary oldKey, not related keys)
+    const anySuccess = results.some((r) => r.status === 'success');
+    if (anySuccess || results.every((r) => r.status === 'skipped')) {
+      console.log('🧹 Cleaning up old localStorage keys...');
+
+      // Market Preferences keys
+      const marketKeys = [
+        'monarch_marketsSortDirection',
+        'monarch_marketsEntriesPerPage',
+        'includeUnknownTokens',
+        'showUnknownOracle',
+        'monarch_marketsTrustedVaultsOnly',
+        'monarch_marketsColumnVisibility',
+        'monarch_marketsTableViewMode',
+        'monarch_marketsUsdMinSupply_2',
+        'monarch_marketsUsdMinBorrow',
+        'monarch_marketsUsdMinLiquidity',
+        'monarch_minSupplyEnabled',
+        'monarch_minBorrowEnabled',
+        'monarch_minLiquidityEnabled',
+        'monarch_marketsFavorites',
+      ];
+
+      // App Settings keys
+      const appKeys = ['useEth', 'showUnwhitelistedMarkets', 'showFullRewardAPY', 'settings-apr-display'];
+
+      // History Preferences keys
+      const historyKeys = ['monarch_historyGroupedView'];
+
+      // Delete all secondary keys (primary keys already deleted by executeMigration)
+      [...marketKeys, ...appKeys, ...historyKeys].forEach((key) => {
+        storage.removeItem(key);
+      });
+
+      console.log('✅ Cleanup complete');
+      markMigrationComplete();
+    }
+  }, []); // Run once on mount
+
+  // Render nothing
+  return null;
+}
diff --git a/src/components/common/table-container-with-header.tsx b/src/components/common/table-container-with-header.tsx
index 31034cdf..e976f029 100644
--- a/src/components/common/table-container-with-header.tsx
+++ b/src/components/common/table-container-with-header.tsx
@@ -3,6 +3,7 @@ type TableContainerWithHeaderProps = {
   actions?: React.ReactNode;
   children: React.ReactNode;
   className?: string;
+  noPadding?: boolean;
 };
 
 /**
@@ -29,14 +30,14 @@ type TableContainerWithHeaderProps = {
  *   <Table>...</Table>
  * </TableContainerWithHeader>
  */
-export function TableContainerWithHeader({ title, actions, children, className = '' }: TableContainerWithHeaderProps) {
+export function TableContainerWithHeader({ title, actions, children, className = '', noPadding = false }: TableContainerWithHeaderProps) {
   return (
     <div className={`bg-surface rounded-md font-zen shadow-sm ${className}`}>
       <div className="flex items-center justify-between border-b border-gray-200 dark:border-gray-800 px-6 py-0.5">
         <h3 className="font-monospace text-xs uppercase text-secondary">{title}</h3>
         {actions && <div className="flex items-center gap-2">{actions}</div>}
       </div>
-      <div className="overflow-x-auto pb-4">{children}</div>
+      <div className={`overflow-x-auto ${noPadding ? '' : 'pb-4'}`}>{children}</div>
     </div>
   );
 }
diff --git a/src/components/providers/CustomRpcProvider.tsx b/src/components/providers/CustomRpcProvider.tsx
index 23abd81c..3f35570d 100644
--- a/src/components/providers/CustomRpcProvider.tsx
+++ b/src/components/providers/CustomRpcProvider.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import { createContext, useContext, useEffect, useState, type ReactNode, useMemo } from 'react';
-import { useCustomRpc, type CustomRpcUrls } from '@/hooks/useCustomRpc';
+import { useCustomRpc, type CustomRpcUrls } from '@/stores/useCustomRpc';
 import type { SupportedNetworks } from '@/utils/networks';
 
 type CustomRpcContextType = {
diff --git a/src/components/shared/rate-formatted.tsx b/src/components/shared/rate-formatted.tsx
index 5599724d..a0caac01 100644
--- a/src/components/shared/rate-formatted.tsx
+++ b/src/components/shared/rate-formatted.tsx
@@ -1,4 +1,4 @@
-import { useMarkets } from '@/hooks/useMarkets';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { convertApyToApr } from '@/utils/rateMath';
 
 type RateFormattedProps = {
@@ -35,7 +35,7 @@ type RateFormattedProps = {
  * <RateFormatted value={0.05} showLabel />
  */
 export function RateFormatted({ value, showLabel = false, precision = 2, className = '' }: RateFormattedProps) {
-  const { isAprDisplay } = useMarkets();
+  const { isAprDisplay } = useAppSettings();
 
   // Convert APY to APR if the user has enabled APR display mode
   const displayValue = isAprDisplay ? convertApyToApr(value) : value;
diff --git a/src/components/status/loading-screen.tsx b/src/components/status/loading-screen.tsx
index 010d013d..de59e3a9 100644
--- a/src/components/status/loading-screen.tsx
+++ b/src/components/status/loading-screen.tsx
@@ -100,9 +100,7 @@ export default function LoadingScreen({ message, className }: LoadingScreenProps
 
   return (
     <div
-      className={`bg-surface my-4 flex min-h-48 flex-col items-center justify-center space-y-4 rounded py-8 shadow-sm font-zen ${
-        className ?? ''
-      }`}
+      className={`bg-surface my-4 flex min-h-48 flex-col items-center justify-center space-y-4 rounded py-8 font-zen ${className ?? ''}`}
     >
       <Image
         src={loadingImg}
diff --git a/src/contexts/MarketsContext.tsx b/src/contexts/MarketsContext.tsx
index 4048ac88..83d8a2e0 100644
--- a/src/contexts/MarketsContext.tsx
+++ b/src/contexts/MarketsContext.tsx
@@ -5,8 +5,8 @@ import { supportsMorphoApi } from '@/config/dataSources';
 import { useOracleDataContext } from '@/contexts/OracleDataContext';
 import { fetchMorphoMarkets } from '@/data-sources/morpho-api/market';
 import { fetchSubgraphMarkets } from '@/data-sources/subgraph/market';
-import { useBlacklistedMarkets } from '@/hooks/useBlacklistedMarkets';
-import { useLocalStorage } from '@/hooks/useLocalStorage';
+import { useBlacklistedMarkets } from '@/stores/useBlacklistedMarkets';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { ALL_SUPPORTED_NETWORKS, isSupportedChain } from '@/utils/networks';
 import type { Market } from '@/utils/types';
 
@@ -21,16 +21,6 @@ export type MarketsContextType = {
   error: unknown | null;
   refetch: (onSuccess?: () => void) => void;
   refresh: () => Promise<void>;
-  showUnwhitelistedMarkets: boolean;
-  setShowUnwhitelistedMarkets: (value: boolean) => void;
-  showFullRewardAPY: boolean;
-  setShowFullRewardAPY: (value: boolean) => void;
-  isAprDisplay: boolean;
-  setIsAprDisplay: (value: boolean) => void;
-  isBlacklisted: (uniqueKey: string) => boolean;
-  addBlacklistedMarket: (uniqueKey: string, chainId: number, reason?: string) => boolean;
-  removeBlacklistedMarket: (uniqueKey: string) => void;
-  isDefaultBlacklisted: (uniqueKey: string) => boolean;
 };
 
 const MarketsContext = createContext<MarketsContextType | undefined>(undefined);
@@ -48,18 +38,14 @@ export function MarketsProvider({ children }: MarketsProviderProps) {
   // Store raw unfiltered markets to avoid refetching when blacklist changes
   const [rawMarkets, setRawMarkets] = useState<Market[]>([]);
 
-  // Global setting for showing unwhitelisted markets
-  const [showUnwhitelistedMarkets, setShowUnwhitelistedMarkets] = useLocalStorage('showUnwhitelistedMarkets', false);
+  // Global settings from Zustand store
+  const { showUnwhitelistedMarkets } = useAppSettings();
 
-  // Global setting for showing full reward APY (base + external rewards)
-  const [showFullRewardAPY, setShowFullRewardAPY] = useLocalStorage('showFullRewardAPY', false);
+  // Blacklisted markets management from Zustand store (internal use only for filtering)
+  const { getAllBlacklistedKeys, customBlacklistedMarkets } = useBlacklistedMarkets();
 
-  // Global setting for showing APR instead of APY
-  const [isAprDisplay, setIsAprDisplay] = useLocalStorage('settings-apr-display', false);
-
-  // Blacklisted markets management
-  const { allBlacklistedMarketKeys, addBlacklistedMarket, removeBlacklistedMarket, isBlacklisted, isDefaultBlacklisted } =
-    useBlacklistedMarkets();
+  // Get all blacklisted keys for filtering - memoize to prevent infinite loops
+  const allBlacklistedMarketKeys = useMemo(() => getAllBlacklistedKeys(), [customBlacklistedMarkets, getAllBlacklistedKeys]);
 
   // Oracle data context for enriching markets
   const { getOracleData } = useOracleDataContext();
@@ -302,38 +288,8 @@ export function MarketsProvider({ children }: MarketsProviderProps) {
       error: combinedError,
       refetch,
       refresh,
-      showUnwhitelistedMarkets,
-      setShowUnwhitelistedMarkets,
-      showFullRewardAPY,
-      setShowFullRewardAPY,
-      isAprDisplay,
-      setIsAprDisplay,
-      isBlacklisted,
-      addBlacklistedMarket,
-      removeBlacklistedMarket,
-      isDefaultBlacklisted,
     }),
-    [
-      markets,
-      whitelistedMarkets,
-      allMarkets,
-      rawMarkets,
-      isLoading,
-      isRefetching,
-      combinedError,
-      refetch,
-      refresh,
-      showUnwhitelistedMarkets,
-      setShowUnwhitelistedMarkets,
-      showFullRewardAPY,
-      setShowFullRewardAPY,
-      isAprDisplay,
-      setIsAprDisplay,
-      isBlacklisted,
-      addBlacklistedMarket,
-      removeBlacklistedMarket,
-      isDefaultBlacklisted,
-    ],
+    [markets, whitelistedMarkets, allMarkets, rawMarkets, isLoading, isRefetching, combinedError, refetch, refresh],
   );
 
   return <MarketsContext.Provider value={contextValue}>{children}</MarketsContext.Provider>;
diff --git a/src/features/autovault/components/vault-detail/allocations/allocations/market-view.tsx b/src/features/autovault/components/vault-detail/allocations/allocations/market-view.tsx
index 7c99696e..aee5c989 100644
--- a/src/features/autovault/components/vault-detail/allocations/allocations/market-view.tsx
+++ b/src/features/autovault/components/vault-detail/allocations/allocations/market-view.tsx
@@ -1,6 +1,6 @@
 import { Table, TableHeader, TableBody, TableRow, TableHead, TableCell } from '@/components/ui/table';
 import { MarketIdentity, MarketIdentityFocus } from '@/features/markets/components/market-identity';
-import { useMarkets } from '@/hooks/useMarkets';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { useRateLabel } from '@/hooks/useRateLabel';
 import type { MarketAllocation } from '@/types/vaultAllocations';
 import { formatBalance, formatReadable } from '@/utils/balance';
@@ -18,7 +18,7 @@ type MarketViewProps = {
 };
 
 export function MarketView({ allocations, totalAllocation, vaultAssetSymbol, vaultAssetDecimals, chainId }: MarketViewProps) {
-  const { isAprDisplay } = useMarkets();
+  const { isAprDisplay } = useAppSettings();
   const { short: rateLabel } = useRateLabel();
 
   // Sort by allocation amount (most to least)
diff --git a/src/features/autovault/components/vault-detail/modals/deposit-to-vault-modal.tsx b/src/features/autovault/components/vault-detail/modals/deposit-to-vault-modal.tsx
index 88bda90d..cccff212 100644
--- a/src/features/autovault/components/vault-detail/modals/deposit-to-vault-modal.tsx
+++ b/src/features/autovault/components/vault-detail/modals/deposit-to-vault-modal.tsx
@@ -6,7 +6,7 @@ import { Modal, ModalBody, ModalHeader } from '@/components/common/Modal';
 import Input from '@/components/Input/Input';
 import { ExecuteTransactionButton } from '@/components/ui/ExecuteTransactionButton';
 import { TokenIcon } from '@/components/shared/token-icon';
-import { useLocalStorage } from '@/hooks/useLocalStorage';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { useVaultV2Deposit } from '@/hooks/useVaultV2Deposit';
 import { formatBalance } from '@/utils/balance';
 import { VaultDepositProcessModal } from './vault-deposit-process-modal';
@@ -32,7 +32,7 @@ export function DepositToVaultModal({
   onClose,
   onSuccess,
 }: DepositToVaultModalProps): JSX.Element {
-  const [usePermit2Setting] = useLocalStorage('usePermit2', true);
+  const { usePermit2: usePermit2Setting } = useAppSettings();
 
   const {
     depositAmount,
diff --git a/src/features/history/components/history-table.tsx b/src/features/history/components/history-table.tsx
index 461617da..e36375a2 100644
--- a/src/features/history/components/history-table.tsx
+++ b/src/features/history/components/history-table.tsx
@@ -27,12 +27,11 @@ import { RebalanceDetail } from './rebalance-detail';
 import { useMarkets } from '@/contexts/MarketsContext';
 import useUserTransactions from '@/hooks/useUserTransactions';
 import { useDisclosure } from '@/hooks/useDisclosure';
-import { useLocalStorage } from '@/hooks/useLocalStorage';
+import { useHistoryPreferences } from '@/stores/useHistoryPreferences';
 import { useStyledToast } from '@/hooks/useStyledToast';
 import { formatReadable } from '@/utils/balance';
 import { getNetworkImg, getNetworkName } from '@/utils/networks';
 import { groupTransactionsByHash, getWithdrawals, getSupplies, type GroupedTransaction } from '@/utils/transactionGrouping';
-import { storageKeys } from '@/utils/storageKeys';
 import { UserTxTypes, type Market, type MarketPosition, type UserTransaction } from '@/utils/types';
 
 type HistoryTableProps = {
@@ -87,9 +86,8 @@ export function HistoryTable({ account, positions, isVaultAdapter = false }: His
   const [isInitialized, setIsInitialized] = useState(false);
   const [totalPages, setTotalPages] = useState(0);
 
-  // Settings state
-  const [pageSize, setPageSize] = useLocalStorage<number>(storageKeys.HistoryEntriesPerPageKey, 10);
-  const [isGroupedView, setIsGroupedView] = useLocalStorage<boolean>(storageKeys.HistoryGroupedViewKey, true);
+  // Settings state from Zustand store
+  const { entriesPerPage: pageSize, setEntriesPerPage: setPageSize, isGroupedView, setIsGroupedView } = useHistoryPreferences();
   const [expandedRows, setExpandedRows] = useState<Set<string>>(new Set());
   const { isOpen: isSettingsOpen, onOpen: onSettingsOpen, onOpenChange: onSettingsOpenChange } = useDisclosure();
 
diff --git a/src/features/market-detail/components/charts/rate-chart.tsx b/src/features/market-detail/components/charts/rate-chart.tsx
index 8d6dc5d8..3b822cbc 100644
--- a/src/features/market-detail/components/charts/rate-chart.tsx
+++ b/src/features/market-detail/components/charts/rate-chart.tsx
@@ -7,7 +7,7 @@ import { AreaChart, Area, XAxis, YAxis, CartesianGrid, Tooltip, Legend, Responsi
 import ButtonGroup from '@/components/ui/button-group';
 import { Spinner } from '@/components/ui/spinner';
 import { CHART_COLORS } from '@/constants/chartColors';
-import { useMarkets } from '@/hooks/useMarkets';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { useRateLabel } from '@/hooks/useRateLabel';
 import { convertApyToApr } from '@/utils/rateMath';
 import type { MarketRates } from '@/utils/types';
@@ -23,7 +23,7 @@ type RateChartProps = {
 };
 
 function RateChart({ historicalData, market, isLoading, selectedTimeframe, selectedTimeRange, handleTimeframeChange }: RateChartProps) {
-  const { isAprDisplay } = useMarkets();
+  const { isAprDisplay } = useAppSettings();
   const { short: rateLabel } = useRateLabel();
 
   const [visibleLines, setVisibleLines] = useState({
diff --git a/src/features/market-detail/components/position-stats.tsx b/src/features/market-detail/components/position-stats.tsx
index 52468240..bb2f4ba2 100644
--- a/src/features/market-detail/components/position-stats.tsx
+++ b/src/features/market-detail/components/position-stats.tsx
@@ -7,7 +7,7 @@ import { HiOutlineGlobeAsiaAustralia } from 'react-icons/hi2';
 import { Spinner } from '@/components/ui/spinner';
 import { TokenIcon } from '@/components/shared/token-icon';
 import { useMarketCampaigns } from '@/hooks/useMarketCampaigns';
-import { useMarkets } from '@/hooks/useMarkets';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { useRateLabel } from '@/hooks/useRateLabel';
 import { formatBalance, formatReadable } from '@/utils/balance';
 import { getTruncatedAssetName } from '@/utils/oracle';
@@ -36,7 +36,7 @@ export function PositionStats({ market, userPosition, positionLoading, cardStyle
   // Default to user view if they have a position, otherwise global
   const [viewMode, setViewMode] = useState<'global' | 'user'>(userPosition && hasPosition(userPosition) ? 'user' : 'global');
 
-  const { showFullRewardAPY, isAprDisplay } = useMarkets();
+  const { showFullRewardAPY, isAprDisplay } = useAppSettings();
   const { label: rateLabel } = useRateLabel({ prefix: 'Supply' });
   const { label: borrowRateLabel } = useRateLabel({ prefix: 'Borrow' });
   const { activeCampaigns, hasActiveRewards } = useMarketCampaigns({
diff --git a/src/features/market-detail/market-view.tsx b/src/features/market-detail/market-view.tsx
index 13ff3191..88cb1af3 100644
--- a/src/features/market-detail/market-view.tsx
+++ b/src/features/market-detail/market-view.tsx
@@ -21,7 +21,7 @@ import { useModal } from '@/hooks/useModal';
 import { useMarketData } from '@/hooks/useMarketData';
 import { useMarketHistoricalData } from '@/hooks/useMarketHistoricalData';
 import { useOraclePrice } from '@/hooks/useOraclePrice';
-import { useTransactionFilters } from '@/hooks/useTransactionFilters';
+import { useTransactionFilters } from '@/stores/useTransactionFilters';
 import useUserPositions from '@/hooks/useUserPosition';
 import MORPHO_LOGO from '@/imgs/tokens/morpho.svg';
 import { getExplorerURL, getMarketURL } from '@/utils/external';
diff --git a/src/features/markets/components/apy-breakdown-tooltip.tsx b/src/features/markets/components/apy-breakdown-tooltip.tsx
index d983ffb6..136734b0 100644
--- a/src/features/markets/components/apy-breakdown-tooltip.tsx
+++ b/src/features/markets/components/apy-breakdown-tooltip.tsx
@@ -2,7 +2,7 @@ import type React from 'react';
 import { Tooltip } from '@/components/ui/tooltip';
 import { TokenIcon } from '@/components/shared/token-icon';
 import { useMarketCampaigns } from '@/hooks/useMarketCampaigns';
-import { useMarkets } from '@/hooks/useMarkets';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { useRateLabel } from '@/hooks/useRateLabel';
 import type { SimplifiedCampaign } from '@/utils/merklTypes';
 import { convertApyToApr } from '@/utils/rateMath';
@@ -19,7 +19,7 @@ type APYCellProps = {
 };
 
 export function APYBreakdownTooltip({ baseAPY, activeCampaigns, children }: APYBreakdownTooltipProps) {
-  const { isAprDisplay } = useMarkets();
+  const { isAprDisplay } = useAppSettings();
   const { short: rateLabel } = useRateLabel();
 
   // Convert base rate if APR display is enabled
@@ -70,7 +70,7 @@ export function APYBreakdownTooltip({ baseAPY, activeCampaigns, children }: APYB
 }
 
 export function APYCell({ market }: APYCellProps) {
-  const { showFullRewardAPY, isAprDisplay } = useMarkets();
+  const { showFullRewardAPY, isAprDisplay } = useAppSettings();
   const { activeCampaigns, hasActiveRewards } = useMarketCampaigns({
     marketId: market.uniqueKey,
     loanTokenAddress: market.loanAsset.address,
diff --git a/src/features/markets/components/market-actions-dropdown.tsx b/src/features/markets/components/market-actions-dropdown.tsx
index 7ebc6370..e2cab73d 100644
--- a/src/features/markets/components/market-actions-dropdown.tsx
+++ b/src/features/markets/components/market-actions-dropdown.tsx
@@ -12,28 +12,23 @@ import { DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuIte
 import type { Market } from '@/utils/types';
 import { BlacklistConfirmationModal } from './blacklist-confirmation-modal';
 import { useModal } from '@/hooks/useModal';
+import { useStyledToast } from '@/hooks/useStyledToast';
+import { useMarketPreferences } from '@/stores/useMarketPreferences';
+import { useBlacklistedMarkets } from '@/stores/useBlacklistedMarkets';
 
 type MarketActionsDropdownProps = {
   market: Market;
-  isStared: boolean;
-  starMarket: (id: string) => void;
-  unstarMarket: (id: string) => void;
-  addBlacklistedMarket?: (uniqueKey: string, chainId: number, reason?: string) => boolean;
-  isBlacklisted?: (uniqueKey: string) => boolean;
 };
 
-export function MarketActionsDropdown({
-  market,
-  isStared,
-  starMarket,
-  unstarMarket,
-  addBlacklistedMarket,
-  isBlacklisted,
-}: MarketActionsDropdownProps) {
+export function MarketActionsDropdown({ market }: MarketActionsDropdownProps) {
   const [isConfirmModalOpen, setIsConfirmModalOpen] = useState(false);
   const { open: openModal } = useModal();
+  const { starredMarkets, starMarket, unstarMarket } = useMarketPreferences();
+  const { isBlacklisted, addBlacklistedMarket } = useBlacklistedMarkets();
+  const { success: toastSuccess } = useStyledToast();
 
   const router = useRouter();
+  const isStared = starredMarkets.includes(market.uniqueKey);
 
   const handleClick = (e: React.MouseEvent) => {
     e.stopPropagation();
@@ -45,15 +40,13 @@ export function MarketActionsDropdown({
   };
 
   const handleBlacklistClick = () => {
-    if (!isBlacklisted?.(market.uniqueKey) && addBlacklistedMarket) {
+    if (!isBlacklisted(market.uniqueKey)) {
       setIsConfirmModalOpen(true);
     }
   };
 
   const handleConfirmBlacklist = () => {
-    if (addBlacklistedMarket) {
-      addBlacklistedMarket(market.uniqueKey, market.morphoBlue.chain.id);
-    }
+    addBlacklistedMarket(market.uniqueKey, market.morphoBlue.chain.id);
   };
 
   const onMarketClick = () => {
@@ -99,8 +92,10 @@ export function MarketActionsDropdown({
             onClick={() => {
               if (isStared) {
                 unstarMarket(market.uniqueKey);
+                toastSuccess('Market unstarred', 'Removed from favorites');
               } else {
                 starMarket(market.uniqueKey);
+                toastSuccess('Market starred', 'Added to favorites');
               }
             }}
             startContent={isStared ? <GoStarFill className="h-4 w-4" /> : <GoStar className="h-4 w-4" />}
@@ -111,10 +106,10 @@ export function MarketActionsDropdown({
           <DropdownMenuItem
             onClick={handleBlacklistClick}
             startContent={<AiOutlineStop className="h-4 w-4" />}
-            className={isBlacklisted?.(market.uniqueKey) || !addBlacklistedMarket ? 'opacity-50 cursor-not-allowed' : ''}
-            disabled={isBlacklisted?.(market.uniqueKey) || !addBlacklistedMarket}
+            className={isBlacklisted(market.uniqueKey) ? 'opacity-50 cursor-not-allowed' : ''}
+            disabled={isBlacklisted(market.uniqueKey)}
           >
-            {isBlacklisted?.(market.uniqueKey) ? 'Blacklisted' : 'Blacklist'}
+            {isBlacklisted(market.uniqueKey) ? 'Blacklisted' : 'Blacklist'}
           </DropdownMenuItem>
         </DropdownMenuContent>
       </DropdownMenu>
diff --git a/src/features/markets/components/market-details-block.tsx b/src/features/markets/components/market-details-block.tsx
index c13efa7b..ccefd60e 100644
--- a/src/features/markets/components/market-details-block.tsx
+++ b/src/features/markets/components/market-details-block.tsx
@@ -3,7 +3,7 @@ import { ChevronDownIcon, ChevronUpIcon, ExternalLinkIcon } from '@radix-ui/reac
 import { motion, AnimatePresence } from 'framer-motion';
 import { formatUnits } from 'viem';
 import { useMarketCampaigns } from '@/hooks/useMarketCampaigns';
-import { useMarkets } from '@/hooks/useMarkets';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { useRateLabel } from '@/hooks/useRateLabel';
 import { formatBalance, formatReadable } from '@/utils/balance';
 import { getIRMTitle, previewMarketState } from '@/utils/morpho';
@@ -36,7 +36,7 @@ export function MarketDetailsBlock({
 }: MarketDetailsBlockProps): JSX.Element {
   const [isExpanded, setIsExpanded] = useState(!defaultCollapsed && !disableExpansion);
 
-  const { isAprDisplay } = useMarkets();
+  const { isAprDisplay } = useAppSettings();
   const { short: rateLabel } = useRateLabel();
 
   const { activeCampaigns, hasActiveRewards } = useMarketCampaigns({
diff --git a/src/features/markets/components/market-settings-modal.tsx b/src/features/markets/components/market-settings-modal.tsx
index 0b5b26e6..4a625f29 100644
--- a/src/features/markets/components/market-settings-modal.tsx
+++ b/src/features/markets/components/market-settings-modal.tsx
@@ -6,26 +6,15 @@ import { Button } from '@/components/ui/button';
 import { IconSwitch } from '@/components/ui/icon-switch';
 import { Modal, ModalHeader, ModalBody, ModalFooter } from '@/components/common/Modal';
 import { TrustedByCell } from '@/features/autovault/components/trusted-vault-badges';
-import { defaultTrustedVaults, type TrustedVault } from '@/constants/vaults/known_vaults';
-import { useMarkets } from '@/hooks/useMarkets';
 import { useModal } from '@/hooks/useModal';
-import { useLocalStorage } from '@/hooks/useLocalStorage';
-import { storageKeys } from '@/utils/storageKeys';
+import { useTrustedVaults } from '@/stores/useTrustedVaults';
+import { useMarketPreferences } from '@/stores/useMarketPreferences';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { type ColumnVisibility, COLUMN_LABELS, COLUMN_DESCRIPTIONS, DEFAULT_COLUMN_VISIBILITY } from './column-visibility';
 
 type MarketSettingsModalProps = {
   isOpen: boolean;
   onOpenChange: (isOpen: boolean) => void;
-  usdFilters: {
-    minSupply: string;
-    minBorrow: string;
-    minLiquidity: string;
-  };
-  setUsdFilters: (filters: MarketSettingsModalProps['usdFilters']) => void;
-  entriesPerPage: number;
-  onEntriesPerPageChange: (value: number) => void;
-  columnVisibility: ColumnVisibility;
-  setColumnVisibility: (visibility: ColumnVisibility) => void;
 };
 
 function SettingItem({ title, description, children }: { title: string; description: string; children: React.ReactNode }) {
@@ -40,26 +29,31 @@ function SettingItem({ title, description, children }: { title: string; descript
   );
 }
 
-export default function MarketSettingsModal({
-  isOpen,
-  onOpenChange,
-  usdFilters,
-  setUsdFilters,
-  entriesPerPage,
-  onEntriesPerPageChange,
-  columnVisibility,
-  setColumnVisibility,
-}: MarketSettingsModalProps) {
+export default function MarketSettingsModal({ isOpen, onOpenChange }: MarketSettingsModalProps) {
+  // Subscribe to Zustand stores directly - no prop drilling!
+  const {
+    columnVisibility,
+    setColumnVisibility,
+    entriesPerPage,
+    setEntriesPerPage,
+    usdMinSupply,
+    setUsdMinSupply,
+    usdMinBorrow,
+    setUsdMinBorrow,
+    usdMinLiquidity,
+    setUsdMinLiquidity,
+  } = useMarketPreferences();
+
   const [customEntries, setCustomEntries] = React.useState(entriesPerPage.toString());
-  const [userTrustedVaults, setUserTrustedVaults] = useLocalStorage<TrustedVault[]>(storageKeys.UserTrustedVaultsKey, defaultTrustedVaults);
+  const { vaults: userTrustedVaults } = useTrustedVaults();
   const totalVaults = userTrustedVaults.length;
-  const { showFullRewardAPY, setShowFullRewardAPY } = useMarkets();
+  const { showFullRewardAPY, setShowFullRewardAPY } = useAppSettings();
   const { open: openModal } = useModal();
 
   const handleCustomEntriesSubmit = () => {
     const value = Number(customEntries);
     if (!Number.isNaN(value) && value > 0) {
-      onEntriesPerPageChange(value);
+      setEntriesPerPage(value);
     }
     setCustomEntries(value > 0 ? String(value) : entriesPerPage.toString());
   };
@@ -67,7 +61,10 @@ export default function MarketSettingsModal({
   const handleUsdFilterChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const { name, value } = e.target;
     if (/^\d*$/.test(value)) {
-      setUsdFilters({ ...usdFilters, [name]: value });
+      // Update the corresponding store value
+      if (name === 'minSupply') setUsdMinSupply(value);
+      else if (name === 'minBorrow') setUsdMinBorrow(value);
+      else if (name === 'minLiquidity') setUsdMinLiquidity(value);
     }
   };
 
@@ -87,7 +84,7 @@ export default function MarketSettingsModal({
             mainIcon={<FiSliders className="h-5 w-5" />}
             onClose={onClose}
           />
-          <ModalBody className="flex flex-col gap-5 max-h-[70vh] overflow-y-auto">
+          <ModalBody className="flex flex-col gap-5">
             <div className="bg-surface-soft flex flex-col gap-4 rounded p-4">
               <h3 className="text-xs uppercase text-secondary">Filter Thresholds</h3>
               <p className="-mt-3 mb-1 text-xs text-secondary">
@@ -102,7 +99,7 @@ export default function MarketSettingsModal({
                   aria-label="Minimum supply value"
                   name="minSupply"
                   placeholder="0"
-                  value={usdFilters.minSupply}
+                  value={usdMinSupply}
                   onChange={handleUsdFilterChange}
                   size="sm"
                   type="text"
@@ -122,7 +119,7 @@ export default function MarketSettingsModal({
                   aria-label="Minimum borrow value"
                   name="minBorrow"
                   placeholder="0"
-                  value={usdFilters.minBorrow}
+                  value={usdMinBorrow}
                   onChange={handleUsdFilterChange}
                   size="sm"
                   type="text"
@@ -142,7 +139,7 @@ export default function MarketSettingsModal({
                   aria-label="Minimum liquidity value"
                   name="minLiquidity"
                   placeholder="0"
-                  value={usdFilters.minLiquidity}
+                  value={usdMinLiquidity}
                   onChange={handleUsdFilterChange}
                   size="sm"
                   type="text"
@@ -177,10 +174,10 @@ export default function MarketSettingsModal({
                         id={`col-${key}`}
                         selected={isVisible}
                         onChange={(value) =>
-                          setColumnVisibility({
-                            ...columnVisibility,
+                          setColumnVisibility((prev) => ({
+                            ...prev,
                             [key]: value,
-                          })
+                          }))
                         }
                         size="xs"
                         color="primary"
@@ -216,12 +213,7 @@ export default function MarketSettingsModal({
                   <Button
                     size="sm"
                     variant="ghost"
-                    onClick={() =>
-                      openModal('trustedVaults', {
-                        userTrustedVaults,
-                        setUserTrustedVaults,
-                      })
-                    }
+                    onClick={() => openModal('trustedVaults', {})}
                     className="flex-shrink-0"
                   >
                     Manage
diff --git a/src/features/markets/components/markets-table-same-loan.tsx b/src/features/markets/components/markets-table-same-loan.tsx
index a09c816e..f38f884d 100644
--- a/src/features/markets/components/markets-table-same-loan.tsx
+++ b/src/features/markets/components/markets-table-same-loan.tsx
@@ -11,24 +11,21 @@ import { SuppliedAssetFilterCompactSwitch } from '@/features/positions/component
 import { TablePagination } from '@/components/shared/table-pagination';
 import { useTokens } from '@/components/providers/TokenProvider';
 import { TrustedByCell } from '@/features/autovault/components/trusted-vault-badges';
-import { DEFAULT_MIN_SUPPLY_USD, DEFAULT_MIN_LIQUIDITY_USD } from '@/constants/markets';
-import { defaultTrustedVaults, getVaultKey, type TrustedVault } from '@/constants/vaults/known_vaults';
+import { getVaultKey, type TrustedVault } from '@/constants/vaults/known_vaults';
 import { useFreshMarketsState } from '@/hooks/useFreshMarketsState';
-import { useLocalStorage } from '@/hooks/useLocalStorage';
-import { useMarkets } from '@/hooks/useMarkets';
 import { useModal } from '@/hooks/useModal';
 import { useRateLabel } from '@/hooks/useRateLabel';
+import { useTrustedVaults } from '@/stores/useTrustedVaults';
+import { useMarketPreferences } from '@/stores/useMarketPreferences';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { formatBalance, formatReadable } from '@/utils/balance';
 import { filterMarkets, sortMarkets, createPropertySort } from '@/utils/marketFilters';
-import { parseNumericThreshold } from '@/utils/markets';
 import { getViemChain } from '@/utils/networks';
 import { parsePriceFeedVendors, PriceFeedVendors, OracleVendorIcons } from '@/utils/oracle';
 import { convertApyToApr } from '@/utils/rateMath';
-import { storageKeys } from '@/utils/storageKeys';
 import { type ERC20Token, type UnknownERC20Token, infoToKey } from '@/utils/tokens';
 import type { Market } from '@/utils/types';
 import { buildTrustedVaultMap } from '@/utils/vaults';
-import { DEFAULT_COLUMN_VISIBILITY, type ColumnVisibility } from '@/features/markets/components/column-visibility';
 import { MarketIdBadge } from './market-id-badge';
 import { MarketIdentity, MarketIdentityMode, MarketIdentityFocus } from './market-identity';
 import { MarketIndicators } from './market-indicators';
@@ -52,8 +49,6 @@ type MarketsTableWithSameLoanAssetProps = {
   markets: MarketWithSelection[];
   onToggleMarket: (marketId: string) => void;
   disabled?: boolean;
-  // Optional: Render additional content for selected markets in the cart
-  renderCartItemExtra?: (market: Market) => React.ReactNode;
   // Optional: Pass unique tokens for better filter performance
   uniqueCollateralTokens?: ERC20Token[];
   // Optional: Hide the select column (useful for single-select mode)
@@ -449,7 +444,6 @@ function MarketRow({
   onToggle,
   disabled,
   showSelectColumn,
-  columnVisibility,
   trustedVaultMap,
   supplyRateLabel,
   borrowRateLabel,
@@ -459,12 +453,13 @@ function MarketRow({
   onToggle: () => void;
   disabled: boolean;
   showSelectColumn: boolean;
-  columnVisibility: ColumnVisibility;
   trustedVaultMap: Map<string, TrustedVault>;
   supplyRateLabel: string;
   borrowRateLabel: string;
   isAprDisplay: boolean;
 }) {
+  const { columnVisibility } = useMarketPreferences();
+
   const { market, isSelected } = marketWithSelection;
   const trustedVaults = useMemo(() => {
     if (!columnVisibility.trustedBy) {
@@ -625,13 +620,12 @@ export function MarketsTableWithSameLoanAsset({
   markets,
   onToggleMarket,
   disabled = false,
-  renderCartItemExtra,
   uniqueCollateralTokens,
   showSelectColumn = true,
   showSettings = true,
 }: MarketsTableWithSameLoanAssetProps): JSX.Element {
   // Get global market settings
-  const { showUnwhitelistedMarkets, setShowUnwhitelistedMarkets, isAprDisplay } = useMarkets();
+  const { showUnwhitelistedMarkets, isAprDisplay } = useAppSettings();
   const { findToken } = useTokens();
   const { label: supplyRateLabel } = useRateLabel({ prefix: 'Supply' });
   const { label: borrowRateLabel } = useRateLabel({ prefix: 'Borrow' });
@@ -662,24 +656,22 @@ export function MarketsTableWithSameLoanAsset({
   const [oracleFilter, setOracleFilter] = useState<PriceFeedVendors[]>([]);
   const [searchQuery, setSearchQuery] = useState('');
 
-  // Settings state (persisted with storage key namespace)
-  const [entriesPerPage, setEntriesPerPage] = useLocalStorage(storageKeys.MarketEntriesPerPageKey, 8);
-  const [includeUnknownTokens, setIncludeUnknownTokens] = useLocalStorage(storageKeys.MarketsShowUnknownTokens, false);
-  const [showUnknownOracle, setShowUnknownOracle] = useLocalStorage(storageKeys.MarketsShowUnknownOracle, false);
-  const [userTrustedVaults, _setUserTrustedVaults] = useLocalStorage<TrustedVault[]>(
-    storageKeys.UserTrustedVaultsKey,
-    defaultTrustedVaults,
-  );
-
-  // Store USD filters as separate localStorage items to match markets.tsx pattern
-  const [usdMinSupply, setUsdMinSupply] = useLocalStorage(storageKeys.MarketsUsdMinSupplyKey, DEFAULT_MIN_SUPPLY_USD.toString());
-  const [usdMinBorrow, setUsdMinBorrow] = useLocalStorage(storageKeys.MarketsUsdMinBorrowKey, '');
-  const [usdMinLiquidity, setUsdMinLiquidity] = useLocalStorage(
-    storageKeys.MarketsUsdMinLiquidityKey,
-    DEFAULT_MIN_LIQUIDITY_USD.toString(),
-  );
+  // Settings state from Zustand store
+  const {
+    entriesPerPage,
+    includeUnknownTokens,
+    showUnknownOracle,
+    trustedVaultsOnly,
+    usdMinSupply,
+    usdMinBorrow,
+    usdMinLiquidity,
+    minSupplyEnabled,
+    minBorrowEnabled,
+    minLiquidityEnabled,
+    columnVisibility,
+  } = useMarketPreferences();
 
-  const [trustedVaultsOnly, setTrustedVaultsOnly] = useLocalStorage(storageKeys.MarketsTrustedVaultsOnlyKey, false);
+  const { vaults: userTrustedVaults } = useTrustedVaults();
 
   const trustedVaultMap = useMemo(() => {
     return buildTrustedVaultMap(userTrustedVaults);
@@ -697,20 +689,6 @@ export function MarketsTableWithSameLoanAsset({
     [trustedVaultMap],
   );
 
-  // USD Filter enabled states
-  const [minSupplyEnabled, setMinSupplyEnabled] = useLocalStorage(
-    storageKeys.MarketsMinSupplyEnabledKey,
-    true, // Default to enabled for backward compatibility
-  );
-  const [minBorrowEnabled, setMinBorrowEnabled] = useLocalStorage(storageKeys.MarketsMinBorrowEnabledKey, false);
-  const [minLiquidityEnabled, setMinLiquidityEnabled] = useLocalStorage(storageKeys.MarketsMinLiquidityEnabledKey, false);
-
-  // Column visibility state
-  const [columnVisibility, setColumnVisibility] = useLocalStorage<ColumnVisibility>(
-    storageKeys.MarketsColumnVisibilityKey,
-    DEFAULT_COLUMN_VISIBILITY,
-  );
-
   // Create memoized usdFilters object from individual localStorage values
   const usdFilters = useMemo(
     () => ({
@@ -721,19 +699,6 @@ export function MarketsTableWithSameLoanAsset({
     [usdMinSupply, usdMinBorrow, usdMinLiquidity],
   );
 
-  const setUsdFilters = useCallback(
-    (filters: { minSupply: string; minBorrow: string; minLiquidity: string }) => {
-      setUsdMinSupply(filters.minSupply);
-      setUsdMinBorrow(filters.minBorrow);
-      setUsdMinLiquidity(filters.minLiquidity);
-    },
-    [setUsdMinSupply, setUsdMinBorrow, setUsdMinLiquidity],
-  );
-
-  const effectiveMinSupply = parseNumericThreshold(usdFilters.minSupply);
-  const effectiveMinBorrow = parseNumericThreshold(usdFilters.minBorrow);
-  const effectiveMinLiquidity = parseNumericThreshold(usdFilters.minLiquidity);
-
   const handleSort = (column: SortColumn) => {
     if (sortColumn === column) {
       setSortDirection((prev) => (prev === 1 ? -1 : 1));
@@ -890,11 +855,6 @@ export function MarketsTableWithSameLoanAsset({
     trustedVaultsOnly,
   ]);
 
-  // Get selected markets
-  const _selectedMarkets = useMemo(() => {
-    return markets.filter((m) => m.isSelected);
-  }, [markets]);
-
   // Pagination with guards to prevent invalid states
   const safePerPage = Math.max(1, Math.floor(entriesPerPage));
   const totalPages = Math.max(1, Math.ceil(processedMarkets.length / safePerPage));
@@ -941,51 +901,12 @@ export function MarketsTableWithSameLoanAsset({
           />
         </div>
         <div className="flex items-center gap-3">
-          <SuppliedAssetFilterCompactSwitch
-            includeUnknownTokens={includeUnknownTokens}
-            setIncludeUnknownTokens={setIncludeUnknownTokens}
-            showUnknownOracle={showUnknownOracle}
-            setShowUnknownOracle={setShowUnknownOracle}
-            showUnwhitelistedMarkets={showUnwhitelistedMarkets}
-            setShowUnwhitelistedMarkets={setShowUnwhitelistedMarkets}
-            trustedVaultsOnly={trustedVaultsOnly}
-            setTrustedVaultsOnly={setTrustedVaultsOnly}
-            minSupplyEnabled={minSupplyEnabled}
-            setMinSupplyEnabled={setMinSupplyEnabled}
-            minBorrowEnabled={minBorrowEnabled}
-            setMinBorrowEnabled={setMinBorrowEnabled}
-            minLiquidityEnabled={minLiquidityEnabled}
-            setMinLiquidityEnabled={setMinLiquidityEnabled}
-            thresholds={{
-              minSupply: effectiveMinSupply,
-              minBorrow: effectiveMinBorrow,
-              minLiquidity: effectiveMinLiquidity,
-            }}
-            onOpenSettings={() =>
-              openModal('marketSettings', {
-                usdFilters,
-                setUsdFilters,
-                entriesPerPage,
-                onEntriesPerPageChange: setEntriesPerPage,
-                columnVisibility,
-                setColumnVisibility,
-              })
-            }
-          />
+          <SuppliedAssetFilterCompactSwitch onOpenSettings={() => openModal('marketSettings', {})} />
           {showSettings && (
             <Button
               variant="ghost"
               size="sm"
-              onClick={() =>
-                openModal('marketSettings', {
-                  usdFilters,
-                  setUsdFilters,
-                  entriesPerPage,
-                  onEntriesPerPageChange: setEntriesPerPage,
-                  columnVisibility,
-                  setColumnVisibility,
-                })
-              }
+              onClick={() => openModal('marketSettings', {})}
               className="min-w-0 px-2"
             >
               <GearIcon className="h-4 w-4" />
@@ -1141,7 +1062,6 @@ export function MarketsTableWithSameLoanAsset({
                   onToggle={() => onToggleMarket(marketWithSelection.market.uniqueKey)}
                   disabled={disabled}
                   showSelectColumn={showSelectColumn}
-                  columnVisibility={columnVisibility}
                   trustedVaultMap={trustedVaultMap}
                   supplyRateLabel={supplyRateLabel}
                   borrowRateLabel={borrowRateLabel}
diff --git a/src/features/markets/components/table/market-table-body.tsx b/src/features/markets/components/table/market-table-body.tsx
index 144a66c1..5ce174b2 100644
--- a/src/features/markets/components/table/market-table-body.tsx
+++ b/src/features/markets/components/table/market-table-body.tsx
@@ -10,38 +10,25 @@ import OracleVendorBadge from '@/features/markets/components/oracle-vendor-badge
 import { TrustedByCell } from '@/features/autovault/components/trusted-vault-badges';
 import { getVaultKey, type TrustedVault } from '@/constants/vaults/known_vaults';
 import { useRateLabel } from '@/hooks/useRateLabel';
+import { useStyledToast } from '@/hooks/useStyledToast';
+import { useMarketPreferences } from '@/stores/useMarketPreferences';
 import type { Market } from '@/utils/types';
 import { APYCell } from '../apy-breakdown-tooltip';
-import type { ColumnVisibility } from '../column-visibility';
 import { MarketActionsDropdown } from '../market-actions-dropdown';
 import { ExpandedMarketDetail } from './market-row-detail';
 import { TDAsset, TDTotalSupplyOrBorrow } from './market-table-utils';
 
 type MarketTableBodyProps = {
   currentEntries: Market[];
-  staredIds: string[];
   expandedRowId: string | null;
   setExpandedRowId: (id: string | null) => void;
-  starMarket: (id: string) => void;
-  unstarMarket: (id: string) => void;
-  columnVisibility: ColumnVisibility;
   trustedVaultMap: Map<string, TrustedVault>;
-  addBlacklistedMarket?: (uniqueKey: string, chainId: number, reason?: string) => boolean;
-  isBlacklisted?: (uniqueKey: string) => boolean;
 };
 
-export function MarketTableBody({
-  currentEntries,
-  staredIds,
-  expandedRowId,
-  setExpandedRowId,
-  starMarket,
-  unstarMarket,
-  columnVisibility,
-  trustedVaultMap,
-  addBlacklistedMarket,
-  isBlacklisted,
-}: MarketTableBodyProps) {
+export function MarketTableBody({ currentEntries, expandedRowId, setExpandedRowId, trustedVaultMap }: MarketTableBodyProps) {
+  const { columnVisibility, starredMarkets, starMarket, unstarMarket } = useMarketPreferences();
+  const { success: toastSuccess } = useStyledToast();
+
   const { label: supplyRateLabel } = useRateLabel({ prefix: 'Supply' });
   const { label: borrowRateLabel } = useRateLabel({ prefix: 'Borrow' });
 
@@ -91,7 +78,7 @@ export function MarketTableBody({
     <TableBody className="text-sm">
       {currentEntries.map((item, index) => {
         const collatToShow = item.collateralAsset.symbol.slice(0, 6).concat(item.collateralAsset.symbol.length > 6 ? '...' : '');
-        const isStared = staredIds.includes(item.uniqueKey);
+        const isStared = starredMarkets.includes(item.uniqueKey);
 
         return (
           <React.Fragment key={index}>
@@ -111,8 +98,10 @@ export function MarketTableBody({
                     e.stopPropagation();
                     if (isStared) {
                       unstarMarket(item.uniqueKey);
+                      toastSuccess('Market unstarred', 'Removed from favorites');
                     } else {
                       starMarket(item.uniqueKey);
+                      toastSuccess('Market starred', 'Added to favorites');
                     }
                   }}
                 >
@@ -250,14 +239,7 @@ export function MarketTableBody({
                 className="justify-center px-4 py-3"
               >
                 <div className="flex items-center justify-center">
-                  <MarketActionsDropdown
-                    market={item}
-                    isStared={isStared}
-                    starMarket={starMarket}
-                    unstarMarket={unstarMarket}
-                    addBlacklistedMarket={addBlacklistedMarket}
-                    isBlacklisted={isBlacklisted}
-                  />
+                  <MarketActionsDropdown market={item} />
                 </div>
               </TableCell>
             </TableRow>
diff --git a/src/features/markets/components/table/markets-table.tsx b/src/features/markets/components/table/markets-table.tsx
index 9ea9d93f..17f632c9 100644
--- a/src/features/markets/components/table/markets-table.tsx
+++ b/src/features/markets/components/table/markets-table.tsx
@@ -1,4 +1,4 @@
-import { useMemo, useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
 import { FaRegStar, FaStar } from 'react-icons/fa';
 import { ReloadIcon } from '@radix-ui/react-icons';
 import { CgCompress } from 'react-icons/cg';
@@ -10,106 +10,87 @@ import { Button } from '@/components/ui/button';
 import { Tooltip } from '@/components/ui/tooltip';
 import { TooltipContent } from '@/components/shared/tooltip-content';
 import { TableContainerWithHeader } from '@/components/common/table-container-with-header';
+import EmptyScreen from '@/components/status/empty-screen';
+import LoadingScreen from '@/components/status/loading-screen';
 import { SuppliedAssetFilterCompactSwitch } from '@/features/positions/components/supplied-asset-filter-compact-switch';
 import type { TrustedVault } from '@/constants/vaults/known_vaults';
 import { useRateLabel } from '@/hooks/useRateLabel';
+import { useMarketPreferences } from '@/stores/useMarketPreferences';
 import type { Market } from '@/utils/types';
 import { buildTrustedVaultMap } from '@/utils/vaults';
-import type { ColumnVisibility } from '../column-visibility';
 import { SortColumn } from '../constants';
 import { MarketTableBody } from './market-table-body';
 import { HTSortable } from './market-table-utils';
 
 type MarketsTableProps = {
-  sortColumn: number;
-  titleOnclick: (column: number) => void;
-  sortDirection: number;
   markets: Market[];
-  staredIds: string[];
-  unstarMarket: (id: string) => void;
-  starMarket: (id: string) => void;
   currentPage: number;
-  entriesPerPage: number;
   setCurrentPage: (value: number) => void;
-  columnVisibility: ColumnVisibility;
   trustedVaults: TrustedVault[];
   className?: string;
-  wrapperClassName?: string;
   tableClassName?: string;
-  addBlacklistedMarket?: (uniqueKey: string, chainId: number, reason?: string) => boolean;
-  isBlacklisted?: (uniqueKey: string) => boolean;
-  // Settings props
-  includeUnknownTokens: boolean;
-  setIncludeUnknownTokens: (value: boolean) => void;
-  showUnknownOracle: boolean;
-  setShowUnknownOracle: (value: boolean) => void;
-  showUnwhitelistedMarkets: boolean;
-  setShowUnwhitelistedMarkets: (value: boolean) => void;
-  trustedVaultsOnly: boolean;
-  setTrustedVaultsOnly: (value: boolean) => void;
-  minSupplyEnabled: boolean;
-  setMinSupplyEnabled: (value: boolean) => void;
-  minBorrowEnabled: boolean;
-  setMinBorrowEnabled: (value: boolean) => void;
-  minLiquidityEnabled: boolean;
-  setMinLiquidityEnabled: (value: boolean) => void;
-  thresholds: {
-    minSupply: number;
-    minBorrow: number;
-    minLiquidity: number;
-  };
   onOpenSettings: () => void;
   onRefresh: () => void;
   isRefetching: boolean;
-  tableViewMode: 'compact' | 'expanded';
-  setTableViewMode: (mode: 'compact' | 'expanded') => void;
   isMobile: boolean;
+  loading?: boolean;
+  isEmpty?: boolean;
 };
 
 function MarketsTable({
-  staredIds,
-  sortColumn,
-  titleOnclick,
-  sortDirection,
   markets,
-  starMarket,
-  unstarMarket,
   currentPage,
-  entriesPerPage,
   setCurrentPage,
-  columnVisibility,
   trustedVaults,
   className,
-  wrapperClassName,
   tableClassName,
-  addBlacklistedMarket,
-  isBlacklisted,
-  includeUnknownTokens,
-  setIncludeUnknownTokens,
-  showUnknownOracle,
-  setShowUnknownOracle,
-  showUnwhitelistedMarkets,
-  setShowUnwhitelistedMarkets,
-  trustedVaultsOnly,
-  setTrustedVaultsOnly,
-  minSupplyEnabled,
-  setMinSupplyEnabled,
-  minBorrowEnabled,
-  setMinBorrowEnabled,
-  minLiquidityEnabled,
-  setMinLiquidityEnabled,
-  thresholds,
   onOpenSettings,
   onRefresh,
   isRefetching,
-  tableViewMode,
-  setTableViewMode,
   isMobile,
+  loading = false,
+  isEmpty = false,
 }: MarketsTableProps) {
   const [expandedRowId, setExpandedRowId] = useState<string | null>(null);
   const { label: supplyRateLabel } = useRateLabel({ prefix: 'Supply' });
   const { label: borrowRateLabel } = useRateLabel({ prefix: 'Borrow' });
 
+  const {
+    columnVisibility,
+    sortColumn,
+    setSortColumn,
+    sortDirection,
+    setSortDirection,
+    entriesPerPage,
+    tableViewMode,
+    setTableViewMode,
+    includeUnknownTokens,
+    showUnknownOracle,
+    trustedVaultsOnly,
+    minSupplyEnabled,
+    minBorrowEnabled,
+    minLiquidityEnabled,
+  } = useMarketPreferences();
+
+  // Handle column header clicks for sorting
+  const titleOnclick = useCallback(
+    (column: number) => {
+      // Validate that column is a valid SortColumn value
+      const isValidColumn = Object.values(SortColumn).includes(column);
+      if (!isValidColumn) {
+        console.warn('Invalid sort column:', column);
+        return;
+      }
+
+      setSortColumn(column);
+
+      if (column === sortColumn) {
+        setSortDirection(-sortDirection);
+      }
+    },
+    [sortColumn, sortDirection, setSortColumn, setSortDirection],
+  );
+
   const trustedVaultMap = useMemo(() => buildTrustedVaultMap(trustedVaults), [trustedVaults]);
 
   const indexOfLastEntry = currentPage * entriesPerPage;
@@ -120,30 +101,15 @@ function MarketsTable({
 
   const effectiveTableViewMode = isMobile ? 'compact' : tableViewMode;
 
-  const containerClassName = ['flex flex-col gap-2 pb-4', className].filter((value): value is string => Boolean(value)).join(' ');
+  const containerClassName = ['flex flex-col gap-2 pb-4', loading || isEmpty || markets.length === 0 ? 'container items-center' : className]
+    .filter((value): value is string => Boolean(value))
+    .join(' ');
   const tableClassNames = ['responsive', tableClassName].filter((value): value is string => Boolean(value)).join(' ');
 
   // Header actions (filter, refresh, expand/compact, settings)
   const headerActions = (
     <>
-      <SuppliedAssetFilterCompactSwitch
-        includeUnknownTokens={includeUnknownTokens}
-        setIncludeUnknownTokens={setIncludeUnknownTokens}
-        showUnknownOracle={showUnknownOracle}
-        setShowUnknownOracle={setShowUnknownOracle}
-        showUnwhitelistedMarkets={showUnwhitelistedMarkets}
-        setShowUnwhitelistedMarkets={setShowUnwhitelistedMarkets}
-        trustedVaultsOnly={trustedVaultsOnly}
-        setTrustedVaultsOnly={setTrustedVaultsOnly}
-        minSupplyEnabled={minSupplyEnabled}
-        setMinSupplyEnabled={setMinSupplyEnabled}
-        minBorrowEnabled={minBorrowEnabled}
-        setMinBorrowEnabled={setMinBorrowEnabled}
-        minLiquidityEnabled={minLiquidityEnabled}
-        setMinLiquidityEnabled={setMinLiquidityEnabled}
-        thresholds={thresholds}
-        onOpenSettings={onOpenSettings}
-      />
+      <SuppliedAssetFilterCompactSwitch onOpenSettings={onOpenSettings} />
 
       <Tooltip
         content={
@@ -153,17 +119,15 @@ function MarketsTable({
           />
         }
       >
-        <span>
-          <Button
-            variant="ghost"
-            size="sm"
-            onClick={onRefresh}
-            disabled={isRefetching}
-            className="text-secondary min-w-0 px-2"
-          >
-            <ReloadIcon className={`${isRefetching ? 'animate-spin' : ''} h-3 w-3`} />
-          </Button>
-        </span>
+        <Button
+          variant="ghost"
+          size="sm"
+          onClick={onRefresh}
+          disabled={isRefetching}
+          className="text-secondary min-w-0 px-2"
+        >
+          <ReloadIcon className={`${isRefetching ? 'animate-spin' : ''} h-3 w-3`} />
+        </Button>
       </Tooltip>
 
       {/* Hide expand/compact toggle on mobile */}
@@ -181,17 +145,15 @@ function MarketsTable({
             />
           }
         >
-          <span>
-            <Button
-              aria-label="Toggle table width"
-              variant="ghost"
-              size="sm"
-              className="text-secondary min-w-0 px-2"
-              onClick={() => setTableViewMode(tableViewMode === 'compact' ? 'expanded' : 'compact')}
-            >
-              {effectiveTableViewMode === 'compact' ? <RiExpandHorizontalLine className="h-3 w-3" /> : <CgCompress className="h-3 w-3" />}
-            </Button>
-          </span>
+          <Button
+            aria-label="Toggle table width"
+            variant="ghost"
+            size="sm"
+            className="text-secondary min-w-0 px-2"
+            onClick={() => setTableViewMode(tableViewMode === 'compact' ? 'expanded' : 'compact')}
+          >
+            {effectiveTableViewMode === 'compact' ? <RiExpandHorizontalLine className="h-3 w-3" /> : <CgCompress className="h-3 w-3" />}
+          </Button>
         </Tooltip>
       )}
 
@@ -203,179 +165,208 @@ function MarketsTable({
           />
         }
       >
-        <span>
-          <Button
-            aria-label="Market Preferences"
-            variant="ghost"
-            size="sm"
-            className="text-secondary min-w-0 px-2"
-            onClick={onOpenSettings}
-          >
-            <FiSettings className="h-3 w-3" />
-          </Button>
-        </span>
+        <Button
+          aria-label="Market Preferences"
+          variant="ghost"
+          size="sm"
+          className="text-secondary min-w-0 px-2"
+          onClick={onOpenSettings}
+        >
+          <FiSettings className="h-3 w-3" />
+        </Button>
       </Tooltip>
     </>
   );
 
+  // Determine empty state hint based on active filters
+  const getEmptyStateHint = () => {
+    if (!includeUnknownTokens) {
+      return "Try enabling 'Show Unknown Tokens' in settings, or adjust your current filters.";
+    }
+    if (!showUnknownOracle) {
+      return "Try enabling 'Show Unknown Oracles' in settings, or adjust your oracle filters.";
+    }
+    if (trustedVaultsOnly) {
+      return 'Disable the Trusted Vaults filter or update your trusted list in Settings.';
+    }
+    if (minSupplyEnabled || minBorrowEnabled || minLiquidityEnabled) {
+      return 'Try disabling USD filters in settings, or adjust your filter thresholds.';
+    }
+    return 'Try adjusting your filters or search query to see more results.';
+  };
+
   return (
     <div className={containerClassName}>
       <TableContainerWithHeader
         title=""
         actions={headerActions}
+        noPadding={loading || isEmpty || markets.length === 0}
+        className="w-full"
       >
-        <Table className={tableClassNames}>
-          <TableHeader>
-            <TableRow>
-              <HTSortable
-                label={sortColumn === 0 ? <FaStar /> : <FaRegStar />}
-                sortColumn={sortColumn}
-                titleOnclick={titleOnclick}
-                sortDirection={sortDirection}
-                targetColumn={SortColumn.Starred}
-                showDirection={false}
-              />
-              <TableHead className="font-normal px-2 py-2 whitespace-nowrap"> Id </TableHead>
-              <HTSortable
-                label="Loan"
-                sortColumn={sortColumn}
-                titleOnclick={titleOnclick}
-                sortDirection={sortDirection}
-                targetColumn={SortColumn.LoanAsset}
-              />
-              <HTSortable
-                label="Collateral"
-                sortColumn={sortColumn}
-                titleOnclick={titleOnclick}
-                sortDirection={sortDirection}
-                targetColumn={SortColumn.CollateralAsset}
-              />
-              <TableHead className="font-normal px-2 py-2 whitespace-nowrap">Oracle</TableHead>
-              <HTSortable
-                label="LLTV"
-                sortColumn={sortColumn}
-                titleOnclick={titleOnclick}
-                sortDirection={sortDirection}
-                targetColumn={SortColumn.LLTV}
-              />
-              {columnVisibility.trustedBy && (
-                <HTSortable
-                  label="Trusted By"
-                  sortColumn={sortColumn}
-                  titleOnclick={titleOnclick}
-                  sortDirection={sortDirection}
-                  targetColumn={SortColumn.TrustedBy}
-                />
-              )}
-              {columnVisibility.totalSupply && (
-                <HTSortable
-                  label="Total Supply"
-                  sortColumn={sortColumn}
-                  titleOnclick={titleOnclick}
-                  sortDirection={sortDirection}
-                  targetColumn={SortColumn.Supply}
-                />
-              )}
-              {columnVisibility.totalBorrow && (
-                <HTSortable
-                  label="Total Borrow"
-                  sortColumn={sortColumn}
-                  titleOnclick={titleOnclick}
-                  sortDirection={sortDirection}
-                  targetColumn={SortColumn.Borrow}
-                />
-              )}
-              {columnVisibility.liquidity && (
-                <HTSortable
-                  label="Liquidity"
-                  sortColumn={sortColumn}
-                  titleOnclick={titleOnclick}
-                  sortDirection={sortDirection}
-                  targetColumn={SortColumn.Liquidity}
-                />
-              )}
-              {columnVisibility.supplyAPY && (
+        {loading ? (
+          <LoadingScreen
+            message="Loading Morpho Blue Markets..."
+            className="min-h-[300px] container px-[4%]"
+          />
+        ) : isEmpty ? (
+          <div className="flex justify-center min-h-[200px] items-center">
+            <p className="text-secondary">No data available</p>
+          </div>
+        ) : markets.length === 0 ? (
+          <EmptyScreen
+            message="No markets found with the current filters"
+            hint={getEmptyStateHint()}
+          />
+        ) : (
+          <Table className={tableClassNames}>
+            <TableHeader>
+              <TableRow>
                 <HTSortable
-                  label={supplyRateLabel}
+                  label={sortColumn === 0 ? <FaStar /> : <FaRegStar />}
                   sortColumn={sortColumn}
                   titleOnclick={titleOnclick}
                   sortDirection={sortDirection}
-                  targetColumn={SortColumn.SupplyAPY}
+                  targetColumn={SortColumn.Starred}
+                  showDirection={false}
                 />
-              )}
-              {columnVisibility.borrowAPY && (
+                <TableHead className="font-normal px-2 py-2 whitespace-nowrap"> Id </TableHead>
                 <HTSortable
-                  label={borrowRateLabel}
+                  label="Loan"
                   sortColumn={sortColumn}
                   titleOnclick={titleOnclick}
                   sortDirection={sortDirection}
-                  targetColumn={SortColumn.BorrowAPY}
+                  targetColumn={SortColumn.LoanAsset}
                 />
-              )}
-              {columnVisibility.rateAtTarget && (
                 <HTSortable
-                  label="Target Rate"
+                  label="Collateral"
                   sortColumn={sortColumn}
                   titleOnclick={titleOnclick}
                   sortDirection={sortDirection}
-                  targetColumn={SortColumn.RateAtTarget}
+                  targetColumn={SortColumn.CollateralAsset}
                 />
-              )}
-              {columnVisibility.utilizationRate && (
+                <TableHead className="font-normal px-2 py-2 whitespace-nowrap">Oracle</TableHead>
                 <HTSortable
-                  label="Utilization"
+                  label="LLTV"
                   sortColumn={sortColumn}
                   titleOnclick={titleOnclick}
                   sortDirection={sortDirection}
-                  targetColumn={SortColumn.UtilizationRate}
+                  targetColumn={SortColumn.LLTV}
                 />
-              )}
-              <TableHead
-                className="font-normal px-2 py-2 whitespace-nowrap"
-                style={{ padding: '0.35rem 0.8rem' }}
-              >
-                {' '}
-                Risk{' '}
-              </TableHead>
-              <TableHead
-                className="font-normal px-2 py-2 whitespace-nowrap"
-                style={{ padding: '0.35rem 0.8rem' }}
-              >
-                {' '}
-                Indicators{' '}
-              </TableHead>
-              <TableHead
-                className="font-normal px-2 py-2 whitespace-nowrap"
-                style={{ padding: '0.35rem 0.8rem' }}
-              >
-                {' '}
-                Actions{' '}
-              </TableHead>
-            </TableRow>
-          </TableHeader>
-          <MarketTableBody
-            currentEntries={currentEntries}
-            staredIds={staredIds}
-            expandedRowId={expandedRowId}
-            setExpandedRowId={setExpandedRowId}
-            starMarket={starMarket}
-            unstarMarket={unstarMarket}
-            columnVisibility={columnVisibility}
-            trustedVaultMap={trustedVaultMap}
-            addBlacklistedMarket={addBlacklistedMarket}
-            isBlacklisted={isBlacklisted}
-          />
-        </Table>
+                {columnVisibility.trustedBy && (
+                  <HTSortable
+                    label="Trusted By"
+                    sortColumn={sortColumn}
+                    titleOnclick={titleOnclick}
+                    sortDirection={sortDirection}
+                    targetColumn={SortColumn.TrustedBy}
+                  />
+                )}
+                {columnVisibility.totalSupply && (
+                  <HTSortable
+                    label="Total Supply"
+                    sortColumn={sortColumn}
+                    titleOnclick={titleOnclick}
+                    sortDirection={sortDirection}
+                    targetColumn={SortColumn.Supply}
+                  />
+                )}
+                {columnVisibility.totalBorrow && (
+                  <HTSortable
+                    label="Total Borrow"
+                    sortColumn={sortColumn}
+                    titleOnclick={titleOnclick}
+                    sortDirection={sortDirection}
+                    targetColumn={SortColumn.Borrow}
+                  />
+                )}
+                {columnVisibility.liquidity && (
+                  <HTSortable
+                    label="Liquidity"
+                    sortColumn={sortColumn}
+                    titleOnclick={titleOnclick}
+                    sortDirection={sortDirection}
+                    targetColumn={SortColumn.Liquidity}
+                  />
+                )}
+                {columnVisibility.supplyAPY && (
+                  <HTSortable
+                    label={supplyRateLabel}
+                    sortColumn={sortColumn}
+                    titleOnclick={titleOnclick}
+                    sortDirection={sortDirection}
+                    targetColumn={SortColumn.SupplyAPY}
+                  />
+                )}
+                {columnVisibility.borrowAPY && (
+                  <HTSortable
+                    label={borrowRateLabel}
+                    sortColumn={sortColumn}
+                    titleOnclick={titleOnclick}
+                    sortDirection={sortDirection}
+                    targetColumn={SortColumn.BorrowAPY}
+                  />
+                )}
+                {columnVisibility.rateAtTarget && (
+                  <HTSortable
+                    label="Target Rate"
+                    sortColumn={sortColumn}
+                    titleOnclick={titleOnclick}
+                    sortDirection={sortDirection}
+                    targetColumn={SortColumn.RateAtTarget}
+                  />
+                )}
+                {columnVisibility.utilizationRate && (
+                  <HTSortable
+                    label="Utilization"
+                    sortColumn={sortColumn}
+                    titleOnclick={titleOnclick}
+                    sortDirection={sortDirection}
+                    targetColumn={SortColumn.UtilizationRate}
+                  />
+                )}
+                <TableHead
+                  className="font-normal px-2 py-2 whitespace-nowrap"
+                  style={{ padding: '0.35rem 0.8rem' }}
+                >
+                  {' '}
+                  Risk{' '}
+                </TableHead>
+                <TableHead
+                  className="font-normal px-2 py-2 whitespace-nowrap"
+                  style={{ padding: '0.35rem 0.8rem' }}
+                >
+                  {' '}
+                  Indicators{' '}
+                </TableHead>
+                <TableHead
+                  className="font-normal px-2 py-2 whitespace-nowrap"
+                  style={{ padding: '0.35rem 0.8rem' }}
+                >
+                  {' '}
+                  Actions{' '}
+                </TableHead>
+              </TableRow>
+            </TableHeader>
+            <MarketTableBody
+              currentEntries={currentEntries}
+              expandedRowId={expandedRowId}
+              setExpandedRowId={setExpandedRowId}
+              trustedVaultMap={trustedVaultMap}
+            />
+          </Table>
+        )}
       </TableContainerWithHeader>
-      <TablePagination
-        totalPages={totalPages}
-        totalEntries={markets.length}
-        currentPage={currentPage}
-        pageSize={entriesPerPage}
-        onPageChange={setCurrentPage}
-        isLoading={false}
-        showEntryCount={false}
-      />
+      {!loading && !isEmpty && markets.length > 0 && (
+        <TablePagination
+          totalPages={totalPages}
+          totalEntries={markets.length}
+          currentPage={currentPage}
+          pageSize={entriesPerPage}
+          onPageChange={setCurrentPage}
+          isLoading={false}
+          showEntryCount={false}
+        />
+      )}
     </div>
   );
 }
diff --git a/src/features/markets/markets-view.tsx b/src/features/markets/markets-view.tsx
index 80e2f647..7b193bd1 100644
--- a/src/features/markets/markets-view.tsx
+++ b/src/features/markets/markets-view.tsx
@@ -5,27 +5,21 @@ import { useRouter } from 'next/navigation';
 
 import Header from '@/components/layout/header/Header';
 import { useTokens } from '@/components/providers/TokenProvider';
-import EmptyScreen from '@/components/status/empty-screen';
-import LoadingScreen from '@/components/status/loading-screen';
-import { DEFAULT_MIN_SUPPLY_USD, DEFAULT_MIN_LIQUIDITY_USD } from '@/constants/markets';
-import { defaultTrustedVaults, getVaultKey, type TrustedVault } from '@/constants/vaults/known_vaults';
-import { useLocalStorage } from '@/hooks/useLocalStorage';
+import { getVaultKey } from '@/constants/vaults/known_vaults';
 import { useMarkets } from '@/hooks/useMarkets';
 import { useModal } from '@/hooks/useModal';
 import { usePagination } from '@/hooks/usePagination';
-import { useStaredMarkets } from '@/hooks/useStaredMarkets';
 import { useStyledToast } from '@/hooks/useStyledToast';
+import { useTrustedVaults } from '@/stores/useTrustedVaults';
+import { useMarketPreferences } from '@/stores/useMarketPreferences';
 import { filterMarkets, sortMarkets, createPropertySort, createStarredSort } from '@/utils/marketFilters';
-import { parseNumericThreshold } from '@/utils/markets';
 import type { SupportedNetworks } from '@/utils/networks';
 import type { PriceFeedVendors } from '@/utils/oracle';
-import { storageKeys } from '@/utils/storageKeys';
 import type { ERC20Token, UnknownERC20Token } from '@/utils/tokens';
 import type { Market } from '@/utils/types';
 
 import AdvancedSearchBar, { ShortcutType } from './components/advanced-search-bar';
 import AssetFilter from './components/filters/asset-filter';
-import { DEFAULT_COLUMN_VISIBILITY, type ColumnVisibility } from './components/column-visibility';
 import { SortColumn } from './components/constants';
 import MarketsTable from './components/table/markets-table';
 import NetworkFilter from './components/filters/network-filter';
@@ -42,21 +36,7 @@ export default function Markets({ initialNetwork, initialCollaterals, initialLoa
 
   const toast = useStyledToast();
 
-  const {
-    loading,
-    markets: rawMarkets,
-    refetch,
-    isRefetching,
-    showUnwhitelistedMarkets,
-    setShowUnwhitelistedMarkets,
-    addBlacklistedMarket: addBlacklistedMarketBase,
-    isBlacklisted,
-  } = useMarkets();
-  const { staredIds, starMarket, unstarMarket } = useStaredMarkets();
-
-  // Use addBlacklistedMarket directly from context
-  // The context automatically reapplies the filter when blacklist changes
-  const addBlacklistedMarket = addBlacklistedMarketBase;
+  const { loading, markets: rawMarkets, refetch, isRefetching } = useMarkets();
 
   // Initialize state with server-parsed values
   const [selectedCollaterals, setSelectedCollaterals] = useState<string[]>(initialCollaterals);
@@ -66,8 +46,21 @@ export default function Markets({ initialNetwork, initialCollaterals, initialLoa
   const [uniqueCollaterals, setUniqueCollaterals] = useState<(ERC20Token | UnknownERC20Token)[]>([]);
   const [uniqueLoanAssets, setUniqueLoanAssets] = useState<(ERC20Token | UnknownERC20Token)[]>([]);
 
-  const [sortColumn, setSortColumn] = useLocalStorage(storageKeys.MarketSortColumnKey, SortColumn.Supply);
-  const [sortDirection, setSortDirection] = useLocalStorage(storageKeys.MarketSortDirectionKey, -1);
+  // Market preferences from Zustand store
+  const {
+    sortColumn,
+    sortDirection,
+    includeUnknownTokens,
+    showUnknownOracle,
+    usdMinSupply,
+    usdMinBorrow,
+    usdMinLiquidity,
+    minSupplyEnabled,
+    minBorrowEnabled,
+    minLiquidityEnabled,
+    trustedVaultsOnly,
+    starredMarkets,
+  } = useMarketPreferences();
 
   const [filteredMarkets, setFilteredMarkets] = useState<Market[]>([]);
 
@@ -75,48 +68,11 @@ export default function Markets({ initialNetwork, initialCollaterals, initialLoa
 
   const [selectedOracles, setSelectedOracles] = useState<PriceFeedVendors[]>([]);
 
-  const { currentPage, setCurrentPage, entriesPerPage, handleEntriesPerPageChange, resetPage } = usePagination();
-
-  const [includeUnknownTokens, setIncludeUnknownTokens] = useLocalStorage(storageKeys.MarketsShowUnknownTokens, false);
-  const [showUnknownOracle, setShowUnknownOracle] = useLocalStorage(storageKeys.MarketsShowUnknownOracle, false);
+  const { currentPage, setCurrentPage, resetPage } = usePagination();
 
   const { allTokens, findToken } = useTokens();
 
-  // USD Filter values
-  const [usdMinSupply, setUsdMinSupply] = useLocalStorage(storageKeys.MarketsUsdMinSupplyKey, DEFAULT_MIN_SUPPLY_USD.toString());
-  const [usdMinBorrow, setUsdMinBorrow] = useLocalStorage(storageKeys.MarketsUsdMinBorrowKey, '');
-  const [usdMinLiquidity, setUsdMinLiquidity] = useLocalStorage(
-    storageKeys.MarketsUsdMinLiquidityKey,
-    DEFAULT_MIN_LIQUIDITY_USD.toString(),
-  );
-
-  // USD Filter enabled states
-  const [minSupplyEnabled, setMinSupplyEnabled] = useLocalStorage(
-    storageKeys.MarketsMinSupplyEnabledKey,
-    true, // Default to enabled for backward compatibility
-  );
-  const [minBorrowEnabled, setMinBorrowEnabled] = useLocalStorage(storageKeys.MarketsMinBorrowEnabledKey, false);
-  const [minLiquidityEnabled, setMinLiquidityEnabled] = useLocalStorage(storageKeys.MarketsMinLiquidityEnabledKey, false);
-
-  const [trustedVaultsOnly, setTrustedVaultsOnly] = useLocalStorage(storageKeys.MarketsTrustedVaultsOnlyKey, false);
-
-  // Column visibility state
-  const [columnVisibilityState, setColumnVisibilityState] = useLocalStorage<ColumnVisibility>(
-    storageKeys.MarketsColumnVisibilityKey,
-    DEFAULT_COLUMN_VISIBILITY,
-  );
-
-  const columnVisibility = useMemo(() => ({ ...DEFAULT_COLUMN_VISIBILITY, ...columnVisibilityState }), [columnVisibilityState]);
-
-  const setColumnVisibility = useCallback(
-    (visibility: ColumnVisibility) => {
-      setColumnVisibilityState({ ...DEFAULT_COLUMN_VISIBILITY, ...visibility });
-    },
-    [setColumnVisibilityState],
-  );
-
-  // Table view mode: 'compact' (scrollable) or 'expanded' (full width)
-  const [tableViewMode, setTableViewMode] = useLocalStorage<'compact' | 'expanded'>(storageKeys.MarketsTableViewModeKey, 'compact');
+  const { tableViewMode } = useMarketPreferences();
 
   // Force compact mode on mobile - track window size
   const [isMobile, setIsMobile] = useState(false);
@@ -134,10 +90,7 @@ export default function Markets({ initialNetwork, initialCollaterals, initialLoa
   // Effective table view mode - always compact on mobile
   const effectiveTableViewMode = isMobile ? 'compact' : tableViewMode;
 
-  const [userTrustedVaults, _setUserTrustedVaults] = useLocalStorage<TrustedVault[]>(
-    storageKeys.UserTrustedVaultsKey,
-    defaultTrustedVaults,
-  );
+  const { vaults: userTrustedVaults } = useTrustedVaults();
   const { open: openModal } = useModal();
 
   const trustedVaultKeys = useMemo(() => {
@@ -166,19 +119,6 @@ export default function Markets({ initialNetwork, initialCollaterals, initialLoa
     [usdMinSupply, usdMinBorrow, usdMinLiquidity],
   );
 
-  const setUsdFilters = useCallback(
-    (filters: { minSupply: string; minBorrow: string; minLiquidity: string }) => {
-      setUsdMinSupply(filters.minSupply);
-      setUsdMinBorrow(filters.minBorrow);
-      setUsdMinLiquidity(filters.minLiquidity);
-    },
-    [setUsdMinSupply, setUsdMinBorrow, setUsdMinLiquidity],
-  );
-
-  const effectiveMinSupply = parseNumericThreshold(usdFilters.minSupply);
-  const effectiveMinBorrow = parseNumericThreshold(usdFilters.minBorrow);
-  const effectiveMinLiquidity = parseNumericThreshold(usdFilters.minLiquidity);
-
   useEffect(() => {
     // return if no markets
     if (!rawMarkets) return;
@@ -298,7 +238,7 @@ export default function Markets({ initialNetwork, initialCollaterals, initialLoa
     // Apply sorting
     let sorted: Market[];
     if (sortColumn === SortColumn.Starred) {
-      sorted = sortMarkets(filtered, createStarredSort(staredIds), 1);
+      sorted = sortMarkets(filtered, createStarredSort(starredMarkets), 1);
     } else if (sortColumn === SortColumn.TrustedBy) {
       sorted = sortMarkets(filtered, (a, b) => Number(hasTrustedVault(a)) - Number(hasTrustedVault(b)), sortDirection as 1 | -1);
     } else {
@@ -335,7 +275,7 @@ export default function Markets({ initialNetwork, initialCollaterals, initialLoa
     selectedCollaterals,
     selectedLoanAssets,
     selectedOracles,
-    staredIds,
+    starredMarkets,
     findToken,
     usdFilters,
     minSupplyEnabled,
@@ -369,24 +309,6 @@ export default function Markets({ initialNetwork, initialCollaterals, initialLoa
     resetPage,
   ]);
 
-  const titleOnclick = useCallback(
-    (column: number) => {
-      // Validate that column is a valid SortColumn value
-      const isValidColumn = Object.values(SortColumn).includes(column);
-      if (!isValidColumn) {
-        console.error(`Invalid sort column value: ${column}`);
-        return;
-      }
-
-      setSortColumn(column);
-
-      if (column === sortColumn) {
-        setSortDirection(-sortDirection);
-      }
-    },
-    [sortColumn, sortDirection, setSortColumn, setSortDirection],
-  );
-
   // Add keyboard shortcut for search
   useEffect(() => {
     const handleKeyDown = (event: KeyboardEvent) => {
@@ -494,89 +416,22 @@ export default function Markets({ initialNetwork, initialCollaterals, initialLoa
 
       {/* Table Section - centered when expanded, full width when compact */}
       <div className={effectiveTableViewMode === 'expanded' ? 'mt-4 px-[2%]' : 'container px-[4%] mt-4'}>
-        {loading ? (
-          <div className={effectiveTableViewMode === 'expanded' ? 'container px-[4%]' : 'w-full'}>
-            <LoadingScreen
-              message="Loading Morpho Blue Markets..."
-              className="min-h-[300px] w-full"
-            />
-          </div>
-        ) : rawMarkets == null ? (
-          <div className="flex justify-center"> No data </div>
-        ) : (
-          <div className={effectiveTableViewMode === 'expanded' ? 'flex justify-center' : 'w-full'}>
-            {filteredMarkets.length > 0 ? (
-              <MarketsTable
-                markets={filteredMarkets}
-                titleOnclick={titleOnclick}
-                sortColumn={sortColumn}
-                sortDirection={sortDirection}
-                staredIds={staredIds}
-                starMarket={starMarket}
-                unstarMarket={unstarMarket}
-                currentPage={currentPage}
-                entriesPerPage={entriesPerPage}
-                setCurrentPage={setCurrentPage}
-                columnVisibility={columnVisibility}
-                trustedVaults={userTrustedVaults}
-                className={effectiveTableViewMode === 'compact' ? 'w-full' : undefined}
-                wrapperClassName={effectiveTableViewMode === 'compact' ? 'w-full' : undefined}
-                tableClassName={effectiveTableViewMode === 'compact' ? 'w-full min-w-full' : undefined}
-                addBlacklistedMarket={addBlacklistedMarket}
-                isBlacklisted={isBlacklisted}
-                includeUnknownTokens={includeUnknownTokens}
-                setIncludeUnknownTokens={setIncludeUnknownTokens}
-                showUnknownOracle={showUnknownOracle}
-                setShowUnknownOracle={setShowUnknownOracle}
-                showUnwhitelistedMarkets={showUnwhitelistedMarkets}
-                setShowUnwhitelistedMarkets={setShowUnwhitelistedMarkets}
-                trustedVaultsOnly={trustedVaultsOnly}
-                setTrustedVaultsOnly={setTrustedVaultsOnly}
-                minSupplyEnabled={minSupplyEnabled}
-                setMinSupplyEnabled={setMinSupplyEnabled}
-                minBorrowEnabled={minBorrowEnabled}
-                setMinBorrowEnabled={setMinBorrowEnabled}
-                minLiquidityEnabled={minLiquidityEnabled}
-                setMinLiquidityEnabled={setMinLiquidityEnabled}
-                thresholds={{
-                  minSupply: effectiveMinSupply,
-                  minBorrow: effectiveMinBorrow,
-                  minLiquidity: effectiveMinLiquidity,
-                }}
-                onOpenSettings={() =>
-                  openModal('marketSettings', {
-                    usdFilters,
-                    setUsdFilters,
-                    entriesPerPage,
-                    onEntriesPerPageChange: handleEntriesPerPageChange,
-                    columnVisibility,
-                    setColumnVisibility,
-                  })
-                }
-                onRefresh={handleRefresh}
-                isRefetching={isRefetching}
-                tableViewMode={tableViewMode}
-                setTableViewMode={setTableViewMode}
-                isMobile={isMobile}
-              />
-            ) : (
-              <EmptyScreen
-                message="No markets found with the current filters"
-                hint={
-                  (selectedCollaterals.length > 0 || selectedLoanAssets.length > 0) && !includeUnknownTokens
-                    ? "Try enabling 'Show Unknown Tokens' in settings, or adjust your current filters."
-                    : selectedOracles.length > 0 && !showUnknownOracle
-                      ? "Try enabling 'Show Unknown Oracles' in settings, or adjust your oracle filters."
-                      : trustedVaultsOnly
-                        ? 'Disable the Trusted Vaults filter or update your trusted list in Settings.'
-                        : minSupplyEnabled || minBorrowEnabled || minLiquidityEnabled
-                          ? 'Try disabling USD filters in settings, or adjust your filter thresholds.'
-                          : 'Try adjusting your filters or search query to see more results.'
-                }
-              />
-            )}
-          </div>
-        )}
+        <div className={effectiveTableViewMode === 'expanded' ? 'flex justify-center' : 'w-full'}>
+          <MarketsTable
+            markets={filteredMarkets}
+            currentPage={currentPage}
+            setCurrentPage={setCurrentPage}
+            trustedVaults={userTrustedVaults}
+            className={effectiveTableViewMode === 'compact' ? 'w-full' : undefined}
+            tableClassName={effectiveTableViewMode === 'compact' ? 'w-full min-w-full' : undefined}
+            onOpenSettings={() => openModal('marketSettings', {})}
+            onRefresh={handleRefresh}
+            isRefetching={isRefetching}
+            isMobile={isMobile}
+            loading={loading}
+            isEmpty={rawMarkets == null}
+          />
+        </div>
       </div>
     </>
   );
diff --git a/src/features/positions-report/components/report-table.tsx b/src/features/positions-report/components/report-table.tsx
index 230baa77..b86c3c2b 100644
--- a/src/features/positions-report/components/report-table.tsx
+++ b/src/features/positions-report/components/report-table.tsx
@@ -12,7 +12,7 @@ import { Badge } from '@/components/ui/badge';
 import { NetworkIcon } from '@/components/shared/network-icon';
 import OracleVendorBadge from '@/features/markets/components/oracle-vendor-badge';
 import { TokenIcon } from '@/components/shared/token-icon';
-import { useMarkets } from '@/hooks/useMarkets';
+import { useAppSettings } from '@/stores/useAppSettings';
 import type { ReportSummary } from '@/hooks/usePositionReport';
 import { useRateLabel } from '@/hooks/useRateLabel';
 import { formatReadable } from '@/utils/balance';
@@ -63,7 +63,7 @@ const formatDays = (seconds: number) => {
 };
 
 function MarketSummaryBlock({ market, interestEarned, decimals, symbol, apy, hasActivePosition }: MarketInfoBlockProps) {
-  const { isAprDisplay } = useMarkets();
+  const { isAprDisplay } = useAppSettings();
   const { short: rateLabel } = useRateLabel();
 
   // Convert to APR if display mode is enabled
@@ -121,7 +121,7 @@ function MarketSummaryBlock({ market, interestEarned, decimals, symbol, apy, has
 export function ReportTable({ report, asset, startDate, endDate, chainId }: ReportTableProps) {
   const [expandedMarkets, setExpandedMarkets] = useState<Set<string>>(new Set());
 
-  const { isAprDisplay } = useMarkets();
+  const { isAprDisplay } = useAppSettings();
   const { short: rateLabel } = useRateLabel();
 
   // Convert APY to APR if display mode is enabled
diff --git a/src/features/positions/components/from-markets-table.tsx b/src/features/positions/components/from-markets-table.tsx
index 1595cccf..8bcb8994 100644
--- a/src/features/positions/components/from-markets-table.tsx
+++ b/src/features/positions/components/from-markets-table.tsx
@@ -3,7 +3,7 @@ import { Button } from '@/components/ui/button';
 import { TablePagination } from '@/components/shared/table-pagination';
 import { Table, TableHeader, TableBody, TableRow, TableHead, TableCell } from '@/components/ui/table';
 import { MarketIdentity, MarketIdentityMode, MarketIdentityFocus } from '@/features/markets/components/market-identity';
-import { useMarkets } from '@/hooks/useMarkets';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { useRateLabel } from '@/hooks/useRateLabel';
 import { formatReadable } from '@/utils/balance';
 import { previewMarketState } from '@/utils/morpho';
@@ -23,7 +23,7 @@ const PER_PAGE = 5;
 
 export function FromMarketsTable({ positions, selectedMarketUniqueKey, onSelectMarket, onSelectMax }: FromMarketsTableProps) {
   const [currentPage, setCurrentPage] = useState(1);
-  const { isAprDisplay } = useMarkets();
+  const { isAprDisplay } = useAppSettings();
   const { short: rateLabel } = useRateLabel();
 
   const totalPages = Math.ceil(positions.length / PER_PAGE);
diff --git a/src/features/positions/components/onboarding/setup-positions.tsx b/src/features/positions/components/onboarding/setup-positions.tsx
index 63b74555..e1d058d1 100644
--- a/src/features/positions/components/onboarding/setup-positions.tsx
+++ b/src/features/positions/components/onboarding/setup-positions.tsx
@@ -9,7 +9,7 @@ import { ExecuteTransactionButton } from '@/components/ui/ExecuteTransactionButt
 import Input from '@/components/Input/Input';
 import { MarketIdentity, MarketIdentityMode, MarketIdentityFocus } from '@/features/markets/components/market-identity';
 import { SupplyProcessModal } from '@/modals/supply/supply-process-modal';
-import { useLocalStorage } from '@/hooks/useLocalStorage';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { useMultiMarketSupply } from '@/hooks/useMultiMarketSupply';
 import { useRateLabel } from '@/hooks/useRateLabel';
 import { useStyledToast } from '@/hooks/useStyledToast';
@@ -22,8 +22,7 @@ export function SetupPositions({ onClose }: { onClose: () => void }) {
   const toast = useStyledToast();
   const { short: rateLabel } = useRateLabel();
   const { selectedToken, selectedMarkets, balances, goToPrevStep } = useOnboarding();
-  const [useEth] = useLocalStorage('useEth', false);
-  const [usePermit2Setting] = useLocalStorage('usePermit2', true);
+  const { useEth, usePermit2: usePermit2Setting } = useAppSettings();
   const [totalAmount, setTotalAmount] = useState<string>('');
   const [totalAmountBigInt, setTotalAmountBigInt] = useState<bigint>(0n);
   const [amounts, setAmounts] = useState<Record<string, string>>({});
diff --git a/src/features/positions/components/rebalance/rebalance-modal.tsx b/src/features/positions/components/rebalance/rebalance-modal.tsx
index 62dc5fb2..559e9f99 100644
--- a/src/features/positions/components/rebalance/rebalance-modal.tsx
+++ b/src/features/positions/components/rebalance/rebalance-modal.tsx
@@ -7,7 +7,7 @@ import { Modal, ModalHeader, ModalBody, ModalFooter } from '@/components/common/
 import { Spinner } from '@/components/ui/spinner';
 import { TokenIcon } from '@/components/shared/token-icon';
 import { ExecuteTransactionButton } from '@/components/ui/ExecuteTransactionButton';
-import { useLocalStorage } from '@/hooks/useLocalStorage';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { useMarkets } from '@/hooks/useMarkets';
 import { useRebalance } from '@/hooks/useRebalance';
 import { useStyledToast } from '@/hooks/useStyledToast';
@@ -33,7 +33,7 @@ export function RebalanceModal({ groupedPosition, isOpen, onOpenChange, refetch,
   const [showProcessModal, setShowProcessModal] = useState(false);
   const [showToModal, setShowToModal] = useState(false);
   const toast = useStyledToast();
-  const [usePermit2Setting] = useLocalStorage('usePermit2', true);
+  const { usePermit2: usePermit2Setting } = useAppSettings();
 
   // Use computed markets based on user setting
   const { markets } = useMarkets();
diff --git a/src/features/positions/components/supplied-asset-filter-compact-switch.tsx b/src/features/positions/components/supplied-asset-filter-compact-switch.tsx
index 41b9f06b..c304a110 100644
--- a/src/features/positions/components/supplied-asset-filter-compact-switch.tsx
+++ b/src/features/positions/components/supplied-asset-filter-compact-switch.tsx
@@ -12,52 +12,49 @@ import { Modal, ModalHeader, ModalBody, ModalFooter } from '@/components/common/
 import { TooltipContent } from '@/components/shared/tooltip-content';
 import { MONARCH_PRIMARY } from '@/constants/chartColors';
 import { formatReadable } from '@/utils/balance';
+import { useMarketPreferences } from '@/stores/useMarketPreferences';
+import { useAppSettings } from '@/stores/useAppSettings';
+import { parseNumericThreshold } from '@/utils/markets';
 
 type SuppliedAssetFilterCompactSwitchProps = {
-  includeUnknownTokens: boolean;
-  setIncludeUnknownTokens: (value: boolean) => void;
-  showUnknownOracle: boolean;
-  setShowUnknownOracle: (value: boolean) => void;
-  showUnwhitelistedMarkets: boolean;
-  setShowUnwhitelistedMarkets: (value: boolean) => void;
-  trustedVaultsOnly: boolean;
-  setTrustedVaultsOnly: (value: boolean) => void;
-  minSupplyEnabled: boolean;
-  setMinSupplyEnabled: (value: boolean) => void;
-  minBorrowEnabled: boolean;
-  setMinBorrowEnabled: (value: boolean) => void;
-  minLiquidityEnabled: boolean;
-  setMinLiquidityEnabled: (value: boolean) => void;
-  thresholds: {
-    minSupply: number;
-    minBorrow: number;
-    minLiquidity: number;
-  };
   onOpenSettings: () => void;
   className?: string;
 };
 
-export function SuppliedAssetFilterCompactSwitch({
-  includeUnknownTokens,
-  setIncludeUnknownTokens,
-  showUnknownOracle,
-  setShowUnknownOracle,
-  showUnwhitelistedMarkets,
-  setShowUnwhitelistedMarkets,
-  trustedVaultsOnly,
-  setTrustedVaultsOnly,
-  minSupplyEnabled,
-  setMinSupplyEnabled,
-  minBorrowEnabled,
-  setMinBorrowEnabled,
-  minLiquidityEnabled,
-  setMinLiquidityEnabled,
-  thresholds,
-  onOpenSettings,
-  className,
-}: SuppliedAssetFilterCompactSwitchProps) {
+export function SuppliedAssetFilterCompactSwitch({ onOpenSettings, className }: SuppliedAssetFilterCompactSwitchProps) {
   const { isOpen, onOpen, onOpenChange, onClose } = useDisclosure();
 
+  // Get all filter values from stores
+  const {
+    includeUnknownTokens,
+    setIncludeUnknownTokens,
+    showUnknownOracle,
+    setShowUnknownOracle,
+    trustedVaultsOnly,
+    setTrustedVaultsOnly,
+    minSupplyEnabled,
+    setMinSupplyEnabled,
+    minBorrowEnabled,
+    setMinBorrowEnabled,
+    minLiquidityEnabled,
+    setMinLiquidityEnabled,
+    usdMinSupply,
+    usdMinBorrow,
+    usdMinLiquidity,
+  } = useMarketPreferences();
+
+  const { showUnwhitelistedMarkets, setShowUnwhitelistedMarkets } = useAppSettings();
+
+  // Compute thresholds from store values
+  const thresholds = useMemo(
+    () => ({
+      minSupply: parseNumericThreshold(usdMinSupply),
+      minBorrow: parseNumericThreshold(usdMinBorrow),
+      minLiquidity: parseNumericThreshold(usdMinLiquidity),
+    }),
+    [usdMinSupply, usdMinBorrow, usdMinLiquidity],
+  );
+
   const thresholdCopy = useMemo(
     () => ({
       minSupply: formatReadable(thresholds.minSupply),
diff --git a/src/features/positions/components/supplied-morpho-blue-grouped-table.tsx b/src/features/positions/components/supplied-morpho-blue-grouped-table.tsx
index 8d936e59..48af610f 100644
--- a/src/features/positions/components/supplied-morpho-blue-grouped-table.tsx
+++ b/src/features/positions/components/supplied-morpho-blue-grouped-table.tsx
@@ -18,8 +18,8 @@ import { TooltipContent } from '@/components/shared/tooltip-content';
 import { TableContainerWithHeader } from '@/components/common/table-container-with-header';
 import { Modal, ModalHeader, ModalBody, ModalFooter } from '@/components/common/Modal';
 import { useDisclosure } from '@/hooks/useDisclosure';
-import { useLocalStorage } from '@/hooks/useLocalStorage';
-import { useMarkets } from '@/hooks/useMarkets';
+import { usePositionsPreferences } from '@/stores/usePositionsPreferences';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { computeMarketWarnings } from '@/hooks/useMarketWarnings';
 import { useRateLabel } from '@/hooks/useRateLabel';
 import { useStyledToast } from '@/hooks/useStyledToast';
@@ -28,7 +28,6 @@ import { formatReadable, formatBalance } from '@/utils/balance';
 import { getNetworkImg } from '@/utils/networks';
 import { getGroupedEarnings, groupPositionsByLoanAsset, processCollaterals } from '@/utils/positions';
 import { convertApyToApr } from '@/utils/rateMath';
-import { storageKeys } from '@/utils/storageKeys';
 import { type GroupedPosition, type MarketPositionWithEarnings, type WarningWithDetail, WarningCategory } from '@/utils/types';
 import { RiskIndicator } from '@/features/markets/components/risk-indicator';
 import { PositionActionsDropdown } from './position-actions-dropdown';
@@ -116,13 +115,11 @@ export function SuppliedMorphoBlueGroupedTable({
   const [expandedRows, setExpandedRows] = useState<Set<string>>(new Set());
   const [showRebalanceModal, setShowRebalanceModal] = useState(false);
   const [selectedGroupedPosition, setSelectedGroupedPosition] = useState<GroupedPosition | null>(null);
-  const [showCollateralExposure, setShowCollateralExposure] = useLocalStorage<boolean>(
-    storageKeys.PositionsShowCollateralExposureKey,
-    true,
-  );
+  // Positions preferences from Zustand store
+  const { showCollateralExposure, setShowCollateralExposure } = usePositionsPreferences();
   const { isOpen: isSettingsOpen, onOpen: onSettingsOpen, onOpenChange: onSettingsOpenChange } = useDisclosure();
   const { address } = useConnection();
-  const { isAprDisplay } = useMarkets();
+  const { isAprDisplay } = useAppSettings();
   const { short: rateLabel } = useRateLabel();
 
   const toast = useStyledToast();
diff --git a/src/features/positions/components/user-vaults-table.tsx b/src/features/positions/components/user-vaults-table.tsx
index 20e3c0ac..18eaf0f6 100644
--- a/src/features/positions/components/user-vaults-table.tsx
+++ b/src/features/positions/components/user-vaults-table.tsx
@@ -11,7 +11,7 @@ import { TooltipContent } from '@/components/shared/tooltip-content';
 import { TableContainerWithHeader } from '@/components/common/table-container-with-header';
 import type { UserVaultV2 } from '@/data-sources/subgraph/v2-vaults';
 import { useTokens } from '@/components/providers/TokenProvider';
-import { useMarkets } from '@/hooks/useMarkets';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { useRateLabel } from '@/hooks/useRateLabel';
 import { formatReadable } from '@/utils/balance';
 import { getNetworkImg } from '@/utils/networks';
@@ -32,7 +32,7 @@ type UserVaultsTableProps = {
 export function UserVaultsTable({ vaults, account, refetch, isRefetching = false }: UserVaultsTableProps) {
   const [expandedRows, setExpandedRows] = useState<Set<string>>(new Set());
   const { findToken } = useTokens();
-  const { isAprDisplay } = useMarkets();
+  const { isAprDisplay } = useAppSettings();
   const { short: rateLabel } = useRateLabel();
 
   const toggleRow = (rowKey: string) => {
diff --git a/src/hooks/useBlacklistedMarkets.ts b/src/hooks/useBlacklistedMarkets.ts
deleted file mode 100644
index f583df9e..00000000
--- a/src/hooks/useBlacklistedMarkets.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { useCallback, useMemo } from 'react';
-import { useStyledToast } from '@/hooks/useStyledToast';
-import { blacklistedMarkets as defaultBlacklistedMarkets } from '@/utils/markets';
-import { useLocalStorage } from './useLocalStorage';
-
-type BlacklistedMarket = {
-  uniqueKey: string;
-  chainId: number;
-  reason?: string;
-  addedAt: number;
-};
-
-export function useBlacklistedMarkets() {
-  const [customBlacklistedMarkets, setCustomBlacklistedMarkets] = useLocalStorage<BlacklistedMarket[]>('customBlacklistedMarkets', []);
-  const { success: toastSuccess } = useStyledToast();
-
-  // Combine default and custom blacklists
-  const allBlacklistedMarketKeys = useMemo(() => {
-    const customKeys = customBlacklistedMarkets.map((m) => m.uniqueKey);
-    return new Set([...defaultBlacklistedMarkets, ...customKeys]);
-  }, [customBlacklistedMarkets]);
-
-  // Add a market to blacklist
-  const addBlacklistedMarket = useCallback(
-    (uniqueKey: string, chainId: number, reason?: string) => {
-      // Check if already blacklisted
-      if (allBlacklistedMarketKeys.has(uniqueKey)) {
-        return false;
-      }
-
-      const newMarket: BlacklistedMarket = {
-        uniqueKey,
-        chainId,
-        reason,
-        addedAt: Date.now(),
-      };
-
-      setCustomBlacklistedMarkets((prev) => [...prev, newMarket]);
-      toastSuccess('Market blacklisted', 'Market added to blacklist');
-      return true;
-    },
-    [allBlacklistedMarketKeys, setCustomBlacklistedMarkets, toastSuccess],
-  );
-
-  // Remove a custom blacklisted market (cannot remove defaults)
-  const removeBlacklistedMarket = useCallback(
-    (uniqueKey: string) => {
-      setCustomBlacklistedMarkets((prev) => prev.filter((m) => m.uniqueKey !== uniqueKey));
-      toastSuccess('Market removed from blacklist', 'Market is now visible');
-    },
-    [setCustomBlacklistedMarkets, toastSuccess],
-  );
-
-  // Check if a market is blacklisted
-  const isBlacklisted = useCallback(
-    (uniqueKey: string) => {
-      return allBlacklistedMarketKeys.has(uniqueKey);
-    },
-    [allBlacklistedMarketKeys],
-  );
-
-  // Check if a market is in default blacklist
-  const isDefaultBlacklisted = useCallback((uniqueKey: string) => {
-    return defaultBlacklistedMarkets.includes(uniqueKey);
-  }, []);
-
-  return {
-    allBlacklistedMarketKeys,
-    customBlacklistedMarkets,
-    addBlacklistedMarket,
-    removeBlacklistedMarket,
-    isBlacklisted,
-    isDefaultBlacklisted,
-  };
-}
diff --git a/src/hooks/useBorrowTransaction.ts b/src/hooks/useBorrowTransaction.ts
index f60ef7a6..751b76a3 100644
--- a/src/hooks/useBorrowTransaction.ts
+++ b/src/hooks/useBorrowTransaction.ts
@@ -6,12 +6,12 @@ import { formatBalance } from '@/utils/balance';
 import { getBundlerV2, MONARCH_TX_IDENTIFIER } from '@/utils/morpho';
 import type { Market } from '@/utils/types';
 import { useERC20Approval } from './useERC20Approval';
-import { useLocalStorage } from './useLocalStorage';
 import { useMorphoAuthorization } from './useMorphoAuthorization';
 import { usePermit2 } from './usePermit2';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { useStyledToast } from './useStyledToast';
 import { useTransactionWithToast } from './useTransactionWithToast';
-import { useUserMarketsCache } from './useUserMarketsCache';
+import { useUserMarketsCache } from '@/stores/useUserMarketsCache';
 
 type UseBorrowTransactionProps = {
   market: Market;
@@ -32,7 +32,7 @@ export type BorrowStepType =
 export function useBorrowTransaction({ market, collateralAmount, borrowAmount, onSuccess }: UseBorrowTransactionProps) {
   const [currentStep, setCurrentStep] = useState<BorrowStepType>('approve_permit2');
   const [showProcessModal, setShowProcessModal] = useState<boolean>(false);
-  const [usePermit2Setting] = useLocalStorage('usePermit2', true);
+  const { usePermit2: usePermit2Setting } = useAppSettings();
   const [useEth, setUseEth] = useState<boolean>(false);
 
   const { address: account, chainId } = useConnection();
diff --git a/src/hooks/useCustomRpc.ts b/src/hooks/useCustomRpc.ts
deleted file mode 100644
index 6a184b1a..00000000
--- a/src/hooks/useCustomRpc.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { type SupportedNetworks, getDefaultRPC } from '@/utils/networks';
-import { useLocalStorage } from './useLocalStorage';
-
-export type CustomRpcUrls = Partial<Record<SupportedNetworks, string>>;
-
-export function useCustomRpc() {
-  const [customRpcUrls, setCustomRpcUrls] = useLocalStorage<CustomRpcUrls>('customRpcUrls', {});
-
-  const setRpcUrl = (chainId: SupportedNetworks, url: string | undefined) => {
-    setCustomRpcUrls((prev) => {
-      const newUrls = { ...prev };
-      if (url === undefined || url === '' || url === getDefaultRPC(chainId)) {
-        delete newUrls[chainId];
-      } else {
-        newUrls[chainId] = url;
-      }
-      return newUrls;
-    });
-  };
-
-  const resetRpcUrl = (chainId: SupportedNetworks) => {
-    setRpcUrl(chainId, undefined);
-  };
-
-  const resetAllRpcUrls = () => {
-    setCustomRpcUrls({});
-  };
-
-  const isUsingCustomRpc = (chainId: SupportedNetworks): boolean => {
-    return Boolean(customRpcUrls[chainId]);
-  };
-
-  const hasAnyCustomRpcs = (): boolean => {
-    return Object.keys(customRpcUrls).length > 0;
-  };
-
-  return {
-    customRpcUrls,
-    setRpcUrl,
-    resetRpcUrl,
-    resetAllRpcUrls,
-    isUsingCustomRpc,
-    hasAnyCustomRpcs,
-  };
-}
diff --git a/src/hooks/useMultiMarketSupply.ts b/src/hooks/useMultiMarketSupply.ts
index 95b3863e..814ca313 100644
--- a/src/hooks/useMultiMarketSupply.ts
+++ b/src/hooks/useMultiMarketSupply.ts
@@ -12,7 +12,7 @@ import type { Market } from '@/utils/types';
 import { GAS_COSTS, GAS_MULTIPLIER } from '@/features/markets/components/constants';
 import { useERC20Approval } from './useERC20Approval';
 import { useStyledToast } from './useStyledToast';
-import { useUserMarketsCache } from './useUserMarketsCache';
+import { useUserMarketsCache } from '@/stores/useUserMarketsCache';
 export type MarketSupply = {
   market: Market;
   amount: bigint;
diff --git a/src/hooks/usePagination.ts b/src/hooks/usePagination.ts
index 00916fd5..d3260d4f 100644
--- a/src/hooks/usePagination.ts
+++ b/src/hooks/usePagination.ts
@@ -1,25 +1,21 @@
-import { useState, useEffect, useCallback } from 'react';
-import storage from 'local-storage-fallback';
-import { storageKeys } from '@/utils/storageKeys';
+import { useState, useCallback } from 'react';
+import { useMarketPreferences } from '@/stores/useMarketPreferences';
 
-export function usePagination(initialEntriesPerPage = 6) {
+/**
+ * Hook for managing pagination state.
+ * - currentPage: Local state (not persisted)
+ * - entriesPerPage: From Zustand store (persisted)
+ */
+export function usePagination() {
   const [currentPage, setCurrentPage] = useState(1);
-  const [entriesPerPage, setEntriesPerPage] = useState(initialEntriesPerPage);
+  const { entriesPerPage, setEntriesPerPage } = useMarketPreferences();
 
   const resetPage = useCallback(() => {
     setCurrentPage(1);
-  }, [setCurrentPage]);
-
-  useEffect(() => {
-    const storedEntriesPerPage = storage.getItem(storageKeys.MarketEntriesPerPageKey);
-    if (storedEntriesPerPage) {
-      setEntriesPerPage(Number.parseInt(storedEntriesPerPage, 10));
-    }
   }, []);
 
   const handleEntriesPerPageChange = (value: number) => {
     setEntriesPerPage(value);
-    storage.setItem(storageKeys.MarketEntriesPerPageKey, value.toString());
     setCurrentPage(1); // Reset to first page
   };
 
diff --git a/src/hooks/usePositionReport.ts b/src/hooks/usePositionReport.ts
index 038d2d2a..e6b81e05 100644
--- a/src/hooks/usePositionReport.ts
+++ b/src/hooks/usePositionReport.ts
@@ -4,7 +4,7 @@ import type { SupportedNetworks } from '@/utils/networks';
 import { fetchPositionsSnapshots } from '@/utils/positions';
 import { estimatedBlockNumber, getClient } from '@/utils/rpc';
 import type { Market, MarketPosition, UserTransaction } from '@/utils/types';
-import { useCustomRpc } from './useCustomRpc';
+import { useCustomRpc } from '@/stores/useCustomRpc';
 import useUserTransactions from './useUserTransactions';
 
 export type PositionReport = {
diff --git a/src/hooks/useRateLabel.ts b/src/hooks/useRateLabel.ts
index 7081f24c..425ec120 100644
--- a/src/hooks/useRateLabel.ts
+++ b/src/hooks/useRateLabel.ts
@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { useMarkets } from './useMarkets';
+import { useAppSettings } from '@/stores/useAppSettings';
 
 type RateLabelOptions = {
   /**
@@ -44,7 +44,7 @@ type RateLabelReturn = {
  */
 export function useRateLabel(options: RateLabelOptions = {}): RateLabelReturn {
   const { prefix, suffix } = options;
-  const { isAprDisplay } = useMarkets();
+  const { isAprDisplay } = useAppSettings();
 
   return useMemo(() => {
     const short = isAprDisplay ? 'APR' : 'APY';
diff --git a/src/hooks/useRebalance.ts b/src/hooks/useRebalance.ts
index a00e8096..08fc72fc 100644
--- a/src/hooks/useRebalance.ts
+++ b/src/hooks/useRebalance.ts
@@ -7,11 +7,11 @@ import { getBundlerV2, MONARCH_TX_IDENTIFIER } from '@/utils/morpho';
 import type { GroupedPosition, RebalanceAction } from '@/utils/types';
 import { GAS_COSTS, GAS_MULTIPLIER } from '@/features/markets/components/constants';
 import { useERC20Approval } from './useERC20Approval';
-import { useLocalStorage } from './useLocalStorage';
 import { useMorphoAuthorization } from './useMorphoAuthorization';
 import { usePermit2 } from './usePermit2';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { useStyledToast } from './useStyledToast';
-import { useUserMarketsCache } from './useUserMarketsCache';
+import { useUserMarketsCache } from '@/stores/useUserMarketsCache';
 
 // Define more specific step types
 export type RebalanceStepType =
@@ -31,7 +31,7 @@ export const useRebalance = (groupedPosition: GroupedPosition, onRebalance?: ()
   const { address: account } = useConnection();
   const bundlerAddress = getBundlerV2(groupedPosition.chainId);
   const toast = useStyledToast();
-  const [usePermit2Setting] = useLocalStorage('usePermit2', true); // Read user setting
+  const { usePermit2: usePermit2Setting } = useAppSettings();
 
   const totalAmount = rebalanceActions.reduce((acc, action) => acc + BigInt(action.amount), BigInt(0));
 
diff --git a/src/hooks/useRepayTransaction.ts b/src/hooks/useRepayTransaction.ts
index 19097661..301bfaf4 100644
--- a/src/hooks/useRepayTransaction.ts
+++ b/src/hooks/useRepayTransaction.ts
@@ -6,8 +6,8 @@ import { formatBalance } from '@/utils/balance';
 import { getBundlerV2, MONARCH_TX_IDENTIFIER } from '@/utils/morpho';
 import type { Market, MarketPosition } from '@/utils/types';
 import { useERC20Approval } from './useERC20Approval';
-import { useLocalStorage } from './useLocalStorage';
 import { usePermit2 } from './usePermit2';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { useStyledToast } from './useStyledToast';
 import { useTransactionWithToast } from './useTransactionWithToast';
 
@@ -30,7 +30,7 @@ export function useRepayTransaction({
 }: UseRepayTransactionProps) {
   const [currentStep, setCurrentStep] = useState<'approve' | 'signing' | 'repaying'>('approve');
   const [showProcessModal, setShowProcessModal] = useState<boolean>(false);
-  const [usePermit2Setting] = useLocalStorage('usePermit2', true);
+  const { usePermit2: usePermit2Setting } = useAppSettings();
 
   const { address: account, chainId } = useConnection();
   const toast = useStyledToast();
diff --git a/src/hooks/useStaredMarkets.ts b/src/hooks/useStaredMarkets.ts
deleted file mode 100644
index 427387b6..00000000
--- a/src/hooks/useStaredMarkets.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { useState, useCallback } from 'react';
-import storage from 'local-storage-fallback';
-import { useStyledToast } from '@/hooks/useStyledToast';
-import { storageKeys } from '@/utils/storageKeys';
-
-const getInitialStaredMarkets = (): string[] => {
-  try {
-    const item = storage.getItem(storageKeys.MarketFavoritesKey) ?? '[]';
-    return JSON.parse(item) as string[];
-  } catch (error) {
-    console.error('Error parsing stared markets from localStorage', error);
-    return [];
-  }
-};
-
-export const useStaredMarkets = () => {
-  const [staredIds, setStaredIds] = useState<string[]>(getInitialStaredMarkets);
-  const { success: toastSuccess } = useStyledToast();
-
-  const starMarket = useCallback(
-    (id: string) => {
-      if (staredIds.includes(id)) return; // Already stared
-
-      const newStaredIds = [...staredIds, id];
-      setStaredIds(newStaredIds);
-      storage.setItem(storageKeys.MarketFavoritesKey, JSON.stringify(newStaredIds));
-      toastSuccess('Market starred', 'Market added to favorites');
-    },
-    [staredIds, toastSuccess],
-  );
-
-  const unstarMarket = useCallback(
-    (id: string) => {
-      if (!staredIds.includes(id)) return; // Not stared
-
-      const newStaredIds = staredIds.filter((i) => i !== id);
-      setStaredIds(newStaredIds);
-      storage.setItem(storageKeys.MarketFavoritesKey, JSON.stringify(newStaredIds));
-      toastSuccess('Market unstarred', 'Market removed from favorites');
-    },
-    [staredIds, toastSuccess],
-  );
-
-  return { staredIds, starMarket, unstarMarket };
-};
diff --git a/src/hooks/useSupplyMarket.ts b/src/hooks/useSupplyMarket.ts
index 4c226599..23277d7d 100644
--- a/src/hooks/useSupplyMarket.ts
+++ b/src/hooks/useSupplyMarket.ts
@@ -3,11 +3,11 @@ import { type Address, encodeFunctionData, erc20Abi } from 'viem';
 import { useConnection, useBalance, useReadContract } from 'wagmi';
 import morphoBundlerAbi from '@/abis/bundlerV2';
 import { useERC20Approval } from '@/hooks/useERC20Approval';
-import { useLocalStorage } from '@/hooks/useLocalStorage';
 import { usePermit2 } from '@/hooks/usePermit2';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { useStyledToast } from '@/hooks/useStyledToast';
 import { useTransactionWithToast } from '@/hooks/useTransactionWithToast';
-import { useUserMarketsCache } from '@/hooks/useUserMarketsCache';
+import { useUserMarketsCache } from '@/stores/useUserMarketsCache';
 import { formatBalance } from '@/utils/balance';
 import { getBundlerV2, MONARCH_TX_IDENTIFIER } from '@/utils/morpho';
 import type { Market } from '@/utils/types';
@@ -50,7 +50,7 @@ export function useSupplyMarket(market: Market, onSuccess?: () => void): UseSupp
   const [useEth, setUseEth] = useState<boolean>(false);
   const [showProcessModal, setShowProcessModal] = useState<boolean>(false);
   const [currentStep, setCurrentStep] = useState<SupplyStepType>('approve');
-  const [usePermit2Setting] = useLocalStorage('usePermit2', true);
+  const { usePermit2: usePermit2Setting } = useAppSettings();
 
   const { address: account, chainId } = useConnection();
   const { batchAddUserMarkets } = useUserMarketsCache(account);
diff --git a/src/hooks/useTransactionFilters.ts b/src/hooks/useTransactionFilters.ts
deleted file mode 100644
index 3b9275c2..00000000
--- a/src/hooks/useTransactionFilters.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { useLocalStorage } from './useLocalStorage';
-
-type SymbolFilters = Record<
-  string,
-  {
-    minSupplyAmount: string;
-    minBorrowAmount: string;
-  }
->;
-
-/**
- * Hook to manage transaction filter settings with localStorage persistence
- * Filters are cached per token symbol (e.g., all USDC markets share the same filter)
- */
-export function useTransactionFilters(loanAssetSymbol: string) {
-  const [allFilters, setAllFilters] = useLocalStorage<SymbolFilters>('monarch_transaction_filters_v2', {});
-
-  const currentFilters = allFilters[loanAssetSymbol] ?? {
-    minSupplyAmount: '0',
-    minBorrowAmount: '0',
-  };
-
-  const setMinSupplyAmount = (value: string) => {
-    setAllFilters((prev) => ({
-      ...prev,
-      [loanAssetSymbol]: {
-        ...prev[loanAssetSymbol],
-        minSupplyAmount: value,
-        minBorrowAmount: prev[loanAssetSymbol]?.minBorrowAmount ?? '0',
-      },
-    }));
-  };
-
-  const setMinBorrowAmount = (value: string) => {
-    setAllFilters((prev) => ({
-      ...prev,
-      [loanAssetSymbol]: {
-        ...prev[loanAssetSymbol],
-        minSupplyAmount: prev[loanAssetSymbol]?.minSupplyAmount ?? '0',
-        minBorrowAmount: value,
-      },
-    }));
-  };
-
-  return {
-    minSupplyAmount: currentFilters.minSupplyAmount,
-    minBorrowAmount: currentFilters.minBorrowAmount,
-    setMinSupplyAmount,
-    setMinBorrowAmount,
-  };
-}
diff --git a/src/hooks/useUserMarketsCache.ts b/src/hooks/useUserMarketsCache.ts
deleted file mode 100644
index 63af9a1a..00000000
--- a/src/hooks/useUserMarketsCache.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { useCallback } from 'react';
-import storage from 'local-storage-fallback';
-import { storageKeys } from '../utils/storageKeys';
-
-type MarketIdentifier = {
-  marketUniqueKey: string;
-  chainId: number;
-};
-
-type UserMarketsCache = Record<string, MarketIdentifier[]>;
-
-export function useUserMarketsCache(address: string | undefined) {
-  const userAddress = address?.toLowerCase() ?? '';
-
-  // Load cache from localStorage
-  const loadCache = useCallback((): UserMarketsCache => {
-    try {
-      const cached = storage.getItem(storageKeys.CacheMarketPositionKeys);
-      if (cached) {
-        return JSON.parse(cached) as UserMarketsCache;
-      }
-    } catch (error) {
-      console.error('Failed to load markets cache:', error);
-    }
-    return {};
-  }, []);
-
-  // Save cache to localStorage
-  const saveCache = useCallback((cache: UserMarketsCache) => {
-    try {
-      storage.setItem(storageKeys.CacheMarketPositionKeys, JSON.stringify(cache));
-    } catch (error) {
-      console.error('Failed to save markets cache:', error);
-    }
-  }, []);
-
-  // Add markets to the user's known list
-  const addUserMarkets = useCallback(
-    (markets: MarketIdentifier[]) => {
-      if (!userAddress) return;
-
-      const cache = loadCache();
-      const userMarkets = cache[userAddress] ?? [];
-
-      const updatedMarkets = [...userMarkets];
-      let hasChanges = false;
-
-      markets.forEach((market) => {
-        // Check if market already exists
-        const exists = updatedMarkets.some((m) => m.marketUniqueKey === market.marketUniqueKey && m.chainId === market.chainId);
-
-        if (!exists) {
-          updatedMarkets.push(market);
-          hasChanges = true;
-        }
-      });
-
-      if (hasChanges) {
-        cache[userAddress] = updatedMarkets;
-        saveCache(cache);
-      }
-    },
-    [userAddress, loadCache, saveCache],
-  );
-
-  // Get markets for the current user
-  const getUserMarkets = useCallback((): MarketIdentifier[] => {
-    if (!userAddress) return [];
-
-    const cache = loadCache();
-    return cache[userAddress] ?? [];
-  }, [userAddress, loadCache]);
-
-  // Update cache with markets from API response
-  const batchAddUserMarkets = useCallback(
-    (apiMarkets: { marketUniqueKey: string; chainId: number }[]) => {
-      if (!userAddress || !apiMarkets.length) return;
-
-      addUserMarkets(
-        apiMarkets.map((market) => ({
-          marketUniqueKey: market.marketUniqueKey,
-          chainId: market.chainId,
-        })),
-      );
-    },
-    [userAddress, addUserMarkets],
-  );
-
-  return {
-    addUserMarkets,
-    getUserMarkets,
-    batchAddUserMarkets,
-  };
-}
diff --git a/src/hooks/useUserPositions.ts b/src/hooks/useUserPositions.ts
index f8796c31..eb13ca3b 100644
--- a/src/hooks/useUserPositions.ts
+++ b/src/hooks/useUserPositions.ts
@@ -8,8 +8,8 @@ import { SupportedNetworks } from '@/utils/networks';
 import { fetchPositionsSnapshots, type PositionSnapshot } from '@/utils/positions';
 import { getClient } from '@/utils/rpc';
 import type { Market } from '@/utils/types';
-import { useUserMarketsCache } from '../hooks/useUserMarketsCache';
-import { useCustomRpc } from './useCustomRpc';
+import { useUserMarketsCache } from '@/stores/useUserMarketsCache';
+import { useCustomRpc } from '@/stores/useCustomRpc';
 import { useMarkets } from './useMarkets';
 
 // Type for market key and chain identifier
diff --git a/src/hooks/useVaultV2Deposit.ts b/src/hooks/useVaultV2Deposit.ts
index 4da4dbfd..279bcb26 100644
--- a/src/hooks/useVaultV2Deposit.ts
+++ b/src/hooks/useVaultV2Deposit.ts
@@ -3,8 +3,8 @@ import { type Address, encodeFunctionData, erc20Abi } from 'viem';
 import { useConnection, useReadContract } from 'wagmi';
 import morphoBundlerAbi from '@/abis/bundlerV2';
 import { useERC20Approval } from '@/hooks/useERC20Approval';
-import { useLocalStorage } from '@/hooks/useLocalStorage';
 import { usePermit2 } from '@/hooks/usePermit2';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { useStyledToast } from '@/hooks/useStyledToast';
 import { useTransactionWithToast } from '@/hooks/useTransactionWithToast';
 import { formatBalance } from '@/utils/balance';
@@ -61,7 +61,7 @@ export function useVaultV2Deposit({
   const [inputError, setInputError] = useState<string | null>(null);
   const [showProcessModal, setShowProcessModal] = useState<boolean>(false);
   const [currentStep, setCurrentStep] = useState<VaultDepositStepType>('approve');
-  const [usePermit2Setting] = useLocalStorage('usePermit2', true);
+  const { usePermit2: usePermit2Setting } = useAppSettings();
 
   const { address: account } = useConnection();
   const toast = useStyledToast();
diff --git a/src/modals/borrow/components/add-collateral-and-borrow.tsx b/src/modals/borrow/components/add-collateral-and-borrow.tsx
index f1fcba43..f85b338e 100644
--- a/src/modals/borrow/components/add-collateral-and-borrow.tsx
+++ b/src/modals/borrow/components/add-collateral-and-borrow.tsx
@@ -5,7 +5,7 @@ import { LTVWarning } from '@/components/shared/ltv-warning';
 import { MarketDetailsBlock } from '@/features/markets/components/market-details-block';
 import Input from '@/components/Input/Input';
 import { useBorrowTransaction } from '@/hooks/useBorrowTransaction';
-import { useLocalStorage } from '@/hooks/useLocalStorage';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { formatBalance, formatReadable } from '@/utils/balance';
 import { getNativeTokenSymbol } from '@/utils/networks';
 import { isWrappedNativeToken } from '@/utils/tokens';
@@ -39,7 +39,7 @@ export function AddCollateralAndBorrow({
   const [borrowAmount, setBorrowAmount] = useState<bigint>(BigInt(0));
   const [collateralInputError, setCollateralInputError] = useState<string | null>(null);
   const [borrowInputError, setBorrowInputError] = useState<string | null>(null);
-  const [usePermit2Setting] = useLocalStorage('usePermit2', true);
+  const { usePermit2: usePermit2Setting } = useAppSettings();
 
   // lltv with 18 decimals
   const lltv = BigInt(market.lltv);
diff --git a/src/modals/settings/blacklisted-markets-modal.tsx b/src/modals/settings/blacklisted-markets-modal.tsx
index 39412c1e..0950f116 100644
--- a/src/modals/settings/blacklisted-markets-modal.tsx
+++ b/src/modals/settings/blacklisted-markets-modal.tsx
@@ -8,6 +8,8 @@ import { Button } from '@/components/ui/button';
 import { Modal, ModalHeader, ModalBody, ModalFooter } from '@/components/common/Modal';
 import { MarketIdentity, MarketIdentityMode, MarketIdentityFocus } from '@/features/markets/components/market-identity';
 import { useMarkets } from '@/contexts/MarketsContext';
+import { useBlacklistedMarkets } from '@/stores/useBlacklistedMarkets';
+import { useStyledToast } from '@/hooks/useStyledToast';
 import type { Market } from '@/utils/types';
 
 type BlacklistedMarketsModalProps = {
@@ -20,7 +22,10 @@ const ITEMS_PER_PAGE = 20;
 export function BlacklistedMarketsModal({ isOpen, onOpenChange }: BlacklistedMarketsModalProps) {
   const [searchQuery, setSearchQuery] = React.useState('');
   const [currentPage, setCurrentPage] = React.useState(1);
-  const { rawMarketsUnfiltered, isBlacklisted, addBlacklistedMarket, removeBlacklistedMarket, isDefaultBlacklisted } = useMarkets();
+  const { rawMarketsUnfiltered } = useMarkets();
+  const { customBlacklistedMarkets, isBlacklisted, addBlacklistedMarket, removeBlacklistedMarket, isDefaultBlacklisted } =
+    useBlacklistedMarkets();
+  const { success: toastSuccess } = useStyledToast();
 
   // Reset to page 1 when search query changes
   React.useEffect(() => {
@@ -44,7 +49,7 @@ export function BlacklistedMarketsModal({ isOpen, onOpenChange }: BlacklistedMar
       blacklistedMarkets: blacklisted.sort((a, b) => (a.loanAsset?.symbol ?? '').localeCompare(b.loanAsset?.symbol ?? '')),
       availableMarkets: available.sort((a, b) => (a.loanAsset?.symbol ?? '').localeCompare(b.loanAsset?.symbol ?? '')),
     };
-  }, [rawMarketsUnfiltered, isBlacklisted]);
+  }, [rawMarketsUnfiltered, customBlacklistedMarkets, isBlacklisted]);
 
   // Filter available markets based on search query
   // Only show results if user has typed at least 2 characters
@@ -125,7 +130,10 @@ export function BlacklistedMarketsModal({ isOpen, onOpenChange }: BlacklistedMar
                           <Button
                             size="sm"
                             variant="default"
-                            onClick={() => removeBlacklistedMarket(market.uniqueKey)}
+                            onClick={() => {
+                              removeBlacklistedMarket(market.uniqueKey);
+                              toastSuccess('Market removed from blacklist', 'Market is now visible');
+                            }}
                             disabled={isDefault}
                             className="shrink-0"
                           >
@@ -193,7 +201,12 @@ export function BlacklistedMarketsModal({ isOpen, onOpenChange }: BlacklistedMar
                           <Button
                             size="sm"
                             variant="default"
-                            onClick={() => addBlacklistedMarket(market.uniqueKey, market.morphoBlue.chain.id)}
+                            onClick={() => {
+                              const success = addBlacklistedMarket(market.uniqueKey, market.morphoBlue.chain.id);
+                              if (success) {
+                                toastSuccess('Market blacklisted', 'Market added to blacklist');
+                              }
+                            }}
                             className="shrink-0"
                           >
                             <FiPlus className="h-4 w-4" />
diff --git a/src/modals/settings/trusted-vaults-modal.tsx b/src/modals/settings/trusted-vaults-modal.tsx
index 1053888e..f0ced006 100644
--- a/src/modals/settings/trusted-vaults-modal.tsx
+++ b/src/modals/settings/trusted-vaults-modal.tsx
@@ -14,15 +14,15 @@ import { NetworkIcon } from '@/components/shared/network-icon';
 import { VaultIdentity } from '@/features/autovault/components/vault-identity';
 import { known_vaults, type KnownVault, type TrustedVault } from '@/constants/vaults/known_vaults';
 import { useAllMorphoVaults } from '@/hooks/useAllMorphoVaults';
+import { useTrustedVaults } from '@/stores/useTrustedVaults';
 
 type TrustedVaultsModalProps = {
   isOpen: boolean;
   onOpenChange: (isOpen: boolean) => void;
-  userTrustedVaults: TrustedVault[];
-  setUserTrustedVaults: React.Dispatch<React.SetStateAction<TrustedVault[]>>;
 };
 
-export default function TrustedVaultsModal({ isOpen, onOpenChange, userTrustedVaults, setUserTrustedVaults }: TrustedVaultsModalProps) {
+export default function TrustedVaultsModal({ isOpen, onOpenChange }: TrustedVaultsModalProps) {
+  const { vaults: userTrustedVaults, setVaults: setUserTrustedVaults } = useTrustedVaults();
   const [searchQuery, setSearchQuery] = React.useState('');
   const [morphoSectionOpen, setMorphoSectionOpen] = useState(false);
 
@@ -103,16 +103,14 @@ export default function TrustedVaultsModal({ isOpen, onOpenChange, userTrustedVa
   });
 
   const toggleVault = (vault: KnownVault) => {
-    setUserTrustedVaults((prev) => {
-      const targetAddress = vault.address.toLowerCase();
-      const exists = prev.some((v) => v.chainId === vault.chainId && v.address.toLowerCase() === targetAddress);
+    const targetAddress = vault.address.toLowerCase();
+    const exists = userTrustedVaults.some((v) => v.chainId === vault.chainId && v.address.toLowerCase() === targetAddress);
 
-      if (exists) {
-        return prev.filter((v) => !(v.chainId === vault.chainId && v.address.toLowerCase() === targetAddress));
-      }
-
-      return [...prev, formatVaultForStorage(vault)];
-    });
+    if (exists) {
+      setUserTrustedVaults(userTrustedVaults.filter((v) => !(v.chainId === vault.chainId && v.address.toLowerCase() === targetAddress)));
+    } else {
+      setUserTrustedVaults([...userTrustedVaults, formatVaultForStorage(vault)]);
+    }
   };
 
   const handleSelectAll = () => {
diff --git a/src/modals/supply/supply-modal-content.tsx b/src/modals/supply/supply-modal-content.tsx
index c7f8fc20..73bb409d 100644
--- a/src/modals/supply/supply-modal-content.tsx
+++ b/src/modals/supply/supply-modal-content.tsx
@@ -2,8 +2,8 @@ import { useCallback } from 'react';
 import { IconSwitch } from '@/components/ui/icon-switch';
 import { ReloadIcon } from '@radix-ui/react-icons';
 import Input from '@/components/Input/Input';
-import { useLocalStorage } from '@/hooks/useLocalStorage';
 import { useSupplyMarket } from '@/hooks/useSupplyMarket';
+import { useAppSettings } from '@/stores/useAppSettings';
 import { formatBalance } from '@/utils/balance';
 import { getNativeTokenSymbol } from '@/utils/networks';
 import { isWrappedNativeToken } from '@/utils/tokens';
@@ -22,7 +22,7 @@ type SupplyModalContentProps = {
 };
 
 export function SupplyModalContent({ onClose, market, refetch, onAmountChange }: SupplyModalContentProps): JSX.Element {
-  const [usePermit2Setting] = useLocalStorage('usePermit2', true);
+  const { usePermit2: usePermit2Setting } = useAppSettings();
   const { open: openModal } = useModal();
 
   const onSuccess = useCallback(() => {
diff --git a/src/store/createWagmiConfig.ts b/src/store/createWagmiConfig.ts
index 7a88249f..e80ab44c 100644
--- a/src/store/createWagmiConfig.ts
+++ b/src/store/createWagmiConfig.ts
@@ -1,6 +1,6 @@
 import { createConfig, http } from 'wagmi';
 import { arbitrum, base, mainnet, monad, polygon, unichain } from 'wagmi/chains';
-import type { CustomRpcUrls } from '@/hooks/useCustomRpc';
+import type { CustomRpcUrls } from '@/stores/useCustomRpc';
 import { SupportedNetworks, getDefaultRPC, hyperEvm } from '@/utils/networks';
 
 /**
diff --git a/src/stores/useAppSettings.ts b/src/stores/useAppSettings.ts
new file mode 100644
index 00000000..1ef81a95
--- /dev/null
+++ b/src/stores/useAppSettings.ts
@@ -0,0 +1,59 @@
+import { create } from 'zustand';
+import { persist } from 'zustand/middleware';
+
+type AppSettingsState = {
+  // Transaction settings
+  usePermit2: boolean;
+  useEth: boolean;
+
+  // Display settings
+  showUnwhitelistedMarkets: boolean;
+  showFullRewardAPY: boolean;
+  isAprDisplay: boolean;
+};
+
+type AppSettingsActions = {
+  setUsePermit2: (use: boolean) => void;
+  setUseEth: (use: boolean) => void;
+  setShowUnwhitelistedMarkets: (show: boolean) => void;
+  setShowFullRewardAPY: (show: boolean) => void;
+  setIsAprDisplay: (isApr: boolean) => void;
+
+  // Bulk update for migration
+  setAll: (state: Partial<AppSettingsState>) => void;
+};
+
+type AppSettingsStore = AppSettingsState & AppSettingsActions;
+/**
+ * Zustand store for global app settings (transaction preferences, display options).
+ * Automatically persisted to localStorage.
+ *
+ * @example
+ * ```tsx
+ * const { usePermit2, setUsePermit2 } = useAppSettings();
+ * const { useEth, showFullRewardAPY } = useAppSettings();
+ * ```
+ */
+export const useAppSettings = create<AppSettingsStore>()(
+  persist(
+    (set) => ({
+      // Default state
+      usePermit2: true,
+      useEth: false,
+      showUnwhitelistedMarkets: false,
+      showFullRewardAPY: false,
+      isAprDisplay: false,
+
+      // Actions
+      setUsePermit2: (use) => set({ usePermit2: use }),
+      setUseEth: (use) => set({ useEth: use }),
+      setShowUnwhitelistedMarkets: (show) => set({ showUnwhitelistedMarkets: show }),
+      setShowFullRewardAPY: (show) => set({ showFullRewardAPY: show }),
+      setIsAprDisplay: (isApr) => set({ isAprDisplay: isApr }),
+      setAll: (state) => set(state),
+    }),
+    {
+      name: 'monarch_store_appSettings',
+    },
+  ),
+);
diff --git a/src/stores/useBlacklistedMarkets.ts b/src/stores/useBlacklistedMarkets.ts
new file mode 100644
index 00000000..e7c7e7a2
--- /dev/null
+++ b/src/stores/useBlacklistedMarkets.ts
@@ -0,0 +1,85 @@
+import { create } from 'zustand';
+import { persist } from 'zustand/middleware';
+import { blacklistedMarkets as defaultBlacklistedMarkets } from '@/utils/markets';
+
+export type BlacklistedMarket = {
+  uniqueKey: string;
+  chainId: number;
+  reason?: string;
+  addedAt: number;
+};
+
+type BlacklistedMarketsState = {
+  customBlacklistedMarkets: BlacklistedMarket[];
+};
+
+type BlacklistedMarketsActions = {
+  addBlacklistedMarket: (uniqueKey: string, chainId: number, reason?: string) => boolean;
+  removeBlacklistedMarket: (uniqueKey: string) => void;
+  isBlacklisted: (uniqueKey: string) => boolean;
+  isDefaultBlacklisted: (uniqueKey: string) => boolean;
+  getAllBlacklistedKeys: () => Set<string>;
+  setAll: (state: Partial<BlacklistedMarketsState>) => void;
+};
+
+type BlacklistedMarketsStore = BlacklistedMarketsState & BlacklistedMarketsActions;
+
+/**
+ * Zustand store for blacklisted markets.
+ * Automatically persisted to localStorage.
+ */
+export const useBlacklistedMarkets = create<BlacklistedMarketsStore>()(
+  persist(
+    (set, get) => ({
+      customBlacklistedMarkets: [],
+
+      addBlacklistedMarket: (uniqueKey, chainId, reason) => {
+        const state = get();
+        const allKeys = state.getAllBlacklistedKeys();
+
+        if (allKeys.has(uniqueKey)) {
+          return false;
+        }
+
+        const newMarket: BlacklistedMarket = {
+          uniqueKey,
+          chainId,
+          reason,
+          addedAt: Date.now(),
+        };
+
+        set((prevState) => ({
+          customBlacklistedMarkets: [...prevState.customBlacklistedMarkets, newMarket],
+        }));
+
+        return true;
+      },
+
+      removeBlacklistedMarket: (uniqueKey) => {
+        set((state) => ({
+          customBlacklistedMarkets: state.customBlacklistedMarkets.filter((m) => m.uniqueKey !== uniqueKey),
+        }));
+      },
+
+      isBlacklisted: (uniqueKey) => {
+        const state = get();
+        return state.getAllBlacklistedKeys().has(uniqueKey);
+      },
+
+      isDefaultBlacklisted: (uniqueKey) => {
+        return defaultBlacklistedMarkets.includes(uniqueKey);
+      },
+
+      getAllBlacklistedKeys: () => {
+        const state = get();
+        const customKeys = state.customBlacklistedMarkets.map((m) => m.uniqueKey);
+        return new Set([...defaultBlacklistedMarkets, ...customKeys]);
+      },
+
+      setAll: (newState) => set(newState),
+    }),
+    {
+      name: 'monarch_store_blacklistedMarkets',
+    },
+  ),
+);
diff --git a/src/stores/useCustomRpc.ts b/src/stores/useCustomRpc.ts
new file mode 100644
index 00000000..44353364
--- /dev/null
+++ b/src/stores/useCustomRpc.ts
@@ -0,0 +1,67 @@
+import { create } from 'zustand';
+import { persist } from 'zustand/middleware';
+import { type SupportedNetworks, getDefaultRPC } from '@/utils/networks';
+
+export type CustomRpcUrls = Partial<Record<SupportedNetworks, string>>;
+
+type CustomRpcState = {
+  customRpcUrls: CustomRpcUrls;
+};
+
+type CustomRpcActions = {
+  setRpcUrl: (chainId: SupportedNetworks, url: string | undefined) => void;
+  resetRpcUrl: (chainId: SupportedNetworks) => void;
+  resetAllRpcUrls: () => void;
+  isUsingCustomRpc: (chainId: SupportedNetworks) => boolean;
+  hasAnyCustomRpcs: () => boolean;
+
+  // Bulk update for migration
+  setAll: (state: Partial<CustomRpcState>) => void;
+};
+
+type CustomRpcStore = CustomRpcState & CustomRpcActions;
+
+/**
+ * Zustand store for custom RPC URLs.
+ *
+ * @example
+ * ```tsx
+ * const { customRpcUrls, setRpcUrl, isUsingCustomRpc } = useCustomRpc();
+ * ```
+ */
+export const useCustomRpc = create<CustomRpcStore>()(
+  persist(
+    (set, get) => ({
+      // Default state
+      customRpcUrls: {},
+
+      // Actions
+      setRpcUrl: (chainId, url) => {
+        set((state) => {
+          const newUrls = { ...state.customRpcUrls };
+          if (url === undefined || url === '' || url === getDefaultRPC(chainId)) {
+            delete newUrls[chainId];
+          } else {
+            newUrls[chainId] = url;
+          }
+          return { customRpcUrls: newUrls };
+        });
+      },
+
+      resetRpcUrl: (chainId) => {
+        get().setRpcUrl(chainId, undefined);
+      },
+
+      resetAllRpcUrls: () => set({ customRpcUrls: {} }),
+
+      isUsingCustomRpc: (chainId) => Boolean(get().customRpcUrls[chainId]),
+
+      hasAnyCustomRpcs: () => Object.keys(get().customRpcUrls).length > 0,
+
+      setAll: (state) => set(state),
+    }),
+    {
+      name: 'monarch_store_customRpc',
+    },
+  ),
+);
diff --git a/src/stores/useHistoryPreferences.ts b/src/stores/useHistoryPreferences.ts
new file mode 100644
index 00000000..cdf2ab49
--- /dev/null
+++ b/src/stores/useHistoryPreferences.ts
@@ -0,0 +1,44 @@
+import { create } from 'zustand';
+import { persist } from 'zustand/middleware';
+
+type HistoryPreferencesState = {
+  entriesPerPage: number;
+  isGroupedView: boolean;
+};
+
+type HistoryPreferencesActions = {
+  setEntriesPerPage: (count: number) => void;
+  setIsGroupedView: (grouped: boolean) => void;
+
+  // Bulk update for migration
+  setAll: (state: Partial<HistoryPreferencesState>) => void;
+};
+
+type HistoryPreferencesStore = HistoryPreferencesState & HistoryPreferencesActions;
+
+/**
+ * Zustand store for history table preferences.
+ *
+ * @example
+ * ```tsx
+ * const { entriesPerPage, setEntriesPerPage } = useHistoryPreferences();
+ * const { isGroupedView, setIsGroupedView } = useHistoryPreferences();
+ * ```
+ */
+export const useHistoryPreferences = create<HistoryPreferencesStore>()(
+  persist(
+    (set) => ({
+      // Default state
+      entriesPerPage: 10,
+      isGroupedView: true,
+
+      // Actions
+      setEntriesPerPage: (count) => set({ entriesPerPage: count }),
+      setIsGroupedView: (grouped) => set({ isGroupedView: grouped }),
+      setAll: (state) => set(state),
+    }),
+    {
+      name: 'monarch_store_historyPreferences',
+    },
+  ),
+);
diff --git a/src/stores/useMarketPreferences.ts b/src/stores/useMarketPreferences.ts
new file mode 100644
index 00000000..b8e25ca4
--- /dev/null
+++ b/src/stores/useMarketPreferences.ts
@@ -0,0 +1,138 @@
+import { create } from 'zustand';
+import { persist } from 'zustand/middleware';
+import { SortColumn } from '@/features/markets/components/constants';
+import { DEFAULT_MIN_SUPPLY_USD } from '@/constants/markets';
+import { DEFAULT_COLUMN_VISIBILITY, type ColumnVisibility } from '@/features/markets/components/column-visibility';
+
+type MarketPreferencesState = {
+  // Sorting
+  sortColumn: SortColumn;
+  sortDirection: number;
+
+  // Pagination
+  entriesPerPage: number;
+
+  // Display Settings
+  includeUnknownTokens: boolean;
+  showUnknownOracle: boolean;
+  trustedVaultsOnly: boolean;
+  columnVisibility: ColumnVisibility;
+  tableViewMode: 'compact' | 'expanded';
+
+  // Starred Markets
+  starredMarkets: string[]; // Array of market uniqueKeys
+
+  // USD Filters
+  usdMinSupply: string;
+  usdMinBorrow: string;
+  usdMinLiquidity: string;
+
+  // Filter Enabled States
+  minSupplyEnabled: boolean;
+  minBorrowEnabled: boolean;
+  minLiquidityEnabled: boolean;
+};
+
+type MarketPreferencesActions = {
+  // Sorting
+  setSortColumn: (column: SortColumn) => void;
+  setSortDirection: (direction: number) => void;
+
+  // Pagination
+  setEntriesPerPage: (count: number) => void;
+
+  // Display Settings
+  setIncludeUnknownTokens: (include: boolean) => void;
+  setShowUnknownOracle: (show: boolean) => void;
+  setTrustedVaultsOnly: (only: boolean) => void;
+  setColumnVisibility: (visibilityOrUpdater: ColumnVisibility | ((prev: ColumnVisibility) => ColumnVisibility)) => void;
+  setTableViewMode: (mode: 'compact' | 'expanded') => void;
+
+  // Starred Markets
+  starMarket: (uniqueKey: string) => void;
+  unstarMarket: (uniqueKey: string) => void;
+  isMarketStarred: (uniqueKey: string) => boolean;
+
+  // USD Filters
+  setUsdMinSupply: (value: string) => void;
+  setUsdMinBorrow: (value: string) => void;
+  setUsdMinLiquidity: (value: string) => void;
+
+  // Filter Enabled States
+  setMinSupplyEnabled: (enabled: boolean) => void;
+  setMinBorrowEnabled: (enabled: boolean) => void;
+  setMinLiquidityEnabled: (enabled: boolean) => void;
+
+  // Bulk update for migration
+  setAll: (state: Partial<MarketPreferencesState>) => void;
+};
+
+type MarketPreferencesStore = MarketPreferencesState & MarketPreferencesActions;
+
+/**
+ * Zustand store for market table preferences (sorting, filtering, pagination, column visibility).
+ * Automatically persisted to localStorage.
+ *
+ * @example
+ * ```tsx
+ * const { sortColumn, setSortColumn } = useMarketPreferences();
+ * const { columnVisibility, setColumnVisibility } = useMarketPreferences();
+ * ```
+ */
+export const useMarketPreferences = create<MarketPreferencesStore>()(
+  persist(
+    (set, get) => ({
+      // Default state
+      sortColumn: SortColumn.Supply,
+      sortDirection: -1,
+      entriesPerPage: 8,
+      includeUnknownTokens: false,
+      showUnknownOracle: false,
+      trustedVaultsOnly: false,
+      columnVisibility: DEFAULT_COLUMN_VISIBILITY,
+      tableViewMode: 'compact',
+      starredMarkets: [],
+      usdMinSupply: DEFAULT_MIN_SUPPLY_USD.toString(),
+      usdMinBorrow: '',
+      usdMinLiquidity: '',
+      minSupplyEnabled: false,
+      minBorrowEnabled: false,
+      minLiquidityEnabled: false,
+
+      // Actions
+      setSortColumn: (column) => set({ sortColumn: column }),
+      setSortDirection: (direction) => set({ sortDirection: direction }),
+      setEntriesPerPage: (count) => set({ entriesPerPage: count }),
+      setIncludeUnknownTokens: (include) => set({ includeUnknownTokens: include }),
+      setShowUnknownOracle: (show) => set({ showUnknownOracle: show }),
+      setTrustedVaultsOnly: (only) => set({ trustedVaultsOnly: only }),
+      setColumnVisibility: (visibilityOrUpdater) =>
+        set((state) => ({
+          columnVisibility: typeof visibilityOrUpdater === 'function' ? visibilityOrUpdater(state.columnVisibility) : visibilityOrUpdater,
+        })),
+      setTableViewMode: (mode) => set({ tableViewMode: mode }),
+      starMarket: (uniqueKey) =>
+        set((state) => ({
+          starredMarkets: state.starredMarkets.includes(uniqueKey) ? state.starredMarkets : [...state.starredMarkets, uniqueKey],
+        })),
+      unstarMarket: (uniqueKey) =>
+        set((state) => ({
+          starredMarkets: state.starredMarkets.filter((id) => id !== uniqueKey),
+        })),
+      isMarketStarred: (uniqueKey) => {
+        const state = get();
+        return state.starredMarkets.includes(uniqueKey);
+      },
+      setUsdMinSupply: (value) => set({ usdMinSupply: value }),
+      setUsdMinBorrow: (value) => set({ usdMinBorrow: value }),
+      setUsdMinLiquidity: (value) => set({ usdMinLiquidity: value }),
+      setMinSupplyEnabled: (enabled) => set({ minSupplyEnabled: enabled }),
+      setMinBorrowEnabled: (enabled) => set({ minBorrowEnabled: enabled }),
+      setMinLiquidityEnabled: (enabled) => set({ minLiquidityEnabled: enabled }),
+      setAll: (state) => set(state),
+    }),
+    {
+      name: 'monarch_store_marketPreferences',
+    },
+  ),
+);
diff --git a/src/stores/useModalStore.ts b/src/stores/useModalStore.ts
index b84ee51d..5d22cd83 100644
--- a/src/stores/useModalStore.ts
+++ b/src/stores/useModalStore.ts
@@ -1,8 +1,6 @@
 import { create } from 'zustand';
 import type { Market, MarketPosition } from '@/utils/types';
 import type { SwapToken } from '@/features/swap/types';
-import type { TrustedVault } from '@/constants/vaults/known_vaults';
-import type { ColumnVisibility } from '@/features/markets/components/column-visibility';
 
 /**
  * Registry of Zustand-managed modals (Pattern 2).
@@ -25,23 +23,9 @@ export type ModalProps = {
   };
 
   // Settings & Configuration
-  marketSettings: {
-    usdFilters: {
-      minSupply: string;
-      minBorrow: string;
-      minLiquidity: string;
-    };
-    setUsdFilters: (filters: { minSupply: string; minBorrow: string; minLiquidity: string }) => void;
-    entriesPerPage: number;
-    onEntriesPerPageChange: (value: number) => void;
-    columnVisibility: ColumnVisibility;
-    setColumnVisibility: (visibility: ColumnVisibility) => void;
-  };
+  marketSettings: Record<string, never>; // No props needed - uses useMarketPreferences() store
 
-  trustedVaults: {
-    userTrustedVaults: TrustedVault[];
-    setUserTrustedVaults: React.Dispatch<React.SetStateAction<TrustedVault[]>>;
-  };
+  trustedVaults: Record<string, never>; // No props needed - uses useTrustedVaults() store
 
   blacklistedMarkets: Record<string, never>; // No props needed - uses useMarkets() context
 };
diff --git a/src/stores/usePositionsPreferences.ts b/src/stores/usePositionsPreferences.ts
new file mode 100644
index 00000000..0c24e339
--- /dev/null
+++ b/src/stores/usePositionsPreferences.ts
@@ -0,0 +1,39 @@
+import { create } from 'zustand';
+import { persist } from 'zustand/middleware';
+
+type PositionsPreferencesState = {
+  showCollateralExposure: boolean;
+};
+
+type PositionsPreferencesActions = {
+  setShowCollateralExposure: (show: boolean) => void;
+
+  // Bulk update for migration
+  setAll: (state: Partial<PositionsPreferencesState>) => void;
+};
+
+type PositionsPreferencesStore = PositionsPreferencesState & PositionsPreferencesActions;
+
+/**
+ * Zustand store for positions page preferences.
+ *
+ * @example
+ * ```tsx
+ * const { showCollateralExposure, setShowCollateralExposure } = usePositionsPreferences();
+ * ```
+ */
+export const usePositionsPreferences = create<PositionsPreferencesStore>()(
+  persist(
+    (set) => ({
+      // Default state
+      showCollateralExposure: true,
+
+      // Actions
+      setShowCollateralExposure: (show) => set({ showCollateralExposure: show }),
+      setAll: (state) => set(state),
+    }),
+    {
+      name: 'monarch_store_positionsPreferences',
+    },
+  ),
+);
diff --git a/src/stores/useTransactionFilters.ts b/src/stores/useTransactionFilters.ts
new file mode 100644
index 00000000..cf388539
--- /dev/null
+++ b/src/stores/useTransactionFilters.ts
@@ -0,0 +1,96 @@
+import { useMemo } from 'react';
+import { create } from 'zustand';
+import { persist } from 'zustand/middleware';
+
+type SymbolFilters = Record<
+  string,
+  {
+    minSupplyAmount: string;
+    minBorrowAmount: string;
+  }
+>;
+
+type TransactionFiltersState = {
+  filters: SymbolFilters;
+};
+
+type TransactionFiltersActions = {
+  setMinSupplyAmount: (symbol: string, value: string) => void;
+  setMinBorrowAmount: (symbol: string, value: string) => void;
+
+  // Bulk update for migration
+  setAll: (state: Partial<TransactionFiltersState>) => void;
+};
+
+type TransactionFiltersStore = TransactionFiltersState & TransactionFiltersActions;
+
+/**
+ * Zustand store for transaction filter settings with localStorage persistence.
+ * Filters are cached per token symbol (e.g., all USDC markets share the same filter).
+ */
+export const useTransactionFiltersStore = create<TransactionFiltersStore>()(
+  persist(
+    (set) => ({
+      // Default state
+      filters: {},
+
+      // Actions
+      setMinSupplyAmount: (symbol, value) => {
+        set((state) => ({
+          filters: {
+            ...state.filters,
+            [symbol]: {
+              ...state.filters[symbol],
+              minSupplyAmount: value,
+              minBorrowAmount: state.filters[symbol]?.minBorrowAmount ?? '0',
+            },
+          },
+        }));
+      },
+
+      setMinBorrowAmount: (symbol, value) => {
+        set((state) => ({
+          filters: {
+            ...state.filters,
+            [symbol]: {
+              ...state.filters[symbol],
+              minSupplyAmount: state.filters[symbol]?.minSupplyAmount ?? '0',
+              minBorrowAmount: value,
+            },
+          },
+        }));
+      },
+
+      setAll: (state) => set(state),
+    }),
+    {
+      name: 'monarch_store_transactionFilters',
+    },
+  ),
+);
+
+/**
+ * Convenience hook with scoped API for a specific token symbol.
+ * Maintains backward-compatible interface with the old useLocalStorage-based hook.
+ *
+ * @example
+ * ```tsx
+ * const { minSupplyAmount, setMinSupplyAmount } = useTransactionFilters('USDC');
+ * ```
+ */
+export function useTransactionFilters(loanAssetSymbol: string) {
+  const currentFilters = useTransactionFiltersStore((s) => s.filters[loanAssetSymbol] ?? { minSupplyAmount: '0', minBorrowAmount: '0' });
+
+  const setMinSupply = useTransactionFiltersStore((s) => s.setMinSupplyAmount);
+  const setMinBorrow = useTransactionFiltersStore((s) => s.setMinBorrowAmount);
+
+  return useMemo(
+    () => ({
+      minSupplyAmount: currentFilters.minSupplyAmount,
+      minBorrowAmount: currentFilters.minBorrowAmount,
+      setMinSupplyAmount: (value: string) => setMinSupply(loanAssetSymbol, value),
+      setMinBorrowAmount: (value: string) => setMinBorrow(loanAssetSymbol, value),
+    }),
+    [currentFilters, setMinSupply, setMinBorrow, loanAssetSymbol],
+  );
+}
diff --git a/src/stores/useTrustedVaults.ts b/src/stores/useTrustedVaults.ts
new file mode 100644
index 00000000..e84455bc
--- /dev/null
+++ b/src/stores/useTrustedVaults.ts
@@ -0,0 +1,76 @@
+import { create } from 'zustand';
+import { persist } from 'zustand/middleware';
+import { defaultTrustedVaults, getVaultKey, type TrustedVault } from '@/constants/vaults/known_vaults';
+
+type TrustedVaultsState = {
+  vaults: TrustedVault[];
+};
+
+type TrustedVaultsActions = {
+  addVault: (vault: TrustedVault) => void;
+
+  removeVault: (address: string, chainId: number) => void;
+
+  setVaults: (vaults: TrustedVault[]) => void;
+
+  isVaultTrusted: (address: string, chainId: number) => boolean;
+};
+
+type TrustedVaultsStore = TrustedVaultsState & TrustedVaultsActions;
+
+/**
+ * Zustand store for managing trusted vaults.
+ * Persisted to localStorage to survive page refreshes.
+ *
+ * @example
+ * ```tsx
+ * const { vaults, addVault, removeVault } = useTrustedVaults();
+ *
+ * // Add a vault
+ * addVault({ address: '0x123...', chainId: 1, name: 'My Vault' });
+ *
+ * // Check if trusted
+ * const isTrusted = useTrustedVaults.getState().isVaultTrusted('0x123...', 1);
+ * ```
+ */
+export const useTrustedVaults = create<TrustedVaultsStore>()(
+  persist(
+    (set, get) => ({
+      vaults: defaultTrustedVaults,
+
+      addVault: (vault) => {
+        const { vaults } = get();
+        const vaultKey = getVaultKey(vault.address, vault.chainId);
+
+        // Check if vault already exists
+        const exists = vaults.some((v) => getVaultKey(v.address, v.chainId) === vaultKey);
+
+        if (!exists) {
+          set({ vaults: [...vaults, vault] });
+        }
+      },
+
+      removeVault: (address, chainId) => {
+        const { vaults } = get();
+        const vaultKey = getVaultKey(address, chainId);
+
+        set({
+          vaults: vaults.filter((v) => getVaultKey(v.address, v.chainId) !== vaultKey),
+        });
+      },
+
+      setVaults: (vaults) => {
+        set({ vaults });
+      },
+
+      isVaultTrusted: (address, chainId) => {
+        const { vaults } = get();
+        const vaultKey = getVaultKey(address, chainId);
+        return vaults.some((v) => getVaultKey(v.address, v.chainId) === vaultKey);
+      },
+    }),
+    {
+      name: 'monarch_store_trustedVaults', // DIFFERENT key from old 'userTrustedVaults'
+    },
+  ),
+);
diff --git a/src/stores/useUserMarketsCache.ts b/src/stores/useUserMarketsCache.ts
new file mode 100644
index 00000000..cf7d1ef6
--- /dev/null
+++ b/src/stores/useUserMarketsCache.ts
@@ -0,0 +1,125 @@
+import { useCallback } from 'react';
+import { create } from 'zustand';
+import { persist } from 'zustand/middleware';
+
+type MarketIdentifier = {
+  marketUniqueKey: string;
+  chainId: number;
+};
+
+type UserMarketsCache = Record<string, MarketIdentifier[]>;
+
+type UserMarketsCacheState = {
+  cache: UserMarketsCache;
+};
+
+type UserMarketsCacheActions = {
+  addUserMarkets: (address: string, markets: MarketIdentifier[]) => void;
+  getUserMarkets: (address: string) => MarketIdentifier[];
+  batchAddUserMarkets: (address: string, markets: MarketIdentifier[]) => void;
+
+  // Bulk update for migration
+  setAll: (state: Partial<UserMarketsCacheState>) => void;
+};
+
+type UserMarketsCacheStore = UserMarketsCacheState & UserMarketsCacheActions;
+
+/**
+ * Zustand store for caching user's market positions.
+ * Stores a mapping of user addresses to their market identifiers.
+ */
+export const useUserMarketsCacheStore = create<UserMarketsCacheStore>()(
+  persist(
+    (set, get) => ({
+      // Default state
+      cache: {},
+
+      // Actions
+      addUserMarkets: (address, markets) => {
+        const userAddress = address.toLowerCase();
+
+        set((state) => {
+          const userMarkets = state.cache[userAddress] ?? [];
+          const updatedMarkets = [...userMarkets];
+          let hasChanges = false;
+
+          markets.forEach((market) => {
+            // Check if market already exists
+            const exists = updatedMarkets.some((m) => m.marketUniqueKey === market.marketUniqueKey && m.chainId === market.chainId);
+
+            if (!exists) {
+              updatedMarkets.push(market);
+              hasChanges = true;
+            }
+          });
+
+          if (hasChanges) {
+            return {
+              cache: {
+                ...state.cache,
+                [userAddress]: updatedMarkets,
+              },
+            };
+          }
+
+          return state;
+        });
+      },
+
+      getUserMarkets: (address) => {
+        if (!address) return [];
+        const userAddress = address.toLowerCase();
+        return get().cache[userAddress] ?? [];
+      },
+
+      batchAddUserMarkets: (address, markets) => {
+        get().addUserMarkets(address, markets);
+      },
+
+      setAll: (state) => set(state),
+    }),
+    {
+      name: 'monarch_store_userMarketsCache',
+    },
+  ),
+);
+
+/**
+ * Convenience hook with scoped API for a specific user address.
+ * Maintains backward-compatible interface with the old localStorage-based hook.
+ *
+ * @example
+ * ```tsx
+ * const { addUserMarkets, getUserMarkets } = useUserMarketsCache(userAddress);
+ * ```
+ */
+export function useUserMarketsCache(address: string | undefined) {
+  const userAddress = address?.toLowerCase() ?? '';
+
+  const addMarkets = useUserMarketsCacheStore((s) => s.addUserMarkets);
+  const getMarkets = useUserMarketsCacheStore((s) => s.getUserMarkets);
+  const batchAdd = useUserMarketsCacheStore((s) => s.batchAddUserMarkets);
+
+  return {
+    addUserMarkets: useCallback(
+      (markets: MarketIdentifier[]) => {
+        if (!userAddress) return;
+        addMarkets(userAddress, markets);
+      },
+      [addMarkets, userAddress],
+    ),
+
+    getUserMarkets: useCallback((): MarketIdentifier[] => {
+      if (!userAddress) return [];
+      return getMarkets(userAddress);
+    }, [getMarkets, userAddress]),
+
+    batchAddUserMarkets: useCallback(
+      (apiMarkets: { marketUniqueKey: string; chainId: number }[]) => {
+        if (!userAddress || !apiMarkets.length) return;
+        batchAdd(userAddress, apiMarkets);
+      },
+      [batchAdd, userAddress],
+    ),
+  };
+}
diff --git a/src/utils/storage-migration.ts b/src/utils/storage-migration.ts
new file mode 100644
index 00000000..caadda55
--- /dev/null
+++ b/src/utils/storage-migration.ts
@@ -0,0 +1,264 @@
+import storage from 'local-storage-fallback';
+
+/**
+ * One-time storage migration system
+ *
+ * Purpose: Migrate from useLocalStorage to Zustand stores while preserving user data
+ *
+ * Timeline:
+ * - Expiry: February 1, 2026
+ * - Delete after: February 2026 (1 month grace period)
+ *
+ * Safety features:
+ * - Idempotent (safe to run multiple times)
+ * - Validates data before migrating
+ * - Logs all actions for debugging
+ * - Never deletes old data until migration succeeds
+ * - Auto-disables after expiry date
+ */
+
+// Migration configuration
+export const MIGRATION_STATUS_KEY = 'monarch_migration_v1_complete';
+export const MIGRATION_EXPIRY_DATE = '2026-02-01';
+export const MIGRATION_VERSION = 'v1';
+
+/**
+ * Migration definition for a single localStorage key → Zustand store
+ */
+export type MigrationDefinition<T = any> = {
+  /** Old localStorage key to migrate from */
+  oldKey: string;
+
+  /** New Zustand persist key (MUST be different from oldKey!) */
+  newKey: string;
+
+  /** Zustand store name (for logging) */
+  storeName: string;
+
+  /**
+   * Migration function that receives old data and store instance
+   * Returns true if migration succeeded, false if skipped
+   */
+  migrate: (oldData: T) => boolean;
+
+  /**
+   * Optional validation function
+   * Returns true if data is valid and should be migrated
+   */
+  validate?: (data: unknown) => data is T;
+
+  /**
+   * Optional description for logging
+   */
+  description?: string;
+};
+
+/**
+ * Result of a single migration attempt
+ */
+export type MigrationResult = {
+  oldKey: string;
+  storeName: string;
+  status: 'success' | 'skipped' | 'error';
+  reason?: string;
+  error?: unknown;
+};
+
+/**
+ * Check if migrations have already been completed
+ */
+export function isMigrationComplete(): boolean {
+  try {
+    const status = storage.getItem(MIGRATION_STATUS_KEY);
+    return status === 'true';
+  } catch (error) {
+    console.warn('Error checking migration status:', error);
+    return false;
+  }
+}
+
+/**
+ * Mark migrations as complete
+ */
+export function markMigrationComplete(): void {
+  try {
+    storage.setItem(MIGRATION_STATUS_KEY, 'true');
+    console.log(`✅ Migration ${MIGRATION_VERSION} marked as complete`);
+  } catch (error) {
+    console.error('Error marking migration complete:', error);
+  }
+}
+
+/**
+ * Check if migration component has expired
+ * If expired, logs warning and suggests removal
+ */
+export function isMigrationExpired(): boolean {
+  const now = new Date();
+  const expiry = new Date(MIGRATION_EXPIRY_DATE);
+
+  if (now > expiry) {
+    console.warn(
+      `⚠️  MIGRATION COMPONENT EXPIRED (${MIGRATION_EXPIRY_DATE})\n` +
+        '    Please remove StorageMigrator component from codebase:\n' +
+        '    1. Remove <StorageMigrator /> from app/layout.tsx\n' +
+        '    2. Delete src/components/StorageMigrator.tsx\n' +
+        '    3. Delete src/utils/storage-migration.ts',
+    );
+    return true;
+  }
+
+  return false;
+}
+
+/**
+ * Execute a single migration
+ */
+export function executeMigration<T>(definition: MigrationDefinition<T>): MigrationResult {
+  const { oldKey, newKey, storeName, migrate, validate, description } = definition;
+
+  try {
+    // CRITICAL: Verify old and new keys are different!
+    if (oldKey === newKey) {
+      return {
+        oldKey,
+        storeName,
+        status: 'error',
+        reason: 'CRITICAL: oldKey and newKey must be different to prevent data loss!',
+        error: new Error('oldKey === newKey'),
+      };
+    }
+
+    // Check if old data exists
+    const oldDataRaw = storage.getItem(oldKey);
+
+    if (!oldDataRaw) {
+      return {
+        oldKey,
+        storeName,
+        status: 'skipped',
+        reason: 'No data found in old localStorage key',
+      };
+    }
+
+    // Check if new key already has data (migration already happened?)
+    const newDataRaw = storage.getItem(newKey);
+    if (newDataRaw) {
+      console.log(`⚠️  New key "${newKey}" already has data - skipping migration`);
+      // Don't delete old data yet - maybe user manually migrated
+      return {
+        oldKey,
+        storeName,
+        status: 'skipped',
+        reason: 'New key already has data (migration already completed?)',
+      };
+    }
+
+    // Parse old data
+    let oldData: unknown;
+    try {
+      oldData = JSON.parse(oldDataRaw);
+    } catch (parseError) {
+      return {
+        oldKey,
+        storeName,
+        status: 'error',
+        reason: 'Failed to parse JSON from old key',
+        error: parseError,
+      };
+    }
+
+    // Validate if validation function provided
+    if (validate && !validate(oldData)) {
+      return {
+        oldKey,
+        storeName,
+        status: 'skipped',
+        reason: 'Data validation failed',
+      };
+    }
+
+    // Execute migration (writes to new key via Zustand)
+    const success = migrate(oldData as T);
+
+    if (!success) {
+      return {
+        oldKey,
+        storeName,
+        status: 'skipped',
+        reason: 'Migration function returned false',
+      };
+    }
+
+    // Verify new data was written
+    const verifyNewData = storage.getItem(newKey);
+    if (!verifyNewData) {
+      return {
+        oldKey,
+        storeName,
+        status: 'error',
+        reason: 'Migration function succeeded but new key has no data!',
+        error: new Error('New key is empty after migration'),
+      };
+    }
+
+    // Migration succeeded AND verified - NOW it's safe to remove old data
+    storage.removeItem(oldKey);
+
+    return {
+      oldKey,
+      storeName,
+      status: 'success',
+      reason: description,
+    };
+  } catch (error) {
+    return {
+      oldKey,
+      storeName,
+      status: 'error',
+      reason: 'Unexpected error during migration',
+      error,
+    };
+  }
+}
+
+/**
+ * Execute all migrations and return results
+ */
+export function executeAllMigrations(migrations: MigrationDefinition[]): MigrationResult[] {
+  console.log(`🚀 Starting storage migration ${MIGRATION_VERSION}...`);
+  console.log(`📦 ${migrations.length} migrations to process`);
+
+  const results: MigrationResult[] = [];
+
+  for (const migration of migrations) {
+    const result = executeMigration(migration);
+    results.push(result);
+
+    // Log result
+    const emoji = result.status === 'success' ? '✅' : result.status === 'error' ? '❌' : '⏭️';
+    const message = `${emoji} ${migration.oldKey} → ${migration.storeName}`;
+
+    if (result.status === 'success') {
+      console.log(message, result.reason ? `(${result.reason})` : '');
+    } else if (result.status === 'error') {
+      console.error(message, result.reason, result.error);
+    } else {
+      console.log(message, `(${result.reason})`);
+    }
+  }
+
+  // Summary
+  const successful = results.filter((r) => r.status === 'success').length;
+  const skipped = results.filter((r) => r.status === 'skipped').length;
+  const errors = results.filter((r) => r.status === 'error').length;
+
+  console.log(
+    `\n📊 Migration ${MIGRATION_VERSION} Summary:\n` +
+      `   ✅ Successful: ${successful}\n` +
+      `   ⏭️  Skipped: ${skipped}\n` +
+      `   ❌ Errors: ${errors}\n`,
+  );
+
+  return results;
+}
diff --git a/src/utils/storageKeys.ts b/src/utils/storageKeys.ts
deleted file mode 100644
index fc4f68dd..00000000
--- a/src/utils/storageKeys.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-export const storageKeys = {
-  MarketSortColumnKey: 'monarch_marketsSortColumn',
-  MarketSortDirectionKey: 'monarch_marketsSortDirection',
-  MarketFavoritesKey: 'monarch_marketsFavorites',
-  MarketEntriesPerPageKey: 'monarch_marketsEntriesPerPage',
-  MarketsUsdMinSupplyKey: 'monarch_marketsUsdMinSupply_2',
-  MarketsUsdMinBorrowKey: 'monarch_marketsUsdMinBorrow',
-  MarketsUsdMinLiquidityKey: 'monarch_marketsUsdMinLiquidity',
-  // USD Filter enabled/disabled states
-  MarketsMinSupplyEnabledKey: 'monarch_minSupplyEnabled',
-  MarketsMinBorrowEnabledKey: 'monarch_minBorrowEnabled',
-  MarketsMinLiquidityEnabledKey: 'monarch_minLiquidityEnabled',
-  PositionsShowCollateralExposureKey: 'positions:show-collateral-exposure',
-  ThemeKey: 'theme',
-  CacheMarketPositionKeys: 'monarch_cache_market_unique_keys',
-  // Deprecated: Use MarketsMinSupplyEnabledKey instead
-  MarketsShowSmallMarkets: 'monarch_show_small_markets',
-  MarketsShowUnknownTokens: 'includeUnknownTokens',
-  MarketsShowUnknownOracle: 'showUnknownOracle',
-  // Column visibility settings
-  MarketsColumnVisibilityKey: 'monarch_marketsColumnVisibility',
-  // Table view mode
-  MarketsTableViewModeKey: 'monarch_marketsTableViewMode',
-  MarketsTrustedVaultsOnlyKey: 'monarch_marketsTrustedVaultsOnly',
-  // History settings
-  HistoryEntriesPerPageKey: 'monarch_historyEntriesPerPage',
-  HistoryGroupedViewKey: 'monarch_historyGroupedView',
-  // Trusted vaults
-  UserTrustedVaultsKey: 'userTrustedVaults',
-} as const;