diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 7cbe407e..7e622fcd 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -28,7 +28,7 @@
                 "clsx": "^2.1.1",
                 "cmdk": "^1.1.1",
                 "i18next": "^26.5.12",
-                "lucide-react": "^0.363.0",
+                "lucide-react": "^1.65.0",
                 "react": "^18.3.1",
                 "react-dom": "^18.3.1",
                 "react-i18next": "^17.1.9",
@@ -4751,12 +4751,18 @@
             }
         },
         "node_modules/lucide-react": {
-            "version": "0.363.0",
-            "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.363.0.tgz",
-            "integrity": "sha512-AlsfPCsXQyQx7wwsIgzcKOL9LwC498LIMAo+c0Es5PkHJa33xwmYAkkSoKoJWWWSYQEStqu58/jT4tL2gi32uQ==",
+            "version": "1.65.0",
+            "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-1.65.0.tgz",
+            "integrity": "sha512-roSdtzudEY39i2hn5LLjA8toYfhF2z4S10WSqZF4ubXpHlOmNTvaxMxZLdJfQDi6pEifQWX+cRmYihKSsvAxfA==",
             "license": "ISC",
             "peerDependencies": {
-                "react": "^16.5.1 || ^17.0.0 || ^18.0.0"
+                "@types/react": "*",
+                "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
             }
         },
         "node_modules/math-intrinsics": {
diff --git a/frontend/package.json b/frontend/package.json
index 8880d85a..0a976641 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -64,7 +64,7 @@
         "clsx": "^2.1.1",
         "cmdk": "^1.1.1",
         "i18next": "^26.5.12",
-        "lucide-react": "^0.363.0",
+        "lucide-react": "^1.65.0",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-i18next": "^17.1.9",
diff --git a/frontend/src/components/settings/AboutTab.jsx b/frontend/src/components/settings/AboutTab.jsx
index ef12b108..bdf24881 100644
--- a/frontend/src/components/settings/AboutTab.jsx
+++ b/frontend/src/components/settings/AboutTab.jsx
@@ -1,9 +1,10 @@
 import { useState, useEffect, useRef } from 'react';
 import api from '../../services/api';
 import {
-    Github, FileText, HelpCircle, MessageSquare, Bug, Check, Download, CheckCircle,
+    FileText, HelpCircle, MessageSquare, Bug, Check, Download, CheckCircle,
     RefreshCw, ExternalLink, Star, X, AlertTriangle
 } from 'lucide-react';
+import { SiGithub as Github } from 'react-icons/si';
 import ServerKitLogo from '../ServerKitLogo';
 import ErrorState from '../ErrorState';
 import { Button } from '@/components/ui/button';
diff --git a/frontend/src/components/settings/IconReferenceTab.jsx b/frontend/src/components/settings/IconReferenceTab.jsx
index bfb25df2..425a4698 100644
--- a/frontend/src/components/settings/IconReferenceTab.jsx
+++ b/frontend/src/components/settings/IconReferenceTab.jsx
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import {
-    Github, FileText, HelpCircle, MessageSquare, Bug, Check, Download, CheckCircle,
+    FileText, HelpCircle, MessageSquare, Bug, Check, Download, CheckCircle,
     RefreshCw, ExternalLink, Star, X, Code, Search, Container, Globe, BarChart3,
     Database, Shield, Cloud, Video, Music, Image, Home, Server, GitBranch, Workflow,
     HardDrive, Lock, Users, Settings as SettingsIcon, Layers, ChevronDown, Copy, Tag,
@@ -48,9 +48,6 @@ const ICON_CATALOG = {
     'Navigation & UI': {
         Home, Star, Sun, Moon, Palette, Play, Square, Calendar, Clock,
         LogOut, SettingsIcon, Newspaper, TrendingUp, BarChart3, Minus
-    },
-    'Brands': {
-        Github
     }
 };
 
diff --git a/frontend/src/components/settings/ThemeStudioModal.jsx b/frontend/src/components/settings/ThemeStudioModal.jsx
index 8a4a87e6..6e5cb979 100644
--- a/frontend/src/components/settings/ThemeStudioModal.jsx
+++ b/frontend/src/components/settings/ThemeStudioModal.jsx
@@ -1,5 +1,6 @@
 import { useEffect, useMemo, useState, useId } from 'react';
-import { Download, Save, Github } from 'lucide-react';
+import { Download, Save } from 'lucide-react';
+import { SiGithub as Github } from 'react-icons/si';
 import {
     Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription,
 } from '@/components/ui/dialog';
diff --git a/frontend/src/pages/GithubAppCallback.jsx b/frontend/src/pages/GithubAppCallback.jsx
index 83a4e87e..90b3629e 100644
--- a/frontend/src/pages/GithubAppCallback.jsx
+++ b/frontend/src/pages/GithubAppCallback.jsx
@@ -1,6 +1,7 @@
 import { useEffect, useRef, useState } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
-import { Github, Loader2 } from 'lucide-react';
+import { Loader2 } from 'lucide-react';
+import { SiGithub as Github } from 'react-icons/si';
 import api from '../services/api';
 import { useToast } from '../contexts/useToast.js';
 import { useTranslation } from 'react-i18next';
diff --git a/frontend/src/pages/Services.jsx b/frontend/src/pages/Services.jsx
index fc943559..cdce5c8d 100644
--- a/frontend/src/pages/Services.jsx
+++ b/frontend/src/pages/Services.jsx
@@ -1,6 +1,7 @@
 import { useCallback, useState, useEffect, useMemo  } from 'react';
 import { useNavigate, Link } from 'react-router-dom';
-import { Layers, Plus, Square, Play, RotateCw, GitBranch, Github, FolderOpen, FileArchive, FolderKanban, ArrowDownToLine } from 'lucide-react';
+import { Layers, Plus, Square, Play, RotateCw, GitBranch, FolderOpen, FileArchive, FolderKanban, ArrowDownToLine } from 'lucide-react';
+import { SiGithub as Github } from 'react-icons/si';
 import api from '../services/api';
 import { useToast } from '../contexts/useToast.js';
 import { getServiceType, getStatusConfig, formatRelativeTime } from '../utils/serviceTypes';
diff --git a/frontend/src/pages/SourceConnectionCallback.jsx b/frontend/src/pages/SourceConnectionCallback.jsx
index 8b6a9e1f..84d9242a 100644
--- a/frontend/src/pages/SourceConnectionCallback.jsx
+++ b/frontend/src/pages/SourceConnectionCallback.jsx
@@ -1,6 +1,7 @@
 import { useEffect, useRef, useState } from 'react';
 import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
-import { Github, Gitlab, GitBranch, Loader2 } from 'lucide-react';
+import { GitBranch, Loader2 } from 'lucide-react';
+import { SiGithub as Github, SiGitlab as Gitlab } from 'react-icons/si';
 import { SiBitbucket } from 'react-icons/si';
 import api from '../services/api';
 import { useToast } from '../contexts/useToast.js';