diff --git a/client/src/Components/v1/Alert/index.jsx b/client/src/Components/v1/Alert/index.jsx
index 89416f5b1..dd3b2f9f2 100644
--- a/client/src/Components/v1/Alert/index.jsx
+++ b/client/src/Components/v1/Alert/index.jsx
@@ -18,7 +18,7 @@ const icons = {
 	),
 	error: (
 		<Icon
-			name="AlertTriangle"
+			name="AlertCircle"
 			size={24}
 		/>
 	),
diff --git a/client/src/Components/v1/Check/Check.jsx b/client/src/Components/v1/Check/Check.jsx
index 01a41879e..cc3749fda 100644
--- a/client/src/Components/v1/Check/Check.jsx
+++ b/client/src/Components/v1/Check/Check.jsx
@@ -39,17 +39,11 @@ const Check = ({ text, noHighlightText, variant = "info", outlined = false }) =>
 					size={20}
 				/>
 			) : (
-				<Box
-					lineHeight={0}
-					sx={{
-						"& svg > path": { fill: colors[variant] },
-					}}
-				>
-					<Icon
-						name="Check"
-						size={16}
-					/>
-				</Box>
+				<Icon
+					name="Check"
+					size={16}
+					color={colors[variant]}
+				/>
 			)}
 			<Typography
 				component="span"
diff --git a/client/src/Components/v1/Icon/index.jsx b/client/src/Components/v1/Icon/index.jsx
index 4fa82a686..2f4ff968d 100644
--- a/client/src/Components/v1/Icon/index.jsx
+++ b/client/src/Components/v1/Icon/index.jsx
@@ -1,6 +1,138 @@
 import { useTheme } from "@mui/material";
-import * as LucideIcons from "lucide-react";
 import PropTypes from "prop-types";
+import {
+	Activity,
+	AlertCircle,
+	AlertTriangle,
+	ArrowDown,
+	ArrowLeft,
+	ArrowUp,
+	ArrowUpRight,
+	Bell,
+	Calendar,
+	Check,
+	CheckCircle,
+	CheckSquare,
+	ChevronDown,
+	ChevronLeft,
+	ChevronRight,
+	ChevronsLeft,
+	ChevronsRight,
+	ChevronsUpDown,
+	Circle,
+	CircleDot,
+	Clock,
+	Code,
+	Cpu,
+	Database,
+	ExternalLink,
+	Eye,
+	EyeOff,
+	FileText,
+	Gauge,
+	Globe,
+	GripVertical,
+	HelpCircle,
+	History,
+	Image,
+	Info,
+	Key,
+	Layers,
+	Link,
+	Lock,
+	LogOut,
+	Mail,
+	Menu,
+	MessageCircle,
+	MoreVertical,
+	Pause,
+	PauseCircle,
+	Play,
+	PlayCircle,
+	PlusCircle,
+	RefreshCw,
+	Ruler,
+	Search,
+	Settings,
+	Square,
+	Trash2,
+	TrendingUp,
+	Upload,
+	User,
+	Users,
+	Wifi,
+	Wrench,
+	X,
+} from "lucide-react";
+
+/**
+ * Map of icon names to Lucide icon components.
+ * Only includes icons that are actually used in the application.
+ */
+const iconComponents = {
+	Activity,
+	AlertCircle,
+	AlertTriangle,
+	ArrowDown,
+	ArrowLeft,
+	ArrowUp,
+	ArrowUpRight,
+	Bell,
+	Calendar,
+	Check,
+	CheckCircle,
+	CheckSquare,
+	ChevronDown,
+	ChevronLeft,
+	ChevronRight,
+	ChevronsLeft,
+	ChevronsRight,
+	ChevronsUpDown,
+	Circle,
+	CircleDot,
+	Clock,
+	Code,
+	Cpu,
+	Database,
+	ExternalLink,
+	Eye,
+	EyeOff,
+	FileText,
+	Gauge,
+	Globe,
+	GripVertical,
+	HelpCircle,
+	History,
+	Image,
+	Info,
+	Key,
+	Layers,
+	Link,
+	Lock,
+	LogOut,
+	Mail,
+	Menu,
+	MessageCircle,
+	MoreVertical,
+	Pause,
+	PauseCircle,
+	Play,
+	PlayCircle,
+	PlusCircle,
+	RefreshCw,
+	Ruler,
+	Search,
+	Settings,
+	Square,
+	Trash2,
+	TrendingUp,
+	Upload,
+	User,
+	Users,
+	Wifi,
+	Wrench,
+	X,
+};
 
 /**
  * Theme-aware icon component wrapping Lucide icons
@@ -34,10 +166,10 @@ const Icon = ({ name, size = 20, color, strokeWidth = 1.5, fill = "none", ...pro
 		return colorValue;
 	};
 
-	const LucideIcon = LucideIcons[name];
+	const LucideIcon = iconComponents[name];
 
 	if (!LucideIcon) {
-		console.warn(`Icon "${name}" not found in Lucide icons`);
+		console.warn(`Icon "${name}" not found in Icon component`);
 		return null;
 	}
 
diff --git a/client/src/Components/v1/Toast/index.jsx b/client/src/Components/v1/Toast/index.jsx
index 4250bc571..d409cec81 100644
--- a/client/src/Components/v1/Toast/index.jsx
+++ b/client/src/Components/v1/Toast/index.jsx
@@ -18,7 +18,7 @@ const icons = {
 	),
 	error: (
 		<Icon
-			name="AlertTriangle"
+			name="AlertCircle"
 			size={24}
 		/>
 	),
diff --git a/client/src/Pages/Maintenance/CreateMaintenance/Components/MonitorList/index.jsx b/client/src/Pages/Maintenance/CreateMaintenance/Components/MonitorList/index.jsx
index 3f606e4a2..2bf7a991f 100644
--- a/client/src/Pages/Maintenance/CreateMaintenance/Components/MonitorList/index.jsx
+++ b/client/src/Pages/Maintenance/CreateMaintenance/Components/MonitorList/index.jsx
@@ -17,7 +17,7 @@ const MonitorListItem = ({ monitor, onDelete }) => {
 			<Icon
 				name="Trash2"
 				size={20}
-				sx={{ cursor: "pointer" }}
+				style={{ cursor: "pointer" }}
 				onClick={() => onDelete(monitor)}
 			/>
 		</Stack>
diff --git a/client/src/Pages/StatusPage/Create/Components/MonitorList/index.jsx b/client/src/Pages/StatusPage/Create/Components/MonitorList/index.jsx
index 81e6df6c5..349571fe8 100644
--- a/client/src/Pages/StatusPage/Create/Components/MonitorList/index.jsx
+++ b/client/src/Pages/StatusPage/Create/Components/MonitorList/index.jsx
@@ -35,7 +35,7 @@ const MonitorListItem = ({
 			<Icon
 				name="Trash2"
 				size={20}
-				sx={{ marginLeft: "auto" }}
+				style={{ marginLeft: "auto", cursor: "pointer" }}
 				onClick={() => {
 					onDelete(monitor);
 				}}