diff --git a/client/src/components/Chat/Input/Files/SourceIcon.tsx b/client/src/components/Chat/Input/Files/SourceIcon.tsx
index 7378d49a6b..9f1392be64 100644
--- a/client/src/components/Chat/Input/Files/SourceIcon.tsx
+++ b/client/src/components/Chat/Input/Files/SourceIcon.tsx
@@ -18,7 +18,7 @@ const sourceToClassname = {
 };
 
 const defaultClassName =
-  'absolute right-0 bottom-0 rounded-full p-[0.15rem] text-gray-600 transition-colors';
+  'absolute right-0 bottom-0 rounded-full p-[0.15rem] text-text-secondary transition-colors';
 
 export default function SourceIcon({
   source,
diff --git a/client/src/components/Chat/Menus/Endpoints/components/SearchResults.tsx b/client/src/components/Chat/Menus/Endpoints/components/SearchResults.tsx
index 14bc2f0424..5025912a2f 100644
--- a/client/src/components/Chat/Menus/Endpoints/components/SearchResults.tsx
+++ b/client/src/components/Chat/Menus/Endpoints/components/SearchResults.tsx
@@ -199,7 +199,7 @@ export function SearchResults({ results, localize, searchValue }: SearchResultsP
                         <span>{modelName}</span>
                       </div>
                       {isGlobal && (
-                        <EarthIcon className="ml-auto size-4 text-green-400" aria-hidden="true" />
+                        <EarthIcon className="ml-auto size-4 text-accent-primary" aria-hidden="true" />
                       )}
                       {isModelSelected && (
                         <>
diff --git a/client/src/components/Endpoints/Settings/Advanced.tsx b/client/src/components/Endpoints/Settings/Advanced.tsx
index 6ef582941e..98284a89cb 100644
--- a/client/src/components/Endpoints/Settings/Advanced.tsx
+++ b/client/src/components/Endpoints/Settings/Advanced.tsx
@@ -285,13 +285,13 @@ export default function Settings({
           <div className="mb-2 flex w-full justify-between gap-2">
             <label
               htmlFor="resend-files"
-              className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 dark:text-gray-50"
+              className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
             >
               <small>{localize('com_endpoint_plug_resend_files')}</small>
             </label>
             <label
               htmlFor="image-detail-value"
-              className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 dark:text-gray-50"
+              className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
             >
               <small>{localize('com_endpoint_plug_image_detail')}</small>
             </label>
@@ -302,7 +302,7 @@ export default function Settings({
               className={cn(
                 defaultTextProps,
                 optionText,
-                'flex rounded-md bg-transparent py-2 text-xs focus:outline-none focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 dark:border-gray-700',
+                'flex rounded-md bg-transparent py-2 text-xs focus:outline-none focus:ring-2 focus:ring-ring-primary focus:ring-offset-2 border-border-light',
                 'pointer-events-none max-h-5 w-12 border-0 group-hover/temp:border-border-light',
               )}
             />
diff --git a/client/src/components/MCP/MCPServerStatusIcon.tsx b/client/src/components/MCP/MCPServerStatusIcon.tsx
index 12c88a65cb..30b85812c8 100644
--- a/client/src/components/MCP/MCPServerStatusIcon.tsx
+++ b/client/src/components/MCP/MCPServerStatusIcon.tsx
@@ -151,7 +151,7 @@ function LoadingStatusIcon({ serverName, onCancel, canCancel }: InitializingStat
       >
         <div className="relative size-4">
           <Spinner className="size-4 text-text-primary group-hover:opacity-0" />
-          <X className="absolute inset-0 size-4 text-red-500 opacity-0 group-hover:opacity-100" />
+          <X className="absolute inset-0 size-4 text-text-destructive opacity-0 group-hover:opacity-100" />
         </div>
       </button>
     );
diff --git a/client/src/components/Skills/buttons/SkillToggle.tsx b/client/src/components/Skills/buttons/SkillToggle.tsx
index ff948b1fac..39a27adf67 100644
--- a/client/src/components/Skills/buttons/SkillToggle.tsx
+++ b/client/src/components/Skills/buttons/SkillToggle.tsx
@@ -23,7 +23,7 @@ function SkillToggle({ enabled, onChange, ariaLabel }: SkillToggleProps) {
       <span
         className={cn(
           'relative inline-flex h-5 w-9 shrink-0 rounded-full transition-colors duration-200',
-          enabled ? 'bg-green-500' : 'bg-border-medium',
+          enabled ? 'bg-surface-submit' : 'bg-border-medium',
         )}
       >
         <span
diff --git a/client/src/components/Skills/display/SkillDetail.tsx b/client/src/components/Skills/display/SkillDetail.tsx
index 4a1c3117ea..a961af094f 100644
--- a/client/src/components/Skills/display/SkillDetail.tsx
+++ b/client/src/components/Skills/display/SkillDetail.tsx
@@ -107,7 +107,7 @@ export default function SkillDetail({ skill, onEdit, onDelete }: SkillDetailProp
                     side="top"
                     render={
                       <EarthIcon
-                        className="size-5 shrink-0 text-green-400"
+                        className="size-5 shrink-0 text-accent-primary"
                         aria-label={localize('com_ui_skill_sr_public')}
                       />
                     }
diff --git a/client/src/components/Skills/display/SkillDetailHeader.tsx b/client/src/components/Skills/display/SkillDetailHeader.tsx
index 91de3ec6fb..2295dca06b 100644
--- a/client/src/components/Skills/display/SkillDetailHeader.tsx
+++ b/client/src/components/Skills/display/SkillDetailHeader.tsx
@@ -42,7 +42,7 @@ const SkillDetailHeader = ({ skill, showActions = true }: SkillDetailHeaderProps
               side="top"
               render={
                 <EarthIcon
-                  className="h-5 w-5 shrink-0 text-green-400"
+                  className="h-5 w-5 shrink-0 text-accent-primary"
                   aria-label={localize('com_ui_sr_public_skill')}
                 />
               }
diff --git a/client/src/components/Skills/forms/CreateSkillForm.tsx b/client/src/components/Skills/forms/CreateSkillForm.tsx
index 1bcbfe4afb..0a882cf843 100644
--- a/client/src/components/Skills/forms/CreateSkillForm.tsx
+++ b/client/src/components/Skills/forms/CreateSkillForm.tsx
@@ -261,7 +261,7 @@ export default function CreateSkillForm({
           {createSkill.error != null && (
             <div
               role="alert"
-              className="flex items-start gap-2 rounded-md border border-red-500/40 bg-red-500/5 p-3 text-sm text-red-500"
+              className="flex items-start gap-2 rounded-md border border-red-500/40 bg-red-500/5 p-3 text-sm text-text-destructive"
             >
               <AlertTriangle className="mt-0.5 size-4 shrink-0" aria-hidden="true" />
               <span>{localize('com_ui_skill_create_error')}</span>