diff --git a/src/apps/insights/components/PnLDetailModal.tsx b/src/apps/insights/components/PnLDetailModal.tsx
index d7509af0..14a7aa83 100644
--- a/src/apps/insights/components/PnLDetailModal.tsx
+++ b/src/apps/insights/components/PnLDetailModal.tsx
@@ -19,8 +19,6 @@ interface PnLDetailModalProps {
 }
 
 export const PnLDetailModal = ({ open, onOpenChange, view, signals }: PnLDetailModalProps) => {
-  if (!view) return null;
-
   const isMobile = useIsMobile();
 
   const filteredSignals = useMemo(() => {
@@ -31,7 +29,7 @@ export const PnLDetailModal = ({ open, onOpenChange, view, signals }: PnLDetailM
       case 'open':
         return signals.filter(s => s.status === 'active');
       case 'closed':
-        return signals.filter(s => 
+        return signals.filter(s =>
           ['completed', 'stopped', 'closed'].includes(s.status || 'active')
         );
       default:
@@ -45,7 +43,7 @@ export const PnLDetailModal = ({ open, onOpenChange, view, signals }: PnLDetailM
       const openSignals = filteredSignals
         .filter(s => typeof s.profit_loss_percent === 'number')
         .sort((a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime());
-      
+
       let cumulative = 0;
       const data = openSignals.map(s => {
         cumulative += s.profit_loss_percent || 0;
@@ -73,7 +71,7 @@ export const PnLDetailModal = ({ open, onOpenChange, view, signals }: PnLDetailM
           const dateB = b.closed_at || b.last_price_update || b.created_at;
           return new Date(dateA).getTime() - new Date(dateB).getTime();
         });
-      
+
       let cumulative = 0;
       return closedSignals.map(s => {
         cumulative += s.realized_pnl_percent || 0;
@@ -106,25 +104,25 @@ export const PnLDetailModal = ({ open, onOpenChange, view, signals }: PnLDetailM
 
   const getDescriptionData = () => {
     const count = filteredSignals.length;
-    const winCount = filteredSignals.filter(s => 
-      view === 'open' 
-        ? (s.profit_loss_percent || 0) > 0 
+    const winCount = filteredSignals.filter(s =>
+      view === 'open'
+        ? (s.profit_loss_percent || 0) > 0
         : (s.realized_pnl_percent || 0) > 0
     ).length;
     const winRate = count > 0 ? ((winCount / count) * 100).toFixed(1) : '0.0';
-    
+
     return { count, winRate };
   };
 
   const CustomTooltip = ({ active, payload }: any) => {
     if (!active || !payload?.length) return null;
-    
+
     const p = payload[0]?.payload;
     if (!p) return null;
-    
+
     const dateText = p.isNow ? 'Now' : format(new Date(p.ts), 'MMM dd, yyyy HH:mm');
     const val = typeof payload[0].value === 'number' ? payload[0].value : 0;
-    
+
     return (
       <div className="glass-card p-4 rounded-2xl border border-primary/20 backdrop-blur-2xl">
         <p className="text-sm font-semibold text-white mb-1">{dateText}</p>
@@ -147,11 +145,11 @@ export const PnLDetailModal = ({ open, onOpenChange, view, signals }: PnLDetailM
               <AreaChart data={chartData}>
                 <defs>
                   <linearGradient id="colorPnL" x1="0" y1="0" x2="0" y2="1">
-                    <stop offset="5%" stopColor={isPositive ? 'hsl(142,76%,58%)' : 'hsl(348,83%,58%)'} stopOpacity={0.3}/>
-                    <stop offset="95%" stopColor={isPositive ? 'hsl(142,76%,58%)' : 'hsl(348,83%,58%)'} stopOpacity={0}/>
+                    <stop offset="5%" stopColor={isPositive ? 'hsl(142,76%,58%)' : 'hsl(348,83%,58%)'} stopOpacity={0.3} />
+                    <stop offset="95%" stopColor={isPositive ? 'hsl(142,76%,58%)' : 'hsl(348,83%,58%)'} stopOpacity={0} />
                   </linearGradient>
                 </defs>
-                <XAxis 
+                <XAxis
                   dataKey="ts"
                   type="number"
                   domain={['auto', 'auto']}
@@ -161,7 +159,7 @@ export const PnLDetailModal = ({ open, onOpenChange, view, signals }: PnLDetailM
                   stroke="hsl(var(--muted-foreground))"
                   className="text-[10px] sm:text-xs"
                 />
-                <YAxis 
+                <YAxis
                   stroke="hsl(var(--muted-foreground))"
                   className="text-[10px] sm:text-xs"
                   tickFormatter={(value) => `${value.toFixed(1)}%`}
@@ -187,7 +185,7 @@ export const PnLDetailModal = ({ open, onOpenChange, view, signals }: PnLDetailM
       {/* Trades Table */}
       <div className="mt-4 sm:mt-6">
         <h3 className="text-base sm:text-lg font-semibold mb-4 text-white">Trade Breakdown</h3>
-        
+
         {/* Trade Timeline - only for closed trades */}
         {view === 'closed' && filteredSignals.length > 0 && (
           <div className="mb-6 glass-card rounded-3xl p-4 border border-amber-500/20">
@@ -201,7 +199,7 @@ export const PnLDetailModal = ({ open, onOpenChange, view, signals }: PnLDetailM
                 })
                 .map(signal => {
                   const { events, latestStop } = normalizeTrailingHistory(signal);
-                  
+
                   return (
                     <div key={signal.id} className="border-l-2 border-amber-500/30 pl-3">
                       <div className="text-xs font-medium text-white mb-3">{signal.ticker}</div>
@@ -220,7 +218,7 @@ export const PnLDetailModal = ({ open, onOpenChange, view, signals }: PnLDetailM
                               </div>
                             );
                           }
-                          
+
                           if (event.type === 'tp_hit') {
                             return (
                               <div key={idx} className="space-y-1">
@@ -249,7 +247,7 @@ export const PnLDetailModal = ({ open, onOpenChange, view, signals }: PnLDetailM
                               </div>
                             );
                           }
-                          
+
                           if (event.type === 'stop_loss_hit') {
                             return (
                               <div key={idx} className="flex items-center gap-2 text-xs">
@@ -261,7 +259,7 @@ export const PnLDetailModal = ({ open, onOpenChange, view, signals }: PnLDetailM
                               </div>
                             );
                           }
-                          
+
                           if (event.type === 'closed') {
                             return (
                               <div key={idx} className="flex items-center gap-2 text-xs">
@@ -275,7 +273,7 @@ export const PnLDetailModal = ({ open, onOpenChange, view, signals }: PnLDetailM
                               </div>
                             );
                           }
-                          
+
                           return null;
                         })}
                         <div className="flex items-center gap-2 text-xs pt-2 border-t border-amber-500/20">
@@ -313,96 +311,95 @@ export const PnLDetailModal = ({ open, onOpenChange, view, signals }: PnLDetailM
                 ) : (
                   filteredSignals
                     .sort((a, b) => {
-                      const dateA = view === 'open' 
-                        ? new Date(a.created_at) 
+                      const dateA = view === 'open'
+                        ? new Date(a.created_at)
                         : new Date(a.closed_at || a.last_price_update || a.created_at);
-                      const dateB = view === 'open' 
-                        ? new Date(b.created_at) 
+                      const dateB = view === 'open'
+                        ? new Date(b.created_at)
                         : new Date(b.closed_at || b.last_price_update || b.created_at);
                       return dateB.getTime() - dateA.getTime();
                     })
                     .map(signal => {
-                      const pnl = view === 'open' 
-                        ? (signal.profit_loss_percent || 0) 
+                      const pnl = view === 'open'
+                        ? (signal.profit_loss_percent || 0)
                         : (signal.realized_pnl_percent || 0);
                       const isPositivePnL = pnl >= 0;
-                      
+
                       // Count TP hits
                       const tpHits = [
                         signal.tp1_hit,
                         signal.tp2_hit,
                         signal.tp3_hit,
                       ].filter(Boolean).length;
-                      
+
                       return (
                         <TableRow key={signal.id}>
                           <TableCell className="font-medium">{signal.ticker}</TableCell>
                           <TableCell className="hidden sm:table-cell">${formatPrice(signal.entry_price, signal.ticker)}</TableCell>
                           <TableCell>
-                            ${view === 'open' 
+                            ${view === 'open'
                               ? formatPrice(signal.current_price || signal.entry_price, signal.ticker)
-                              : signal.stop_loss_hit 
+                              : signal.stop_loss_hit
                                 ? formatPrice(getEffectiveStopLoss(signal), signal.ticker)
                                 : formatPrice(signal.current_price || signal.entry_price, signal.ticker)
                             }
                           </TableCell>
-                           <TableCell>
-                             <div className="flex flex-col gap-1">
-                               <span className={isPositivePnL ? 'text-[hsl(142,76%,58%)]' : 'text-[hsl(348,83%,58%)]'}>
-                                 {isPositivePnL ? '+' : ''}{pnl.toFixed(2)}%
-                               </span>
-                                {view === 'closed' && signal.status === 'closed' && (
-                                  <details className="text-[10px] text-muted-foreground cursor-pointer">
-                                    <summary className="hover:text-white transition-colors">How calculated?</summary>
-                                    <div className="mt-2 space-y-1 text-[9px] bg-background/50 rounded p-2">
-                                      {signal.tp1_hit && (
-                                        <div>TP1: {(
-                                          signal.order_side === 'buy' 
-                                            ? (((signal.tp1 - signal.entry_price) / signal.entry_price) * 100 * 0.3333)
-                                            : (((signal.entry_price - signal.tp1) / signal.entry_price) * 100 * 0.3333)
-                                        ).toFixed(2)}% (33.33%)</div>
-                                      )}
-                                      {signal.tp2_hit && (
-                                        <div>TP2: {(
-                                          signal.order_side === 'buy' 
-                                            ? (((signal.tp2 - signal.entry_price) / signal.entry_price) * 100 * 0.3333)
-                                            : (((signal.entry_price - signal.tp2) / signal.entry_price) * 100 * 0.3333)
-                                        ).toFixed(2)}% (33.33%)</div>
-                                      )}
-                                      {signal.tp3_hit && (
-                                        <div>TP3: {(
-                                          signal.order_side === 'buy' 
-                                            ? (((signal.tp3 - signal.entry_price) / signal.entry_price) * 100 * 0.3333)
-                                            : (((signal.entry_price - signal.tp3) / signal.entry_price) * 100 * 0.3333)
-                                        ).toFixed(2)}% (33.33%)</div>
-                                      )}
-                                      {(() => {
-                                        const tpCount = [signal.tp1_hit, signal.tp2_hit, signal.tp3_hit].filter(Boolean).length;
-                                        const remaining = 1 - (tpCount * 0.3333);
-                                        if (remaining > 0) {
-                                          const exitPrice = signal.stop_loss_hit ? getEffectiveStopLoss(signal) : (signal.current_price || signal.entry_price);
-                                          const remainingPnL = signal.order_side === 'buy'
-                                            ? ((exitPrice - signal.entry_price) / signal.entry_price) * 100 * remaining
-                                            : ((signal.entry_price - exitPrice) / signal.entry_price) * 100 * remaining;
-                                          return <div className="text-amber-400">Remaining: {remainingPnL.toFixed(2)}% ({(remaining * 100).toFixed(0)}%)</div>;
-                                        }
-                                        return null;
-                                      })()}
-                                    </div>
-                                  </details>
-                                )}
-                             </div>
-                           </TableCell>
-                           <TableCell className="hidden md:table-cell">
+                          <TableCell>
+                            <div className="flex flex-col gap-1">
+                              <span className={isPositivePnL ? 'text-[hsl(142,76%,58%)]' : 'text-[hsl(348,83%,58%)]'}>
+                                {isPositivePnL ? '+' : ''}{pnl.toFixed(2)}%
+                              </span>
+                              {view === 'closed' && signal.status === 'closed' && (
+                                <details className="text-[10px] text-muted-foreground cursor-pointer">
+                                  <summary className="hover:text-white transition-colors">How calculated?</summary>
+                                  <div className="mt-2 space-y-1 text-[9px] bg-background/50 rounded p-2">
+                                    {signal.tp1_hit && (
+                                      <div>TP1: {(
+                                        signal.order_side === 'buy'
+                                          ? (((signal.tp1 - signal.entry_price) / signal.entry_price) * 100 * 0.3333)
+                                          : (((signal.entry_price - signal.tp1) / signal.entry_price) * 100 * 0.3333)
+                                      ).toFixed(2)}% (33.33%)</div>
+                                    )}
+                                    {signal.tp2_hit && (
+                                      <div>TP2: {(
+                                        signal.order_side === 'buy'
+                                          ? (((signal.tp2 - signal.entry_price) / signal.entry_price) * 100 * 0.3333)
+                                          : (((signal.entry_price - signal.tp2) / signal.entry_price) * 100 * 0.3333)
+                                      ).toFixed(2)}% (33.33%)</div>
+                                    )}
+                                    {signal.tp3_hit && (
+                                      <div>TP3: {(
+                                        signal.order_side === 'buy'
+                                          ? (((signal.tp3 - signal.entry_price) / signal.entry_price) * 100 * 0.3333)
+                                          : (((signal.entry_price - signal.tp3) / signal.entry_price) * 100 * 0.3333)
+                                      ).toFixed(2)}% (33.33%)</div>
+                                    )}
+                                    {(() => {
+                                      const tpCount = [signal.tp1_hit, signal.tp2_hit, signal.tp3_hit].filter(Boolean).length;
+                                      const remaining = 1 - (tpCount * 0.3333);
+                                      if (remaining > 0) {
+                                        const exitPrice = signal.stop_loss_hit ? getEffectiveStopLoss(signal) : (signal.current_price || signal.entry_price);
+                                        const remainingPnL = signal.order_side === 'buy'
+                                          ? ((exitPrice - signal.entry_price) / signal.entry_price) * 100 * remaining
+                                          : ((signal.entry_price - exitPrice) / signal.entry_price) * 100 * remaining;
+                                        return <div className="text-amber-400">Remaining: {remainingPnL.toFixed(2)}% ({(remaining * 100).toFixed(0)}%)</div>;
+                                      }
+                                      return null;
+                                    })()}
+                                  </div>
+                                </details>
+                              )}
+                            </div>
+                          </TableCell>
+                          <TableCell className="hidden md:table-cell">
                             <div className="flex gap-1">
                               {[1, 2, 3].map(i => (
                                 <div
                                   key={i}
-                                  className={`w-5 h-5 rounded-full flex items-center justify-center text-[10px] font-semibold ${
-                                    signal[`tp${i}_hit` as keyof typeof signal]
+                                  className={`w-5 h-5 rounded-full flex items-center justify-center text-[10px] font-semibold ${signal[`tp${i}_hit` as keyof typeof signal]
                                       ? 'bg-emerald-500/20 text-emerald-400 border border-emerald-500/30'
                                       : 'bg-slate-500/10 text-slate-600 border border-slate-500/20'
-                                  }`}
+                                    }`}
                                 >
                                   {i}
                                 </div>
@@ -410,13 +407,13 @@ export const PnLDetailModal = ({ open, onOpenChange, view, signals }: PnLDetailM
                             </div>
                           </TableCell>
                           <TableCell className="hidden sm:table-cell">
-                            <Badge 
+                            <Badge
                               className={
-                                signal.status === 'active' 
+                                signal.status === 'active'
                                   ? 'bg-violet-500/20 text-violet-400 border-violet-500/30'
                                   : signal.status === 'completed'
-                                  ? 'bg-emerald-500/20 text-emerald-400 border-emerald-500/30'
-                                  : 'bg-slate-500/20 text-slate-400 border-slate-500/30'
+                                    ? 'bg-emerald-500/20 text-emerald-400 border-emerald-500/30'
+                                    : 'bg-slate-500/20 text-slate-400 border-slate-500/30'
                               }
                             >
                               {signal.status?.toUpperCase()}
diff --git a/src/apps/pulse/components/App/tests/__snapshots__/AppWrapper.test.tsx.snap b/src/apps/pulse/components/App/tests/__snapshots__/AppWrapper.test.tsx.snap
index c8db30ce..8de4fe84 100644
--- a/src/apps/pulse/components/App/tests/__snapshots__/AppWrapper.test.tsx.snap
+++ b/src/apps/pulse/components/App/tests/__snapshots__/AppWrapper.test.tsx.snap
@@ -136,19 +136,19 @@ exports[`<AppWrapper /> > renders correctly and matches snapshot 1`] = `
               type="button"
             >
               <div
-                className="flex items-center justify-center max-w-[150px] w-32 h-9 bg-[#1E1D24] rounded-[10px]"
+                className="relative w-[113px] h-[36px] bg-[#1E1D24] rounded-[6px]"
               >
                 <div
-                  className="flex ml-1.5 font-normal desktop:text-sm tablet:text-sm mobile:text-xs xs:text-xs justify-items-end"
+                  className="absolute left-[12px] top-[12px] font-normal text-[12px] leading-[12px] tracking-[-0.02em] text-white"
                 >
                   Select token
                 </div>
                 <div
-                  className="flex ml-1.5"
+                  className="absolute right-[12px] top-[15px]"
                 >
                   <img
                     alt="arrow-down"
-                    className="w-2 h-1"
+                    className="w-[12px] h-[6px] opacity-50"
                     src="data:image/svg+xml,%3csvg%20width='10'%20height='6'%20viewBox='0%200%2010%206'%20fill='none'%20xmlns='http://www.w3.org/2000/svg'%3e%3cpath%20opacity='0.5'%20d='M1%201L4.64645%204.64645C4.84171%204.84171%205.15829%204.84171%205.35355%204.64645L9%201'%20stroke='white'%20stroke-width='1.25'%20stroke-linecap='round'%20stroke-linejoin='round'/%3e%3c/svg%3e"
                   />
                 </div>
diff --git a/src/apps/pulse/components/App/tests/__snapshots__/HomeScreen.test.tsx.snap b/src/apps/pulse/components/App/tests/__snapshots__/HomeScreen.test.tsx.snap
index 665f2df3..38b947a4 100644
--- a/src/apps/pulse/components/App/tests/__snapshots__/HomeScreen.test.tsx.snap
+++ b/src/apps/pulse/components/App/tests/__snapshots__/HomeScreen.test.tsx.snap
@@ -136,19 +136,19 @@ exports[`<HomeScreen /> > renders correctly and matches snapshot 1`] = `
               type="button"
             >
               <div
-                className="flex items-center justify-center max-w-[150px] w-32 h-9 bg-[#1E1D24] rounded-[10px]"
+                className="relative w-[113px] h-[36px] bg-[#1E1D24] rounded-[6px]"
               >
                 <div
-                  className="flex ml-1.5 font-normal desktop:text-sm tablet:text-sm mobile:text-xs xs:text-xs justify-items-end"
+                  className="absolute left-[12px] top-[12px] font-normal text-[12px] leading-[12px] tracking-[-0.02em] text-white"
                 >
                   Select token
                 </div>
                 <div
-                  className="flex ml-1.5"
+                  className="absolute right-[12px] top-[15px]"
                 >
                   <img
                     alt="arrow-down"
-                    className="w-2 h-1"
+                    className="w-[12px] h-[6px] opacity-50"
                     src="data:image/svg+xml,%3csvg%20width='10'%20height='6'%20viewBox='0%200%2010%206'%20fill='none'%20xmlns='http://www.w3.org/2000/svg'%3e%3cpath%20opacity='0.5'%20d='M1%201L4.64645%204.64645C4.84171%204.84171%205.15829%204.84171%205.35355%204.64645L9%201'%20stroke='white'%20stroke-width='1.25'%20stroke-linecap='round'%20stroke-linejoin='round'/%3e%3c/svg%3e"
                   />
                 </div>
diff --git a/src/apps/pulse/components/Buy/Buy.tsx b/src/apps/pulse/components/Buy/Buy.tsx
index c8edb6bc..9e56be2c 100644
--- a/src/apps/pulse/components/Buy/Buy.tsx
+++ b/src/apps/pulse/components/Buy/Buy.tsx
@@ -642,74 +642,103 @@ export default function Buy(props: BuyProps) {
           >
             {token ? (
               <div
-                className="flex items-center mobile:w-32 xs:w-32 desktop:w-36 h-9 bg-[#1E1D24] rounded-md"
+                className="relative w-[113px] h-[36px] bg-[#1E1D24] rounded-[6px] shrink-0"
                 data-testid={`pulse-buy-token-selected-${token.chainId}-${token.name}`}
               >
-                <div className="relative inline-block">
+                {/* Logo */}
+                <div className="absolute left-[6px] top-[6px] w-[24px] h-[24px]">
                   {token.logo ? (
                     <img
                       src={token.logo}
                       alt="Main"
-                      className="w-6 h-6 ml-1 mr-1 rounded-full"
+                      className="w-full h-full rounded-full"
                     />
                   ) : (
-                    <div className="w-6 h-6 ml-1 mr-1 overflow-hidden rounded-full">
+                    <div className="w-full h-full overflow-hidden rounded-full">
                       <RandomAvatar name={token.name || ''} />
-                      <span className="absolute inset-0 flex items-center justify-center text-white text-lg">
+                      <span className="absolute inset-0 flex items-center justify-center text-white text-[10px]">
                         {token.name?.slice(0, 2)}
                       </span>
                     </div>
                   )}
                   <img
                     src={getLogoForChainId(token.chainId)}
-                    className="w-2.5 h-2.5 absolute bottom-[-2px] right-[2px] rounded-full"
+                    className="w-2.5 h-2.5 absolute -bottom-0.5 -right-0.5 rounded-full ring-1 ring-[#1E1D24]"
                     alt="Chain Logo"
                   />
                 </div>
-                <div className="flex flex-col mt-2.5 h-10 w-[91px]">
-                  <div className="flex">
-                    <p className="font-normal desktop:text-sm mobile:text-xs xs:text-xs">
-                      {token.symbol}
-                    </p>
-                    {token.symbol.length + token.name.length <= 13 && (
-                      <p className="ml-1 opacity-30 font-normal desktop:text-sm mobile:text-xs xs:text-xs text-white">
-                        {token.name}
-                      </p>
+
+                {/* Top Row: Symbol and Name */}
+                <div className="absolute left-[36px] top-[6px] flex items-center gap-[4px] max-w-[90px]">
+                  <p className="font-normal text-[12px] leading-[12px] tracking-[-0.02em] text-white truncate shrink-0 max-w-[50px]">
+                    {token.symbol}
+                  </p>
+                  <p className="font-normal text-[12px] leading-[12px] tracking-[-0.02em] text-white opacity-30 truncate block">
+                    {token.name}
+                  </p>
+                </div>
+
+                {/* Bottom Row: Price and Change */}
+                <div className="absolute left-[36px] top-[20px] flex items-center gap-[6px]">
+                  <p className="font-normal text-[10px] leading-[10px] tracking-[-0.02em] text-white opacity-50">
+                    ${token.usdValue}
+                  </p>
+
+                  <div className="flex items-center gap-[2px]">
+                    {/* Triangle Indicator */}
+                    {token.dailyPriceChange !== 0 && (
+                      <div
+                        className={`w-0 h-0 border-l-[4px] border-l-transparent border-r-[4px] border-r-transparent ${
+                          token.dailyPriceChange >= 0
+                            ? 'border-b-[6px] border-b-[#5CFF93]'
+                            : 'border-t-[6px] border-t-[#FF366C]'
+                        } opacity-50`}
+                      />
                     )}
-                  </div>
-                  <div className="flex">
-                    <p className="opacity-50 font-normal text-white h-[10px] text-[10px]">
-                      ${token.usdValue}
+
+                    <p
+                      className={`font-normal text-[10px] leading-[10px] tracking-[-0.02em] opacity-50 ${
+                        token.dailyPriceChange >= 0
+                          ? 'text-[#5CFF93]'
+                          : 'text-[#FF366C]'
+                      }`}
+                    >
+                      {Math.abs(token.dailyPriceChange).toFixed(2)}%
                     </p>
                   </div>
                 </div>
-                <div className="flex m-1.5">
-                  <img src={ArrowDown} className="w-2 h-1" alt="arrow-down" />
+
+                {/* Chevron */}
+                <div className="absolute right-[12px] top-[15px]">
+                  <img
+                    src={ArrowDown}
+                    className="w-[12px] h-[6px] opacity-50"
+                    alt="arrow-down"
+                  />
                 </div>
               </div>
             ) : (
-              <div className="flex items-center justify-center max-w-[150px] w-32 h-9 bg-[#1E1D24] rounded-[10px]">
+              <div className="relative w-[113px] h-[36px] bg-[#1E1D24] rounded-[6px]">
                 {isSearchingToken ? (
-                  <div className="flex items-center">
+                  <div className="flex items-center absolute left-[12px] top-[10px]">
                     <TailSpin width={16} height={16} />
-                    <div className="flex font-normal desktop:text-sm tablet:text-sm mobile:text-xs xs:text-xs">
+                    <div className="ml-2 font-normal text-[12px] leading-[12px] tracking-[-0.02em] text-white opacity-50">
                       Searching...
                     </div>
                   </div>
                 ) : (
-                  <>
-                    <div className="flex ml-1.5 font-normal desktop:text-sm tablet:text-sm mobile:text-xs xs:text-xs justify-items-end">
-                      Select token
-                    </div>
-                    <div className="flex ml-1.5">
-                      <img
-                        src={ArrowDown}
-                        className="w-2 h-1"
-                        alt="arrow-down"
-                      />
-                    </div>
-                  </>
+                  <div className="absolute left-[12px] top-[12px] font-normal text-[12px] leading-[12px] tracking-[-0.02em] text-white">
+                    Select token
+                  </div>
                 )}
+                {/* Chevron */}
+                <div className="absolute right-[12px] top-[15px]">
+                  <img
+                    src={ArrowDown}
+                    className="w-[12px] h-[6px] opacity-50"
+                    alt="arrow-down"
+                  />
+                </div>
               </div>
             )}
           </button>
diff --git a/src/apps/pulse/components/Buy/tests/__snapshots__/Buy.test.tsx.snap b/src/apps/pulse/components/Buy/tests/__snapshots__/Buy.test.tsx.snap
index e4093c75..aa7a9e8c 100644
--- a/src/apps/pulse/components/Buy/tests/__snapshots__/Buy.test.tsx.snap
+++ b/src/apps/pulse/components/Buy/tests/__snapshots__/Buy.test.tsx.snap
@@ -17,52 +17,66 @@ exports[`<Buy /> > renders correctly and matches snapshot 1`] = `
         type="button"
       >
         <div
-          className="flex items-center mobile:w-32 xs:w-32 desktop:w-36 h-9 bg-[#1E1D24] rounded-md"
+          className="relative w-[113px] h-[36px] bg-[#1E1D24] rounded-[6px] shrink-0"
           data-testid="pulse-buy-token-selected-1-Test Token"
         >
           <div
-            className="relative inline-block"
+            className="absolute left-[6px] top-[6px] w-[24px] h-[24px]"
           >
             <img
               alt="Main"
-              className="w-6 h-6 ml-1 mr-1 rounded-full"
+              className="w-full h-full rounded-full"
               src="test-logo.png"
             />
             <img
               alt="Chain Logo"
-              className="w-2.5 h-2.5 absolute bottom-[-2px] right-[2px] rounded-full"
+              className="w-2.5 h-2.5 absolute -bottom-0.5 -right-0.5 rounded-full ring-1 ring-[#1E1D24]"
               src="/src/assets/images/logo-ethereum.png"
             />
           </div>
           <div
-            className="flex flex-col mt-2.5 h-10 w-[91px]"
+            className="absolute left-[36px] top-[6px] flex items-center gap-[4px] max-w-[90px]"
           >
-            <div
-              className="flex"
+            <p
+              className="font-normal text-[12px] leading-[12px] tracking-[-0.02em] text-white truncate shrink-0 max-w-[50px]"
             >
-              <p
-                className="font-normal desktop:text-sm mobile:text-xs xs:text-xs"
-              >
-                TEST
-              </p>
-            </div>
+              TEST
+            </p>
+            <p
+              className="font-normal text-[12px] leading-[12px] tracking-[-0.02em] text-white opacity-30 truncate block"
+            >
+              Test Token
+            </p>
+          </div>
+          <div
+            className="absolute left-[36px] top-[20px] flex items-center gap-[6px]"
+          >
+            <p
+              className="font-normal text-[10px] leading-[10px] tracking-[-0.02em] text-white opacity-50"
+            >
+              $
+              100.00
+            </p>
             <div
-              className="flex"
+              className="flex items-center gap-[2px]"
             >
+              <div
+                className="w-0 h-0 border-l-[4px] border-l-transparent border-r-[4px] border-r-transparent border-b-[6px] border-b-[#5CFF93] opacity-50"
+              />
               <p
-                className="opacity-50 font-normal text-white h-[10px] text-[10px]"
+                className="font-normal text-[10px] leading-[10px] tracking-[-0.02em] opacity-50 text-[#5CFF93]"
               >
-                $
-                100.00
+                0.05
+                %
               </p>
             </div>
           </div>
           <div
-            className="flex m-1.5"
+            className="absolute right-[12px] top-[15px]"
           >
             <img
               alt="arrow-down"
-              className="w-2 h-1"
+              className="w-[12px] h-[6px] opacity-50"
               src="data:image/svg+xml,%3csvg%20width='10'%20height='6'%20viewBox='0%200%2010%206'%20fill='none'%20xmlns='http://www.w3.org/2000/svg'%3e%3cpath%20opacity='0.5'%20d='M1%201L4.64645%204.64645C4.84171%204.84171%205.15829%204.84171%205.35355%204.64645L9%201'%20stroke='white'%20stroke-width='1.25'%20stroke-linecap='round'%20stroke-linejoin='round'/%3e%3c/svg%3e"
             />
           </div>
diff --git a/src/apps/pulse/components/Search/PortfolioTokenList.tsx b/src/apps/pulse/components/Search/PortfolioTokenList.tsx
index a3787d7b..02d6b0d3 100644
--- a/src/apps/pulse/components/Search/PortfolioTokenList.tsx
+++ b/src/apps/pulse/components/Search/PortfolioTokenList.tsx
@@ -315,7 +315,7 @@ const PortfolioTokenList = (props: PortfolioTokenListProps) => {
             onClick={() => handleSort('price')}
             data-testid="pulse-portfolio-header-token"
           >
-            <p className="font-['Poppins'] text-[13px] font-normal text-white opacity-50 tracking-[-0.02em]">
+            <p className="text-[13px] font-normal text-white opacity-50 tracking-[-0.02em]">
               Token/Price
             </p>
             <SortIndicator
@@ -330,7 +330,7 @@ const PortfolioTokenList = (props: PortfolioTokenListProps) => {
             onClick={() => handleSort('balance')}
             data-testid="pulse-portfolio-header-balance"
           >
-            <p className="font-['Poppins'] text-[13px] font-normal text-white opacity-50 tracking-[-0.02em]">
+            <p className="text-[13px] font-normal text-white opacity-50 tracking-[-0.02em]">
               Balance
             </p>
             <SortIndicator
@@ -345,7 +345,7 @@ const PortfolioTokenList = (props: PortfolioTokenListProps) => {
             onClick={() => handleSort('pnl')}
             data-testid="pulse-portfolio-header-pnl"
           >
-            <p className="font-['Poppins'] text-[13px] font-normal text-white opacity-50 tracking-[-0.02em] whitespace-nowrap">
+            <p className="text-[13px] font-normal text-white opacity-50 tracking-[-0.02em] whitespace-nowrap">
               Unrealized PnL/%
             </p>
             <SortIndicator
diff --git a/src/apps/pulse/components/Search/Search.tsx b/src/apps/pulse/components/Search/Search.tsx
index 6d7f9293..3d1aab76 100644
--- a/src/apps/pulse/components/Search/Search.tsx
+++ b/src/apps/pulse/components/Search/Search.tsx
@@ -465,7 +465,8 @@ export default function Search({
           usdValue: formatExponentialSmallNumber(
             limitDigitsNumber(item.price || 0)
           ),
-          dailyPriceChange: 0.0,
+          dailyPriceChange:
+            'price_change_24h' in item ? item.price_change_24h || 0.0 : 0.0,
           chainId: selectedChainId,
           decimals: selectedDecimals,
           address: selectedContract,
diff --git a/src/apps/pulse/components/Search/tests/__snapshots__/PortfolioTokenList.test.tsx.snap b/src/apps/pulse/components/Search/tests/__snapshots__/PortfolioTokenList.test.tsx.snap
index 21e3661f..14bd58f3 100644
--- a/src/apps/pulse/components/Search/tests/__snapshots__/PortfolioTokenList.test.tsx.snap
+++ b/src/apps/pulse/components/Search/tests/__snapshots__/PortfolioTokenList.test.tsx.snap
@@ -17,7 +17,7 @@ exports[`<PortfolioTokenList /> > renders correctly and matches snapshot 1`] = `
         onClick={[Function]}
       >
         <p
-          className="font-['Poppins'] text-[13px] font-normal text-white opacity-50 tracking-[-0.02em]"
+          className="text-[13px] font-normal text-white opacity-50 tracking-[-0.02em]"
         >
           Token/Price
         </p>
@@ -68,7 +68,7 @@ exports[`<PortfolioTokenList /> > renders correctly and matches snapshot 1`] = `
         onClick={[Function]}
       >
         <p
-          className="font-['Poppins'] text-[13px] font-normal text-white opacity-50 tracking-[-0.02em]"
+          className="text-[13px] font-normal text-white opacity-50 tracking-[-0.02em]"
         >
           Balance
         </p>
@@ -119,7 +119,7 @@ exports[`<PortfolioTokenList /> > renders correctly and matches snapshot 1`] = `
         onClick={[Function]}
       >
         <p
-          className="font-['Poppins'] text-[13px] font-normal text-white opacity-50 tracking-[-0.02em] whitespace-nowrap"
+          className="text-[13px] font-normal text-white opacity-50 tracking-[-0.02em] whitespace-nowrap"
         >
           Unrealized PnL/%
         </p>
diff --git a/src/apps/pulse/components/Sell/Sell.tsx b/src/apps/pulse/components/Sell/Sell.tsx
index ebd1f725..fca1ad37 100644
--- a/src/apps/pulse/components/Sell/Sell.tsx
+++ b/src/apps/pulse/components/Sell/Sell.tsx
@@ -301,79 +301,105 @@ const Sell = (props: SellProps) => {
           >
             {token ? (
               <div
-                className="flex items-center mobile:w-32 xs:w-28 desktop:w-36 h-9 bg-[#1E1D24] rounded-md"
+                className="relative w-[113px] h-[36px] bg-[#1E1D24] rounded-[6px] shrink-0"
                 data-testid={`pulse-sell-token-selected-${token.chainId}-${token.name}`}
               >
-                <div className="relative inline-block">
+                {/* Logo */}
+                <div className="absolute left-[6px] top-[6px] w-[24px] h-[24px]">
                   {token.logo ? (
                     <img
                       src={token.logo}
                       alt="Main"
-                      className="w-6 h-6 ml-1 mr-1 rounded-full"
-                      data-testid="pulse-sell-token-selector-logo"
+                      className="w-full h-full rounded-full"
                     />
                   ) : (
-                    <div className="w-full h-full overflow-hidden rounded-full w-[34px] h-6 ml-1 mr-1">
+                    <div className="w-full h-full overflow-hidden rounded-full">
                       <RandomAvatar name={token.name || ''} />
-                      <span className="absolute inset-0 flex items-center justify-center text-white text-xs">
+                      <span className="absolute inset-0 flex items-center justify-center text-white text-[10px]">
                         {token.name?.slice(0, 2)}
                       </span>
                     </div>
                   )}
                   <img
                     src={getLogoForChainId(token.chainId)}
-                    className="absolute w-2.5 h-2.5 bottom-[-2px] right-[2px] rounded-full"
+                    className="w-2.5 h-2.5 absolute -bottom-0.5 -right-0.5 rounded-full ring-1 ring-[#1E1D24]"
                     alt="Chain Logo"
-                    data-testid="pulse-sell-token-selector-chain-logo"
                   />
                 </div>
-                <div className="flex flex-col mt-2.5 h-10 w-[91px]">
-                  <div className="flex">
-                    <p
-                      className="desktop:text-sm mobile:text-xs xs:text-xs font-normal"
-                      data-testid="pulse-sell-token-selector-symbol"
-                    >
-                      {token.symbol}
-                    </p>
-                    {token.name &&
-                      token.symbol.length + token.name.length <= 13 && (
-                        <p
-                          className="opacity-30 desktop:text-sm mobile:text-xs xs:text-xs font-normal ml-1 text-white"
-                          data-testid="pulse-sell-token-selector-name"
-                        >
-                          {token.name}
-                        </p>
-                      )}
-                  </div>
-                  <div className="flex">
+
+                {/* Top Row: Symbol and Name */}
+                <div className="absolute left-[36px] top-[6px] flex items-center gap-[4px] max-w-[90px]">
+                  <p
+                    className="font-normal text-[12px] leading-[12px] tracking-[-0.02em] text-white truncate shrink-0 max-w-[50px]"
+                    data-testid="pulse-sell-token-selector-symbol"
+                  >
+                    {token.symbol}
+                  </p>
+                  <p
+                    className="font-normal text-[12px] leading-[12px] tracking-[-0.02em] text-white opacity-30 truncate block"
+                    data-testid="pulse-sell-token-selector-name"
+                  >
+                    {token.name}
+                  </p>
+                </div>
+
+                {/* Bottom Row: Price and Change */}
+                <div className="absolute left-[36px] top-[20px] flex items-center gap-[6px]">
+                  <p
+                    className="font-normal text-[10px] leading-[10px] tracking-[-0.02em] text-white opacity-50"
+                    data-testid="pulse-sell-token-selector-price"
+                  >
+                    ${formatExponentialSmallNumber(token.usdValue)}
+                  </p>
+
+                  <div className="flex items-center gap-[2px]">
+                    {/* Triangle Indicator */}
+                    {token.dailyPriceChange !== 0 && (
+                      <div
+                        className={`w-0 h-0 border-l-[4px] border-l-transparent border-r-[4px] border-r-transparent ${
+                          token.dailyPriceChange >= 0
+                            ? 'border-b-[6px] border-b-[#5CFF93]'
+                            : 'border-t-[6px] border-t-[#FF366C]'
+                        } opacity-50`}
+                      />
+                    )}
+
                     <p
-                      className="text-[10px] font-normal text-white h-[10px] opacity-50"
-                      data-testid="pulse-sell-token-selector-price"
+                      className={`font-normal text-[10px] leading-[10px] tracking-[-0.02em] opacity-50 ${
+                        token.dailyPriceChange >= 0
+                          ? 'text-[#5CFF93]'
+                          : 'text-[#FF366C]'
+                      }`}
                     >
-                      ${formatExponentialSmallNumber(token.usdValue)}
+                      {Math.abs(token.dailyPriceChange).toFixed(2)}%
                     </p>
                   </div>
                 </div>
-                <div
-                  className="flex ml-1.5"
-                  data-testid="pulse-sell-token-selector-arrow"
-                >
-                  <img src={ArrowDown} className="w-2 h-1" alt="arrow-down" />
+
+                {/* Chevron */}
+                <div className="absolute right-[12px] top-[15px]">
+                  <img
+                    src={ArrowDown}
+                    className="w-[12px] h-[6px] opacity-50"
+                    alt="arrow-down"
+                  />
                 </div>
               </div>
             ) : (
-              <div className="flex items-center justify-center max-w-[150px] w-32 h-9 bg-[#1E1D24] rounded-[10px]">
+              <div className="relative w-[113px] h-[36px] bg-[#1E1D24] rounded-[6px]">
                 <div
-                  className="flex ml-1.5 font-normal desktop:text-sm tablet:text-sm mobile:text-xs xs:text-xs justify-items-end"
+                  className="absolute left-[12px] top-[12px] font-normal text-[12px] leading-[12px] tracking-[-0.02em] text-white"
                   data-testid="pulse-sell-token-selector-placeholder"
                 >
                   Select token
                 </div>
-                <div
-                  className="flex ml-1.5"
-                  data-testid="pulse-sell-token-selector-arrow-placeholder"
-                >
-                  <img src={ArrowDown} className="w-2 h-1" alt="arrow-down" />
+                {/* Chevron */}
+                <div className="absolute right-[12px] top-[15px]">
+                  <img
+                    src={ArrowDown}
+                    className="w-[12px] h-[6px] opacity-50"
+                    alt="arrow-down"
+                  />
                 </div>
               </div>
             )}
diff --git a/src/apps/pulse/components/Sell/tests/__snapshots__/Sell.test.tsx.snap b/src/apps/pulse/components/Sell/tests/__snapshots__/Sell.test.tsx.snap
index 3f866945..0ba99cea 100644
--- a/src/apps/pulse/components/Sell/tests/__snapshots__/Sell.test.tsx.snap
+++ b/src/apps/pulse/components/Sell/tests/__snapshots__/Sell.test.tsx.snap
@@ -18,57 +18,69 @@ exports[`<Sell /> > renders correctly and matches snapshot 1`] = `
           type="button"
         >
           <div
-            class="flex items-center mobile:w-32 xs:w-28 desktop:w-36 h-9 bg-[#1E1D24] rounded-md"
+            class="relative w-[113px] h-[36px] bg-[#1E1D24] rounded-[6px] shrink-0"
             data-testid="pulse-sell-token-selected-1-Test Token"
           >
             <div
-              class="relative inline-block"
+              class="absolute left-[6px] top-[6px] w-[24px] h-[24px]"
             >
               <img
                 alt="Main"
-                class="w-6 h-6 ml-1 mr-1 rounded-full"
-                data-testid="pulse-sell-token-selector-logo"
+                class="w-full h-full rounded-full"
                 src="test-logo.png"
               />
               <img
                 alt="Chain Logo"
-                class="absolute w-2.5 h-2.5 bottom-[-2px] right-[2px] rounded-full"
-                data-testid="pulse-sell-token-selector-chain-logo"
+                class="w-2.5 h-2.5 absolute -bottom-0.5 -right-0.5 rounded-full ring-1 ring-[#1E1D24]"
                 src="/src/assets/images/logo-ethereum.png"
               />
             </div>
             <div
-              class="flex flex-col mt-2.5 h-10 w-[91px]"
+              class="absolute left-[36px] top-[6px] flex items-center gap-[4px] max-w-[90px]"
             >
-              <div
-                class="flex"
+              <p
+                class="font-normal text-[12px] leading-[12px] tracking-[-0.02em] text-white truncate shrink-0 max-w-[50px]"
+                data-testid="pulse-sell-token-selector-symbol"
               >
-                <p
-                  class="desktop:text-sm mobile:text-xs xs:text-xs font-normal"
-                  data-testid="pulse-sell-token-selector-symbol"
-                >
-                  TEST
-                </p>
-              </div>
+                TEST
+              </p>
+              <p
+                class="font-normal text-[12px] leading-[12px] tracking-[-0.02em] text-white opacity-30 truncate block"
+                data-testid="pulse-sell-token-selector-name"
+              >
+                Test Token
+              </p>
+            </div>
+            <div
+              class="absolute left-[36px] top-[20px] flex items-center gap-[6px]"
+            >
+              <p
+                class="font-normal text-[10px] leading-[10px] tracking-[-0.02em] text-white opacity-50"
+                data-testid="pulse-sell-token-selector-price"
+              >
+                $
+                100
+              </p>
               <div
-                class="flex"
+                class="flex items-center gap-[2px]"
               >
+                <div
+                  class="w-0 h-0 border-l-[4px] border-l-transparent border-r-[4px] border-r-transparent border-b-[6px] border-b-[#5CFF93] opacity-50"
+                />
                 <p
-                  class="text-[10px] font-normal text-white h-[10px] opacity-50"
-                  data-testid="pulse-sell-token-selector-price"
+                  class="font-normal text-[10px] leading-[10px] tracking-[-0.02em] opacity-50 text-[#5CFF93]"
                 >
-                  $
-                  100
+                  0.05
+                  %
                 </p>
               </div>
             </div>
             <div
-              class="flex ml-1.5"
-              data-testid="pulse-sell-token-selector-arrow"
+              class="absolute right-[12px] top-[15px]"
             >
               <img
                 alt="arrow-down"
-                class="w-2 h-1"
+                class="w-[12px] h-[6px] opacity-50"
                 src="data:image/svg+xml,%3csvg%20width='10'%20height='6'%20viewBox='0%200%2010%206'%20fill='none'%20xmlns='http://www.w3.org/2000/svg'%3e%3cpath%20opacity='0.5'%20d='M1%201L4.64645%204.64645C4.84171%204.84171%205.15829%204.84171%205.35355%204.64645L9%201'%20stroke='white'%20stroke-width='1.25'%20stroke-linecap='round'%20stroke-linejoin='round'/%3e%3c/svg%3e"
               />
             </div>
diff --git a/src/containers/Main.tsx b/src/containers/Main.tsx
index ed3e1a83..4bfc56c3 100644
--- a/src/containers/Main.tsx
+++ b/src/containers/Main.tsx
@@ -929,7 +929,7 @@ const AuthLayout = () => {
       },
       {
         path: '*',
-        element: <NotFound />,
+        element: <Navigate to="/" replace />,
       },
     ];