diff --git a/ui/desktop/src/components/RichChatInput.tsx b/ui/desktop/src/components/RichChatInput.tsx
index 20b338e802..4b1f2f91ff 100644
--- a/ui/desktop/src/components/RichChatInput.tsx
+++ b/ui/desktop/src/components/RichChatInput.tsx
@@ -384,23 +384,10 @@ export const RichChatInput = forwardRef<RichChatInputRef, RichChatInputProps>(({
           <span 
             key={`misspelled-${keyCounter++}`} 
             data-misspelled="true"
-            className="inline whitespace-pre-wrap cursor-pointer select-none"
+            className="inline whitespace-pre-wrap cursor-pointer bg-red-50 dark:bg-red-950/30 text-red-600 dark:text-red-400 font-medium px-1 py-0.5 rounded-sm border border-red-200 dark:border-red-800 underline decoration-wavy decoration-red-500 decoration-2 underline-offset-2 hover:bg-red-100 dark:hover:bg-red-900/40 hover:border-red-300 dark:hover:border-red-700 hover:scale-105 transition-all duration-150 relative z-10"
             style={{
-              // Enhanced styling for better visibility and interaction
-              backgroundColor: '#fef2f2', // Very light red background
-              color: '#dc2626', // Red text
-              fontWeight: '500',
-              padding: '2px 4px',
-              borderRadius: '3px',
-              border: '1px solid #fca5a5',
-              textDecoration: 'underline wavy #dc2626',
-              textDecorationThickness: '2px',
-              textUnderlineOffset: '2px',
               pointerEvents: 'auto', // Override parent's pointer-events: none
-              userSelect: 'none', // Prevent text selection interference
-              position: 'relative', // Ensure it's above other elements
-              zIndex: 10, // Higher z-index than parent
-              transition: 'all 0.15s ease',
+              userSelect: 'text', // Allow text selection for normal text editing
             }}
             title={`Click or hover for suggestions: ${content}`}
             onClick={(e) => {
@@ -432,11 +419,6 @@ export const RichChatInput = forwardRef<RichChatInputRef, RichChatInputProps>(({
             onMouseEnter={(e) => {
               console.log('🖱️ MOUSEENTER: Mouse entered misspelled word:', content);
               
-              // Add hover effect
-              e.currentTarget.style.backgroundColor = '#fee2e2';
-              e.currentTarget.style.borderColor = '#f87171';
-              e.currentTarget.style.transform = 'scale(1.02)';
-              
               if (misspelledData) {
                 const rect = e.currentTarget.getBoundingClientRect();
                 console.log('🖱️ MOUSEENTER: Element rect:', rect);
@@ -459,11 +441,6 @@ export const RichChatInput = forwardRef<RichChatInputRef, RichChatInputProps>(({
             onMouseLeave={(e) => {
               console.log('🖱️ MOUSELEAVE: Mouse left misspelled word:', content);
               
-              // Remove hover effect
-              e.currentTarget.style.backgroundColor = '#fef2f2';
-              e.currentTarget.style.borderColor = '#fca5a5';
-              e.currentTarget.style.transform = 'scale(1)';
-              
               // Add a small delay before hiding to allow moving to tooltip
               setTimeout(() => {
                 setTooltip(prev => {
diff --git a/ui/desktop/src/components/SpellCheckTooltip.tsx b/ui/desktop/src/components/SpellCheckTooltip.tsx
index 251775fc37..a6bf4ffd1c 100644
--- a/ui/desktop/src/components/SpellCheckTooltip.tsx
+++ b/ui/desktop/src/components/SpellCheckTooltip.tsx
@@ -101,7 +101,7 @@ export const SpellCheckTooltip: React.FC<SpellCheckTooltipProps> = ({
       ref={tooltipRef}
       tabIndex={-1} // Make it focusable for keyboard events
       data-spell-tooltip="true" // For click detection
-      className="fixed z-50 bg-white border border-gray-300 rounded-lg shadow-xl py-2 min-w-48 max-w-64 outline-none"
+      className="fixed z-50 bg-background-default border border-border-default rounded-lg shadow-xl py-2 min-w-48 max-w-64 outline-none"
       style={{
         left: position.x,
         top: position.y - 8, // Position slightly above the word
@@ -112,8 +112,8 @@ export const SpellCheckTooltip: React.FC<SpellCheckTooltipProps> = ({
       onMouseLeave={onMouseLeave}
     >
       {/* Header */}
-      <div className="px-3 py-1 text-xs text-gray-600 border-b border-gray-200 mb-1 font-medium">
-        Suggestions for "<span className="text-red-600 font-semibold">{misspelledWord}</span>"
+      <div className="px-3 py-1 text-xs text-text-muted border-b border-border-subtle mb-1 font-medium">
+        Suggestions for "<span className="text-red-600 dark:text-red-400 font-semibold">{misspelledWord}</span>"
       </div>
 
       {/* Suggestions */}
@@ -131,15 +131,15 @@ export const SpellCheckTooltip: React.FC<SpellCheckTooltipProps> = ({
               onMouseEnter={() => setSelectedIndex(index)}
               className={`w-full text-left px-3 py-2 text-sm transition-all duration-150 flex items-center gap-2 ${
                 selectedIndex === index
-                  ? 'bg-blue-50 text-blue-900 border-l-2 border-blue-500'
-                  : 'text-gray-800 hover:bg-gray-50'
+                  ? 'bg-blue-50 dark:bg-blue-900/20 text-blue-900 dark:text-blue-100 border-l-2 border-blue-500'
+                  : 'text-text-default hover:bg-background-subtle'
               }`}
             >
               <span 
                 className={`w-5 h-5 flex items-center justify-center text-xs rounded text-[10px] font-bold ${
                   selectedIndex === index
                     ? 'bg-blue-500 text-white'
-                    : 'bg-gray-400 text-white'
+                    : 'bg-text-muted text-white'
                 }`}
               >
                 {index + 1}
@@ -149,13 +149,13 @@ export const SpellCheckTooltip: React.FC<SpellCheckTooltipProps> = ({
           ))}
         </div>
       ) : (
-        <div className="px-3 py-2 text-sm text-gray-500 italic">
+        <div className="px-3 py-2 text-sm text-text-muted italic">
           No suggestions available
         </div>
       )}
 
       {/* Separator */}
-      <div className="border-t border-gray-200 my-1" />
+      <div className="border-t border-border-subtle my-1" />
 
       {/* Additional actions */}
       <button
@@ -165,9 +165,9 @@ export const SpellCheckTooltip: React.FC<SpellCheckTooltipProps> = ({
           console.log('🖱️ ADD TO DICTIONARY CLICKED');
           onAddToDictionary();
         }}
-        className="w-full text-left px-3 py-1.5 text-xs text-gray-600 hover:bg-gray-50 transition-colors flex items-center gap-2"
+        className="w-full text-left px-3 py-1.5 text-xs text-text-muted hover:bg-background-subtle transition-colors flex items-center gap-2"
       >
-        <span className="text-green-600">+</span>
+        <span className="text-green-600 dark:text-green-400">+</span>
         Add to dictionary
       </button>
       
@@ -178,14 +178,14 @@ export const SpellCheckTooltip: React.FC<SpellCheckTooltipProps> = ({
           console.log('🖱️ IGNORE CLICKED');
           onIgnore();
         }}
-        className="w-full text-left px-3 py-1.5 text-xs text-gray-600 hover:bg-gray-50 transition-colors flex items-center gap-2"
+        className="w-full text-left px-3 py-1.5 text-xs text-text-muted hover:bg-background-subtle transition-colors flex items-center gap-2"
       >
-        <span className="text-gray-400">×</span>
+        <span className="text-text-muted">×</span>
         Ignore word
       </button>
 
       {/* Keyboard hints */}
-      <div className="px-3 py-1 text-[10px] text-gray-400 border-t border-gray-200 mt-1">
+      <div className="px-3 py-1 text-[10px] text-text-muted border-t border-border-subtle mt-1">
         Press 1-5 to select • ↑↓ to navigate • Enter to apply • Esc to close
       </div>
     </div>