diff --git a/client/package-lock.json b/client/package-lock.json
index e917619ae..7f5397b7f 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -12,7 +12,6 @@
 				"@emotion/styled": "^11.13.0",
 				"@hello-pangea/dnd": "^18.0.0",
 				"@hookform/resolvers": "5.2.2",
-				"@mui/icons-material": "6.4.11",
 				"@mui/lab": "6.0.0-dev.240424162023-9968b4889d",
 				"@mui/material": "6.4.11",
 				"@mui/x-charts": "^7.5.1",
@@ -25,6 +24,7 @@
 				"human-interval": "2.0.1",
 				"i18next": "25.4.2",
 				"joi": "17.13.3",
+				"lucide-react": "^0.562.0",
 				"mui-color-input": "^6.0.0",
 				"pretty-ms": "9.3.0",
 				"react": "18.3.1",
@@ -1189,32 +1189,6 @@
 				"url": "https://opencollective.com/mui-org"
 			}
 		},
-		"node_modules/@mui/icons-material": {
-			"version": "6.4.11",
-			"resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-6.4.11.tgz",
-			"integrity": "sha512-+jjJGIrB1awNbMv4ZVPPdN/p7O1UKFZ+xqRvNIQ8B1KnlID5hPMPBLM6UUbRF4bu3UDCbu79rn9Nye5LGNzmeA==",
-			"license": "MIT",
-			"dependencies": {
-				"@babel/runtime": "^7.26.0"
-			},
-			"engines": {
-				"node": ">=14.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/mui-org"
-			},
-			"peerDependencies": {
-				"@mui/material": "^6.4.11",
-				"@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
-				"react": "^17.0.0 || ^18.0.0 || ^19.0.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/react": {
-					"optional": true
-				}
-			}
-		},
 		"node_modules/@mui/lab": {
 			"version": "6.0.0-dev.240424162023-9968b4889d",
 			"resolved": "https://registry.npmjs.org/@mui/lab/-/lab-6.0.0-dev.240424162023-9968b4889d.tgz",
@@ -2050,9 +2024,9 @@
 			}
 		},
 		"node_modules/@remix-run/router": {
-			"version": "1.23.0",
-			"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.0.tgz",
-			"integrity": "sha512-O3rHJzAQKamUz1fvE0Qaw0xSFqsA/yafi2iqeE0pvdFtCO1viYx8QL6f3Ln/aCCTLxs68SLf0KPM9eSeM8yBnA==",
+			"version": "1.23.2",
+			"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.2.tgz",
+			"integrity": "sha512-Ic6m2U/rMjTkhERIa/0ZtXJP17QUi2CbWE7cqx4J58M8aA3QTfW+2UlQ4psvTX9IO1RfNVhK3pcpdjej7L+t2w==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=14.0.0"
@@ -5297,9 +5271,9 @@
 			"license": "MIT"
 		},
 		"node_modules/js-yaml": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+			"integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
 			"license": "MIT",
 			"dependencies": {
 				"argparse": "^2.0.1"
@@ -5464,6 +5438,15 @@
 				"yallist": "^3.0.2"
 			}
 		},
+		"node_modules/lucide-react": {
+			"version": "0.562.0",
+			"resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.562.0.tgz",
+			"integrity": "sha512-82hOAu7y0dbVuFfmO4bYF1XEwYk/mEbM5E+b1jgci/udUBEE/R7LF5Ip0CCEmXe8AybRM8L+04eP+LGZeDvkiw==",
+			"license": "ISC",
+			"peerDependencies": {
+				"react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+			}
+		},
 		"node_modules/math-intrinsics": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -6129,12 +6112,12 @@
 			}
 		},
 		"node_modules/react-router": {
-			"version": "6.30.1",
-			"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.30.1.tgz",
-			"integrity": "sha512-X1m21aEmxGXqENEPG3T6u0Th7g0aS4ZmoNynhbs+Cn+q+QGTLt+d5IQ2bHAXKzKcxGJjxACpVbnYQSCRcfxHlQ==",
+			"version": "6.30.3",
+			"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.30.3.tgz",
+			"integrity": "sha512-XRnlbKMTmktBkjCLE8/XcZFlnHvr2Ltdr1eJX4idL55/9BbORzyZEaIkBFDhFGCEWBBItsVrDxwx3gnisMitdw==",
 			"license": "MIT",
 			"dependencies": {
-				"@remix-run/router": "1.23.0"
+				"@remix-run/router": "1.23.2"
 			},
 			"engines": {
 				"node": ">=14.0.0"
@@ -6144,13 +6127,13 @@
 			}
 		},
 		"node_modules/react-router-dom": {
-			"version": "6.30.1",
-			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.30.1.tgz",
-			"integrity": "sha512-llKsgOkZdbPU1Eg3zK8lCn+sjD9wMRZZPuzmdWWX5SUs8OFkN5HnFVC0u5KMeMaC9aoancFI/KoLuKPqN+hxHw==",
+			"version": "6.30.3",
+			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.30.3.tgz",
+			"integrity": "sha512-pxPcv1AczD4vso7G4Z3TKcvlxK7g7TNt3/FNGMhfqyntocvYKj+GCatfigGDjbLozC4baguJ0ReCigoDJXb0ag==",
 			"license": "MIT",
 			"dependencies": {
-				"@remix-run/router": "1.23.0",
-				"react-router": "6.30.1"
+				"@remix-run/router": "1.23.2",
+				"react-router": "6.30.3"
 			},
 			"engines": {
 				"node": ">=14.0.0"
diff --git a/client/package.json b/client/package.json
index 376671942..50fafb35c 100644
--- a/client/package.json
+++ b/client/package.json
@@ -17,7 +17,6 @@
 		"@emotion/styled": "^11.13.0",
 		"@hello-pangea/dnd": "^18.0.0",
 		"@hookform/resolvers": "5.2.2",
-		"@mui/icons-material": "6.4.11",
 		"@mui/lab": "6.0.0-dev.240424162023-9968b4889d",
 		"@mui/material": "6.4.11",
 		"@mui/x-charts": "^7.5.1",
@@ -30,6 +29,7 @@
 		"human-interval": "2.0.1",
 		"i18next": "25.4.2",
 		"joi": "17.13.3",
+		"lucide-react": "^0.562.0",
 		"mui-color-input": "^6.0.0",
 		"pretty-ms": "9.3.0",
 		"react": "18.3.1",
diff --git a/client/src/Components/v1/ActionsMenu/index.jsx b/client/src/Components/v1/ActionsMenu/index.jsx
index 5cd0dfa5b..b469e6764 100644
--- a/client/src/Components/v1/ActionsMenu/index.jsx
+++ b/client/src/Components/v1/ActionsMenu/index.jsx
@@ -2,7 +2,7 @@
 import IconButton from "@mui/material/IconButton";
 import Menu from "@mui/material/Menu";
 import MenuItem from "@mui/material/MenuItem";
-import Settings from "../../../assets/icons/settings-bold.svg?react";
+import Icon from "../Icon";
 import Dialog from "../Dialog/index.jsx";
 
 // Utils
@@ -84,7 +84,10 @@ const ActionsMenu = ({
 					},
 				}}
 			>
-				<Settings />
+				<Icon
+					name="Settings"
+					size={20}
+				/>
 			</IconButton>
 
 			<Menu
diff --git a/client/src/Components/v1/Alert/index.jsx b/client/src/Components/v1/Alert/index.jsx
index 921d4fd6e..dd3b2f9f2 100644
--- a/client/src/Components/v1/Alert/index.jsx
+++ b/client/src/Components/v1/Alert/index.jsx
@@ -1,10 +1,7 @@
 import PropTypes from "prop-types";
 import { useTheme } from "@emotion/react";
 import { Box, Button, IconButton, Stack, Typography } from "@mui/material";
-import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
-import ErrorOutlineOutlinedIcon from "@mui/icons-material/ErrorOutlineOutlined";
-import WarningAmberOutlinedIcon from "@mui/icons-material/WarningAmberOutlined";
-import CloseIcon from "@mui/icons-material/Close";
+import Icon from "../Icon";
 import "./index.css";
 
 /**
@@ -13,9 +10,24 @@ import "./index.css";
  */
 
 const icons = {
-	info: <InfoOutlinedIcon />,
-	error: <ErrorOutlineOutlinedIcon />,
-	warning: <WarningAmberOutlinedIcon />,
+	info: (
+		<Icon
+			name="Info"
+			size={24}
+		/>
+	),
+	error: (
+		<Icon
+			name="AlertCircle"
+			size={24}
+		/>
+	),
+	warning: (
+		<Icon
+			name="AlertTriangle"
+			size={24}
+		/>
+	),
 };
 
 /**
@@ -97,10 +109,9 @@ const Alert = ({ variant, title, body, isToast, hasIcon = true, onClick }) => {
 						},
 					}}
 				>
-					<CloseIcon
-						sx={{
-							fontSize: "20px",
-						}}
+					<Icon
+						name="X"
+						size={20}
 					/>
 				</IconButton>
 			)}
diff --git a/client/src/Components/v1/ArrowLeft/index.jsx b/client/src/Components/v1/ArrowLeft/index.jsx
index a327d6bb7..e18a7f2d5 100644
--- a/client/src/Components/v1/ArrowLeft/index.jsx
+++ b/client/src/Components/v1/ArrowLeft/index.jsx
@@ -1,27 +1,28 @@
-import LeftArrow from "../../../assets/icons/left-arrow.svg?react";
-import LeftArrowDouble from "../../../assets/icons/left-arrow-double.svg?react";
-import LeftArrowLong from "../../../assets/icons/left-arrow-long.svg?react";
+import Icon from "../Icon";
 import PropTypes from "prop-types";
 
 const ArrowLeft = ({ type, color = "#667085", ...props }) => {
 	if (type === "double") {
 		return (
-			<LeftArrowDouble
-				style={{ color }}
+			<Icon
+				name="ChevronsLeft"
+				color={color}
 				{...props}
 			/>
 		);
 	} else if (type === "long") {
 		return (
-			<LeftArrowLong
-				style={{ color }}
+			<Icon
+				name="ArrowLeft"
+				color={color}
 				{...props}
 			/>
 		);
 	} else {
 		return (
-			<LeftArrow
-				style={{ color }}
+			<Icon
+				name="ChevronLeft"
+				color={color}
 				{...props}
 			/>
 		);
diff --git a/client/src/Components/v1/ArrowRight/index.jsx b/client/src/Components/v1/ArrowRight/index.jsx
index 08a2639b0..3ae64a580 100644
--- a/client/src/Components/v1/ArrowRight/index.jsx
+++ b/client/src/Components/v1/ArrowRight/index.jsx
@@ -1,19 +1,20 @@
-import RightArrow from "../../../assets/icons/right-arrow.svg?react";
-import RightArrowDouble from "../../../assets/icons/right-arrow-double.svg?react";
+import Icon from "../Icon";
 import PropTypes from "prop-types";
 
 const ArrowRight = ({ type, color = "#667085", ...props }) => {
 	if (type === "double") {
 		return (
-			<RightArrowDouble
-				style={{ color }}
+			<Icon
+				name="ChevronsRight"
+				color={color}
 				{...props}
 			/>
 		);
 	} else {
 		return (
-			<RightArrow
-				style={{ color }}
+			<Icon
+				name="ChevronRight"
+				color={color}
 				{...props}
 			/>
 		);
diff --git a/client/src/Components/v1/Check/Check.jsx b/client/src/Components/v1/Check/Check.jsx
index 53971316b..cc3749fda 100644
--- a/client/src/Components/v1/Check/Check.jsx
+++ b/client/src/Components/v1/Check/Check.jsx
@@ -1,7 +1,6 @@
 import "./check.css";
 import PropTypes from "prop-types";
-import CheckGrey from "../../../assets/icons/check.svg?react";
-import CheckOutlined from "../../../assets/icons/check-outlined.svg?react";
+import Icon from "../Icon";
 import { Box, Stack, Typography } from "@mui/material";
 import { useTheme } from "@emotion/react";
 
@@ -35,16 +34,16 @@ const Check = ({ text, noHighlightText, variant = "info", outlined = false }) =>
 			alignItems="center"
 		>
 			{outlined ? (
-				<CheckOutlined alt="check" />
+				<Icon
+					name="CheckCircle"
+					size={20}
+				/>
 			) : (
-				<Box
-					lineHeight={0}
-					sx={{
-						"& svg > path": { fill: colors[variant] },
-					}}
-				>
-					<CheckGrey alt="form checks" />
-				</Box>
+				<Icon
+					name="Check"
+					size={16}
+					color={colors[variant]}
+				/>
 			)}
 			<Typography
 				component="span"
diff --git a/client/src/Components/v1/Common/AppBar.jsx b/client/src/Components/v1/Common/AppBar.jsx
index 1d5a38ddd..5cd3db5c1 100644
--- a/client/src/Components/v1/Common/AppBar.jsx
+++ b/client/src/Components/v1/Common/AppBar.jsx
@@ -8,8 +8,7 @@ import IconButton from "@mui/material/IconButton";
 import Container from "@mui/material/Container";
 import MenuItem from "@mui/material/MenuItem";
 import Drawer from "@mui/material/Drawer";
-import MenuIcon from "@mui/icons-material/Menu";
-import CloseRoundedIcon from "@mui/icons-material/CloseRounded";
+import Icon from "../Icon";
 import ThemeSwitch from "../ThemeSwitch/index.jsx";
 import { useTheme } from "@mui/material/styles";
 import { useSelector } from "react-redux";
@@ -153,7 +152,11 @@ const AppAppBar = () => {
 							aria-label="Menu button"
 							onClick={toggleDrawer(true)}
 						>
-							<MenuIcon sx={{ color: theme.palette.text.primary }} />
+							<Icon
+								name="Menu"
+								size={24}
+								color={theme.palette.text.primary}
+							/>
 						</IconButton>
 						<Drawer
 							anchor="top"
@@ -176,7 +179,11 @@ const AppAppBar = () => {
 									}}
 								>
 									<IconButton onClick={toggleDrawer(false)}>
-										<CloseRoundedIcon sx={{ color: theme.palette.text.primary }} />
+										<Icon
+											name="X"
+											size={24}
+											color={theme.palette.text.primary}
+										/>
 									</IconButton>
 								</Box>
 
diff --git a/client/src/Components/v1/FilterHeader/index.jsx b/client/src/Components/v1/FilterHeader/index.jsx
index 36dd04081..de2c7f0e9 100644
--- a/client/src/Components/v1/FilterHeader/index.jsx
+++ b/client/src/Components/v1/FilterHeader/index.jsx
@@ -1,7 +1,7 @@
 import { Checkbox, FormControl, ListItemText, MenuItem, Select } from "@mui/material";
 import { useTheme } from "@emotion/react";
 import PropTypes from "prop-types";
-import AddCircleOutlineIcon from "@mui/icons-material/AddCircleOutline";
+import Icon from "../Icon";
 
 /**
  * A reusable filter header component that displays a dropdown menu with selectable options.
@@ -29,9 +29,10 @@ const FilterHeader = ({ header, options, value, onChange, multiple = true }) =>
 			<Select
 				multiple={multiple}
 				IconComponent={(props) => (
-					<AddCircleOutlineIcon
+					<Icon
 						{...props}
-						sx={{ fontSize: "medium" }}
+						name="PlusCircle"
+						size={18}
 					/>
 				)}
 				displayEmpty
diff --git a/client/src/Components/v1/Icon/iconMap.js b/client/src/Components/v1/Icon/iconMap.js
new file mode 100644
index 000000000..58da7304b
--- /dev/null
+++ b/client/src/Components/v1/Icon/iconMap.js
@@ -0,0 +1,120 @@
+/**
+ * Maps legacy icon names to Lucide icon names
+ * Use: import { iconMap } from './iconMap'; LucideIcons[iconMap['monitors']]
+ */
+export const iconMap = {
+	// Navigation/Sidebar icons
+	monitors: "Globe",
+	incidents: "AlertTriangle",
+	integrations: "Link",
+	"page-speed": "Gauge",
+	settings: "Settings",
+	notifications: "Bell",
+	maintenance: "Wrench",
+	"status-pages": "Wifi",
+	docs: "FileText",
+	discussions: "MessageCircle",
+	support: "HelpCircle",
+	changeLog: "Code",
+	logs: "Database",
+
+	// User icons
+	user: "User",
+	"user-two": "Users",
+	"user-edit": "UserPen",
+	groups: "Users",
+	lock: "Lock",
+	key: "Key",
+	logout: "LogOut",
+
+	// Action icons
+	edit: "Pencil",
+	"trash-bin": "Trash2",
+	search: "Search",
+	"close-icon": "X",
+	check: "Check",
+	"check-icon": "CheckCircle",
+	"check-outlined": "CheckCircle",
+
+	// Arrow icons
+	"left-arrow": "ChevronLeft",
+	"right-arrow": "ChevronRight",
+	"up-arrow": "ChevronUp",
+	"down-arrow": "ChevronDown",
+	"left-arrow-double": "ChevronsLeft",
+	"right-arrow-double": "ChevronsRight",
+	"left-arrow-long": "ArrowLeft",
+	"top-right-arrow": "ArrowUpRight",
+	"open-in-new-page": "ExternalLink",
+	"selector-vertical": "ChevronsUpDown",
+
+	// Status/Alert icons
+	"alert-icon": "Bell",
+	"warning-icon": "AlertCircle",
+	"history-icon": "History",
+
+	// Data/Chart icons
+	dashboard: "LayoutGrid",
+	"monitor-graph-line": "TrendingUp",
+	"response-time-icon": "TrendingUp",
+	"uptime-icon": "Activity",
+	"speedometer-icon": "Gauge",
+	"spedometer-icon": "Gauge",
+	"ruler-icon": "Ruler",
+	"performance-report": "Layers",
+	"average-response-icon": "BarChart3",
+	"distributed-uptime": "Network",
+
+	// Misc icons
+	calendar: "Calendar",
+	"calendar-check": "CalendarCheck",
+	"clock-snooze": "Clock",
+	mail: "Mail",
+	email: "Mail",
+	folder: "Folder",
+	"dots-vertical": "MoreVertical",
+	"pause-icon": "PauseCircle",
+	"resume-icon": "PlayCircle",
+	"checkbox-filled": "CheckSquare",
+	"checkbox-outline": "Square",
+	"radio-checked": "Circle",
+	"cpu-chip": "Cpu",
+	certificate: "Award",
+	"interval-check": "RefreshCw",
+};
+
+/**
+ * MUI icon to Lucide mapping
+ */
+export const muiToLucideMap = {
+	AddCircleOutline: "PlusCircle",
+	ArrowDownwardRounded: "ArrowDown",
+	ArrowUpwardRounded: "ArrowUp",
+	ArrowDropDown: "ChevronDown",
+	ArrowOutward: "ExternalLink",
+	CheckCircle: "CheckCircle2",
+	Clear: "X",
+	Close: "X",
+	CloseRounded: "X",
+	CloudUpload: "Upload",
+	Delete: "Trash2",
+	DeleteOutlineRounded: "Trash2",
+	Email: "Mail",
+	ErrorOutline: "AlertTriangle",
+	ErrorOutlineOutlined: "AlertTriangle",
+	Image: "ImageIcon",
+	InfoOutlined: "Info",
+	KeyboardArrowDown: "ChevronDown",
+	Menu: "Menu",
+	PauseCircleOutline: "PauseCircle",
+	PauseOutlined: "Pause",
+	PlayArrowOutlined: "Play",
+	PlayCircleOutlineRounded: "PlayCircle",
+	RadioButtonChecked: "Circle",
+	ReorderRounded: "GripVertical",
+	SettingsOutlined: "Settings",
+	Share: "Share2",
+	Visibility: "Eye",
+	VisibilityOff: "EyeOff",
+	WarningAmberOutlined: "AlertTriangle",
+};
diff --git a/client/src/Components/v1/Icon/index.jsx b/client/src/Components/v1/Icon/index.jsx
new file mode 100644
index 000000000..5828601fd
--- /dev/null
+++ b/client/src/Components/v1/Icon/index.jsx
@@ -0,0 +1,196 @@
+import { useTheme } from "@mui/material";
+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 as ImageIcon,
+	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 icons explicitly imported here will be included in the bundle (tree-shaking).
+ * To add a new icon: import it above and add it to this object.
+ */
+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: ImageIcon,
+	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
+ *
+ * @param {string} name - Lucide icon name (e.g., "Bell", "Check", "ArrowLeft")
+ * @param {number} size - Icon size in pixels (default: 20)
+ * @param {string} color - Direct color value OR theme path like "primary.contrastText"
+ * @param {number} strokeWidth - Stroke width (default: 1.5)
+ * @param {string} fill - Fill color (default: "none")
+ */
+const Icon = ({ name, size = 20, color, strokeWidth = 1.5, fill = "none", ...props }) => {
+	const theme = useTheme();
+
+	// Resolve color from theme path or use direct value
+	const resolveColor = (colorValue) => {
+		if (!colorValue) {
+			return theme.palette.primary.contrastTextTertiary; // Default icon color
+		}
+
+		// If it's a theme path like "primary.contrastText"
+		if (typeof colorValue === "string" && colorValue.includes(".")) {
+			const parts = colorValue.split(".");
+			let resolved = theme.palette;
+			for (const part of parts) {
+				resolved = resolved?.[part];
+			}
+			return resolved || colorValue;
+		}
+
+		// Direct color value
+		return colorValue;
+	};
+
+	const LucideIcon = iconComponents[name];
+
+	if (!LucideIcon) {
+		console.warn(`Icon "${name}" not found in Icon component`);
+		return null;
+	}
+
+	return (
+		<LucideIcon
+			size={size}
+			color={resolveColor(color)}
+			strokeWidth={strokeWidth}
+			fill={fill}
+			{...props}
+		/>
+	);
+};
+
+Icon.propTypes = {
+	name: PropTypes.string.isRequired,
+	size: PropTypes.number,
+	color: PropTypes.string,
+	strokeWidth: PropTypes.number,
+	fill: PropTypes.string,
+};
+
+export default Icon;
diff --git a/client/src/Components/v1/Inputs/Checkbox/index.jsx b/client/src/Components/v1/Inputs/Checkbox/index.jsx
index 64f3cc3db..caa6830e7 100644
--- a/client/src/Components/v1/Inputs/Checkbox/index.jsx
+++ b/client/src/Components/v1/Inputs/Checkbox/index.jsx
@@ -1,8 +1,7 @@
 import PropTypes from "prop-types";
 import { FormControlLabel, Checkbox as MuiCheckbox } from "@mui/material";
 import { useTheme } from "@emotion/react";
-import CheckboxOutline from "../../../../assets/icons/checkbox-outline.svg?react";
-import CheckboxFilled from "../../../../assets/icons/checkbox-filled.svg?react";
+import Icon from "../../Icon";
 
 /**
  * Checkbox Component
@@ -65,8 +64,8 @@ const Checkbox = ({
 					name={name}
 					value={value}
 					onChange={onChange}
-					icon={<CheckboxOutline />}
-					checkedIcon={<CheckboxFilled />}
+					icon={<Icon name="Square" />}
+					checkedIcon={<Icon name="CheckSquare" />}
 					inputProps={{
 						"aria-label": "controlled checkbox",
 						id: id,
diff --git a/client/src/Components/v1/Inputs/ImageUpload/index.jsx b/client/src/Components/v1/Inputs/ImageUpload/index.jsx
index e7415bf8f..d224418e0 100644
--- a/client/src/Components/v1/Inputs/ImageUpload/index.jsx
+++ b/client/src/Components/v1/Inputs/ImageUpload/index.jsx
@@ -1,11 +1,10 @@
 // Components
 import { Box, Stack, Typography } from "@mui/material";
-import CloudUploadIcon from "@mui/icons-material/CloudUpload";
+import Icon from "../../Icon";
 import Image from "../../Image/index.jsx";
 import TextField from "@mui/material/TextField";
 import IconButton from "@mui/material/IconButton";
 import ProgressUpload from "../../ProgressBars/index.jsx";
-import ImageIcon from "@mui/icons-material/Image";
 
 // Utils
 import PropTypes from "prop-types";
@@ -176,7 +175,10 @@ const ImageUpload = ({
 									boxShadow: theme.shape.boxShadow,
 								}}
 							>
-								<CloudUploadIcon />
+								<Icon
+									name="Upload"
+									size={24}
+								/>
 							</IconButton>
 							<Typography
 								component="h2"
@@ -203,7 +205,12 @@ const ImageUpload = ({
 					</Box>
 					{(localError || progress.isLoading || progress.value !== 0) && (
 						<ProgressUpload
-							icon={<ImageIcon />}
+							icon={
+								<Icon
+									name="Image"
+									size={20}
+								/>
+							}
 							label={file?.name || "Upload failed"}
 							size={file?.size}
 							progress={progress.value}
diff --git a/client/src/Components/v1/Inputs/Radio/index.jsx b/client/src/Components/v1/Inputs/Radio/index.jsx
index 575c1af74..b6bd4e69c 100644
--- a/client/src/Components/v1/Inputs/Radio/index.jsx
+++ b/client/src/Components/v1/Inputs/Radio/index.jsx
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import { FormControlLabel, Radio as MUIRadio, Typography } from "@mui/material";
 import { useTheme } from "@emotion/react";
-import RadioChecked from "../../../../assets/icons/radio-checked.svg?react";
+import Icon from "../../Icon";
 import "./index.css";
 
 /**
@@ -47,7 +47,12 @@ const Radio = ({
 				<MUIRadio
 					id={id}
 					size={size}
-					checkedIcon={<RadioChecked />}
+					checkedIcon={
+						<Icon
+							name="CircleDot"
+							size={16}
+						/>
+					}
 					sx={{
 						color: "transparent",
 						width: 16,
diff --git a/client/src/Components/v1/Inputs/Search/index.jsx b/client/src/Components/v1/Inputs/Search/index.jsx
index 8138ee6f4..4371ef971 100644
--- a/client/src/Components/v1/Inputs/Search/index.jsx
+++ b/client/src/Components/v1/Inputs/Search/index.jsx
@@ -8,7 +8,7 @@ import {
 	Checkbox,
 } from "@mui/material";
 import { useTheme } from "@emotion/react";
-import SearchIcon from "../../../../assets/icons/search.svg?react";
+import Icon from "../../Icon";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import FieldWrapper from "../FieldWrapper/index.jsx";
@@ -31,20 +31,13 @@ import FieldWrapper from "../FieldWrapper/index.jsx";
 const SearchAdornment = () => {
 	const theme = useTheme();
 	return (
-		<Box
-			height={16}
-			sx={{
-				"& svg": {
-					width: 16,
-					height: 16,
-					"& path": {
-						stroke: theme.palette.primary.contrastTextTertiary,
-						strokeWidth: 1.2,
-					},
-				},
-			}}
-		>
-			<SearchIcon />
+		<Box height={16}>
+			<Icon
+				name="Search"
+				size={16}
+				color="primary.contrastTextTertiary"
+				strokeWidth={1.2}
+			/>
 		</Box>
 	);
 };
diff --git a/client/src/Components/v1/Inputs/Select/index.jsx b/client/src/Components/v1/Inputs/Select/index.jsx
index f952b6818..0f96a2ff6 100644
--- a/client/src/Components/v1/Inputs/Select/index.jsx
+++ b/client/src/Components/v1/Inputs/Select/index.jsx
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import { useTheme } from "@emotion/react";
 import { MenuItem, Select as MuiSelect, Stack, Typography } from "@mui/material";
-import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
+import Icon from "../../Icon";
 import FieldWrapper from "../FieldWrapper/index.jsx";
 
 import "./index.css";
@@ -98,7 +98,13 @@ const Select = ({
 				error={error}
 				name={name}
 				inputProps={{ id: id }}
-				IconComponent={KeyboardArrowDownIcon}
+				IconComponent={(props) => (
+					<Icon
+						name="ChevronDown"
+						size={20}
+						{...props}
+					/>
+				)}
 				MenuProps={{ disableScrollLock: true }}
 				sx={{
 					fontSize: 13,
diff --git a/client/src/Components/v1/Inputs/TextInput/Adornments/index.jsx b/client/src/Components/v1/Inputs/TextInput/Adornments/index.jsx
index 4e4bbd2af..078684405 100644
--- a/client/src/Components/v1/Inputs/TextInput/Adornments/index.jsx
+++ b/client/src/Components/v1/Inputs/TextInput/Adornments/index.jsx
@@ -1,10 +1,7 @@
 import { Stack, Typography, InputAdornment, IconButton } from "@mui/material";
 import { useTheme } from "@mui/material/styles";
 import PropTypes from "prop-types";
-import VisibilityOff from "@mui/icons-material/VisibilityOff";
-import Visibility from "@mui/icons-material/Visibility";
-import ReorderRoundedIcon from "@mui/icons-material/ReorderRounded";
-import DeleteIcon from "../../../../../assets/icons/trash-bin.svg?react";
+import Icon from "../../../Icon";
 
 export const HttpAdornment = ({ https }) => {
 	const theme = useTheme();
@@ -56,7 +53,17 @@ export const PasswordEndAdornment = ({ fieldType, setFieldType }) => {
 					},
 				}}
 			>
-				{fieldType === "password" ? <VisibilityOff /> : <Visibility />}
+				{fieldType === "password" ? (
+					<Icon
+						name="EyeOff"
+						size={20}
+					/>
+				) : (
+					<Icon
+						name="Eye"
+						size={20}
+					/>
+				)}
 			</IconButton>
 		</InputAdornment>
 	);
diff --git a/client/src/Components/v1/MonitorActions/index.jsx b/client/src/Components/v1/MonitorActions/index.jsx
index 624d34b9a..f63fc23fe 100644
--- a/client/src/Components/v1/MonitorActions/index.jsx
+++ b/client/src/Components/v1/MonitorActions/index.jsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import Button from "@mui/material/Button";
 import ButtonGroup from "@mui/material/ButtonGroup";
-import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown";
+import Icon from "../Icon";
 import ClickAwayListener from "@mui/material/ClickAwayListener";
 import Grow from "@mui/material/Grow";
 import Paper from "@mui/material/Paper";
@@ -70,7 +70,10 @@ const MonitorActions = ({ isLoading }) => {
 					aria-haspopup="menu"
 					onClick={handleToggle}
 				>
-					<ArrowDropDownIcon />
+					<Icon
+						name="ChevronDown"
+						size={20}
+					/>
 				</Button>
 			</ButtonGroup>
 			<Popper
diff --git a/client/src/Components/v1/MonitorDetailsControlHeader/index.jsx b/client/src/Components/v1/MonitorDetailsControlHeader/index.jsx
index a86565f49..c5b62280f 100644
--- a/client/src/Components/v1/MonitorDetailsControlHeader/index.jsx
+++ b/client/src/Components/v1/MonitorDetailsControlHeader/index.jsx
@@ -3,10 +3,7 @@ import Status from "./status.jsx";
 import Skeleton from "./skeleton.jsx";
 import Button from "@mui/material/Button";
 import { Tooltip } from "@mui/material";
-import SettingsOutlinedIcon from "@mui/icons-material/SettingsOutlined";
-import PauseOutlinedIcon from "@mui/icons-material/PauseOutlined";
-import PlayArrowOutlinedIcon from "@mui/icons-material/PlayArrowOutlined";
-import EmailIcon from "@mui/icons-material/Email";
+import Icon from "../Icon";
 
 // Utils
 import PropTypes from "prop-types";
@@ -75,7 +72,12 @@ const MonitorDetailsControlHeader = ({
 							variant="contained"
 							color="secondary"
 							loading={isSending}
-							startIcon={<EmailIcon />}
+							startIcon={
+								<Icon
+									name="Mail"
+									size={18}
+								/>
+							}
 							disabled={isTestNotificationsDisabled}
 							onClick={() => {
 								testAllNotifications({ monitorId: monitor?.id });
@@ -103,7 +105,17 @@ const MonitorDetailsControlHeader = ({
 						color="secondary"
 						loading={isPausing}
 						startIcon={
-							monitor?.isActive ? <PauseOutlinedIcon /> : <PlayArrowOutlinedIcon />
+							monitor?.isActive ? (
+								<Icon
+									name="Pause"
+									size={18}
+								/>
+							) : (
+								<Icon
+									name="Play"
+									size={18}
+								/>
+							)
 						}
 						onClick={() => {
 							pauseMonitor({
@@ -119,7 +131,12 @@ const MonitorDetailsControlHeader = ({
 					<Button
 						variant="contained"
 						color="secondary"
-						startIcon={<SettingsOutlinedIcon />}
+						startIcon={
+							<Icon
+								name="Settings"
+								size={18}
+							/>
+						}
 						onClick={() => navigate(`/${path}/configure/${monitor.id}`)}
 					>
 						Configure
diff --git a/client/src/Components/v1/NotificationConfig/index.jsx b/client/src/Components/v1/NotificationConfig/index.jsx
index 58096881e..d76fd9fb6 100644
--- a/client/src/Components/v1/NotificationConfig/index.jsx
+++ b/client/src/Components/v1/NotificationConfig/index.jsx
@@ -2,7 +2,7 @@
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import Divider from "@mui/material/Divider";
-import DeleteOutlineRoundedIcon from "@mui/icons-material/DeleteOutlineRounded";
+import Icon from "../Icon";
 import Search from "../Inputs/Search/index.jsx";
 
 // Utils
@@ -102,11 +102,13 @@ const NotificationConfig = ({
 						>
 							{notification.notificationName}
 						</Typography>
-						<DeleteOutlineRoundedIcon
+						<Icon
+							name="Trash2"
+							size={20}
 							onClick={() => {
 								handleDelete(notification._id);
 							}}
-							sx={{ cursor: "pointer" }}
+							style={{ cursor: "pointer" }}
 						/>
 						{index < selectedNotifications.length - 1 && <Divider />}
 					</Stack>
diff --git a/client/src/Components/v1/ProgressBars/index.jsx b/client/src/Components/v1/ProgressBars/index.jsx
index ad7ceb3dc..86cedcbaa 100644
--- a/client/src/Components/v1/ProgressBars/index.jsx
+++ b/client/src/Components/v1/ProgressBars/index.jsx
@@ -1,8 +1,7 @@
 import { useTheme } from "@emotion/react";
 import PropTypes from "prop-types";
 import { Box, IconButton, LinearProgress, Stack, Typography } from "@mui/material";
-import CloseIcon from "@mui/icons-material/Close";
-import ErrorOutlineOutlinedIcon from "@mui/icons-material/ErrorOutlineOutlined";
+import Icon from "../Icon";
 import "./index.css";
 
 /**
@@ -51,7 +50,10 @@ const ProgressUpload = ({ icon, label, size, progress = 0, onClick, error }) =>
 				alignItems={error ? "center" : "flex-start"}
 			>
 				{error ? (
-					<ErrorOutlineOutlinedIcon />
+					<Icon
+						name="AlertTriangle"
+						size={20}
+					/>
 				) : icon ? (
 					<Box
 						sx={{
@@ -127,10 +129,9 @@ const ProgressUpload = ({ icon, label, size, progress = 0, onClick, error }) =>
 								}
 					}
 				>
-					<CloseIcon
-						sx={{
-							fontSize: "20px",
-						}}
+					<Icon
+						name="X"
+						size={20}
 					/>
 				</IconButton>
 			</Stack>
diff --git a/client/src/Components/v1/ProgressStepper/index.jsx b/client/src/Components/v1/ProgressStepper/index.jsx
index 4ab071c58..9fb0d15dc 100644
--- a/client/src/Components/v1/ProgressStepper/index.jsx
+++ b/client/src/Components/v1/ProgressStepper/index.jsx
@@ -1,15 +1,22 @@
 import React from "react";
 import { Step, Stepper, StepLabel, Typography } from "@mui/material";
-import RadioButtonCheckedIcon from "@mui/icons-material/RadioButtonChecked";
-import CheckCircle from "@mui/icons-material/CheckCircle";
+import Icon from "../Icon";
 import PropTypes from "prop-types";
 
 const CustomStepIcon = (props) => {
 	const { completed, active } = props;
 	return completed ? (
-		<CheckCircle color="accent" />
+		<Icon
+			name="CheckCircle2"
+			size={24}
+			color="accent.main"
+		/>
 	) : (
-		<RadioButtonCheckedIcon color={active ? "accent" : "disabled"} />
+		<Icon
+			name="Circle"
+			size={24}
+			color={active ? "accent.main" : "text.disabled"}
+		/>
 	);
 };
 
diff --git a/client/src/Components/v1/ShareComponent/index.jsx b/client/src/Components/v1/ShareComponent/index.jsx
index 073ed2243..476b3672f 100644
--- a/client/src/Components/v1/ShareComponent/index.jsx
+++ b/client/src/Components/v1/ShareComponent/index.jsx
@@ -1,5 +1,5 @@
 import html2canvas from "html2canvas";
-import ShareIcon from "@mui/icons-material/Share";
+import Icon from "../Icon";
 import { Button } from "@mui/material";
 import { useTheme } from "@emotion/react";
 
@@ -55,7 +55,13 @@ const ShareComponent = ({ elementToCapture, fileName = "screenshot" }) => {
 	return (
 		<Button
 			variant="outlined"
-			startIcon={<ShareIcon sx={{ color: theme.palette.success.main }} />}
+			startIcon={
+				<Icon
+					name="Share2"
+					size={18}
+					color="success.main"
+				/>
+			}
 			color="success"
 			onClick={captureAndShare}
 		>
diff --git a/client/src/Components/v1/Sidebar/components/authFooter.jsx b/client/src/Components/v1/Sidebar/components/authFooter.jsx
index 2c33a2402..16b60d9f2 100644
--- a/client/src/Components/v1/Sidebar/components/authFooter.jsx
+++ b/client/src/Components/v1/Sidebar/components/authFooter.jsx
@@ -7,8 +7,7 @@ import Avatar from "../../Avatar/index.jsx";
 import Menu from "@mui/material/Menu";
 import MenuItem from "@mui/material/MenuItem";
 import Divider from "@mui/material/Divider";
-import DotsVertical from "../../../../assets/icons/dots-vertical.svg?react";
-import LogoutSvg from "../../../../assets/icons/logout.svg?react";
+import Icon from "../../Icon";
 
 import { useTheme } from "@emotion/react";
 import { useSelector } from "react-redux";
@@ -81,6 +80,10 @@ const AuthFooter = ({ collapsed, accountMenuItems }) => {
 					gap: theme.spacing(2),
 					borderRadius: theme.shape.borderRadius,
 					pl: theme.spacing(4),
+					color: theme.palette.primary.contrastTextTertiary,
+					"& svg": {
+						stroke: theme.palette.primary.contrastTextTertiary,
+					},
 				}}
 			>
 				{item.icon}
@@ -160,19 +163,14 @@ const AuthFooter = ({ collapsed, accountMenuItems }) => {
 							ml: "50px",
 							"&:focus": { outline: "none" },
 							alignSelf: "center",
-
-							"& svg": {
-								width: "22px",
-								height: "22px",
-							},
-							"& svg path": {
-								/* Vertical three dots */
-								stroke: theme.palette.primary.contrastTextTertiary,
-							},
 						}}
 						onClick={(event) => openPopup(event)}
 					>
-						<DotsVertical />
+						<Icon
+							name="MoreVertical"
+							size={22}
+							color="primary.contrastTextTertiary"
+						/>
 					</IconButton>
 				</Tooltip>
 			</Stack>
@@ -256,12 +254,13 @@ const AuthFooter = ({ collapsed, accountMenuItems }) => {
 						gap: theme.spacing(4),
 						borderRadius: theme.shape.borderRadius,
 						pl: theme.spacing(4),
-						"& svg path": {
-							stroke: theme.palette.primary.contrastTextTertiary,
-						},
 					}}
 				>
-					<LogoutSvg />
+					<Icon
+						name="LogOut"
+						size={20}
+						color="primary.contrastTextTertiary"
+					/>
 					{t("menu.logOut", "Log out")}
 				</MenuItem>
 			</Menu>
diff --git a/client/src/Components/v1/Sidebar/components/navItem.jsx b/client/src/Components/v1/Sidebar/components/navItem.jsx
index 2c569edde..170d39bee 100644
--- a/client/src/Components/v1/Sidebar/components/navItem.jsx
+++ b/client/src/Components/v1/Sidebar/components/navItem.jsx
@@ -52,12 +52,11 @@ const NavItem = ({ item, collapsed, selected, onClick }) => {
 				<ListItemIcon
 					sx={{
 						minWidth: 0,
+						color: iconStroke,
 						"& svg": {
 							height: 20,
 							width: 20,
 							opacity: 0.81,
-						},
-						"& svg path": {
 							stroke: iconStroke,
 						},
 					}}
diff --git a/client/src/Components/v1/Sidebar/index.jsx b/client/src/Components/v1/Sidebar/index.jsx
index 80022c7e3..b66f081fb 100644
--- a/client/src/Components/v1/Sidebar/index.jsx
+++ b/client/src/Components/v1/Sidebar/index.jsx
@@ -8,22 +8,7 @@ import NavItem from "./components/navItem.jsx";
 import AuthFooter from "./components/authFooter.jsx";
 
 import StarPrompt from "../StarPrompt/index.jsx";
-import LockSvg from "../../../assets/icons/lock.svg?react";
-import UserSvg from "../../../assets/icons/user.svg?react";
-import TeamSvg from "../../../assets/icons/user-two.svg?react";
-import Support from "../../../assets/icons/support.svg?react";
-import Maintenance from "../../../assets/icons/maintenance.svg?react";
-import Monitors from "../../../assets/icons/monitors.svg?react";
-import Incidents from "../../../assets/icons/incidents.svg?react";
-import Integrations from "../../../assets/icons/integrations.svg?react";
-import PageSpeed from "../../../assets/icons/page-speed.svg?react";
-import Settings from "../../../assets/icons/settings.svg?react";
-import ChangeLog from "../../../assets/icons/changeLog.svg?react";
-import Docs from "../../../assets/icons/docs.svg?react";
-import StatusPages from "../../../assets/icons/status-pages.svg?react";
-import Discussions from "../../../assets/icons/discussions.svg?react";
-import Notifications from "../../../assets/icons/notifications.svg?react";
-import Logs from "../../../assets/icons/logs.svg?react";
+import Icon from "../Icon";
 
 // Utils
 import { useTheme } from "@mui/material/styles";
@@ -39,44 +24,41 @@ const URL_MAP = {
 };
 
 const getMenu = (t) => [
-	{ name: t("menu.uptime"), path: "uptime", icon: <Monitors /> },
-	{ name: t("menu.pagespeed"), path: "pagespeed", icon: <PageSpeed /> },
-
-	{ name: t("menu.infrastructure"), path: "infrastructure", icon: <Integrations /> },
+	{ name: t("menu.uptime"), path: "uptime", icon: <Icon name="Globe" /> },
+	{ name: t("menu.pagespeed"), path: "pagespeed", icon: <Icon name="Gauge" /> },
+	{ name: t("menu.infrastructure"), path: "infrastructure", icon: <Icon name="Link" /> },
 	{
 		name: t("menu.notifications"),
 		path: "notifications",
-		icon: <Notifications />,
+		icon: <Icon name="Bell" />,
 	},
-	{ name: t("menu.checks"), path: "checks", icon: <Docs /> },
-	{ name: t("menu.incidents"), path: "incidents", icon: <Incidents /> },
-
-	{ name: t("menu.statusPages"), path: "status", icon: <StatusPages /> },
-	{ name: t("menu.maintenance"), path: "maintenance", icon: <Maintenance /> },
-	{ name: t("menu.logs"), path: "logs", icon: <Logs /> },
-
+	{ name: t("menu.checks"), path: "checks", icon: <Icon name="FileText" /> },
+	{ name: t("menu.incidents"), path: "incidents", icon: <Icon name="AlertTriangle" /> },
+	{ name: t("menu.statusPages"), path: "status", icon: <Icon name="Wifi" /> },
+	{ name: t("menu.maintenance"), path: "maintenance", icon: <Icon name="Wrench" /> },
+	{ name: t("menu.logs"), path: "logs", icon: <Icon name="Database" /> },
 	{
 		name: t("menu.settings"),
-		icon: <Settings />,
+		icon: <Icon name="Settings" />,
 		path: "settings",
 	},
 ];
 
 const getOtherMenuItems = (t) => [
-	{ name: t("menu.support"), path: "support", icon: <Support /> },
+	{ name: t("menu.support"), path: "support", icon: <Icon name="HelpCircle" /> },
 	{
 		name: t("menu.discussions"),
 		path: "discussions",
-		icon: <Discussions />,
+		icon: <Icon name="MessageCircle" />,
 	},
-	{ name: t("menu.docs"), path: "docs", icon: <Docs /> },
-	{ name: t("menu.changelog"), path: "changelog", icon: <ChangeLog /> },
+	{ name: t("menu.docs"), path: "docs", icon: <Icon name="FileText" /> },
+	{ name: t("menu.changelog"), path: "changelog", icon: <Icon name="Code" /> },
 ];
 
 const getAccountMenuItems = (t) => [
-	{ name: t("menu.profile"), path: "account/profile", icon: <UserSvg /> },
-	{ name: t("menu.password"), path: "account/password", icon: <LockSvg /> },
-	{ name: t("menu.team"), path: "account/team", icon: <TeamSvg /> },
+	{ name: t("menu.profile"), path: "account/profile", icon: <Icon name="User" /> },
+	{ name: t("menu.password"), path: "account/password", icon: <Icon name="Lock" /> },
+	{ name: t("menu.team"), path: "account/team", icon: <Icon name="Users" /> },
 ];
 
 const Sidebar = () => {
diff --git a/client/src/Components/v1/StarPrompt/index.jsx b/client/src/Components/v1/StarPrompt/index.jsx
index 6151544c1..f1dd5e136 100644
--- a/client/src/Components/v1/StarPrompt/index.jsx
+++ b/client/src/Components/v1/StarPrompt/index.jsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { Typography, IconButton, Stack, Box } from "@mui/material";
-import CloseIcon from "@mui/icons-material/Close";
+import Icon from "../Icon";
 import { useTheme } from "@emotion/react";
 import { useSelector, useDispatch } from "react-redux";
 import { useTranslation } from "react-i18next";
@@ -67,7 +67,10 @@ const StarPrompt = ({ repoUrl = "https://github.com/bluewave-labs/checkmate" })
 						},
 					}}
 				>
-					<CloseIcon sx={{ fontSize: "1.25rem" }} />
+					<Icon
+						name="X"
+						size={20}
+					/>
 				</IconButton>
 			</Stack>
 
diff --git a/client/src/Components/v1/Table/TablePagination/index.jsx b/client/src/Components/v1/Table/TablePagination/index.jsx
index 8a5af0cd5..77ee5ded1 100644
--- a/client/src/Components/v1/Table/TablePagination/index.jsx
+++ b/client/src/Components/v1/Table/TablePagination/index.jsx
@@ -2,7 +2,7 @@ import PropTypes from "prop-types";
 import { useTheme } from "@emotion/react";
 import { Stack, TablePagination, Typography } from "@mui/material";
 import { TablePaginationActions } from "./Actions/index.jsx";
-import SelectorVertical from "../../../../assets/icons/selector-vertical.svg?react";
+import Icon from "../../Icon";
 
 Pagination.propTypes = {
 	paginationLabel: PropTypes.string, // Label for the pagination.
@@ -100,7 +100,12 @@ function Pagination({
 							},
 						},
 						inputProps: { id: "pagination-dropdown" },
-						IconComponent: SelectorVertical,
+						IconComponent: () => (
+							<Icon
+								name="ChevronsUpDown"
+								size={16}
+							/>
+						),
 						sx: {
 							ml: theme.spacing(4),
 							mr: theme.spacing(12),
diff --git a/client/src/Components/v1/Toast/index.jsx b/client/src/Components/v1/Toast/index.jsx
index 5d66fca3f..d409cec81 100644
--- a/client/src/Components/v1/Toast/index.jsx
+++ b/client/src/Components/v1/Toast/index.jsx
@@ -3,19 +3,31 @@ import IconButton from "@mui/material/IconButton";
 import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
 import ToastBody from "./body.jsx";
-import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
-import ErrorOutlineOutlinedIcon from "@mui/icons-material/ErrorOutlineOutlined";
-import WarningAmberOutlinedIcon from "@mui/icons-material/WarningAmberOutlined";
-import CloseIcon from "@mui/icons-material/Close";
+import Icon from "../Icon";
 
 // Utils
 import { useTheme } from "@emotion/react";
 import PropTypes from "prop-types";
 
 const icons = {
-	info: <InfoOutlinedIcon />,
-	error: <ErrorOutlineOutlinedIcon />,
-	warning: <WarningAmberOutlinedIcon />,
+	info: (
+		<Icon
+			name="Info"
+			size={24}
+		/>
+	),
+	error: (
+		<Icon
+			name="AlertCircle"
+			size={24}
+		/>
+	),
+	warning: (
+		<Icon
+			name="AlertTriangle"
+			size={24}
+		/>
+	),
 };
 
 const Toast = ({ variant, title, body, onClick, hasDismiss, hasIcon }) => {
@@ -50,7 +62,10 @@ const Toast = ({ variant, title, body, onClick, hasDismiss, hasIcon }) => {
 				)}
 				{title && (
 					<IconButton onClick={onClick}>
-						<CloseIcon />
+						<Icon
+							name="X"
+							size={20}
+						/>
 					</IconButton>
 				)}
 			</Stack>
@@ -63,7 +78,10 @@ const Toast = ({ variant, title, body, onClick, hasDismiss, hasIcon }) => {
 				<ToastBody body={body} />
 				{!title && (
 					<IconButton onClick={onClick}>
-						<CloseIcon />
+						<Icon
+							name="X"
+							size={20}
+						/>
 					</IconButton>
 				)}
 			</Stack>
diff --git a/client/src/Pages/Account/components/AddMemberMenu/index.jsx b/client/src/Pages/Account/components/AddMemberMenu/index.jsx
index ab1ba599d..96bea3522 100644
--- a/client/src/Pages/Account/components/AddMemberMenu/index.jsx
+++ b/client/src/Pages/Account/components/AddMemberMenu/index.jsx
@@ -3,7 +3,7 @@ import Button from "@mui/material/Button";
 import Menu from "@mui/material/Menu";
 import MenuItem from "@mui/material/MenuItem";
 import { useTheme } from "@emotion/react";
-import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown";
+import Icon from "@/Components/v1/Icon";
 import { useTranslation } from "react-i18next";
 import Proptypes from "prop-types";
 
@@ -24,7 +24,13 @@ const AddMemberMenu = ({ handleInviteOpen, handleIsRegisterOpen }) => {
 			<Button
 				variant="contained"
 				color="accent"
-				endIcon={<ArrowDropDownIcon sx={{ color: theme.palette.secondary.light }} />}
+				endIcon={
+					<Icon
+						name="ChevronDown"
+						size={20}
+						color="secondary.light"
+					/>
+				}
 				onClick={handleClick}
 			>
 				{t("teamPanel.addTeamMember.addMemberMenu")}
diff --git a/client/src/Pages/Account/components/RoleTable/index.jsx b/client/src/Pages/Account/components/RoleTable/index.jsx
index 5eea33685..90a30dcd4 100644
--- a/client/src/Pages/Account/components/RoleTable/index.jsx
+++ b/client/src/Pages/Account/components/RoleTable/index.jsx
@@ -1,6 +1,6 @@
 import Typography from "@mui/material/Typography";
 import DataTable from "@/Components/v1/Table/index.jsx";
-import DeleteOutlineRoundedIcon from "@mui/icons-material/DeleteOutlineRounded";
+import Icon from "@/Components/v1/Icon";
 
 import { useTranslation } from "react-i18next";
 import { ROLES } from "../../../../Utils/roleUtils.js";
@@ -21,11 +21,13 @@ const RoleTable = ({ roles, handleDeleteRole }) => {
 			render: (row) => {
 				if (row === ROLES.SUPERADMIN) return null;
 				return (
-					<DeleteOutlineRoundedIcon
+					<Icon
+						name="Trash2"
+						size={20}
 						onClick={() => {
 							handleDeleteRole(row);
 						}}
-						sx={{ cursor: "pointer" }}
+						style={{ cursor: "pointer" }}
 					/>
 				);
 			},
diff --git a/client/src/Pages/Auth/CheckEmail.jsx b/client/src/Pages/Auth/CheckEmail.jsx
index 6aee7a470..95261a768 100644
--- a/client/src/Pages/Auth/CheckEmail.jsx
+++ b/client/src/Pages/Auth/CheckEmail.jsx
@@ -7,9 +7,9 @@ import { createToast } from "../../Utils/toastUtils.jsx";
 import { forgotPassword } from "../../Features/Auth/authSlice.js";
 import { Trans, useTranslation } from "react-i18next";
 import Background from "@/assets/Images/background-grid.svg?react";
-import EmailIcon from "@/assets/icons/email.svg?react";
 import Logo from "@/assets/icons/checkmate-icon.svg?react";
 import IconBox from "@/Components/v1/IconBox/index.jsx";
+import Icon from "@/Components/v1/Icon";
 import "./index.css";
 
 const CheckEmail = () => {
@@ -160,7 +160,7 @@ const CheckEmail = () => {
 								svgHeight={24}
 								mb={theme.spacing(4)}
 							>
-								<EmailIcon alt={t("auth.forgotPassword.imageAlts.email")} />
+								<Icon name="Mail" />
 							</IconBox>
 						</Stack>
 						<Typography component="h1">{t("auth.forgotPassword.heading")}</Typography>
diff --git a/client/src/Pages/Auth/ForgotPassword.jsx b/client/src/Pages/Auth/ForgotPassword.jsx
index 0a89b2987..e6ba4c1f7 100644
--- a/client/src/Pages/Auth/ForgotPassword.jsx
+++ b/client/src/Pages/Auth/ForgotPassword.jsx
@@ -8,9 +8,9 @@ import { newOrChangedCredentials } from "../../Validation/validation.js";
 import { useNavigate } from "react-router-dom";
 import TextInput from "@/Components/v1/Inputs/TextInput/index.jsx";
 import Logo from "@/assets/icons/checkmate-icon.svg?react";
-import Key from "@/assets/icons/key.svg?react";
 import Background from "@/assets/Images/background-grid.svg?react";
 import IconBox from "@/Components/v1/IconBox/index.jsx";
+import Icon from "@/Components/v1/Icon";
 import { Trans, useTranslation } from "react-i18next";
 import "./index.css";
 
@@ -165,7 +165,7 @@ const ForgotPassword = () => {
 								svgHeight={24}
 								mb={theme.spacing(4)}
 							>
-								<Key alt={t("auth.forgotPassword.imageAlts.passwordKey")} />
+								<Icon name="Key" />
 							</IconBox>
 						</Stack>
 						<Typography component="h1">{t("auth.forgotPassword.heading")}</Typography>
diff --git a/client/src/Pages/Auth/NewPasswordConfirmed.jsx b/client/src/Pages/Auth/NewPasswordConfirmed.jsx
index 53b352853..c92e52552 100644
--- a/client/src/Pages/Auth/NewPasswordConfirmed.jsx
+++ b/client/src/Pages/Auth/NewPasswordConfirmed.jsx
@@ -4,9 +4,9 @@ import { useNavigate } from "react-router-dom";
 import { useDispatch } from "react-redux";
 import { clearAuthState } from "../../Features/Auth/authSlice.js";
 import Background from "@/assets/Images/background-grid.svg?react";
-import ConfirmIcon from "@/assets/icons/check-outlined.svg?react";
 import Logo from "@/assets/icons/checkmate-icon.svg?react";
 import IconBox from "@/Components/v1/IconBox/index.jsx";
+import Icon from "@/Components/v1/Icon";
 import { Trans, useTranslation } from "react-i18next";
 import "./index.css";
 
@@ -94,7 +94,7 @@ const NewPasswordConfirmed = () => {
 								svgHeight={24}
 								mb={theme.spacing(4)}
 							>
-								<ConfirmIcon alt={t("auth.forgotPassword.imageAlts.passwordConfirm")} />
+								<Icon name="CheckCircle" />
 							</IconBox>
 						</Stack>
 						<Typography component="h1">{t("auth.forgotPassword.heading")}</Typography>
diff --git a/client/src/Pages/Auth/SetNewPassword.jsx b/client/src/Pages/Auth/SetNewPassword.jsx
index 6525c3f27..ada5d6246 100644
--- a/client/src/Pages/Auth/SetNewPassword.jsx
+++ b/client/src/Pages/Auth/SetNewPassword.jsx
@@ -11,9 +11,9 @@ import Check from "@/Components/v1/Check/Check.jsx";
 import TextInput from "@/Components/v1/Inputs/TextInput/index.jsx";
 import { PasswordEndAdornment } from "@/Components/v1/Inputs/TextInput/Adornments/index.jsx";
 import IconBox from "@/Components/v1/IconBox/index.jsx";
-import LockIcon from "@/assets/icons/lock.svg?react";
 import Logo from "@/assets/icons/checkmate-icon.svg?react";
 import Background from "@/assets/Images/background-grid.svg?react";
+import Icon from "@/Components/v1/Icon";
 import "./index.css";
 import { useValidatePassword } from "./hooks/useValidatePassword.jsx";
 import { Trans, useTranslation } from "react-i18next";
@@ -140,7 +140,7 @@ const SetNewPassword = () => {
 								svgHeight={24}
 								mb={theme.spacing(4)}
 							>
-								<LockIcon alt={t("auth.forgotPassword.imageAlts.lock")} />
+								<Icon name="Lock" />
 							</IconBox>
 						</Stack>
 						<Typography component="h1">{t("auth.forgotPassword.heading")}</Typography>
diff --git a/client/src/Pages/Incidents/Components/StatusBoxes/StatusBox.jsx b/client/src/Pages/Incidents/Components/StatusBoxes/StatusBox.jsx
index c27c5948c..d7f02ada3 100644
--- a/client/src/Pages/Incidents/Components/StatusBoxes/StatusBox.jsx
+++ b/client/src/Pages/Incidents/Components/StatusBoxes/StatusBox.jsx
@@ -2,10 +2,7 @@ import PropTypes from "prop-types";
 import { useTheme } from "@emotion/react";
 import { Box, Stack, Typography } from "@mui/material";
 import Background from "@/assets/Images/background-grid.svg?react";
-import AlertIcon from "@/assets/icons/alert-icon.svg?react";
-import CheckIcon from "@/assets/icons/check-icon.svg?react";
-import CloseIcon from "@/assets/icons/close-icon.svg?react";
-import WarningIcon from "@/assets/icons/warning-icon.svg?react";
+import Icon from "@/Components/v1/Icon";
 
 const StatusBox = ({ title, value, status }) => {
 	const theme = useTheme();
@@ -26,28 +23,40 @@ const StatusBox = ({ title, value, status }) => {
 		color = theme.palette.success.lowContrast;
 		icon = (
 			<Box sx={{ ...sharedStyles, top: theme.spacing(6), right: theme.spacing(6) }}>
-				<CheckIcon />
+				<Icon
+					name="CheckCircle"
+					size={20}
+				/>
 			</Box>
 		);
 	} else if (status === "down") {
 		color = theme.palette.error.lowContrast;
 		icon = (
 			<Box sx={{ ...sharedStyles, top: theme.spacing(6), right: theme.spacing(6) }}>
-				<CloseIcon />
+				<Icon
+					name="X"
+					size={20}
+				/>
 			</Box>
 		);
 	} else if (status === "paused") {
 		color = theme.palette.warning.lowContrast;
 		icon = (
 			<Box sx={{ ...sharedStyles, top: theme.spacing(6), right: theme.spacing(6) }}>
-				<WarningIcon />
+				<Icon
+					name="AlertTriangle"
+					size={20}
+				/>
 			</Box>
 		);
 	} else {
 		color = theme.palette.accent.main;
 		icon = (
 			<Box sx={{ ...sharedStyles, top: theme.spacing(6), right: theme.spacing(6) }}>
-				<AlertIcon />
+				<Icon
+					name="Bell"
+					size={20}
+				/>
 			</Box>
 		);
 	}
diff --git a/client/src/Pages/Incidents2/Components/ActiveIncidentsPanel/index.jsx b/client/src/Pages/Incidents2/Components/ActiveIncidentsPanel/index.jsx
index 8ed80d037..fda257695 100644
--- a/client/src/Pages/Incidents2/Components/ActiveIncidentsPanel/index.jsx
+++ b/client/src/Pages/Incidents2/Components/ActiveIncidentsPanel/index.jsx
@@ -3,8 +3,7 @@ import { Box, Stack, Typography } from "@mui/material";
 import { useTheme } from "@emotion/react";
 import { useTranslation } from "react-i18next";
 import PanelSkeleton from "../IncidentsSummaryPanel/skeleton.jsx";
-import Incidents from "@/assets/icons/incidents.svg?react";
-import CheckIcon from "@/assets/icons/check-icon.svg?react";
+import Icon from "@/Components/v1/Icon";
 import SummaryCard from "../SummaryCard/index.jsx";
 
 /**
@@ -63,7 +62,10 @@ const ActiveIncidentsPanel = ({ totalCount = 0, isLoading = false, error = null
 							mb: theme.spacing(1),
 						}}
 					>
-						<CheckIcon />
+						<Icon
+							name="CheckCircle"
+							size={60}
+						/>
 					</Box>
 
 					<Typography
@@ -101,7 +103,10 @@ const ActiveIncidentsPanel = ({ totalCount = 0, isLoading = false, error = null
 						},
 					}}
 				>
-					<Incidents />
+					<Icon
+						name="AlertTriangle"
+						size={60}
+					/>
 				</Box>
 
 				<Typography
diff --git a/client/src/Pages/Incidents2/Components/LatestIncidentsPanel/IncidentItem.jsx b/client/src/Pages/Incidents2/Components/LatestIncidentsPanel/IncidentItem.jsx
index 22d45509c..67254f548 100644
--- a/client/src/Pages/Incidents2/Components/LatestIncidentsPanel/IncidentItem.jsx
+++ b/client/src/Pages/Incidents2/Components/LatestIncidentsPanel/IncidentItem.jsx
@@ -3,7 +3,7 @@ import { Box, Stack, Typography } from "@mui/material";
 import { useTheme } from "@emotion/react";
 import { StatusLabel } from "@/Components/v1/Label/index.jsx";
 import { getHumanReadableDuration } from "@/Utils/timeUtils.js";
-import Monitors from "@/assets/icons/monitors.svg?react";
+import Icon from "@/Components/v1/Icon";
 import { useTranslation } from "react-i18next";
 
 const IncidentItem = ({ incident }) => {
@@ -67,7 +67,7 @@ const IncidentItem = ({ incident }) => {
 				gap={theme.spacing(2)}
 			>
 				<Box sx={iconWrapperStyle}>
-					<Monitors />
+					<Icon name="Globe" size={18} />
 				</Box>
 				<Typography
 					variant="body1"
diff --git a/client/src/Pages/Incidents2/Components/StatisticsPanel/index.jsx b/client/src/Pages/Incidents2/Components/StatisticsPanel/index.jsx
index d2ce09d6c..5e6943ea9 100644
--- a/client/src/Pages/Incidents2/Components/StatisticsPanel/index.jsx
+++ b/client/src/Pages/Incidents2/Components/StatisticsPanel/index.jsx
@@ -3,9 +3,7 @@ import { Box, Stack, Typography, Divider } from "@mui/material";
 import { useTheme } from "@emotion/react";
 import PanelSkeleton from "../IncidentsSummaryPanel/skeleton.jsx";
 import { useTranslation } from "react-i18next";
-import Clock from "@/assets/icons/maintenance.svg?react";
-import Incidents from "@/assets/icons/incidents.svg?react";
-import NotificationIcon from "@/assets/icons/notifications.svg?react";
+import Icon from "@/Components/v1/Icon";
 import SummaryCard from "../SummaryCard/index.jsx";
 
 /**
@@ -33,10 +31,6 @@ const StatisticsPanel = ({ isLoading = false, error = null, summary = {} }) => {
 	const { t } = useTranslation();
 	const totalResolutions =
 		(summary?.totalManualResolutions || 0) + (summary?.totalAutomaticResolutions || 0);
-	const automaticPercentage =
-		totalResolutions > 0
-			? (summary?.totalAutomaticResolutions / totalResolutions) * 100
-			: 0;
 
 	const iconWrapperStyle = {
 		display: "flex",
@@ -102,7 +96,7 @@ const StatisticsPanel = ({ isLoading = false, error = null, summary = {} }) => {
 						sx={rowStyle}
 					>
 						<Box sx={iconWrapperStyle}>
-							<NotificationIcon />
+							<Icon name="Bell" size={18} />
 						</Box>
 						<Typography
 							variant="body1"
@@ -121,7 +115,7 @@ const StatisticsPanel = ({ isLoading = false, error = null, summary = {} }) => {
 						sx={rowStyle}
 					>
 						<Box sx={iconWrapperStyle}>
-							<Incidents />
+							<Icon name="AlertTriangle" size={18} />
 						</Box>
 						<Typography
 							variant="body1"
@@ -139,7 +133,7 @@ const StatisticsPanel = ({ isLoading = false, error = null, summary = {} }) => {
 					sx={rowStyle}
 				>
 					<Box sx={iconWrapperStyle}>
-						<Clock />
+						<Icon name="Wrench" size={18} />
 					</Box>
 					<Typography
 						variant="body1"
diff --git a/client/src/Pages/Incidents2/index.jsx b/client/src/Pages/Incidents2/index.jsx
index 966388b51..2f31864bf 100644
--- a/client/src/Pages/Incidents2/index.jsx
+++ b/client/src/Pages/Incidents2/index.jsx
@@ -87,8 +87,8 @@ const Incidents2 = () => {
 
 	useEffect(() => {
 		const lookup = monitors?.reduce((acc, monitor) => {
-			acc[monitor._id] = {
-				_id: monitor._id,
+			acc[monitor.id] = {
+				_id: monitor.id,
 				name: monitor.name,
 				type: monitor.type,
 			};
diff --git a/client/src/Pages/Infrastructure/Create/Components/MonitorActionButtons.jsx b/client/src/Pages/Infrastructure/Create/Components/MonitorActionButtons.jsx
index 871fe0d7b..2bde5f321 100644
--- a/client/src/Pages/Infrastructure/Create/Components/MonitorActionButtons.jsx
+++ b/client/src/Pages/Infrastructure/Create/Components/MonitorActionButtons.jsx
@@ -2,8 +2,7 @@ import { useState } from "react";
 import { Box, Button } from "@mui/material";
 import { useTheme } from "@emotion/react";
 import { useTranslation } from "react-i18next";
-import PauseCircleOutlineIcon from "@mui/icons-material/PauseCircleOutline";
-import PlayCircleOutlineRoundedIcon from "@mui/icons-material/PlayCircleOutlineRounded";
+import Icon from "@/Components/v1/Icon";
 import Dialog from "@/Components/v1/Dialog/index.jsx";
 import PropTypes from "prop-types";
 
@@ -36,12 +35,18 @@ const MonitorActionButtons = ({ monitor, isBusy, handlePause, handleRemove }) =>
 			>
 				{monitor?.isActive ? (
 					<>
-						<PauseCircleOutlineIcon />
+						<Icon
+							name="PauseCircle"
+							size={20}
+						/>
 						{t("pause")}
 					</>
 				) : (
 					<>
-						<PlayCircleOutlineRoundedIcon />
+						<Icon
+							name="PlayCircle"
+							size={20}
+						/>
 						{t("resume")}
 					</>
 				)}
diff --git a/client/src/Pages/Infrastructure/Create/hooks/useInfrastructureSubmit.jsx b/client/src/Pages/Infrastructure/Create/hooks/useInfrastructureSubmit.jsx
index c5c7aacf2..04279cac4 100644
--- a/client/src/Pages/Infrastructure/Create/hooks/useInfrastructureSubmit.jsx
+++ b/client/src/Pages/Infrastructure/Create/hooks/useInfrastructureSubmit.jsx
@@ -61,7 +61,7 @@ const useInfrastructureSubmit = () => {
 		};
 
 		const finalForm = {
-			...(isCreate ? {} : { _id: monitorId }),
+			...(isCreate ? {} : { id: monitorId }),
 			...rest,
 			description: form.name,
 			type: "hardware",
diff --git a/client/src/Pages/Infrastructure/Create/index.jsx b/client/src/Pages/Infrastructure/Create/index.jsx
index b27c11cd4..21d70720d 100644
--- a/client/src/Pages/Infrastructure/Create/index.jsx
+++ b/client/src/Pages/Infrastructure/Create/index.jsx
@@ -22,9 +22,9 @@ import { useTranslation } from "react-i18next";
 import {
 	useDeleteMonitor,
 	useFetchGlobalSettings,
-	useFetchHardwareMonitorById,
+	useFetchMonitorById,
 	usePauseMonitor,
-} from "../../../Hooks/monitorHooks.js";
+} from "@/Hooks/monitorHooks.js";
 import useInfrastructureMonitorForm from "./hooks/useInfrastructureMonitorForm.jsx";
 import useValidateInfrastructureForm from "./hooks/useValidateInfrastructureForm.jsx";
 import useInfrastructureSubmit from "./hooks/useInfrastructureSubmit.jsx";
@@ -37,14 +37,16 @@ const CreateInfrastructureMonitor = () => {
 	const { t } = useTranslation();
 
 	// State
+	const [monitor, setMonitor] = useState(null);
 	const [https, setHttps] = useState(false);
 	const [updateTrigger, setUpdateTrigger] = useState(false);
 	const [availableDisks, setAvailableDisks] = useState([]);
 
 	// Fetch monitor details if editing
-	const [monitor, isLoading] = useFetchHardwareMonitorById({
+	const [isLoading] = useFetchMonitorById({
 		monitorId,
-		updateTrigger,
+		setMonitor,
+		updateTrigger: true,
 	});
 	const [deleteMonitor, isDeleting] = useDeleteMonitor();
 	const [globalSettings, globalSettingsLoading] = useFetchGlobalSettings();
@@ -150,8 +152,7 @@ const CreateInfrastructureMonitor = () => {
 
 	const handleRemove = async (event) => {
 		event.preventDefault();
-		const TEMP_MONITOR = { id: monitor._id };
-		await deleteMonitor({ monitor: TEMP_MONITOR, redirect: "/infrastructure" });
+		await deleteMonitor({ monitor, redirect: "/infrastructure" });
 	};
 
 	const isBusy =
diff --git a/client/src/Pages/Infrastructure/Monitors/Components/Filters/index.jsx b/client/src/Pages/Infrastructure/Monitors/Components/Filters/index.jsx
index 70bf502af..01e56c68a 100644
--- a/client/src/Pages/Infrastructure/Monitors/Components/Filters/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/Components/Filters/index.jsx
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 import FilterHeader from "@/Components/v1/FilterHeader/index.jsx";
 import { useMemo } from "react";
 import { Box, Button } from "@mui/material";
-import ClearIcon from "@mui/icons-material/Clear";
+import Icon from "@/Components/v1/Icon";
 import { useTranslation } from "react-i18next";
 
 /**
@@ -68,7 +68,12 @@ const Filter = ({
 				color={theme.palette.primary.contrastText}
 				onClick={handleReset}
 				variant="contained"
-				endIcon={<ClearIcon />}
+				endIcon={
+					<Icon
+						name="X"
+						size={18}
+					/>
+				}
 				sx={{
 					visibility: isFilterActive ? "visible" : "hidden",
 				}}
diff --git a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
index 5f0360312..292eb9714 100644
--- a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
@@ -7,7 +7,7 @@ import { Stack } from "@mui/material";
 import { InfrastructureMenu } from "../MonitorsTableMenu/index.jsx";
 import LoadingSpinner from "../../../../Uptime/Monitors/Components/LoadingSpinner/index.jsx";
 // Assets
-import CPUChipIcon from "@/assets/icons/cpu-chip.svg?react";
+import Icon from "@/Components/v1/Icon";
 import CustomGauge from "@/Components/v1/Charts/CustomGauge/index.jsx";
 
 // Utils
@@ -67,9 +67,9 @@ const MonitorsTable = ({
 					alignItems={"center"}
 					gap=".25rem"
 				>
-					<CPUChipIcon
-						width={20}
-						height={20}
+					<Icon
+						name="Cpu"
+						size={20}
 					/>
 					{row.processor}
 				</Stack>
diff --git a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTableMenu/index.jsx b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTableMenu/index.jsx
index 39aa84e90..50af0aaa2 100644
--- a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTableMenu/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTableMenu/index.jsx
@@ -5,7 +5,7 @@ import { useTheme } from "@emotion/react";
 import { useNavigate } from "react-router-dom";
 import { createToast } from "@/Utils/toastUtils.jsx";
 import { IconButton, Menu, MenuItem } from "@mui/material";
-import Settings from "@/assets/icons/settings-bold.svg?react";
+import Icon from "@/Components/v1/Icon";
 import PropTypes from "prop-types";
 import Dialog from "@/Components/v1/Dialog/index.jsx";
 import { networkService } from "@/Utils/NetworkService.js";
@@ -100,7 +100,10 @@ const InfrastructureMenu = ({ monitor, isAdmin, updateCallback }) => {
 				}}
 				ref={anchor}
 			>
-				<Settings />
+				<Icon
+					name="Settings"
+					size={20}
+				/>
 			</IconButton>
 
 			<Menu
diff --git a/client/src/Pages/Maintenance/CreateMaintenance/Components/MonitorList/index.jsx b/client/src/Pages/Maintenance/CreateMaintenance/Components/MonitorList/index.jsx
index c70912582..2bf7a991f 100644
--- a/client/src/Pages/Maintenance/CreateMaintenance/Components/MonitorList/index.jsx
+++ b/client/src/Pages/Maintenance/CreateMaintenance/Components/MonitorList/index.jsx
@@ -1,6 +1,6 @@
 // Components
 import { Stack, Typography } from "@mui/material";
-import DeleteIcon from "@mui/icons-material/Delete";
+import Icon from "@/Components/v1/Icon";
 import { useTheme } from "@emotion/react";
 import PropTypes from "prop-types";
 
@@ -14,8 +14,10 @@ const MonitorListItem = ({ monitor, onDelete }) => {
 			width="100%"
 		>
 			<Typography flexGrow={1}>{monitor.name}</Typography>
-			<DeleteIcon
-				sx={{ cursor: "pointer" }}
+			<Icon
+				name="Trash2"
+				size={20}
+				style={{ cursor: "pointer" }}
 				onClick={() => onDelete(monitor)}
 			/>
 		</Stack>
diff --git a/client/src/Pages/Maintenance/CreateMaintenance/index.jsx b/client/src/Pages/Maintenance/CreateMaintenance/index.jsx
index 759679a2d..3e8090325 100644
--- a/client/src/Pages/Maintenance/CreateMaintenance/index.jsx
+++ b/client/src/Pages/Maintenance/CreateMaintenance/index.jsx
@@ -16,7 +16,7 @@ import useMaintenanceActions from "./hooks/useMaintenanceActions.jsx";
 
 import TextInput from "@/Components/v1/Inputs/TextInput/index.jsx";
 import Breadcrumbs from "@/Components/v1/Breadcrumbs/index.jsx";
-import CalendarIcon from "@/assets/icons/calendar.svg?react";
+import Icon from "@/Components/v1/Icon";
 import "./index.css";
 import Search from "@/Components/v1/Inputs/Search/index.jsx";
 import { logger } from "@/Utils/Logger.js";
@@ -217,7 +217,14 @@ const CreateMaintenance = () => {
 									disablePast
 									disableHighlightToday
 									value={form.startDate}
-									slots={{ openPickerIcon: () => <CalendarIcon /> }}
+									slots={{
+										openPickerIcon: () => (
+											<Icon
+												name="Calendar"
+												size={20}
+											/>
+										),
+									}}
 									slotProps={{
 										switchViewButton: { sx: { display: "none" } },
 										nextIconButton: { sx: { ml: theme.spacing(2) } },
diff --git a/client/src/Pages/Maintenance/MaintenanceTable/ActionsMenu/index.jsx b/client/src/Pages/Maintenance/MaintenanceTable/ActionsMenu/index.jsx
index 38a3d8e64..09c69dd98 100644
--- a/client/src/Pages/Maintenance/MaintenanceTable/ActionsMenu/index.jsx
+++ b/client/src/Pages/Maintenance/MaintenanceTable/ActionsMenu/index.jsx
@@ -4,7 +4,7 @@ import { useNavigate } from "react-router-dom";
 import { useSelector } from "react-redux";
 import { IconButton, Menu, MenuItem } from "@mui/material";
 import { logger } from "@/Utils/Logger.js";
-import Settings from "@/assets/icons/settings-bold.svg?react";
+import Icon from "@/Components/v1/Icon";
 import PropTypes from "prop-types";
 import { networkService } from "../../../../main.jsx";
 import { createToast } from "@/Utils/toastUtils.jsx";
@@ -98,7 +98,10 @@ const ActionsMenu = ({ /* isAdmin, */ maintenanceWindow, updateCallback }) => {
 					},
 				}}
 			>
-				<Settings />
+				<Icon
+					name="Settings"
+					size={20}
+				/>
 			</IconButton>
 
 			<Menu
diff --git a/client/src/Pages/Maintenance/MaintenanceTable/index.jsx b/client/src/Pages/Maintenance/MaintenanceTable/index.jsx
index faeb2072c..004bbeb3a 100644
--- a/client/src/Pages/Maintenance/MaintenanceTable/index.jsx
+++ b/client/src/Pages/Maintenance/MaintenanceTable/index.jsx
@@ -2,8 +2,7 @@ import PropTypes from "prop-types";
 import { Box } from "@mui/material";
 import DataTable from "@/Components/v1/Table/index.jsx";
 import Pagination from "@/Components/v1/Table/TablePagination/index.jsx";
-import ArrowDownwardRoundedIcon from "@mui/icons-material/ArrowDownwardRounded";
-import ArrowUpwardRoundedIcon from "@mui/icons-material/ArrowUpwardRounded";
+import Icon from "@/Components/v1/Icon";
 import ActionsMenu from "./ActionsMenu/index.jsx";
 import { memo } from "react";
 import { useDispatch, useSelector } from "react-redux";
@@ -68,9 +67,15 @@ const MaintenanceTable = ({
 						}}
 					>
 						{sort.order === "asc" ? (
-							<ArrowUpwardRoundedIcon />
+							<Icon
+								name="ArrowUp"
+								size={18}
+							/>
 						) : (
-							<ArrowDownwardRoundedIcon />
+							<Icon
+								name="ArrowDown"
+								size={18}
+							/>
 						)}
 					</span>
 				</Box>
@@ -89,9 +94,15 @@ const MaintenanceTable = ({
 						}}
 					>
 						{sort.order === "asc" ? (
-							<ArrowUpwardRoundedIcon />
+							<Icon
+								name="ArrowUp"
+								size={18}
+							/>
 						) : (
-							<ArrowDownwardRoundedIcon />
+							<Icon
+								name="ArrowDown"
+								size={18}
+							/>
 						)}
 					</span>
 				</Box>
diff --git a/client/src/Pages/Notifications/components/ActionMenu.jsx b/client/src/Pages/Notifications/components/ActionMenu.jsx
index d57ad931f..52516a737 100644
--- a/client/src/Pages/Notifications/components/ActionMenu.jsx
+++ b/client/src/Pages/Notifications/components/ActionMenu.jsx
@@ -1,7 +1,7 @@
 // Components
 import Menu from "@mui/material/Menu";
 import IconButton from "@mui/material/IconButton";
-import SettingsOutlinedIcon from "@mui/icons-material/SettingsOutlined";
+import Icon from "@/Components/v1/Icon";
 import MenuItem from "@mui/material/MenuItem";
 
 // Utils
@@ -49,7 +49,10 @@ const ActionMenu = ({ notification, onDelete }) => {
 				onClick={handleClick}
 				onMouseDown={(e) => e.stopPropagation()}
 			>
-				<SettingsOutlinedIcon />
+				<Icon
+					name="Settings"
+					size={20}
+				/>
 			</IconButton>
 
 			<Menu
diff --git a/client/src/Pages/PageSpeed/Create/index.jsx b/client/src/Pages/PageSpeed/Create/index.jsx
index 2cce26159..b218ff381 100644
--- a/client/src/Pages/PageSpeed/Create/index.jsx
+++ b/client/src/Pages/PageSpeed/Create/index.jsx
@@ -3,10 +3,9 @@ import { Box, Stack, Tooltip, Typography, Button, ButtonGroup } from "@mui/mater
 import ConfigBox from "@/Components/v1/ConfigBox/index.jsx";
 import Select from "@/Components/v1/Inputs/Select/index.jsx";
 import TextInput from "@/Components/v1/Inputs/TextInput/index.jsx";
-import PauseCircleOutlineIcon from "@mui/icons-material/PauseCircleOutline";
+import Icon from "@/Components/v1/Icon";
 import Breadcrumbs from "@/Components/v1/Breadcrumbs/index.jsx";
 import PulseDot from "@/Components/v1/Animated/PulseDot.jsx";
-import PlayCircleOutlineRoundedIcon from "@mui/icons-material/PlayCircleOutlineRounded";
 import SkeletonLayout from "./skeleton.jsx";
 import NotificationsConfig from "@/Components/v1/NotificationConfig/index.jsx";
 import Dialog from "@/Components/v1/Dialog/index.jsx";
@@ -178,8 +177,7 @@ const PageSpeedSetup = () => {
 
 	const handleRemove = async (event) => {
 		event.preventDefault();
-		const TEMP_MONITOR = { id: monitor._id };
-		await deleteMonitor({ monitor: TEMP_MONITOR, redirect: "/pagespeed" });
+		await deleteMonitor({ monitor: { id: monitorId }, redirect: "/pagespeed" });
 	};
 
 	const isBusy = isLoading || isCreating || isDeleting || isUpdating || isPausing;
@@ -314,12 +312,18 @@ const PageSpeedSetup = () => {
 							>
 								{monitor?.isActive ? (
 									<>
-										<PauseCircleOutlineIcon />
+										<Icon
+											name="PauseCircle"
+											size={20}
+										/>
 										{t("pause")}
 									</>
 								) : (
 									<>
-										<PlayCircleOutlineRoundedIcon />
+										<Icon
+											name="PlayCircle"
+											size={20}
+										/>
 										{t("resume")}
 									</>
 								)}
diff --git a/client/src/Pages/PageSpeed/Details/Components/Charts/AreaChartLegend.jsx b/client/src/Pages/PageSpeed/Details/Components/Charts/AreaChartLegend.jsx
index 113e4d618..525e4d0d2 100644
--- a/client/src/Pages/PageSpeed/Details/Components/Charts/AreaChartLegend.jsx
+++ b/client/src/Pages/PageSpeed/Details/Components/Charts/AreaChartLegend.jsx
@@ -1,6 +1,6 @@
 import { Box, Typography, Divider } from "@mui/material";
 import Checkbox from "@/Components/v1/Inputs/Checkbox/index.jsx";
-import MetricsIcon from "@/assets/icons/ruler-icon.svg?react";
+import Icon from "@/Components/v1/Icon";
 import LegendBox from "@/Components/v1/Charts/LegendBox/index.jsx";
 import { useTranslation } from "react-i18next";
 import { useTheme } from "@emotion/react";
@@ -10,7 +10,12 @@ const AreaChartLegend = ({ metrics, handleMetrics }) => {
 	const { t } = useTranslation();
 	return (
 		<LegendBox
-			icon={<MetricsIcon />}
+			icon={
+				<Icon
+					name="Ruler"
+					size={20}
+				/>
+			}
 			header="Metrics"
 		>
 			<Box>
diff --git a/client/src/Pages/PageSpeed/Details/Components/Charts/PieChartLegend.jsx b/client/src/Pages/PageSpeed/Details/Components/Charts/PieChartLegend.jsx
index 43e2371b4..5cfdad608 100644
--- a/client/src/Pages/PageSpeed/Details/Components/Charts/PieChartLegend.jsx
+++ b/client/src/Pages/PageSpeed/Details/Components/Charts/PieChartLegend.jsx
@@ -1,7 +1,7 @@
 import { Stack, Box, Typography } from "@mui/material";
 import { useTheme } from "@emotion/react";
 import LegendBox from "@/Components/v1/Charts/LegendBox/index.jsx";
-import SpeedometerIcon from "@/assets/icons/speedometer-icon.svg?react";
+import Icon from "@/Components/v1/Icon";
 import PropTypes from "prop-types";
 
 const PieChartLegend = ({ audits }) => {
@@ -9,7 +9,12 @@ const PieChartLegend = ({ audits }) => {
 
 	return (
 		<LegendBox
-			icon={<SpeedometerIcon />}
+			icon={
+				<Icon
+					name="Gauge"
+					size={20}
+				/>
+			}
 			header="Performance metrics"
 			sx={{ flex: 1 }}
 		>
diff --git a/client/src/Pages/PageSpeed/Details/Components/PageSpeedAreaChart/index.jsx b/client/src/Pages/PageSpeed/Details/Components/PageSpeedAreaChart/index.jsx
index aa88d57e5..9020ddd6d 100644
--- a/client/src/Pages/PageSpeed/Details/Components/PageSpeedAreaChart/index.jsx
+++ b/client/src/Pages/PageSpeed/Details/Components/PageSpeedAreaChart/index.jsx
@@ -2,7 +2,7 @@ import ChartBox from "@/Components/v1/Charts/ChartBox/index.jsx";
 import AreaChart from "../Charts/AreaChart.jsx";
 import AreaChartLegend from "../Charts/AreaChartLegend.jsx";
 import SkeletonLayout from "./skeleton.jsx";
-import ScoreIcon from "@/assets/icons/monitor-graph-line.svg?react";
+import Icon from "@/Components/v1/Icon";
 import { Stack } from "@mui/material";
 import PropTypes from "prop-types";
 
@@ -24,7 +24,12 @@ const PageSpeedAreaChart = ({ shouldRender, monitor, metrics, handleMetrics }) =
 		>
 			<ChartBox
 				justifyContent="flex-start"
-				icon={<ScoreIcon />}
+				icon={
+					<Icon
+						name="TrendingUp"
+						size={20}
+					/>
+				}
 				header="Score history"
 				height="100%"
 				borderRadiusRight={16}
diff --git a/client/src/Pages/PageSpeed/Details/Components/PerformanceReport/index.jsx b/client/src/Pages/PageSpeed/Details/Components/PerformanceReport/index.jsx
index c2eecaa6a..a2e1b5f96 100644
--- a/client/src/Pages/PageSpeed/Details/Components/PerformanceReport/index.jsx
+++ b/client/src/Pages/PageSpeed/Details/Components/PerformanceReport/index.jsx
@@ -1,5 +1,5 @@
 import ChartBox from "@/Components/v1/Charts/ChartBox/index.jsx";
-import PerformanceIcon from "@/assets/icons/performance-report.svg?react";
+import Icon from "@/Components/v1/Icon";
 import PieChart from "../Charts/PieChart.jsx";
 import { Typography } from "@mui/material";
 import { useTheme } from "@emotion/react";
@@ -17,7 +17,12 @@ const PerformanceReport = ({ shouldRender, audits }) => {
 
 	return (
 		<ChartBox
-			icon={<PerformanceIcon />}
+			icon={
+				<Icon
+					name="Layers"
+					size={20}
+				/>
+			}
 			header="Performance report"
 			Legend={<PieChartLegend audits={audits} />}
 			borderRadiusRight={16}
diff --git a/client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx b/client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx
index 8a6444d1b..4642e2336 100644
--- a/client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx
+++ b/client/src/Pages/PageSpeed/Monitors/Components/Card/index.jsx
@@ -1,6 +1,5 @@
 import PropTypes from "prop-types";
-// import PageSpeedIcon from "../../../../assets/icons/page-speed.svg?react";
-import PageSpeedIcon from "@/assets/icons/page-speed.svg?react";
+import Icon from "@/Components/v1/Icon";
 import { StatusLabel } from "@/Components/v1/Label/index.jsx";
 import { Box, Grid, Stack, Typography } from "@mui/material";
 import { useNavigate } from "react-router-dom";
@@ -241,7 +240,10 @@ const Card = ({ monitor }) => {
 				}}
 			>
 				<IconBox>
-					<PageSpeedIcon />
+					<Icon
+						name="Gauge"
+						size={20}
+					/>
 				</IconBox>
 				<Typography
 					component="h2"
diff --git a/client/src/Pages/StatusPage/Create/Components/MonitorList/index.jsx b/client/src/Pages/StatusPage/Create/Components/MonitorList/index.jsx
index d2a13b2eb..349571fe8 100644
--- a/client/src/Pages/StatusPage/Create/Components/MonitorList/index.jsx
+++ b/client/src/Pages/StatusPage/Create/Components/MonitorList/index.jsx
@@ -1,7 +1,6 @@
 // Components
 import { Stack, Typography } from "@mui/material";
-import ReorderRoundedIcon from "@mui/icons-material/ReorderRounded";
-import DeleteIcon from "@mui/icons-material/Delete";
+import Icon from "@/Components/v1/Icon";
 
 // Utils
 import { DragDropContext, Droppable, Draggable } from "@hello-pangea/dnd";
@@ -28,10 +27,15 @@ const MonitorListItem = ({
 			justifyContent={"start"}
 			border={`1px solid ${theme.palette.primary.lowContrast}`}
 		>
-			<ReorderRoundedIcon />
+			<Icon
+				name="GripVertical"
+				size={20}
+			/>
 			<Typography>{monitor.name}</Typography>
-			<DeleteIcon
-				sx={{ marginLeft: "auto" }}
+			<Icon
+				name="Trash2"
+				size={20}
+				style={{ marginLeft: "auto", cursor: "pointer" }}
 				onClick={() => {
 					onDelete(monitor);
 				}}
diff --git a/client/src/Pages/StatusPage/Create/Components/Progress/index.jsx b/client/src/Pages/StatusPage/Create/Components/Progress/index.jsx
index 2d9731ea0..594fd9709 100644
--- a/client/src/Pages/StatusPage/Create/Components/Progress/index.jsx
+++ b/client/src/Pages/StatusPage/Create/Components/Progress/index.jsx
@@ -1,6 +1,6 @@
 import { Button, Box } from "@mui/material";
 import ProgressUpload from "@/Components/v1/ProgressBars/index.jsx";
-import ImageIcon from "@mui/icons-material/Image";
+import Icon from "@/Components/v1/Icon";
 import { useTranslation } from "react-i18next";
 import { formatBytes } from "../../../../../Utils/fileUtils.js";
 const Progress = ({ isLoading, progressValue, logo, logoType, removeLogo, errors }) => {
@@ -8,7 +8,12 @@ const Progress = ({ isLoading, progressValue, logo, logoType, removeLogo, errors
 	if (isLoading) {
 		return (
 			<ProgressUpload
-				icon={<ImageIcon />}
+				icon={
+					<Icon
+						name="Image"
+						size={20}
+					/>
+				}
 				label={logo?.name}
 				size={formatBytes(logo?.size)}
 				progress={progressValue}
diff --git a/client/src/Pages/StatusPage/Status/Components/ControlsHeader/index.jsx b/client/src/Pages/StatusPage/Status/Components/ControlsHeader/index.jsx
index 60a4882f5..fe1c4c852 100644
--- a/client/src/Pages/StatusPage/Status/Components/ControlsHeader/index.jsx
+++ b/client/src/Pages/StatusPage/Status/Components/ControlsHeader/index.jsx
@@ -1,9 +1,8 @@
 // Components
 import { Box, Stack, Typography, Button } from "@mui/material";
 import Image from "@/Components/v1/Image/index.jsx";
-import SettingsIcon from "@/assets/icons/settings-bold.svg?react";
+import Icon from "@/Components/v1/Icon";
 import ThemeSwitch from "@/Components/v1/ThemeSwitch/index.jsx";
-import ArrowOutwardIcon from "@mui/icons-material/ArrowOutward";
 //Utils
 import { useTheme } from "@mui/material/styles";
 import { useNavigate } from "react-router-dom";
@@ -46,7 +45,12 @@ const Controls = ({ url, type }) => {
 						},
 					}}
 				>
-					<SettingsIcon /> {t("configure")}
+					<Icon
+						name="Settings"
+						size={18}
+						style={{ marginRight: "8px" }}
+					/>{" "}
+					{t("configure")}
 				</Button>
 			</Box>
 		</Stack>
@@ -111,7 +115,10 @@ const ControlsHeader = ({ statusPage, isPublic, url, type = "uptime" }) => {
 						}}
 					>
 						<Typography>{t("publicLink")}</Typography>
-						<ArrowOutwardIcon />
+						<Icon
+							name="ExternalLink"
+							size={18}
+						/>
 					</Stack>
 				)}
 			</Stack>
diff --git a/client/src/Pages/StatusPage/Status/Components/StatusBar/index.jsx b/client/src/Pages/StatusPage/Status/Components/StatusBar/index.jsx
index 1898ff3d7..7b9460068 100644
--- a/client/src/Pages/StatusPage/Status/Components/StatusBar/index.jsx
+++ b/client/src/Pages/StatusPage/Status/Components/StatusBar/index.jsx
@@ -1,7 +1,6 @@
 // Components
 import { Stack, Typography } from "@mui/material";
-import CheckCircleIcon from "@mui/icons-material/CheckCircle";
-import ErrorOutlineIcon from "@mui/icons-material/ErrorOutline";
+import Icon from "@/Components/v1/Icon";
 
 // Utils
 import { useTheme } from "@mui/material/styles";
@@ -10,8 +9,10 @@ import PropTypes from "prop-types";
 const getMonitorStatus = (monitors, theme) => {
 	const monitorsStatus = {
 		icon: (
-			<ErrorOutlineIcon
-				sx={{ color: theme.palette.primary.contrastTextSecondaryDarkBg }}
+			<Icon
+				name="AlertTriangle"
+				size={24}
+				color="primary.contrastTextSecondaryDarkBg"
 			/>
 		),
 	};
@@ -19,8 +20,10 @@ const getMonitorStatus = (monitors, theme) => {
 		monitorsStatus.msg = "All systems operational";
 		monitorsStatus.color = theme.palette.success.lowContrast;
 		monitorsStatus.icon = (
-			<CheckCircleIcon
-				sx={{ color: theme.palette.primary.contrastTextSecondaryDarkBg }}
+			<Icon
+				name="CheckCircle2"
+				size={24}
+				color="primary.contrastTextSecondaryDarkBg"
 			/>
 		);
 	}
diff --git a/client/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable/index.jsx b/client/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable/index.jsx
index 1afe25409..9882239bd 100644
--- a/client/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable/index.jsx
+++ b/client/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable/index.jsx
@@ -2,7 +2,7 @@ import DataTable from "@/Components/v1/Table/index.jsx";
 import { useTheme } from "@emotion/react";
 import { useNavigate } from "react-router-dom";
 import { StatusLabel } from "@/Components/v1/Label/index.jsx";
-import ArrowOutwardIcon from "@mui/icons-material/ArrowOutward";
+import Icon from "@/Components/v1/Icon";
 import { Stack, Typography } from "@mui/material";
 import { useTranslation } from "react-i18next";
 const StatusPagesTable = ({ data }) => {
@@ -48,7 +48,12 @@ const StatusPagesTable = ({ data }) => {
 						}}
 					>
 						<Typography>{content}</Typography>
-						{row.isPublished && <ArrowOutwardIcon />}
+						{row.isPublished && (
+							<Icon
+								name="ExternalLink"
+								size={18}
+							/>
+						)}
 					</Stack>
 				);
 			},
diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index 2c7821571..b1460dba6 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -28,10 +28,7 @@ import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { monitorValidation } from "../../../Validation/validation.js";
 import { createToast } from "../../../Utils/toastUtils.jsx";
-import {
-	PauseOutlined as PauseOutlinedIcon,
-	PlayArrowOutlined as PlayArrowOutlinedIcon,
-} from "@mui/icons-material";
+import Icon from "@/Components/v1/Icon";
 import { useMonitorUtils } from "../../../Hooks/useMonitorUtils.js";
 import { useGetNotificationsByTeamId } from "../../../Hooks/useNotifications.js";
 import { useParams } from "react-router-dom";
@@ -429,7 +426,17 @@ const UptimeCreate = ({ isClone = false }) => {
 								color="secondary"
 								loading={isBusy}
 								startIcon={
-									monitor?.isActive ? <PauseOutlinedIcon /> : <PlayArrowOutlinedIcon />
+									monitor?.isActive ? (
+										<Icon
+											name="Pause"
+											size={18}
+										/>
+									) : (
+										<Icon
+											name="Play"
+											size={18}
+										/>
+									)
 								}
 								onClick={handlePause}
 							>
diff --git a/client/src/Pages/Uptime/Details/Components/ChartBoxes/index.jsx b/client/src/Pages/Uptime/Details/Components/ChartBoxes/index.jsx
index 582c7891f..b8496f5ea 100644
--- a/client/src/Pages/Uptime/Details/Components/ChartBoxes/index.jsx
+++ b/client/src/Pages/Uptime/Details/Components/ChartBoxes/index.jsx
@@ -1,9 +1,7 @@
 // Components
 import { Stack, Typography, Box } from "@mui/material";
 import ChartBox from "@/Components/v1/Charts/ChartBox/index.jsx";
-import UptimeIcon from "@/assets/icons/uptime-icon.svg?react";
-import IncidentsIcon from "@/assets/icons/incidents.svg?react";
-import AverageResponseIcon from "@/assets/icons/average-response-icon.svg?react";
+import Icon from "@/Components/v1/Icon";
 import UpBarChart from "../Charts/UpBarChart.jsx";
 import DownBarChart from "../Charts/DownBarChart.jsx";
 import ResponseGaugeChart from "../Charts/ResponseGaugeChart.jsx";
@@ -38,7 +36,12 @@ const ChartBoxes = ({
 			gap={theme.spacing(8)}
 		>
 			<ChartBox
-				icon={<UptimeIcon />}
+				icon={
+					<Icon
+						name="Activity"
+						size={20}
+					/>
+				}
 				header="Uptime"
 				isEmpty={monitorData?.groupedUpChecks?.length === 0}
 			>
@@ -89,7 +92,12 @@ const ChartBoxes = ({
 				/>
 			</ChartBox>
 			<ChartBox
-				icon={<IncidentsIcon />}
+				icon={
+					<Icon
+						name="AlertTriangle"
+						size={20}
+					/>
+				}
 				header="Incidents"
 				noDataMessage={noIncidentsMessage}
 				isEmpty={monitorData?.groupedDownChecks?.length === 0}
@@ -123,7 +131,12 @@ const ChartBoxes = ({
 				/>
 			</ChartBox>
 			<ChartBox
-				icon={<AverageResponseIcon />}
+				icon={
+					<Icon
+						name="BarChart3"
+						size={20}
+					/>
+				}
 				header="Average Response Time"
 			>
 				<ResponseGaugeChart avgResponseTime={monitorData?.groupedAvgResponseTime ?? 0} />
diff --git a/client/src/Pages/Uptime/Details/Components/Charts/ResponseTimeChart.jsx b/client/src/Pages/Uptime/Details/Components/Charts/ResponseTimeChart.jsx
index 861b600d4..7e7a940e0 100644
--- a/client/src/Pages/Uptime/Details/Components/Charts/ResponseTimeChart.jsx
+++ b/client/src/Pages/Uptime/Details/Components/Charts/ResponseTimeChart.jsx
@@ -1,6 +1,6 @@
 import ChartBox from "@/Components/v1/Charts/ChartBox/index.jsx";
 import MonitorDetailsAreaChart from "@/Components/v1/Charts/MonitorDetailsAreaChart/index.jsx";
-import ResponseTimeIcon from "@/assets/icons/response-time-icon.svg?react";
+import Icon from "@/Components/v1/Icon";
 import SkeletonLayout from "./ResponseTimeChartSkeleton.jsx";
 import PropTypes from "prop-types";
 
@@ -11,7 +11,12 @@ const ResponseTImeChart = ({ isLoading = false, groupedChecks = [], dateRange })
 
 	return (
 		<ChartBox
-			icon={<ResponseTimeIcon />}
+			icon={
+				<Icon
+					name="TrendingUp"
+					size={20}
+				/>
+			}
 			header="Response Times"
 		>
 			<MonitorDetailsAreaChart
diff --git a/client/src/Pages/Uptime/Details/Components/ResponseTable/index.jsx b/client/src/Pages/Uptime/Details/Components/ResponseTable/index.jsx
index 0715561d4..2d7991324 100644
--- a/client/src/Pages/Uptime/Details/Components/ResponseTable/index.jsx
+++ b/client/src/Pages/Uptime/Details/Components/ResponseTable/index.jsx
@@ -1,6 +1,6 @@
 import ChartBox from "@/Components/v1/Charts/ChartBox/index.jsx";
 import PropTypes from "prop-types";
-import HistoryIcon from "@/assets/icons/history-icon.svg?react";
+import Icon from "@/Components/v1/Icon";
 import Table from "@/Components/v1/Table/index.jsx";
 import TablePagination from "@/Components/v1/Table/TablePagination/index.jsx";
 import { StatusLabel } from "@/Components/v1/Label/index.jsx";
@@ -184,7 +184,12 @@ const ResponseTable = ({
 
 	return (
 		<ChartBox
-			icon={<HistoryIcon />}
+			icon={
+				<Icon
+					name="History"
+					size={20}
+				/>
+			}
 			header="Response Times"
 			height="100%"
 		>
diff --git a/client/src/Pages/Uptime/Monitors/Components/Filter/index.jsx b/client/src/Pages/Uptime/Monitors/Components/Filter/index.jsx
index b9a6824c1..62ba0be13 100644
--- a/client/src/Pages/Uptime/Monitors/Components/Filter/index.jsx
+++ b/client/src/Pages/Uptime/Monitors/Components/Filter/index.jsx
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 import FilterHeader from "@/Components/v1/FilterHeader/index.jsx";
 import { useMemo } from "react";
 import { Box, Button } from "@mui/material";
-import ClearIcon from "@mui/icons-material/Clear";
+import Icon from "@/Components/v1/Icon";
 import { useTranslation } from "react-i18next";
 
 /**
@@ -131,7 +131,12 @@ const Filter = ({
 				color={theme.palette.primary.contrastText}
 				onClick={handleReset}
 				variant="contained"
-				endIcon={<ClearIcon />}
+				endIcon={
+					<Icon
+						name="X"
+						size={18}
+					/>
+				}
 				sx={{
 					visibility: isFilterActive ? "visible" : "hidden",
 				}}
diff --git a/client/src/Pages/Uptime/Monitors/Components/StatusBoxes/statusBox.jsx b/client/src/Pages/Uptime/Monitors/Components/StatusBoxes/statusBox.jsx
index c9015816a..136c3575d 100644
--- a/client/src/Pages/Uptime/Monitors/Components/StatusBoxes/statusBox.jsx
+++ b/client/src/Pages/Uptime/Monitors/Components/StatusBoxes/statusBox.jsx
@@ -1,9 +1,8 @@
 import PropTypes from "prop-types";
 import { useTheme } from "@emotion/react";
 import { Box, Stack, Typography } from "@mui/material";
-import Arrow from "@/assets/icons/top-right-arrow.svg?react";
+import Icon from "@/Components/v1/Icon";
 import Background from "@/assets/Images/background-grid.svg?react";
-import ClockSnooze from "@/assets/icons/clock-snooze.svg?react";
 
 const StatusBox = ({ title, value, status }) => {
 	const theme = useTheme();
@@ -20,21 +19,30 @@ const StatusBox = ({ title, value, status }) => {
 		color = theme.palette.success.lowContrast;
 		icon = (
 			<Box sx={{ ...sharedStyles, top: theme.spacing(4) }}>
-				<Arrow />
+				<Icon
+					name="ArrowUpRight"
+					size={20}
+				/>
 			</Box>
 		);
 	} else if (status === "down") {
 		color = theme.palette.error.lowContrast;
 		icon = (
 			<Box sx={{ ...sharedStyles, transform: "rotate(180deg)", top: theme.spacing(2) }}>
-				<Arrow />
+				<Icon
+					name="ArrowUpRight"
+					size={20}
+				/>
 			</Box>
 		);
 	} else if (status === "paused") {
 		color = theme.palette.warning.lowContrast;
 		icon = (
 			<Box sx={{ ...sharedStyles, top: theme.spacing(6), right: theme.spacing(6) }}>
-				<ClockSnooze />
+				<Icon
+					name="Clock"
+					size={20}
+				/>
 			</Box>
 		);
 	}
diff --git a/client/src/Pages/Uptime/Monitors/Components/UptimeDataTable/index.jsx b/client/src/Pages/Uptime/Monitors/Components/UptimeDataTable/index.jsx
index fe220251d..8c3239dd3 100644
--- a/client/src/Pages/Uptime/Monitors/Components/UptimeDataTable/index.jsx
+++ b/client/src/Pages/Uptime/Monitors/Components/UptimeDataTable/index.jsx
@@ -1,8 +1,7 @@
 // Components
 import { Box, Stack } from "@mui/material";
 import DataTable from "@/Components/v1/Table/index.jsx";
-import ArrowDownwardRoundedIcon from "@mui/icons-material/ArrowDownwardRounded";
-import ArrowUpwardRoundedIcon from "@mui/icons-material/ArrowUpwardRounded";
+import Icon from "@/Components/v1/Icon";
 import Host from "@/Components/v1/Host/index.jsx";
 import { StatusLabel } from "@/Components/v1/Label/index.jsx";
 import BarChart from "@/Components/v1/Charts/BarChart/index.jsx";
@@ -92,9 +91,15 @@ const UptimeDataTable = ({
 						}}
 					>
 						{sort?.order === "asc" ? (
-							<ArrowUpwardRoundedIcon />
+							<Icon
+								name="ArrowUp"
+								size={18}
+							/>
 						) : (
-							<ArrowDownwardRoundedIcon />
+							<Icon
+								name="ArrowDown"
+								size={18}
+							/>
 						)}
 					</Stack>
 				</Stack>
@@ -128,9 +133,15 @@ const UptimeDataTable = ({
 						}}
 					>
 						{sort?.order === "asc" ? (
-							<ArrowUpwardRoundedIcon fontSize="18px" />
+							<Icon
+								name="ArrowUp"
+								size={18}
+							/>
 						) : (
-							<ArrowDownwardRoundedIcon fontSize="18px" />
+							<Icon
+								name="ArrowDown"
+								size={18}
+							/>
 						)}
 					</Stack>
 				</Stack>
diff --git a/client/src/assets/icons/alert-icon.svg b/client/src/assets/icons/alert-icon.svg
deleted file mode 100644
index 1dc7fc2b7..000000000
--- a/client/src/assets/icons/alert-icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.35395 21C10.0591 21.6224 10.9853 22 11.9998 22C13.0142 22 13.9405 21.6224 14.6456 21M17.9998 8C17.9998 6.4087 17.3676 4.88258 16.2424 3.75736C15.1172 2.63214 13.5911 2 11.9998 2C10.4085 2 8.88235 2.63214 7.75713 3.75736C6.63192 4.88258 5.99977 6.4087 5.99977 8C5.99977 11.0902 5.22024 13.206 4.34944 14.6054C3.6149 15.7859 3.24763 16.3761 3.2611 16.5408C3.27601 16.7231 3.31463 16.7926 3.46155 16.9016C3.59423 17 4.19237 17 5.38863 17H18.6109C19.8072 17 20.4053 17 20.538 16.9016C20.6849 16.7926 20.7235 16.7231 20.7384 16.5408C20.7519 16.3761 20.3846 15.7859 19.6501 14.6054C18.7793 13.206 17.9998 11.0902 17.9998 8Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/average-response-icon.svg b/client/src/assets/icons/average-response-icon.svg
deleted file mode 100644
index 572e2002f..000000000
--- a/client/src/assets/icons/average-response-icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M20 20V13M12 20V10M4 20L4 16M13.4067 5.0275L18.5751 6.96567M10.7988 5.40092L5.20023 9.59983M21.0607 6.43934C21.6464 7.02513 21.6464 7.97487 21.0607 8.56066C20.4749 9.14645 19.5251 9.14645 18.9393 8.56066C18.3536 7.97487 18.3536 7.02513 18.9393 6.43934C19.5251 5.85355 20.4749 5.85355 21.0607 6.43934ZM5.06066 9.43934C5.64645 10.0251 5.64645 10.9749 5.06066 11.5607C4.47487 12.1464 3.52513 12.1464 2.93934 11.5607C2.35355 10.9749 2.35355 10.0251 2.93934 9.43934C3.52513 8.85355 4.47487 8.85355 5.06066 9.43934ZM13.0607 3.43934C13.6464 4.02513 13.6464 4.97487 13.0607 5.56066C12.4749 6.14645 11.5251 6.14645 10.9393 5.56066C10.3536 4.97487 10.3536 4.02513 10.9393 3.43934C11.5251 2.85355 12.4749 2.85355 13.0607 3.43934Z" stroke="black" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/bwu-icon.svg b/client/src/assets/icons/bwu-icon.svg
deleted file mode 100644
index 80ab50ad9..000000000
--- a/client/src/assets/icons/bwu-icon.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="32" height="32" fill="#1570EF"/>
-<path d="M4.43466 24V9.45455H10.0028C11.054 9.45455 11.9276 9.62026 12.6236 9.9517C13.3243 10.2784 13.8475 10.7259 14.1932 11.294C14.5436 11.8622 14.7188 12.5062 14.7188 13.2259C14.7188 13.8177 14.6051 14.3243 14.3778 14.7457C14.1506 15.1624 13.8452 15.5009 13.4616 15.7614C13.0781 16.0218 12.6496 16.2088 12.1761 16.3224V16.4645C12.6922 16.4929 13.187 16.6515 13.6605 16.9403C14.1387 17.2244 14.5294 17.6269 14.8324 18.1477C15.1354 18.6686 15.2869 19.2983 15.2869 20.0369C15.2869 20.7898 15.1046 21.4669 14.7401 22.0682C14.3755 22.6648 13.8262 23.1359 13.0923 23.4815C12.3584 23.8272 11.4351 24 10.3224 24H4.43466ZM7.0696 21.7983H9.90341C10.8598 21.7983 11.5488 21.616 11.9702 21.2514C12.3963 20.8821 12.6094 20.4086 12.6094 19.831C12.6094 19.4001 12.5028 19.0118 12.2898 18.6662C12.0767 18.3158 11.7737 18.0412 11.3807 17.8423C10.9877 17.6387 10.5189 17.5369 9.97443 17.5369H7.0696V21.7983ZM7.0696 15.6406H9.67614C10.1307 15.6406 10.5402 15.5578 10.9048 15.392C11.2694 15.2216 11.5559 14.9825 11.7642 14.6747C11.9773 14.3622 12.0838 13.9929 12.0838 13.5668C12.0838 13.0033 11.8849 12.5393 11.4872 12.1747C11.0942 11.8101 10.5095 11.6278 9.73295 11.6278H7.0696V15.6406ZM25.5482 9.45455H28.1832V18.9574C28.1832 19.9991 27.937 20.9152 27.4445 21.706C26.9568 22.4967 26.2703 23.1146 25.3849 23.5597C24.4995 24 23.4649 24.2202 22.2812 24.2202C21.0927 24.2202 20.0558 24 19.1704 23.5597C18.285 23.1146 17.5984 22.4967 17.1107 21.706C16.623 20.9152 16.3792 19.9991 16.3792 18.9574V9.45455H19.0141V18.7372C19.0141 19.3433 19.1467 19.883 19.4119 20.3565C19.6817 20.83 20.0605 21.2017 20.5482 21.4716C21.0359 21.7367 21.6136 21.8693 22.2812 21.8693C22.9488 21.8693 23.5264 21.7367 24.0141 21.4716C24.5066 21.2017 24.8853 20.83 25.1505 20.3565C25.4156 19.883 25.5482 19.3433 25.5482 18.7372V9.45455Z" fill="white"/>
-</svg>
diff --git a/client/src/assets/icons/calendar-check.svg b/client/src/assets/icons/calendar-check.svg
deleted file mode 100644
index 07d96dad9..000000000
--- a/client/src/assets/icons/calendar-check.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="20" height="22" viewBox="0 0 20 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M19 10.5V7.8C19 6.11984 19 5.27976 18.673 4.63803C18.3854 4.07354 17.9265 3.6146 17.362 3.32698C16.7202 3 15.8802 3 14.2 3H5.8C4.11984 3 3.27976 3 2.63803 3.32698C2.07354 3.6146 1.6146 4.07354 1.32698 4.63803C1 5.27976 1 6.11984 1 7.8V16.2C1 17.8802 1 18.7202 1.32698 19.362C1.6146 19.9265 2.07354 20.3854 2.63803 20.673C3.27976 21 4.11984 21 5.8 21H10.5M19 9H1M14 1V5M6 1V5M16 20V14M13 17H19" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/calendar.svg b/client/src/assets/icons/calendar.svg
deleted file mode 100644
index be023a4de..000000000
--- a/client/src/assets/icons/calendar.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="20" viewBox="0 0 18 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M16.5 8.33342H1.5M12.3333 1.66675V5.00008M5.66667 1.66675V5.00008M5.5 18.3334H12.5C13.9001 18.3334 14.6002 18.3334 15.135 18.0609C15.6054 17.8212 15.9878 17.4388 16.2275 16.9684C16.5 16.4336 16.5 15.7335 16.5 14.3334V7.33342C16.5 5.93328 16.5 5.23322 16.2275 4.69844C15.9878 4.22803 15.6054 3.84558 15.135 3.6059C14.6002 3.33341 13.9001 3.33341 12.5 3.33341H5.5C4.09987 3.33341 3.3998 3.33341 2.86502 3.6059C2.39462 3.84558 2.01217 4.22803 1.77248 4.69844C1.5 5.23322 1.5 5.93328 1.5 7.33341V14.3334C1.5 15.7335 1.5 16.4336 1.77248 16.9684C2.01217 17.4388 2.39462 17.8212 2.86502 18.0609C3.3998 18.3334 4.09987 18.3334 5.5 18.3334Z" stroke="#344054" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/certificate.svg b/client/src/assets/icons/certificate.svg
deleted file mode 100644
index 2bc6c7e74..000000000
--- a/client/src/assets/icons/certificate.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.5 20H5C3.89543 20 3 19.1046 3 18V4C3 2.89543 3.89543 2 5 2H19C20.1046 2 21 2.89543 21 4V18C21 19.1046 20.1046 20 19 20H17.5M12 19C13.6569 19 15 17.6569 15 16C15 14.3431 13.6569 13 12 13C10.3431 13 9 14.3431 9 16C9 17.6569 10.3431 19 12 19ZM12 19L12.0214 18.9998L8.82867 22.1926L6.00024 19.3641L9.01965 16.3447M12 19L15.1928 22.1926L18.0212 19.3641L15.0018 16.3447M9 6H15M7 9.5H17" stroke="#475466" stroke-width="1" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
\ No newline at end of file
diff --git a/client/src/assets/icons/changeLog.svg b/client/src/assets/icons/changeLog.svg
deleted file mode 100644
index d12f6c10e..000000000
--- a/client/src/assets/icons/changeLog.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M17 17L22 12L17 7M7 7L2 12L7 17M14 3L10 21" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/check-icon.svg b/client/src/assets/icons/check-icon.svg
deleted file mode 100644
index 9a2cfac5a..000000000
--- a/client/src/assets/icons/check-icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.5 12L10.5 15L16.5 9M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/check-outlined.svg b/client/src/assets/icons/check-outlined.svg
deleted file mode 100644
index 1e779d547..000000000
--- a/client/src/assets/icons/check-outlined.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.24935 10.0001L8.74935 12.5001L13.7493 7.50008M18.3327 10.0001C18.3327 14.6025 14.6017 18.3334 9.99935 18.3334C5.39698 18.3334 1.66602 14.6025 1.66602 10.0001C1.66602 5.39771 5.39698 1.66675 9.99935 1.66675C14.6017 1.66675 18.3327 5.39771 18.3327 10.0001Z" stroke="#1570EF" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/check.svg b/client/src/assets/icons/check.svg
deleted file mode 100644
index 357378f40..000000000
--- a/client/src/assets/icons/check.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 10C0 4.47715 4.47715 0 10 0C15.5228 0 20 4.47715 20 10C20 15.5228 15.5228 20 10 20C4.47715 20 0 15.5228 0 10Z" fill="#D0D5DD"/>
-<path d="M6.25 10L8.75 12.5L13.75 7.5" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/checkbox-filled.svg b/client/src/assets/icons/checkbox-filled.svg
deleted file mode 100644
index 8a5be81f0..000000000
--- a/client/src/assets/icons/checkbox-filled.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 6C0 2.68629 2.68629 0 6 0H14C17.3137 0 20 2.68629 20 6V14C20 17.3137 17.3137 20 14 20H6C2.68629 20 0 17.3137 0 14V6Z" fill="#1570EF"/>
-<path d="M14.6668 6.5L8.25016 12.9167L5.3335 10" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/checkbox-green.svg b/client/src/assets/icons/checkbox-green.svg
deleted file mode 100644
index dd5676298..000000000
--- a/client/src/assets/icons/checkbox-green.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="12" cy="12" r="12" fill="#079455"/>
-<circle cx="12" cy="12" r="8" fill="#17B26A"/>
-<circle cx="12" cy="12" r="3" fill="white"/>
-</svg>
diff --git a/client/src/assets/icons/checkbox-outline.svg b/client/src/assets/icons/checkbox-outline.svg
deleted file mode 100644
index bf5a7218c..000000000
--- a/client/src/assets/icons/checkbox-outline.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0.5 6C0.5 2.96243 2.96243 0.5 6 0.5H14C17.0376 0.5 19.5 2.96243 19.5 6V14C19.5 17.0376 17.0376 19.5 14 19.5H6C2.96243 19.5 0.5 17.0376 0.5 14V6Z" stroke="#848b97"/>
-</svg>
diff --git a/client/src/assets/icons/checkbox-red.svg b/client/src/assets/icons/checkbox-red.svg
deleted file mode 100644
index 3c43a2042..000000000
--- a/client/src/assets/icons/checkbox-red.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="12" cy="12" r="12" fill="#D92D20"/>
-<circle cx="12" cy="12" r="8" fill="#F04438"/>
-<circle cx="12" cy="12" r="3" fill="white"/>
-</svg>
diff --git a/client/src/assets/icons/clock-snooze.svg b/client/src/assets/icons/clock-snooze.svg
deleted file mode 100644
index 708e7ba91..000000000
--- a/client/src/assets/icons/clock-snooze.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M16.5 17H21.5L16.5 22H21.5M21.9506 13C21.9833 12.6711 22 12.3375 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22C12.1677 22 12.3344 21.9959 12.5 21.9877C12.6678 21.9795 12.8345 21.9671 13 21.9506M12 6V12L15.7384 13.8692" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/close-icon.svg b/client/src/assets/icons/close-icon.svg
deleted file mode 100644
index e1b6b690a..000000000
--- a/client/src/assets/icons/close-icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15 9L9 15M9 9L15 15M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/cpu-chip.svg b/client/src/assets/icons/cpu-chip.svg
deleted file mode 100644
index 5645840b1..000000000
--- a/client/src/assets/icons/cpu-chip.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9 2V4M15 2V4M9 20V22M15 20V22M20 9H22M20 14H22M2 9H4M2 14H4M8.8 20H15.2C16.8802 20 17.7202 20 18.362 19.673C18.9265 19.3854 19.3854 18.9265 19.673 18.362C20 17.7202 20 16.8802 20 15.2V8.8C20 7.11984 20 6.27976 19.673 5.63803C19.3854 5.07354 18.9265 4.6146 18.362 4.32698C17.7202 4 16.8802 4 15.2 4H8.8C7.11984 4 6.27976 4 5.63803 4.32698C5.07354 4.6146 4.6146 5.07354 4.32698 5.63803C4 6.27976 4 7.11984 4 8.8V15.2C4 16.8802 4 17.7202 4.32698 18.362C4.6146 18.9265 5.07354 19.3854 5.63803 19.673C6.27976 20 7.11984 20 8.8 20ZM10.6 15H13.4C13.9601 15 14.2401 15 14.454 14.891C14.6422 14.7951 14.7951 14.6422 14.891 14.454C15 14.2401 15 13.9601 15 13.4V10.6C15 10.0399 15 9.75992 14.891 9.54601C14.7951 9.35785 14.6422 9.20487 14.454 9.10899C14.2401 9 13.9601 9 13.4 9H10.6C10.0399 9 9.75992 9 9.54601 9.10899C9.35785 9.20487 9.20487 9.35785 9.10899 9.54601C9 9.75992 9 10.0399 9 10.6V13.4C9 13.9601 9 14.2401 9.10899 14.454C9.20487 14.6422 9.35785 14.7951 9.54601 14.891C9.75992 15 10.0399 15 10.6 15Z" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/dashboard.svg b/client/src/assets/icons/dashboard.svg
deleted file mode 100644
index 8958e90ed..000000000
--- a/client/src/assets/icons/dashboard.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 17H16M11.0177 2.764L4.23539 8.03912C3.78202 8.39175 3.55534 8.56806 3.39203 8.78886C3.24737 8.98444 3.1396 9.20478 3.07403 9.43905C3 9.70352 3 9.9907 3 10.5651V17.8C3 18.9201 3 19.4801 3.21799 19.908C3.40973 20.2843 3.71569 20.5903 4.09202 20.782C4.51984 21 5.07989 21 6.2 21H17.8C18.9201 21 19.4802 21 19.908 20.782C20.2843 20.5903 20.5903 20.2843 20.782 19.908C21 19.4801 21 18.9201 21 17.8V10.5651C21 9.9907 21 9.70352 20.926 9.43905C20.8604 9.20478 20.7526 8.98444 20.608 8.78886C20.4447 8.56806 20.218 8.39175 19.7646 8.03913L12.9823 2.764C12.631 2.49075 12.4553 2.35412 12.2613 2.3016C12.0902 2.25526 11.9098 2.25526 11.7387 2.3016C11.5447 2.35412 11.369 2.49075 11.0177 2.764Z" stroke="#667085" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/discussions.svg b/client/src/assets/icons/discussions.svg
deleted file mode 100644
index 293cd51f2..000000000
--- a/client/src/assets/icons/discussions.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24" height="24" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M11 20C15.9706 20 20 15.9706 20 11C20 6.02944 15.9706 2 11 2C6.02944 2 2 6.02944 2 11C2 12.9021 2.5901 14.6665 3.59721 16.1199C3.70168 16.2707 3.7226 16.4653 3.64529 16.6317L2.42556 19.2519C2.23082 19.6399 2.57262 20.0754 2.97992 19.9193L6.0988 18.7595C6.25727 18.7007 6.44031 18.7151 6.58838 18.7985C7.9427 19.5534 9.4987 20 11 20Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M7 8.5H17" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M7 12.5H13" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M7 16.5H11" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/distributed-uptime.svg b/client/src/assets/icons/distributed-uptime.svg
deleted file mode 100644
index e612081e4..000000000
--- a/client/src/assets/icons/distributed-uptime.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11 4.5H18.3C19.4201 4.5 19.9802 4.5 20.408 4.71799C20.7843 4.90973 21.0903 5.21569 21.282 5.59202C21.5 6.01984 21.5 6.57989 21.5 7.7V9C21.5 9.93188 21.5 10.3978 21.3478 10.7654C21.1448 11.2554 20.7554 11.6448 20.2654 11.8478C19.8978 12 19.4319 12 18.5 12M13 19.5H5.7C4.5799 19.5 4.01984 19.5 3.59202 19.282C3.21569 19.0903 2.90973 18.7843 2.71799 18.408C2.5 17.9802 2.5 17.4201 2.5 16.3V15C2.5 14.0681 2.5 13.6022 2.65224 13.2346C2.85523 12.7446 3.24458 12.3552 3.73463 12.1522C4.10218 12 4.56812 12 5.5 12M10.3 14.5H13.7C13.98 14.5 14.12 14.5 14.227 14.4455C14.3211 14.3976 14.3976 14.3211 14.4455 14.227C14.5 14.12 14.5 13.98 14.5 13.7V10.3C14.5 10.02 14.5 9.87996 14.4455 9.773C14.3976 9.67892 14.3211 9.60243 14.227 9.5545C14.12 9.5 13.98 9.5 13.7 9.5H10.3C10.02 9.5 9.87996 9.5 9.773 9.5545C9.67892 9.60243 9.60243 9.67892 9.5545 9.773C9.5 9.87996 9.5 10.02 9.5 10.3V13.7C9.5 13.98 9.5 14.12 9.5545 14.227C9.60243 14.3211 9.67892 14.3976 9.773 14.4455C9.87996 14.5 10.02 14.5 10.3 14.5ZM17.8 22H21.2C21.48 22 21.62 22 21.727 21.9455C21.8211 21.8976 21.8976 21.8211 21.9455 21.727C22 21.62 22 21.48 22 21.2V17.8C22 17.52 22 17.38 21.9455 17.273C21.8976 17.1789 21.8211 17.1024 21.727 17.0545C21.62 17 21.48 17 21.2 17H17.8C17.52 17 17.38 17 17.273 17.0545C17.1789 17.1024 17.1024 17.1789 17.0545 17.273C17 17.38 17 17.52 17 17.8V21.2C17 21.48 17 21.62 17.0545 21.727C17.1024 21.8211 17.1789 21.8976 17.273 21.9455C17.38 22 17.52 22 17.8 22ZM2.8 7H6.2C6.48003 7 6.62004 7 6.727 6.9455C6.82108 6.89757 6.89757 6.82108 6.9455 6.727C7 6.62004 7 6.48003 7 6.2V2.8C7 2.51997 7 2.37996 6.9455 2.273C6.89757 2.17892 6.82108 2.10243 6.727 2.0545C6.62004 2 6.48003 2 6.2 2H2.8C2.51997 2 2.37996 2 2.273 2.0545C2.17892 2.10243 2.10243 2.17892 2.0545 2.273C2 2.37996 2 2.51997 2 2.8V6.2C2 6.48003 2 6.62004 2.0545 6.727C2.10243 6.82108 2.17892 6.89757 2.273 6.9455C2.37996 7 2.51997 7 2.8 7Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/docs.svg b/client/src/assets/icons/docs.svg
deleted file mode 100644
index d36458de2..000000000
--- a/client/src/assets/icons/docs.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14 11H8M10 15H8M16 7H8M20 6.8V17.2C20 18.8802 20 19.7202 19.673 20.362C19.3854 20.9265 18.9265 21.3854 18.362 21.673C17.7202 22 16.8802 22 15.2 22H8.8C7.11984 22 6.27976 22 5.63803 21.673C5.07354 21.3854 4.6146 20.9265 4.32698 20.362C4 19.7202 4 18.8802 4 17.2V6.8C4 5.11984 4 4.27976 4.32698 3.63803C4.6146 3.07354 5.07354 2.6146 5.63803 2.32698C6.27976 2 7.11984 2 8.8 2H15.2C16.8802 2 17.7202 2 18.362 2.32698C18.9265 2.6146 19.3854 3.07354 19.673 3.63803C20 4.27976 20 5.11984 20 6.8Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/dots-vertical.svg b/client/src/assets/icons/dots-vertical.svg
deleted file mode 100644
index e720066c4..000000000
--- a/client/src/assets/icons/dots-vertical.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 13C12.5523 13 13 12.5523 13 12C13 11.4477 12.5523 11 12 11C11.4477 11 11 11.4477 11 12C11 12.5523 11.4477 13 12 13Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 6C12.5523 6 13 5.55228 13 5C13 4.44772 12.5523 4 12 4C11.4477 4 11 4.44772 11 5C11 5.55228 11.4477 6 12 6Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 20C12.5523 20 13 19.5523 13 19C13 18.4477 12.5523 18 12 18C11.4477 18 11 18.4477 11 19C11 19.5523 11.4477 20 12 20Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/down-arrow.svg b/client/src/assets/icons/down-arrow.svg
deleted file mode 100644
index 59b4b6bc5..000000000
--- a/client/src/assets/icons/down-arrow.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 9L12 15L18 9" stroke="#667085" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/edit.svg b/client/src/assets/icons/edit.svg
deleted file mode 100644
index be2c78408..000000000
--- a/client/src/assets/icons/edit.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.66699 14.3333L5.36651 12.9104C5.60313 12.8194 5.72145 12.7739 5.83214 12.7145C5.93046 12.6617 6.02419 12.6008 6.11235 12.5324C6.21161 12.4554 6.30124 12.3657 6.48051 12.1865L14.0003 4.66665C14.7367 3.93027 14.7367 2.73636 14.0003 1.99998C13.264 1.2636 12.0701 1.2636 11.3337 1.99998L3.81385 9.51979C3.63458 9.69906 3.54494 9.7887 3.46792 9.88795C3.39951 9.97611 3.33859 10.0698 3.28582 10.1682C3.2264 10.2789 3.18089 10.3972 3.08988 10.6338L1.66699 14.3333ZM1.66699 14.3333L3.03907 10.766C3.13726 10.5107 3.18635 10.383 3.27055 10.3246C3.34414 10.2735 3.43519 10.2542 3.52319 10.271C3.62388 10.2902 3.72058 10.3869 3.91398 10.5803L5.42004 12.0863C5.61344 12.2797 5.71014 12.3764 5.72937 12.4771C5.74617 12.5651 5.72685 12.6562 5.67576 12.7298C5.61729 12.814 5.48965 12.8631 5.23437 12.9613L1.66699 14.3333Z" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/email.svg b/client/src/assets/icons/email.svg
deleted file mode 100644
index 01f55e961..000000000
--- a/client/src/assets/icons/email.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 7L10.1649 12.7154C10.8261 13.1783 11.1567 13.4097 11.5163 13.4993C11.8339 13.5785 12.1661 13.5785 12.4837 13.4993C12.8433 13.4097 13.1739 13.1783 13.8351 12.7154L22 7M6.8 20H17.2C18.8802 20 19.7202 20 20.362 19.673C20.9265 19.3854 21.3854 18.9265 21.673 18.362C22 17.7202 22 16.8802 22 15.2V8.8C22 7.11984 22 6.27976 21.673 5.63803C21.3854 5.07354 20.9265 4.6146 20.362 4.32698C19.7202 4 18.8802 4 17.2 4H6.8C5.11984 4 4.27976 4 3.63803 4.32698C3.07354 4.6146 2.6146 5.07354 2.32698 5.63803C2 6.27976 2 7.11984 2 8.8V15.2C2 16.8802 2 17.7202 2.32698 18.362C2.6146 18.9265 3.07354 19.3854 3.63803 19.673C4.27976 20 5.11984 20 6.8 20Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/folder.svg b/client/src/assets/icons/folder.svg
deleted file mode 100644
index 15941e5b5..000000000
--- a/client/src/assets/icons/folder.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 8.2C3 7.07989 3 6.51984 3.21799 6.09202C3.40973 5.71569 3.71569 5.40973 4.09202 5.21799C4.51984 5 5.0799 5 6.2 5H9.67452C10.1637 5 10.4083 5 10.6385 5.05526C10.8425 5.10425 11.0376 5.18506 11.2166 5.29472C11.4184 5.4184 11.5914 5.59135 11.9373 5.93726L12.0627 6.06274C12.4086 6.40865 12.5816 6.5816 12.7834 6.70528C12.9624 6.81494 13.1575 6.89575 13.3615 6.94474C13.5917 7 13.8363 7 14.3255 7H17.8C18.9201 7 19.4802 7 19.908 7.21799C20.2843 7.40973 20.5903 7.71569 20.782 8.09202C21 8.51984 21 9.0799 21 10.2V15.8C21 16.9201 21 17.4802 20.782 17.908C20.5903 18.2843 20.2843 18.5903 19.908 18.782C19.4802 19 18.9201 19 17.8 19H6.2C5.07989 19 4.51984 19 4.09202 18.782C3.71569 18.5903 3.40973 18.2843 3.21799 17.908C3 17.4802 3 16.9201 3 15.8V8.2Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
\ No newline at end of file
diff --git a/client/src/assets/icons/groups.svg b/client/src/assets/icons/groups.svg
deleted file mode 100644
index fa2cae03c..000000000
--- a/client/src/assets/icons/groups.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#5f6368"><g><rect fill="none" height="24" width="24"/></g><g><g/><g><g><path d="M16.67,13.13C18.04,14.06,19,15.32,19,17v3h4v-3 C23,14.82,19.43,13.53,16.67,13.13z" fill-rule="evenodd"/></g><g><circle cx="9" cy="8" fill-rule="evenodd" r="4"/></g><g><path d="M15,12c2.21,0,4-1.79,4-4c0-2.21-1.79-4-4-4c-0.47,0-0.91,0.1-1.33,0.24 C14.5,5.27,15,6.58,15,8s-0.5,2.73-1.33,3.76C14.09,11.9,14.53,12,15,12z" fill-rule="evenodd"/></g><g><path d="M9,13c-2.67,0-8,1.34-8,4v3h16v-3C17,14.34,11.67,13,9,13z" fill-rule="evenodd"/></g></g></g></svg>
\ No newline at end of file
diff --git a/client/src/assets/icons/history-icon.svg b/client/src/assets/icons/history-icon.svg
deleted file mode 100644
index 7343455ec..000000000
--- a/client/src/assets/icons/history-icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.07598 7.48282L7.36402 10.5457C7.58715 10.705 7.69872 10.7847 7.81548 10.8031C7.91821 10.8192 8.02343 10.8029 8.11648 10.7565C8.22223 10.7037 8.30449 10.594 8.46901 10.3747L9.37511 9.16652C9.42164 9.10448 9.4449 9.07347 9.47224 9.04671C9.49652 9.02295 9.52315 9.00173 9.55173 8.98338C9.58392 8.9627 9.61935 8.94696 9.6902 8.91546L13.5588 7.19609C13.7192 7.12482 13.7993 7.08918 13.8598 7.03352C13.9133 6.9843 13.9554 6.924 13.9832 6.85684C14.0146 6.78091 14.0204 6.69336 14.0321 6.51826L14.3154 2.2694M13.5 13.5L16.116 14.6211C16.4195 14.7512 16.5713 14.8163 16.6517 14.9243C16.7222 15.0191 16.7569 15.1358 16.7496 15.2537C16.7413 15.3881 16.6497 15.5255 16.4665 15.8002L15.2375 17.6438C15.1507 17.774 15.1072 17.8391 15.0499 17.8863C14.9991 17.928 14.9406 17.9593 14.8777 17.9784C14.8067 18 14.7284 18 14.5719 18H12.5766C12.3693 18 12.2656 18 12.1774 17.9653C12.0995 17.9347 12.0305 17.885 11.9768 17.8208C11.916 17.7481 11.8832 17.6497 11.8177 17.453L11.1048 15.3144C11.0661 15.1983 11.0468 15.1403 11.0417 15.0814C11.0372 15.0291 11.0409 14.9764 11.0528 14.9253C11.0662 14.8677 11.0935 14.813 11.1482 14.7036L11.6897 13.6206C11.7997 13.4005 11.8547 13.2905 11.9395 13.2222C12.0141 13.162 12.1046 13.1246 12.1999 13.1143C12.3081 13.1027 12.4248 13.1416 12.6582 13.2194L13.5 13.5ZM22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" stroke="black" stroke-width="1.1" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/incidents.svg b/client/src/assets/icons/incidents.svg
deleted file mode 100644
index ffe04d09f..000000000
--- a/client/src/assets/icons/incidents.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 8V12M12 16H12.01M2 8.52274V15.4773C2 15.7218 2 15.8441 2.02763 15.9592C2.05213 16.0613 2.09253 16.1588 2.14736 16.2483C2.2092 16.3492 2.29568 16.4357 2.46863 16.6086L7.39137 21.5314C7.56432 21.7043 7.6508 21.7908 7.75172 21.8526C7.84119 21.9075 7.93873 21.9479 8.04077 21.9724C8.15586 22 8.27815 22 8.52274 22H15.4773C15.7218 22 15.8441 22 15.9592 21.9724C16.0613 21.9479 16.1588 21.9075 16.2483 21.8526C16.3492 21.7908 16.4357 21.7043 16.6086 21.5314L21.5314 16.6086C21.7043 16.4357 21.7908 16.3492 21.8526 16.2483C21.9075 16.1588 21.9479 16.0613 21.9724 15.9592C22 15.8441 22 15.7218 22 15.4773V8.52274C22 8.27815 22 8.15586 21.9724 8.04077C21.9479 7.93873 21.9075 7.84119 21.8526 7.75172C21.7908 7.6508 21.7043 7.56432 21.5314 7.39137L16.6086 2.46863C16.4357 2.29568 16.3492 2.2092 16.2483 2.14736C16.1588 2.09253 16.0613 2.05213 15.9592 2.02763C15.8441 2 15.7218 2 15.4773 2H8.52274C8.27815 2 8.15586 2 8.04077 2.02763C7.93873 2.05213 7.84119 2.09253 7.75172 2.14736C7.6508 2.2092 7.56432 2.29568 7.39137 2.46863L2.46863 7.39137C2.29568 7.56432 2.2092 7.6508 2.14736 7.75172C2.09253 7.84119 2.05213 7.93873 2.02763 8.04077C2 8.15586 2 8.27815 2 8.52274Z" stroke="#667085" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/integrations.svg b/client/src/assets/icons/integrations.svg
deleted file mode 100644
index 50e817f00..000000000
--- a/client/src/assets/icons/integrations.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.0002 13C10.4297 13.5741 10.9776 14.0491 11.6067 14.3929C12.2359 14.7367 12.9317 14.9411 13.6468 14.9923C14.362 15.0435 15.0798 14.9403 15.7515 14.6897C16.4233 14.4392 17.0333 14.047 17.5402 13.54L20.5402 10.54C21.451 9.59695 21.955 8.33394 21.9436 7.02296C21.9322 5.71198 21.4063 4.45791 20.4793 3.53087C19.5523 2.60383 18.2982 2.07799 16.9872 2.0666C15.6762 2.0552 14.4132 2.55918 13.4702 3.46997L11.7502 5.17997M14.0002 11C13.5707 10.4258 13.0228 9.95078 12.3936 9.60703C11.7645 9.26327 11.0687 9.05885 10.3535 9.00763C9.63841 8.95641 8.92061 9.0596 8.24885 9.31018C7.5771 9.56077 6.96709 9.9529 6.4602 10.46L3.4602 13.46C2.54941 14.403 2.04544 15.666 2.05683 16.977C2.06822 18.288 2.59407 19.542 3.52111 20.4691C4.44815 21.3961 5.70221 21.9219 7.01319 21.9333C8.32418 21.9447 9.58719 21.4408 10.5302 20.53L12.2402 18.82" stroke="#667085" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/interval-check.svg b/client/src/assets/icons/interval-check.svg
deleted file mode 100644
index 923475c8b..000000000
--- a/client/src/assets/icons/interval-check.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="17" height="18" viewBox="0 0 17 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.9118 14.2882C14.7835 13.0993 16 11.1735 16 9C16 5.38891 12.6421 2.46154 8.5 2.46154H8.05882M8.5 15.5385C4.35786 15.5385 1 12.6111 1 9C1 6.82651 2.21647 4.90072 4.08824 3.71185M7.61765 17L9.38235 15.4615L7.61765 13.9231M9.38235 4.07692L7.61765 2.53846L9.38235 1" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/jupiter_ag_logo.svg b/client/src/assets/icons/jupiter_ag_logo.svg
deleted file mode 100644
index b344961c8..000000000
--- a/client/src/assets/icons/jupiter_ag_logo.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="katman_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 800 800" style="enable-background:new 0 0 800 800;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#141726;}
-	.st1{fill:url(#SVGID_1_);}
-	.st2{fill:url(#SVGID_2_);}
-	.st3{fill:url(#SVGID_3_);}
-	.st4{fill:url(#SVGID_4_);}
-	.st5{fill:url(#SVGID_5_);}
-	.st6{fill:url(#SVGID_6_);}
-</style>
-<circle class="st0" cx="400" cy="400" r="400"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="574.9257" y1="665.8727" x2="248.5257" y2="142.3127" gradientTransform="matrix(1 0 0 -1 0 800)">
-	<stop  offset="0.16" style="stop-color:#C6F462"/>
-	<stop  offset="0.89" style="stop-color:#33D9FF"/>
-</linearGradient>
-<path class="st1" d="M536,568.9c-66.8-108.5-166.4-170-289.4-195.6c-43.5-9-87.2-8.9-129.4,7.7c-28.9,11.4-33.3,23.4-19.7,53.7
-	c92.4-21.9,178.4-1.5,258.9,45c81.1,46.9,141.6,112.2,169.1,205c38.6-11.8,43.6-18.3,34.3-54.2C554.3,609.4,547.4,587.4,536,568.9
-	L536,568.9z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="572.5896" y1="667.3303" x2="246.1996" y2="143.7703" gradientTransform="matrix(1 0 0 -1 0 800)">
-	<stop  offset="0.16" style="stop-color:#C6F462"/>
-	<stop  offset="0.89" style="stop-color:#33D9FF"/>
-</linearGradient>
-<path class="st2" d="M609.1,480.6c-85.8-125-207.3-194.9-355.8-218.3c-39.3-6.2-79.4-4.5-116.2,14.3c-17.6,9-33.2,20.5-37.4,44.9
-	c115.8-31.9,219.7-3.7,317.5,53c98.3,57,175.1,133.5,205,251.1c20.8-18.4,24.5-41,19.1-62C633.9,534.8,625.5,504.5,609.1,480.6
-	L609.1,480.6z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="577.0148" y1="664.5671" x2="250.6247" y2="141.0071" gradientTransform="matrix(1 0 0 -1 0 800)">
-	<stop  offset="0.16" style="stop-color:#C6F462"/>
-	<stop  offset="0.89" style="stop-color:#33D9FF"/>
-</linearGradient>
-<path class="st3" d="M105,488.6c7.3,16.2,12.1,34.5,23,47.6c5.5,6.7,22.2,4.1,33.8,5.7c1.8,0.2,3.6,0.5,5.4,0.7
-	c102.9,15.3,184.1,65.1,242.1,152c3.4,5.1,8.9,12.7,13.4,12.7c17.4-0.1,34.9-2.8,52.5-4.5C449,557.5,232.8,438.3,105,488.6
-	L105,488.6z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="569.0272" y1="669.5518" x2="242.6272" y2="145.9917" gradientTransform="matrix(1 0 0 -1 0 800)">
-	<stop  offset="0.16" style="stop-color:#C6F462"/>
-	<stop  offset="0.89" style="stop-color:#33D9FF"/>
-</linearGradient>
-<path class="st4" d="M656.6,366.7C599.9,287.4,521.7,234.6,432.9,197c-61.5-26.1-125.2-41.8-192.8-33.7
-	c-23.4,2.8-45.3,9.5-63.4,24.7c230.9,5.8,404.6,105.8,524,303.3c0.2-13.1,2.2-27.7-2.6-39.5C686.1,422.5,674.7,392,656.6,366.7z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="571.6973" y1="667.8917" x2="245.2973" y2="144.3317" gradientTransform="matrix(1 0 0 -1 0 800)">
-	<stop  offset="0.16" style="stop-color:#C6F462"/>
-	<stop  offset="0.89" style="stop-color:#33D9FF"/>
-</linearGradient>
-<path class="st5" d="M709.8,325.3c-47-178.9-238-265-379.2-221.4C482.7,133.9,607.5,206.4,709.8,325.3z"/>
-<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="579.0382" y1="663.3111" x2="252.6482" y2="139.7511" gradientTransform="matrix(1 0 0 -1 0 800)">
-	<stop  offset="0.16" style="stop-color:#C6F462"/>
-	<stop  offset="0.89" style="stop-color:#33D9FF"/>
-</linearGradient>
-<path class="st6" d="M155.4,583.9c54.6,69.3,124,109.7,213,122.8C334.4,643.2,214.6,574.5,155.4,583.9L155.4,583.9z"/>
-</svg>
diff --git a/client/src/assets/icons/jupiter_logo_banner_dark.svg b/client/src/assets/icons/jupiter_logo_banner_dark.svg
deleted file mode 100644
index 3d3e23b14..000000000
--- a/client/src/assets/icons/jupiter_logo_banner_dark.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<svg width="104" height="32" viewBox="0 0 104 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.09074 25.1666C4.44267 27.0471 6.17683 28.6205 8.1795 29.7838C10.1822 30.947 12.4081 31.6738 14.7114 31.9165C13.5264 30.1333 11.8039 28.4928 9.65354 27.2438C7.50318 25.9948 5.22591 25.3125 3.09074 25.1666Z" fill="url(#paint0_linear_13278_146906)"/>
-<path d="M12.543 22.2705C8.40015 19.8636 3.91612 19.2502 0.707662 20.3338C1.0174 21.3575 1.42589 22.3487 1.92738 23.2934C4.71498 23.2288 7.75856 23.9859 10.5906 25.6308C13.4227 27.2757 15.5888 29.5459 16.9143 32C17.9839 31.9672 19.0479 31.8309 20.0913 31.5932C19.4426 28.2698 16.6849 24.6779 12.543 22.2705Z" fill="url(#paint1_linear_13278_146906)"/>
-<path d="M32.2852 12.5009C31.7585 10.3584 30.8054 8.34403 29.4829 6.57804C28.1604 4.81205 26.4956 3.33067 24.5879 2.22235C22.6802 1.11403 20.5687 0.401504 18.3796 0.12731C16.1904 -0.146884 13.9684 0.02288 11.8463 0.626466C15.3915 1.06033 19.3267 2.39122 23.1859 4.63324C27.0452 6.87525 30.1533 9.63411 32.2852 12.5009Z" fill="url(#paint2_linear_13278_146906)"/>
-<path d="M27.1271 20.3583C25.3124 17.3446 22.2038 14.4588 18.3743 12.2342C14.5449 10.0095 10.4991 8.7388 6.98531 8.65474C3.894 8.58152 1.57389 9.48017 0.621548 11.1197C0.616124 11.1294 0.608531 11.1386 0.602566 11.1484C0.516877 11.4559 0.443119 11.7639 0.37587 12.0731C1.70568 11.5481 3.24645 11.2558 4.95969 11.2232C8.76959 11.1517 13.0334 12.3703 16.9681 14.6562C20.9027 16.9422 24.0759 20.0438 25.9003 23.3878C26.7182 24.8944 27.2285 26.3777 27.4308 27.7948C27.6662 27.5844 27.8972 27.3669 28.1212 27.1408C28.1272 27.1305 28.131 27.1196 28.1369 27.1088C29.0893 25.4677 28.721 23.0076 27.1271 20.3583Z" fill="url(#paint3_linear_13278_146906)"/>
-<path d="M15.4609 17.2485C9.59662 13.8416 3.11626 13.3079 -5.33621e-07 15.6855C0.00612042 16.4297 0.0630161 17.1726 0.170292 17.9091C1.08699 17.6312 2.03177 17.4562 2.98718 17.3874C6.46951 17.1254 10.3087 18.0957 13.7927 20.1207C17.2766 22.1458 20.023 25.0018 21.5209 28.1543C21.935 29.018 22.2508 29.9254 22.4624 30.8595C23.1555 30.5878 23.8294 30.2694 24.4794 29.9066C25.0011 26.0213 21.3268 20.656 15.4609 17.2485Z" fill="url(#paint4_linear_13278_146906)"/>
-<path d="M30.1434 15.3141C28.3082 12.3036 25.1724 9.40969 21.3158 7.17039C17.4593 4.93109 13.3977 3.64033 9.87257 3.53674C7.1853 3.45919 5.10382 4.11053 4.02457 5.34109C8.50588 4.58182 14.4168 5.85794 20.146 9.18625C25.8753 12.5146 29.9135 17.0181 31.4722 21.2868C32.0064 19.7406 31.5416 17.6098 30.1434 15.3141Z" fill="url(#paint5_linear_13278_146906)"/>
-<path d="M46.6645 9.90909L49.4003 9.90909L49.4003 19.0369C49.4003 19.8807 49.2107 20.6136 48.8314 21.2358C48.4564 21.858 47.9344 22.3374 47.2654 22.674C46.5963 23.0107 45.8186 23.179 44.9323 23.179C44.1439 23.179 43.428 23.0405 42.7845 22.7635C42.1453 22.4822 41.6382 22.0561 41.2632 21.4851C40.8882 20.9098 40.7029 20.1875 40.7071 19.3182L43.4621 19.3182C43.4706 19.6634 43.5409 19.9595 43.673 20.2067C43.8094 20.4496 43.9948 20.6371 44.2291 20.7692C44.4678 20.897 44.749 20.9609 45.0729 20.9609C45.4138 20.9609 45.7014 20.8885 45.9358 20.7436C46.1745 20.5945 46.3556 20.3771 46.4791 20.0916C46.6027 19.8061 46.6645 19.4545 46.6645 19.0369L46.6645 9.90909ZM57.9337 18.8196L57.9337 13.1818L60.6567 13.1818L60.6567 23L58.0423 23L58.0423 21.2166L57.9401 21.2166C57.7185 21.7919 57.3499 22.2543 56.8343 22.6037C56.3229 22.9531 55.6986 23.1278 54.9614 23.1278C54.3051 23.1278 53.7277 22.9787 53.2291 22.6804C52.7306 22.3821 52.3406 21.9581 52.0594 21.4084C51.7824 20.8587 51.6418 20.2003 51.6375 19.4332L51.6375 13.1818L54.3605 13.1818L54.3605 18.9474C54.3648 19.527 54.5203 19.9851 54.8272 20.3217C55.134 20.6584 55.5452 20.8267 56.0608 20.8267C56.3889 20.8267 56.6958 20.7521 56.9813 20.603C57.2668 20.4496 57.4969 20.2237 57.6716 19.9254C57.8506 19.6271 57.9379 19.2585 57.9337 18.8196ZM62.8348 26.6818L62.8348 13.1818L65.5194 13.1818L65.5194 14.831L65.6409 14.831C65.7602 14.5668 65.9328 14.2983 66.1586 14.0256C66.3888 13.7486 66.6871 13.5185 67.0535 13.3352C67.4243 13.1477 67.8845 13.054 68.4342 13.054C69.1501 13.054 69.8106 13.2415 70.4158 13.6165C71.0209 13.9872 71.5045 14.5476 71.8667 15.2976C72.229 16.0433 72.4101 16.9787 72.4101 18.1037C72.4101 19.1989 72.2332 20.1236 71.8795 20.8778C71.5301 21.6278 71.0528 22.1967 70.4477 22.5845C69.8469 22.968 69.1736 23.1598 68.4278 23.1598C67.8994 23.1598 67.4498 23.0724 67.0791 22.8977C66.7126 22.723 66.4122 22.5036 66.1778 22.2393C65.9435 21.9709 65.7645 21.7003 65.6409 21.4276L65.5578 21.4276L65.5578 26.6818L62.8348 26.6818ZM65.5003 18.0909C65.5003 18.6747 65.5812 19.1839 65.7432 19.6186C65.9051 20.0533 66.1395 20.392 66.4463 20.6349C66.7531 20.8736 67.126 20.9929 67.5649 20.9929C68.0081 20.9929 68.3831 20.8714 68.6899 20.6286C68.9967 20.3814 69.229 20.0405 69.3866 19.6058C69.5486 19.1669 69.6295 18.6619 69.6295 18.0909C69.6295 17.5241 69.5507 17.0256 69.393 16.5952C69.2354 16.1648 69.0031 15.8281 68.6963 15.5852C68.3895 15.3423 68.0123 15.2209 67.5649 15.2209C67.1217 15.2209 66.7467 15.3381 66.4399 15.5724C66.1373 15.8068 65.9051 16.1392 65.7432 16.5696C65.5812 17 65.5003 17.5071 65.5003 18.0909ZM74.2254 23L74.2254 13.1818L76.9484 13.1818L76.9484 23L74.2254 23ZM75.5933 11.9162C75.1885 11.9162 74.8412 11.782 74.5514 11.5135C74.2659 11.2408 74.1231 10.9148 74.1231 10.5355C74.1231 10.1605 74.2659 9.83878 74.5514 9.57031C74.8412 9.29759 75.1885 9.16122 75.5933 9.16122C75.9981 9.16122 76.3433 9.29759 76.6288 9.57031C76.9186 9.83878 77.0635 10.1605 77.0635 10.5355C77.0635 10.9148 76.9186 11.2408 76.6288 11.5135C76.3433 11.782 75.9981 11.9162 75.5933 11.9162ZM84.352 13.1818L84.352 15.2273L78.4394 15.2273L78.4394 13.1818L84.352 13.1818ZM79.7817 10.8295L82.5047 10.8295L82.5047 19.983C82.5047 20.2344 82.5431 20.4304 82.6198 20.571C82.6965 20.7074 82.803 20.8033 82.9394 20.8587C83.08 20.9141 83.2419 20.9418 83.4252 20.9418C83.553 20.9418 83.6808 20.9311 83.8087 20.9098C83.9365 20.8842 84.0345 20.8651 84.1027 20.8523L84.531 22.8786C84.3946 22.9212 84.2029 22.9702 83.9557 23.0256C83.7085 23.0852 83.4081 23.1215 83.0544 23.1342C82.3982 23.1598 81.8229 23.0724 81.3286 22.8722C80.8385 22.6719 80.4571 22.3608 80.1844 21.9389C79.9117 21.517 79.7774 20.9844 79.7817 20.3409L79.7817 10.8295ZM90.4948 23.1918C89.4848 23.1918 88.6155 22.9872 87.8868 22.5781C87.1624 22.1648 86.6041 21.581 86.2121 20.8267C85.82 20.0682 85.624 19.1712 85.624 18.1357C85.624 17.1257 85.82 16.2393 86.2121 15.4766C86.6041 14.7138 87.156 14.1193 87.8676 13.6932C88.5835 13.267 89.423 13.054 90.3861 13.054C91.0338 13.054 91.6368 13.1584 92.195 13.3672C92.7575 13.5717 93.2476 13.8807 93.6652 14.294C94.0871 14.7074 94.4152 15.2273 94.6496 15.8537C94.884 16.4759 95.0012 17.2045 95.0012 18.0398L95.0012 18.7876L86.7107 18.7876L86.7107 17.1001L92.4379 17.1001C92.4379 16.7081 92.3527 16.3608 92.1823 16.0582C92.0118 15.7557 91.7753 15.5192 91.4727 15.3487C91.1745 15.174 90.8272 15.0866 90.4308 15.0866C90.0175 15.0866 89.651 15.1825 89.3314 15.3743C89.0161 15.5618 88.7689 15.8153 88.5899 16.1349C88.411 16.4503 88.3193 16.8018 88.3151 17.1896L88.3151 18.794C88.3151 19.2798 88.4046 19.6996 88.5835 20.0533C88.7668 20.407 89.0246 20.6797 89.357 20.8715C89.6894 21.0632 90.0835 21.1591 90.5395 21.1591C90.8421 21.1591 91.1191 21.1165 91.3705 21.0313C91.6219 20.946 91.8371 20.8182 92.0161 20.6477C92.195 20.4773 92.3314 20.2685 92.4252 20.0213L94.9436 20.1875C94.8158 20.7926 94.5537 21.321 94.1574 21.7727C93.7654 22.2202 93.2583 22.5696 92.6361 22.821C92.0182 23.0682 91.3044 23.1918 90.4948 23.1918ZM96.7781 23L96.7781 13.1818L99.4181 13.1818L99.4181 14.8949L99.5203 14.8949C99.6993 14.2855 99.9997 13.8253 100.422 13.5142C100.843 13.1989 101.329 13.0412 101.879 13.0412C102.015 13.0412 102.162 13.0497 102.32 13.0668C102.478 13.0838 102.616 13.1072 102.736 13.1371L102.736 15.5533C102.608 15.5149 102.431 15.4808 102.205 15.451C101.979 15.4212 101.772 15.4063 101.585 15.4063C101.184 15.4063 100.826 15.4936 100.511 15.6683C100.2 15.8388 99.9529 16.0774 99.7696 16.3842C99.5906 16.6911 99.5012 17.0447 99.5012 17.4453L99.5012 23L96.7781 23Z" fill="white"/>
-<defs>
-<linearGradient id="paint0_linear_13278_146906" x1="21.5" y1="6.5" x2="6.66667" y2="32" gradientUnits="userSpaceOnUse">
-<stop offset="0.0001" stop-color="#C7F284"/>
-<stop offset="1" stop-color="#00BEF0"/>
-</linearGradient>
-<linearGradient id="paint1_linear_13278_146906" x1="21.5" y1="6.5" x2="6.66667" y2="32" gradientUnits="userSpaceOnUse">
-<stop offset="0.0001" stop-color="#C7F284"/>
-<stop offset="1" stop-color="#00BEF0"/>
-</linearGradient>
-<linearGradient id="paint2_linear_13278_146906" x1="21.5" y1="6.5" x2="6.66667" y2="32" gradientUnits="userSpaceOnUse">
-<stop offset="0.0001" stop-color="#C7F284"/>
-<stop offset="1" stop-color="#00BEF0"/>
-</linearGradient>
-<linearGradient id="paint3_linear_13278_146906" x1="21.5" y1="6.5" x2="6.66667" y2="32" gradientUnits="userSpaceOnUse">
-<stop offset="0.0001" stop-color="#C7F284"/>
-<stop offset="1" stop-color="#00BEF0"/>
-</linearGradient>
-<linearGradient id="paint4_linear_13278_146906" x1="21.5" y1="6.5" x2="6.66667" y2="32" gradientUnits="userSpaceOnUse">
-<stop offset="0.0001" stop-color="#C7F284"/>
-<stop offset="1" stop-color="#00BEF0"/>
-</linearGradient>
-<linearGradient id="paint5_linear_13278_146906" x1="21.5" y1="6.5" x2="6.66667" y2="32" gradientUnits="userSpaceOnUse">
-<stop offset="0.0001" stop-color="#C7F284"/>
-<stop offset="1" stop-color="#00BEF0"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/client/src/assets/icons/jupiter_logo_banner_light.svg b/client/src/assets/icons/jupiter_logo_banner_light.svg
deleted file mode 100644
index 4744e0bcb..000000000
--- a/client/src/assets/icons/jupiter_logo_banner_light.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<svg width="104" height="32" viewBox="0 0 104 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.09074 25.1666C4.44267 27.0471 6.17683 28.6205 8.1795 29.7838C10.1822 30.947 12.4081 31.6738 14.7114 31.9165C13.5264 30.1333 11.8039 28.4928 9.65354 27.2438C7.50318 25.9948 5.22591 25.3125 3.09074 25.1666Z" fill="url(#paint0_linear_13278_146916)"/>
-<path d="M12.543 22.2705C8.40015 19.8636 3.91612 19.2502 0.707662 20.3338C1.0174 21.3575 1.42589 22.3487 1.92738 23.2934C4.71498 23.2288 7.75856 23.9859 10.5906 25.6308C13.4227 27.2757 15.5888 29.5459 16.9143 32C17.9839 31.9672 19.0479 31.8309 20.0913 31.5932C19.4426 28.2698 16.6849 24.6779 12.543 22.2705Z" fill="url(#paint1_linear_13278_146916)"/>
-<path d="M32.2852 12.5009C31.7585 10.3584 30.8054 8.34403 29.4829 6.57804C28.1604 4.81205 26.4956 3.33067 24.5879 2.22235C22.6802 1.11403 20.5687 0.401504 18.3796 0.12731C16.1904 -0.146884 13.9684 0.02288 11.8463 0.626466C15.3915 1.06033 19.3267 2.39122 23.1859 4.63324C27.0452 6.87525 30.1533 9.63411 32.2852 12.5009Z" fill="url(#paint2_linear_13278_146916)"/>
-<path d="M27.1271 20.3583C25.3124 17.3446 22.2038 14.4588 18.3743 12.2342C14.5449 10.0095 10.4991 8.7388 6.98531 8.65474C3.894 8.58152 1.57389 9.48017 0.621548 11.1197C0.616124 11.1294 0.608531 11.1386 0.602566 11.1484C0.516877 11.4559 0.443119 11.7639 0.37587 12.0731C1.70568 11.5481 3.24645 11.2558 4.95969 11.2232C8.76959 11.1517 13.0334 12.3703 16.9681 14.6562C20.9027 16.9422 24.0759 20.0438 25.9003 23.3878C26.7182 24.8944 27.2285 26.3777 27.4308 27.7948C27.6662 27.5844 27.8972 27.3669 28.1212 27.1408C28.1272 27.1305 28.131 27.1196 28.1369 27.1088C29.0893 25.4677 28.721 23.0076 27.1271 20.3583Z" fill="url(#paint3_linear_13278_146916)"/>
-<path d="M15.4609 17.2485C9.59662 13.8416 3.11626 13.3079 -5.33621e-07 15.6855C0.00612042 16.4297 0.0630161 17.1726 0.170292 17.9091C1.08699 17.6312 2.03177 17.4562 2.98718 17.3874C6.46951 17.1254 10.3087 18.0957 13.7927 20.1207C17.2766 22.1458 20.023 25.0018 21.5209 28.1543C21.935 29.018 22.2508 29.9254 22.4624 30.8595C23.1555 30.5878 23.8294 30.2694 24.4794 29.9066C25.0011 26.0213 21.3268 20.656 15.4609 17.2485Z" fill="url(#paint4_linear_13278_146916)"/>
-<path d="M30.1434 15.3141C28.3082 12.3036 25.1724 9.40969 21.3158 7.17039C17.4593 4.93109 13.3977 3.64033 9.87257 3.53674C7.1853 3.45919 5.10382 4.11053 4.02457 5.34109C8.50588 4.58182 14.4168 5.85794 20.146 9.18625C25.8753 12.5146 29.9135 17.0181 31.4722 21.2868C32.0064 19.7406 31.5416 17.6098 30.1434 15.3141Z" fill="url(#paint5_linear_13278_146916)"/>
-<path d="M46.6645 9.90909L49.4003 9.90909L49.4003 19.0369C49.4003 19.8807 49.2106 20.6136 48.8314 21.2358C48.4564 21.858 47.9344 22.3374 47.2653 22.674C46.5963 23.0107 45.8186 23.179 44.9322 23.179C44.1439 23.179 43.428 23.0405 42.7845 22.7635C42.1453 22.4822 41.6382 22.0561 41.2632 21.4851C40.8882 20.9098 40.7028 20.1875 40.7071 19.3182L43.4621 19.3182C43.4706 19.6634 43.5409 19.9595 43.673 20.2067C43.8094 20.4496 43.9947 20.6371 44.2291 20.7692C44.4677 20.897 44.749 20.9609 45.0729 20.9609C45.4138 20.9609 45.7014 20.8885 45.9358 20.7436C46.1744 20.5945 46.3555 20.3771 46.4791 20.0916C46.6027 19.8061 46.6645 19.4545 46.6645 19.0369L46.6645 9.90909ZM57.9337 18.8196L57.9337 13.1818L60.6567 13.1818L60.6567 23L58.0423 23L58.0423 21.2166L57.94 21.2166C57.7185 21.7919 57.3498 22.2543 56.8342 22.6037C56.3229 22.9531 55.6986 23.1278 54.9614 23.1278C54.3051 23.1278 53.7277 22.9787 53.2291 22.6804C52.7305 22.3821 52.3406 21.9581 52.0594 21.4084C51.7824 20.8587 51.6418 20.2003 51.6375 19.4332L51.6375 13.1818L54.3605 13.1818L54.3605 18.9474C54.3648 19.527 54.5203 19.9851 54.8271 20.3217C55.1339 20.6584 55.5452 20.8267 56.0608 20.8267C56.3889 20.8267 56.6957 20.7521 56.9812 20.603C57.2668 20.4496 57.4969 20.2237 57.6716 19.9254C57.8506 19.6271 57.9379 19.2585 57.9337 18.8196ZM62.8348 26.6818L62.8348 13.1818L65.5194 13.1818L65.5194 14.831L65.6409 14.831C65.7602 14.5668 65.9328 14.2983 66.1586 14.0256C66.3887 13.7486 66.687 13.5185 67.0535 13.3352C67.4242 13.1477 67.8845 13.054 68.4342 13.054C69.1501 13.054 69.8106 13.2415 70.4157 13.6165C71.0208 13.9872 71.5045 14.5476 71.8667 15.2976C72.2289 16.0433 72.41 16.9787 72.41 18.1037C72.41 19.1989 72.2332 20.1236 71.8795 20.8778C71.5301 21.6278 71.0528 22.1967 70.4477 22.5845C69.8468 22.968 69.1735 23.1598 68.4278 23.1598C67.8994 23.1598 67.4498 23.0724 67.0791 22.8977C66.7126 22.723 66.4122 22.5036 66.1778 22.2393C65.9434 21.9709 65.7644 21.7003 65.6409 21.4276L65.5578 21.4276L65.5578 26.6818L62.8348 26.6818ZM65.5002 18.0909C65.5002 18.6747 65.5812 19.1839 65.7431 19.6186C65.9051 20.0533 66.1394 20.392 66.4463 20.6349C66.7531 20.8736 67.1259 20.9929 67.5649 20.9929C68.0081 20.9929 68.3831 20.8714 68.6899 20.6286C68.9967 20.3814 69.2289 20.0405 69.3866 19.6058C69.5485 19.1669 69.6295 18.6619 69.6295 18.0909C69.6295 17.5241 69.5507 17.0256 69.393 16.5952C69.2353 16.1648 69.0031 15.8281 68.6963 15.5852C68.3894 15.3423 68.0123 15.2209 67.5649 15.2209C67.1217 15.2209 66.7467 15.3381 66.4399 15.5724C66.1373 15.8068 65.9051 16.1392 65.7431 16.5696C65.5812 17 65.5002 17.5071 65.5002 18.0909ZM74.2254 23L74.2254 13.1818L76.9484 13.1818L76.9484 23L74.2254 23ZM75.5933 11.9162C75.1884 11.9162 74.8411 11.782 74.5514 11.5135C74.2659 11.2408 74.1231 10.9148 74.1231 10.5355C74.1231 10.1605 74.2659 9.83878 74.5514 9.57031C74.8411 9.29759 75.1884 9.16122 75.5933 9.16122C75.9981 9.16122 76.3433 9.29759 76.6288 9.57031C76.9186 9.83878 77.0634 10.1605 77.0634 10.5355C77.0634 10.9148 76.9186 11.2408 76.6288 11.5135C76.3433 11.782 75.9981 11.9162 75.5933 11.9162ZM84.352 13.1818L84.352 15.2273L78.4393 15.2273L78.4393 13.1818L84.352 13.1818ZM79.7817 10.8295L82.5047 10.8295L82.5047 19.983C82.5047 20.2344 82.543 20.4304 82.6197 20.571C82.6964 20.7074 82.803 20.8033 82.9393 20.8587C83.08 20.9141 83.2419 20.9418 83.4251 20.9418C83.553 20.9418 83.6808 20.9311 83.8087 20.9098C83.9365 20.8842 84.0345 20.8651 84.1027 20.8523L84.531 22.8786C84.3946 22.9212 84.2028 22.9702 83.9557 23.0256C83.7085 23.0852 83.4081 23.1215 83.0544 23.1342C82.3981 23.1598 81.8229 23.0724 81.3285 22.8722C80.8385 22.6719 80.4571 22.3608 80.1844 21.9389C79.9116 21.517 79.7774 20.9844 79.7817 20.3409L79.7817 10.8295ZM90.4947 23.1918C89.4848 23.1918 88.6155 22.9872 87.8868 22.5781C87.1623 22.1648 86.6041 21.581 86.2121 20.8267C85.82 20.0682 85.624 19.1712 85.624 18.1357C85.624 17.1257 85.82 16.2393 86.2121 15.4766C86.6041 14.7138 87.156 14.1193 87.8676 13.6932C88.5835 13.267 89.423 13.054 90.3861 13.054C91.0338 13.054 91.6368 13.1584 92.195 13.3672C92.7575 13.5717 93.2476 13.8807 93.6652 14.294C94.0871 14.7074 94.4152 15.2273 94.6496 15.8537C94.8839 16.4759 95.0011 17.2045 95.0011 18.0398L95.0011 18.7876L86.7106 18.7876L86.7106 17.1001L92.4379 17.1001C92.4379 16.7081 92.3527 16.3608 92.1822 16.0582C92.0118 15.7557 91.7753 15.5192 91.4727 15.3487C91.1744 15.174 90.8271 15.0866 90.4308 15.0866C90.0175 15.0866 89.651 15.1825 89.3314 15.3743C89.016 15.5618 88.7689 15.8153 88.5899 16.1349C88.4109 16.4503 88.3193 16.8018 88.315 17.1896L88.315 18.794C88.315 19.2798 88.4045 19.6996 88.5835 20.0533C88.7668 20.407 89.0246 20.6797 89.3569 20.8715C89.6893 21.0632 90.0835 21.1591 90.5395 21.1591C90.842 21.1591 91.119 21.1165 91.3704 21.0313C91.6219 20.946 91.8371 20.8182 92.016 20.6477C92.195 20.4773 92.3314 20.2685 92.4251 20.0213L94.9436 20.1875C94.8158 20.7926 94.5537 21.321 94.1574 21.7727C93.7653 22.2202 93.2582 22.5696 92.6361 22.821C92.0182 23.0682 91.3044 23.1918 90.4947 23.1918ZM96.7781 23L96.7781 13.1818L99.418 13.1818L99.418 14.8949L99.5203 14.8949C99.6993 14.2855 99.9997 13.8253 100.422 13.5142C100.843 13.1989 101.329 13.0412 101.879 13.0412C102.015 13.0412 102.162 13.0497 102.32 13.0668C102.478 13.0838 102.616 13.1072 102.736 13.1371L102.736 15.5533C102.608 15.5149 102.431 15.4808 102.205 15.451C101.979 15.4212 101.772 15.4063 101.585 15.4063C101.184 15.4063 100.826 15.4936 100.511 15.6683C100.2 15.8388 99.9528 16.0774 99.7696 16.3842C99.5906 16.6911 99.5011 17.0447 99.5011 17.4453L99.5011 23L96.7781 23Z" fill="#111726"/>
-<defs>
-<linearGradient id="paint0_linear_13278_146916" x1="21.5" y1="6.5" x2="6.66667" y2="32" gradientUnits="userSpaceOnUse">
-<stop offset="0.0001" stop-color="#A4D756"/>
-<stop offset="1" stop-color="#00B6E7"/>
-</linearGradient>
-<linearGradient id="paint1_linear_13278_146916" x1="21.5" y1="6.5" x2="6.66667" y2="32" gradientUnits="userSpaceOnUse">
-<stop offset="0.0001" stop-color="#A4D756"/>
-<stop offset="1" stop-color="#00B6E7"/>
-</linearGradient>
-<linearGradient id="paint2_linear_13278_146916" x1="21.5" y1="6.5" x2="6.66667" y2="32" gradientUnits="userSpaceOnUse">
-<stop offset="0.0001" stop-color="#A4D756"/>
-<stop offset="1" stop-color="#00B6E7"/>
-</linearGradient>
-<linearGradient id="paint3_linear_13278_146916" x1="21.5" y1="6.5" x2="6.66667" y2="32" gradientUnits="userSpaceOnUse">
-<stop offset="0.0001" stop-color="#A4D756"/>
-<stop offset="1" stop-color="#00B6E7"/>
-</linearGradient>
-<linearGradient id="paint4_linear_13278_146916" x1="21.5" y1="6.5" x2="6.66667" y2="32" gradientUnits="userSpaceOnUse">
-<stop offset="0.0001" stop-color="#A4D756"/>
-<stop offset="1" stop-color="#00B6E7"/>
-</linearGradient>
-<linearGradient id="paint5_linear_13278_146916" x1="21.5" y1="6.5" x2="6.66667" y2="32" gradientUnits="userSpaceOnUse">
-<stop offset="0.0001" stop-color="#A4D756"/>
-<stop offset="1" stop-color="#00B6E7"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/client/src/assets/icons/key.svg b/client/src/assets/icons/key.svg
deleted file mode 100644
index 5db8d5f16..000000000
--- a/client/src/assets/icons/key.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M17 8.99994C17 8.48812 16.8047 7.9763 16.4142 7.58579C16.0237 7.19526 15.5118 7 15 7M15 15C18.3137 15 21 12.3137 21 9C21 5.68629 18.3137 3 15 3C11.6863 3 9 5.68629 9 9C9 9.27368 9.01832 9.54308 9.05381 9.80704C9.11218 10.2412 9.14136 10.4583 9.12172 10.5956C9.10125 10.7387 9.0752 10.8157 9.00469 10.9419C8.937 11.063 8.81771 11.1823 8.57913 11.4209L3.46863 16.5314C3.29568 16.7043 3.2092 16.7908 3.14736 16.8917C3.09253 16.9812 3.05213 17.0787 3.02763 17.1808C3 17.2959 3 17.4182 3 17.6627V19.4C3 19.9601 3 20.2401 3.10899 20.454C3.20487 20.6422 3.35785 20.7951 3.54601 20.891C3.75992 21 4.03995 21 4.6 21H7V19H9V17H11L12.5791 15.4209C12.8177 15.1823 12.937 15.063 13.0581 14.9953C13.1843 14.9248 13.2613 14.8987 13.4044 14.8783C13.5417 14.8586 13.7588 14.8878 14.193 14.9462C14.4569 14.9817 14.7263 15 15 15Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/left-arrow-double.svg b/client/src/assets/icons/left-arrow-double.svg
deleted file mode 100644
index 4cb2a5186..000000000
--- a/client/src/assets/icons/left-arrow-double.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M18 17L13 12L18 7M11 17L6 12L11 7" stroke="currentColor" stroke-width="1.8"
-        stroke-linecap="round" stroke-linejoin="round" />
-</svg>
\ No newline at end of file
diff --git a/client/src/assets/icons/left-arrow-long.svg b/client/src/assets/icons/left-arrow-long.svg
deleted file mode 100644
index 56a774730..000000000
--- a/client/src/assets/icons/left-arrow-long.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="18" height="14" viewBox="0 0 18 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M17 7H1M1 7L7 13M1 7L7 1" stroke="currentColor" stroke-width="1.5"
-        stroke-linecap="round" stroke-linejoin="round" />
-</svg>
\ No newline at end of file
diff --git a/client/src/assets/icons/left-arrow.svg b/client/src/assets/icons/left-arrow.svg
deleted file mode 100644
index 649d1681c..000000000
--- a/client/src/assets/icons/left-arrow.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M15 18L9 12L15 6" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"
-        stroke-linejoin="round" />
-</svg>
\ No newline at end of file
diff --git a/client/src/assets/icons/lock.svg b/client/src/assets/icons/lock.svg
deleted file mode 100644
index a87535d54..000000000
--- a/client/src/assets/icons/lock.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.3337 5.66667V4.33333C10.3337 2.49238 8.84127 1 7.00033 1C5.15938 1 3.66699 2.49238 3.66699 4.33333V5.66667M7.00033 8.66667V10M4.86699 13H9.13366C10.2538 13 10.8138 13 11.2416 12.782C11.618 12.5903 11.9239 12.2843 12.1157 11.908C12.3337 11.4802 12.3337 10.9201 12.3337 9.8V8.86667C12.3337 7.74656 12.3337 7.18651 12.1157 6.75869C11.9239 6.38236 11.618 6.0764 11.2416 5.88465C10.8138 5.66667 10.2538 5.66667 9.13366 5.66667H4.86699C3.74689 5.66667 3.18683 5.66667 2.75901 5.88465C2.38269 6.0764 2.07673 6.38236 1.88498 6.75869C1.66699 7.18651 1.66699 7.74656 1.66699 8.86667V9.8C1.66699 10.9201 1.66699 11.4802 1.88498 11.908C2.07673 12.2843 2.38269 12.5903 2.75901 12.782C3.18683 13 3.74689 13 4.86699 13Z" stroke="#667085" stroke-width="1" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/logout.svg b/client/src/assets/icons/logout.svg
deleted file mode 100644
index 3f3b69c49..000000000
--- a/client/src/assets/icons/logout.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.6667 11.3333L14 8M14 8L10.6667 4.66667M14 8H6M6 2H5.2C4.0799 2 3.51984 2 3.09202 2.21799C2.7157 2.40973 2.40973 2.71569 2.21799 3.09202C2 3.51984 2 4.07989 2 5.2V10.8C2 11.9201 2 12.4802 2.21799 12.908C2.40973 13.2843 2.71569 13.5903 3.09202 13.782C3.51984 14 4.0799 14 5.2 14H6" stroke="#667085" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/logs.svg b/client/src/assets/icons/logs.svg
deleted file mode 100644
index 556c3ba33..000000000
--- a/client/src/assets/icons/logs.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M21 5C21 6.65685 16.9706 8 12 8C7.02944 8 3 6.65685 3 5M21 5C21 3.34315 16.9706 2 12 2C7.02944 2 3 3.34315 3 5M21 5V19C21 20.66 17 22 12 22C7 22 3 20.66 3 19V5M21 12C21 13.66 17 15 12 15C7 15 3 13.66 3 12"
-        stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
-</svg>
\ No newline at end of file
diff --git a/client/src/assets/icons/mail.svg b/client/src/assets/icons/mail.svg
deleted file mode 100644
index 75c22b111..000000000
--- a/client/src/assets/icons/mail.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M21.5 18L14.8571 12M9.14286 12L2.50003 18M2 7L10.1649 12.7154C10.8261 13.1783 11.1567 13.4097 11.5163 13.4993C11.8339 13.5785 12.1661 13.5785 12.4837 13.4993C12.8433 13.4097 13.1739 13.1783 13.8351 12.7154L22 7M6.8 20H17.2C18.8802 20 19.7202 20 20.362 19.673C20.9265 19.3854 21.3854 18.9265 21.673 18.362C22 17.7202 22 16.8802 22 15.2V8.8C22 7.11984 22 6.27976 21.673 5.63803C21.3854 5.07354 20.9265 4.6146 20.362 4.32698C19.7202 4 18.8802 4 17.2 4H6.8C5.11984 4 4.27976 4 3.63803 4.32698C3.07354 4.6146 2.6146 5.07354 2.32698 5.63803C2 6.27976 2 7.11984 2 8.8V15.2C2 16.8802 2 17.7202 2.32698 18.362C2.6146 18.9265 3.07354 19.3854 3.63803 19.673C4.27976 20 5.11984 20 6.8 20Z" stroke="#475467" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/maintenance.svg b/client/src/assets/icons/maintenance.svg
deleted file mode 100644
index 9486f6086..000000000
--- a/client/src/assets/icons/maintenance.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 6V12L16 14M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" stroke="#667085" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/monitor-graph-line.svg b/client/src/assets/icons/monitor-graph-line.svg
deleted file mode 100644
index 86049eb9e..000000000
--- a/client/src/assets/icons/monitor-graph-line.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M22 12H18L15 21L9 3L6 12H2" stroke="black" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/monitors.svg b/client/src/assets/icons/monitors.svg
deleted file mode 100644
index f40f36433..000000000
--- a/client/src/assets/icons/monitors.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1 11H21M1 11C1 16.5228 5.47715 21 11 21M1 11C1 5.47715 5.47715 1 11 1M21 11C21 16.5228 16.5228 21 11 21M21 11C21 5.47715 16.5228 1 11 1M11 1C13.5013 3.73835 14.9228 7.29203 15 11C14.9228 14.708 13.5013 18.2616 11 21M11 1C8.49872 3.73835 7.07725 7.29203 7 11C7.07725 14.708 8.49872 18.2616 11 21" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/notifications.svg b/client/src/assets/icons/notifications.svg
deleted file mode 100644
index c09ac5746..000000000
--- a/client/src/assets/icons/notifications.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M9.35395 21C10.0591 21.6224 10.9853 22 11.9998 22C13.0142 22 13.9405 21.6224 14.6456 21M17.9998 8V2M14.9998 5H20.9998M12.9998 2.08389C12.6715 2.02841 12.3371 2 11.9998 2C10.4085 2 8.88235 2.63214 7.75713 3.75736C6.63192 4.88258 5.99977 6.4087 5.99977 8C5.99977 11.0902 5.22024 13.206 4.34944 14.6054C3.61491 15.7859 3.24763 16.3761 3.2611 16.5408C3.27601 16.7231 3.31463 16.7926 3.46155 16.9016C3.59423 17 4.19237 17 5.38863 17H18.6109C19.8071 17 20.4052 17 20.5379 16.9016C20.6848 16.7926 20.7235 16.7231 20.7384 16.5408C20.7518 16.3761 20.3845 15.7858 19.65 14.6052C19.1579 13.8144 18.695 12.7948 18.3855 11.5"
-        stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
-</svg>
\ No newline at end of file
diff --git a/client/src/assets/icons/open-in-new-page.svg b/client/src/assets/icons/open-in-new-page.svg
deleted file mode 100644
index 70599f390..000000000
--- a/client/src/assets/icons/open-in-new-page.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 5L13 1M13 1H9M13 1L7.66667 6.33333M5.66667 2.33333H4.2C3.0799 2.33333 2.51984 2.33333 2.09202 2.55132C1.71569 2.74307 1.40973 3.04903 1.21799 3.42535C1 3.85318 1 4.41323 1 5.53333V9.8C1 10.9201 1 11.4802 1.21799 11.908C1.40973 12.2843 1.71569 12.5903 2.09202 12.782C2.51984 13 3.0799 13 4.2 13H8.46667C9.58677 13 10.1468 13 10.5746 12.782C10.951 12.5903 11.2569 12.2843 11.4487 11.908C11.6667 11.4802 11.6667 10.9201 11.6667 9.8V8.33333" stroke="#667085" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/page-speed.svg b/client/src/assets/icons/page-speed.svg
deleted file mode 100644
index 30a1c8a53..000000000
--- a/client/src/assets/icons/page-speed.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 11C4 7.13401 7.13401 4 11 4M15.4999 6.5L10.9999 11M21 11C21 16.5228 16.5228 21 11 21C5.47715 21 1 16.5228 1 11C1 5.47715 5.47715 1 11 1C16.5228 1 21 5.47715 21 11ZM12 11C12 11.5523 11.5523 12 11 12C10.4477 12 10 11.5523 10 11C10 10.4477 10.4477 10 11 10C11.5523 10 12 10.4477 12 11Z" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/pause-icon.svg b/client/src/assets/icons/pause-icon.svg
deleted file mode 100644
index c73abfc1d..000000000
--- a/client/src/assets/icons/pause-icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.5 15V9M14.5 15V9M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/performance-report.svg b/client/src/assets/icons/performance-report.svg
deleted file mode 100644
index 8b7073ac3..000000000
--- a/client/src/assets/icons/performance-report.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9 18L2 22V6L9 2M9 18L16 22M9 18V2M16 22L22 18V2L16 6M16 22V6M16 6L9 2" stroke="black" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/radio-checked.svg b/client/src/assets/icons/radio-checked.svg
deleted file mode 100644
index 1c584b79a..000000000
--- a/client/src/assets/icons/radio-checked.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16C3.58172 16 0 12.4183 0 8Z" fill="#1570EF"/>
-<path d="M5 8C5 6.34315 6.34315 5 8 5C9.65685 5 11 6.34315 11 8C11 9.65685 9.65685 11 8 11C6.34315 11 5 9.65685 5 8Z" fill="white"/>
-</svg>
diff --git a/client/src/assets/icons/response-time-icon.svg b/client/src/assets/icons/response-time-icon.svg
deleted file mode 100644
index db5b2af38..000000000
--- a/client/src/assets/icons/response-time-icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M22 7L14.1314 14.8686C13.7354 15.2646 13.5373 15.4627 13.309 15.5368C13.1082 15.6021 12.8918 15.6021 12.691 15.5368C12.4627 15.4627 12.2646 15.2646 11.8686 14.8686L9.13137 12.1314C8.73535 11.7354 8.53735 11.5373 8.30902 11.4632C8.10817 11.3979 7.89183 11.3979 7.69098 11.4632C7.46265 11.5373 7.26465 11.7354 6.86863 12.1314L2 17M22 7H15M22 7V14" stroke="black" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/resume-icon.svg b/client/src/assets/icons/resume-icon.svg
deleted file mode 100644
index 1da787081..000000000
--- a/client/src/assets/icons/resume-icon.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.5 8.96533C9.5 8.48805 9.5 8.24941 9.59974 8.11618C9.68666 8.00007 9.81971 7.92744 9.96438 7.9171C10.1304 7.90525 10.3311 8.03429 10.7326 8.29239L15.4532 11.3271C15.8016 11.551 15.9758 11.663 16.0359 11.8054C16.0885 11.9298 16.0885 12.0702 16.0359 12.1946C15.9758 12.337 15.8016 12.449 15.4532 12.6729L10.7326 15.7076C10.3311 15.9657 10.1304 16.0948 9.96438 16.0829C9.81971 16.0726 9.68666 15.9999 9.59974 15.8838C9.5 15.7506 9.5 15.512 9.5 15.0347V8.96533Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/right-arrow-double.svg b/client/src/assets/icons/right-arrow-double.svg
deleted file mode 100644
index 6ad4882ad..000000000
--- a/client/src/assets/icons/right-arrow-double.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M6 17L11 12L6 7M13 17L18 12L13 7" stroke="currentColor" stroke-width="1.8"
-        stroke-linecap="round" stroke-linejoin="round" />
-</svg>
\ No newline at end of file
diff --git a/client/src/assets/icons/right-arrow.svg b/client/src/assets/icons/right-arrow.svg
deleted file mode 100644
index 77d022798..000000000
--- a/client/src/assets/icons/right-arrow.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M9 18L15 12L9 6" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"
-        stroke-linejoin="round" />
-</svg>
\ No newline at end of file
diff --git a/client/src/assets/icons/ruler-icon.svg b/client/src/assets/icons/ruler-icon.svg
deleted file mode 100644
index 7266d2876..000000000
--- a/client/src/assets/icons/ruler-icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.5 5.50001L16 7.00001M11.5 8.50001L13 10M8.49996 11.5L9.99996 13M5.49996 14.5L6.99996 16M2.56561 17.5657L6.43424 21.4344C6.63225 21.6324 6.73125 21.7314 6.84542 21.7685C6.94584 21.8011 7.05401 21.8011 7.15443 21.7685C7.2686 21.7314 7.3676 21.6324 7.56561 21.4344L21.4342 7.56573C21.6322 7.36772 21.7313 7.26872 21.7683 7.15455C21.801 7.05413 21.801 6.94596 21.7683 6.84554C21.7313 6.73137 21.6322 6.63237 21.4342 6.43436L17.5656 2.56573C17.3676 2.36772 17.2686 2.26872 17.1544 2.23163C17.054 2.199 16.9458 2.199 16.8454 2.23163C16.7313 2.26872 16.6322 2.36772 16.4342 2.56573L2.56561 16.4344C2.3676 16.6324 2.2686 16.7314 2.2315 16.8455C2.19887 16.946 2.19887 17.0541 2.2315 17.1546C2.2686 17.2687 2.3676 17.3677 2.56561 17.5657Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/search.svg b/client/src/assets/icons/search.svg
deleted file mode 100644
index a1bc74224..000000000
--- a/client/src/assets/icons/search.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 13L10.6667 10.6667M12.3333 6.66667C12.3333 9.79628 9.79628 12.3333 6.66667 12.3333C3.53705 12.3333 1 9.79628 1 6.66667C1 3.53705 3.53705 1 6.66667 1C9.79628 1 12.3333 3.53705 12.3333 6.66667Z" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/selector-vertical.svg b/client/src/assets/icons/selector-vertical.svg
deleted file mode 100644
index 29d9a4998..000000000
--- a/client/src/assets/icons/selector-vertical.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 15L12 20L17 15M7 9L12 4L17 9" stroke="#667085" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/settings-bold.svg b/client/src/assets/icons/settings-bold.svg
deleted file mode 100644
index d8057286c..000000000
--- a/client/src/assets/icons/settings-bold.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9 11.4C10.3255 11.4 11.4 10.3255 11.4 9C11.4 7.67452 10.3255 6.6 9 6.6C7.67452 6.6 6.6 7.67452 6.6 9C6.6 10.3255 7.67452 11.4 9 11.4Z" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14.3818 11.1818C14.285 11.4012 14.2561 11.6445 14.2989 11.8804C14.3417 12.1164 14.4542 12.3341 14.6218 12.5055L14.6655 12.5491C14.8007 12.6842 14.908 12.8446 14.9812 13.0212C15.0544 13.1978 15.0921 13.387 15.0921 13.5782C15.0921 13.7693 15.0544 13.9586 14.9812 14.1352C14.908 14.3118 14.8007 14.4722 14.6655 14.6073C14.5304 14.7425 14.3699 14.8498 14.1934 14.923C14.0168 14.9962 13.8275 15.0339 13.6364 15.0339C13.4452 15.0339 13.2559 14.9962 13.0794 14.923C12.9028 14.8498 12.7424 14.7425 12.6073 14.6073L12.5636 14.5636C12.3922 14.396 12.1745 14.2835 11.9386 14.2407C11.7027 14.1979 11.4594 14.2268 11.24 14.3236C11.0249 14.4158 10.8414 14.5689 10.7122 14.764C10.583 14.9591 10.5137 15.1878 10.5127 15.4218V15.5455C10.5127 15.9312 10.3595 16.3012 10.0867 16.574C9.81392 16.8468 9.44395 17 9.05818 17C8.67241 17 8.30244 16.8468 8.02966 16.574C7.75688 16.3012 7.60364 15.9312 7.60364 15.5455V15.48C7.59801 15.2393 7.52009 15.0058 7.38001 14.81C7.23993 14.6141 7.04417 14.4649 6.81818 14.3818C6.59882 14.285 6.3555 14.2561 6.11957 14.2989C5.88365 14.3417 5.66595 14.4542 5.49455 14.6218L5.45091 14.6655C5.31582 14.8007 5.1554 14.908 4.97882 14.9812C4.80224 15.0544 4.61297 15.0921 4.42182 15.0921C4.23067 15.0921 4.04139 15.0544 3.86481 14.9812C3.68824 14.908 3.52782 14.8007 3.39273 14.6655C3.25749 14.5304 3.1502 14.3699 3.077 14.1934C3.00381 14.0168 2.96613 13.8275 2.96613 13.6364C2.96613 13.4452 3.00381 13.2559 3.077 13.0794C3.1502 12.9028 3.25749 12.7424 3.39273 12.6073L3.43636 12.5636C3.60403 12.3922 3.7165 12.1745 3.75928 11.9386C3.80205 11.7027 3.77317 11.4594 3.67636 11.24C3.58417 11.0249 3.4311 10.8414 3.23597 10.7122C3.04085 10.583 2.81221 10.5137 2.57818 10.5127H2.45455C2.06878 10.5127 1.69881 10.3595 1.42603 10.0867C1.15325 9.81392 1 9.44395 1 9.05818C1 8.67241 1.15325 8.30244 1.42603 8.02966C1.69881 7.75688 2.06878 7.60364 2.45455 7.60364H2.52C2.76072 7.59801 2.99419 7.52009 3.19004 7.38001C3.38589 7.23993 3.53507 7.04417 3.61818 6.81818C3.71499 6.59882 3.74387 6.3555 3.70109 6.11957C3.65832 5.88365 3.54585 5.66595 3.37818 5.49455L3.33455 5.45091C3.19931 5.31582 3.09202 5.1554 3.01882 4.97882C2.94562 4.80224 2.90795 4.61297 2.90795 4.42182C2.90795 4.23067 2.94562 4.04139 3.01882 3.86481C3.09202 3.68824 3.19931 3.52782 3.33455 3.39273C3.46963 3.25749 3.63005 3.1502 3.80663 3.077C3.98321 3.00381 4.17249 2.96613 4.36364 2.96613C4.55479 2.96613 4.74406 3.00381 4.92064 3.077C5.09722 3.1502 5.25764 3.25749 5.39273 3.39273L5.43636 3.43636C5.60777 3.60403 5.82547 3.7165 6.06139 3.75928C6.29731 3.80205 6.54064 3.77317 6.76 3.67636H6.81818C7.03329 3.58417 7.21674 3.4311 7.34596 3.23597C7.47518 3.04085 7.54452 2.81221 7.54545 2.57818V2.45455C7.54545 2.06878 7.6987 1.69881 7.97148 1.42603C8.24426 1.15325 8.61423 1 9 1C9.38577 1 9.75574 1.15325 10.0285 1.42603C10.3013 1.69881 10.4545 2.06878 10.4545 2.45455V2.52C10.4555 2.75403 10.5248 2.98267 10.654 3.17779C10.7833 3.37291 10.9667 3.52599 11.1818 3.61818C11.4012 3.71499 11.6445 3.74387 11.8804 3.70109C12.1164 3.65832 12.3341 3.54585 12.5055 3.37818L12.5491 3.33455C12.6842 3.19931 12.8446 3.09202 13.0212 3.01882C13.1978 2.94562 13.387 2.90795 13.5782 2.90795C13.7693 2.90795 13.9586 2.94562 14.1352 3.01882C14.3118 3.09202 14.4722 3.19931 14.6073 3.33455C14.7425 3.46963 14.8498 3.63005 14.923 3.80663C14.9962 3.98321 15.0339 4.17249 15.0339 4.36364C15.0339 4.55479 14.9962 4.74406 14.923 4.92064C14.8498 5.09722 14.7425 5.25764 14.6073 5.39273L14.5636 5.43636C14.396 5.60777 14.2835 5.82547 14.2407 6.06139C14.1979 6.29731 14.2268 6.54064 14.3236 6.76V6.81818C14.4158 7.03329 14.5689 7.21674 14.764 7.34596C14.9591 7.47518 15.1878 7.54452 15.4218 7.54545H15.5455C15.9312 7.54545 16.3012 7.6987 16.574 7.97148C16.8468 8.24426 17 8.61423 17 9C17 9.38577 16.8468 9.75574 16.574 10.0285C16.3012 10.3013 15.9312 10.4545 15.5455 10.4545H15.48C15.246 10.4555 15.0173 10.5248 14.8222 10.654C14.6271 10.7833 14.474 10.9667 14.3818 11.1818Z" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/settings.svg b/client/src/assets/icons/settings.svg
deleted file mode 100644
index eb86f1d19..000000000
--- a/client/src/assets/icons/settings.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11 14C12.6569 14 14 12.6569 14 11C14 9.34315 12.6569 8 11 8C9.34315 8 8 9.34315 8 11C8 12.6569 9.34315 14 11 14Z" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M17.7273 13.7273C17.6063 14.0015 17.5702 14.3056 17.6236 14.6005C17.6771 14.8954 17.8177 15.1676 18.0273 15.3818L18.0818 15.4364C18.2509 15.6052 18.385 15.8057 18.4765 16.0265C18.568 16.2472 18.6151 16.4838 18.6151 16.7227C18.6151 16.9617 18.568 17.1983 18.4765 17.419C18.385 17.6397 18.2509 17.8402 18.0818 18.0091C17.913 18.1781 17.7124 18.3122 17.4917 18.4037C17.271 18.4952 17.0344 18.5423 16.7955 18.5423C16.5565 18.5423 16.3199 18.4952 16.0992 18.4037C15.8785 18.3122 15.678 18.1781 15.5091 18.0091L15.4545 17.9545C15.2403 17.745 14.9682 17.6044 14.6733 17.5509C14.3784 17.4974 14.0742 17.5335 13.8 17.6545C13.5311 17.7698 13.3018 17.9611 13.1403 18.205C12.9788 18.4489 12.8921 18.7347 12.8909 19.0273V19.1818C12.8909 19.664 12.6994 20.1265 12.3584 20.4675C12.0174 20.8084 11.5549 21 11.0727 21C10.5905 21 10.1281 20.8084 9.78708 20.4675C9.4461 20.1265 9.25455 19.664 9.25455 19.1818V19.1C9.24751 18.7991 9.15011 18.5073 8.97501 18.2625C8.79991 18.0176 8.55521 17.8312 8.27273 17.7273C7.99853 17.6063 7.69437 17.5702 7.39947 17.6236C7.10456 17.6771 6.83244 17.8177 6.61818 18.0273L6.56364 18.0818C6.39478 18.2509 6.19425 18.385 5.97353 18.4765C5.7528 18.568 5.51621 18.6151 5.27727 18.6151C5.03834 18.6151 4.80174 18.568 4.58102 18.4765C4.36029 18.385 4.15977 18.2509 3.99091 18.0818C3.82186 17.913 3.68775 17.7124 3.59626 17.4917C3.50476 17.271 3.45766 17.0344 3.45766 16.7955C3.45766 16.5565 3.50476 16.3199 3.59626 16.0992C3.68775 15.8785 3.82186 15.678 3.99091 15.5091L4.04545 15.4545C4.25503 15.2403 4.39562 14.9682 4.4491 14.6733C4.50257 14.3784 4.46647 14.0742 4.34545 13.8C4.23022 13.5311 4.03887 13.3018 3.79497 13.1403C3.55107 12.9788 3.26526 12.8921 2.97273 12.8909H2.81818C2.33597 12.8909 1.87351 12.6994 1.53253 12.3584C1.19156 12.0174 1 11.5549 1 11.0727C1 10.5905 1.19156 10.1281 1.53253 9.78708C1.87351 9.4461 2.33597 9.25455 2.81818 9.25455H2.9C3.2009 9.24751 3.49273 9.15011 3.73754 8.97501C3.98236 8.79991 4.16883 8.55521 4.27273 8.27273C4.39374 7.99853 4.42984 7.69437 4.37637 7.39947C4.3229 7.10456 4.18231 6.83244 3.97273 6.61818L3.91818 6.56364C3.74913 6.39478 3.61503 6.19425 3.52353 5.97353C3.43203 5.7528 3.38493 5.51621 3.38493 5.27727C3.38493 5.03834 3.43203 4.80174 3.52353 4.58102C3.61503 4.36029 3.74913 4.15977 3.91818 3.99091C4.08704 3.82186 4.28757 3.68775 4.50829 3.59626C4.72901 3.50476 4.96561 3.45766 5.20455 3.45766C5.44348 3.45766 5.68008 3.50476 5.9008 3.59626C6.12152 3.68775 6.32205 3.82186 6.49091 3.99091L6.54545 4.04545C6.75971 4.25503 7.03183 4.39562 7.32674 4.4491C7.62164 4.50257 7.9258 4.46647 8.2 4.34545H8.27273C8.54161 4.23022 8.77093 4.03887 8.93245 3.79497C9.09397 3.55107 9.18065 3.26526 9.18182 2.97273V2.81818C9.18182 2.33597 9.37338 1.87351 9.71435 1.53253C10.0553 1.19156 10.5178 1 11 1C11.4822 1 11.9447 1.19156 12.2856 1.53253C12.6266 1.87351 12.8182 2.33597 12.8182 2.81818V2.9C12.8193 3.19253 12.906 3.47834 13.0676 3.72224C13.2291 3.96614 13.4584 4.15749 13.7273 4.27273C14.0015 4.39374 14.3056 4.42984 14.6005 4.37637C14.8954 4.3229 15.1676 4.18231 15.3818 3.97273L15.4364 3.91818C15.6052 3.74913 15.8057 3.61503 16.0265 3.52353C16.2472 3.43203 16.4838 3.38493 16.7227 3.38493C16.9617 3.38493 17.1983 3.43203 17.419 3.52353C17.6397 3.61503 17.8402 3.74913 18.0091 3.91818C18.1781 4.08704 18.3122 4.28757 18.4037 4.50829C18.4952 4.72901 18.5423 4.96561 18.5423 5.20455C18.5423 5.44348 18.4952 5.68008 18.4037 5.9008C18.3122 6.12152 18.1781 6.32205 18.0091 6.49091L17.9545 6.54545C17.745 6.75971 17.6044 7.03183 17.5509 7.32674C17.4974 7.62164 17.5335 7.9258 17.6545 8.2V8.27273C17.7698 8.54161 17.9611 8.77093 18.205 8.93245C18.4489 9.09397 18.7347 9.18065 19.0273 9.18182H19.1818C19.664 9.18182 20.1265 9.37338 20.4675 9.71435C20.8084 10.0553 21 10.5178 21 11C21 11.4822 20.8084 11.9447 20.4675 12.2856C20.1265 12.6266 19.664 12.8182 19.1818 12.8182H19.1C18.8075 12.8193 18.5217 12.906 18.2778 13.0676C18.0339 13.2291 17.8425 13.4584 17.7273 13.7273Z" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/solana_logo.svg b/client/src/assets/icons/solana_logo.svg
deleted file mode 100644
index bd349af26..000000000
--- a/client/src/assets/icons/solana_logo.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 397.7 311.7" style="enable-background:new 0 0 397.7 311.7;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:url(#SVGID_1_);}
-	.st1{fill:url(#SVGID_2_);}
-	.st2{fill:url(#SVGID_3_);}
-</style>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="360.8791" y1="351.4553" x2="141.213" y2="-69.2936" gradientTransform="matrix(1 0 0 -1 0 314)">
-	<stop  offset="0" style="stop-color:#00FFA3"/>
-	<stop  offset="1" style="stop-color:#DC1FFF"/>
-</linearGradient>
-<path class="st0" d="M64.6,237.9c2.4-2.4,5.7-3.8,9.2-3.8h317.4c5.8,0,8.7,7,4.6,11.1l-62.7,62.7c-2.4,2.4-5.7,3.8-9.2,3.8H6.5
-	c-5.8,0-8.7-7-4.6-11.1L64.6,237.9z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="264.8291" y1="401.6014" x2="45.163" y2="-19.1475" gradientTransform="matrix(1 0 0 -1 0 314)">
-	<stop  offset="0" style="stop-color:#00FFA3"/>
-	<stop  offset="1" style="stop-color:#DC1FFF"/>
-</linearGradient>
-<path class="st1" d="M64.6,3.8C67.1,1.4,70.4,0,73.8,0h317.4c5.8,0,8.7,7,4.6,11.1l-62.7,62.7c-2.4,2.4-5.7,3.8-9.2,3.8H6.5
-	c-5.8,0-8.7-7-4.6-11.1L64.6,3.8z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="312.5484" y1="376.688" x2="92.8822" y2="-44.061" gradientTransform="matrix(1 0 0 -1 0 314)">
-	<stop  offset="0" style="stop-color:#00FFA3"/>
-	<stop  offset="1" style="stop-color:#DC1FFF"/>
-</linearGradient>
-<path class="st2" d="M333.1,120.1c-2.4-2.4-5.7-3.8-9.2-3.8H6.5c-5.8,0-8.7,7-4.6,11.1l62.7,62.7c2.4,2.4,5.7,3.8,9.2,3.8h317.4
-	c5.8,0,8.7-7,4.6-11.1L333.1,120.1z"/>
-</svg>
diff --git a/client/src/assets/icons/solana_logo_banner.svg b/client/src/assets/icons/solana_logo_banner.svg
deleted file mode 100644
index 08ec87cb1..000000000
--- a/client/src/assets/icons/solana_logo_banner.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<svg width="646" height="96" viewBox="0 0 646 96" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1064_606)">
-<path d="M108.53 75.6899L90.81 94.6899C90.4267 95.1026 89.9626 95.432 89.4464 95.6573C88.9303 95.8827 88.3732 95.9994 87.81 95.9999H3.81C3.40937 95.9997 3.01749 95.8827 2.68235 95.6631C2.34722 95.4436 2.08338 95.1311 1.92313 94.7639C1.76288 94.3967 1.71318 93.9908 1.78012 93.5958C1.84706 93.2008 2.02772 92.8338 2.3 92.5399L20 73.5399C20.3833 73.1273 20.8474 72.7979 21.3636 72.5725C21.8797 72.3472 22.4368 72.2305 23 72.2299H107C107.404 72.2216 107.802 72.333 108.143 72.5502C108.484 72.7674 108.754 73.0806 108.917 73.4504C109.081 73.8203 109.131 74.2303 109.062 74.6288C108.993 75.0273 108.808 75.3965 108.53 75.6899ZM90.81 37.4199C90.4253 37.0091 89.9608 36.6811 89.445 36.4558C88.9292 36.2306 88.3728 36.1129 87.81 36.11H3.81C3.40937 36.1102 3.01749 36.2272 2.68235 36.4468C2.34722 36.6663 2.08338 36.9788 1.92313 37.346C1.76288 37.7132 1.71318 38.1191 1.78012 38.5141C1.84706 38.9091 2.02772 39.2761 2.3 39.57L20 58.58C20.3847 58.9908 20.8492 59.3188 21.365 59.5441C21.8808 59.7693 22.4372 59.887 23 59.8899H107C107.4 59.8878 107.79 59.7693 108.124 59.5491C108.458 59.3288 108.72 59.0162 108.879 58.6494C109.038 58.2826 109.087 57.8774 109.019 57.4833C108.952 57.0892 108.772 56.7232 108.5 56.43L90.81 37.4199ZM3.81 23.7699H87.81C88.3732 23.7694 88.9303 23.6527 89.4464 23.4273C89.9626 23.202 90.4267 22.8726 90.81 22.4599L108.53 3.45995C108.808 3.16647 108.993 2.79726 109.062 2.39877C109.131 2.00028 109.081 1.59031 108.917 1.22045C108.754 0.850591 108.484 0.537368 108.143 0.320195C107.802 0.103021 107.404 -0.0084012 107 -5.10783e-05H23C22.4368 0.000541762 21.8797 0.117167 21.3636 0.342553C20.8474 0.567938 20.3833 0.897249 20 1.30995L2.3 20.3099C2.02772 20.6038 1.84706 20.9708 1.78012 21.3658C1.71318 21.7608 1.76288 22.1667 1.92313 22.5339C2.08338 22.9011 2.34722 23.2136 2.68235 23.4331C3.01749 23.6527 3.40937 23.7697 3.81 23.7699Z" fill="url(#paint0_linear_1064_606)"/>
-<path d="M210.94 40.6002H166V25.8002H222.62V11.0002H165.85C163.91 10.9897 161.988 11.3613 160.192 12.0938C158.396 12.8264 156.761 13.9055 155.383 15.2696C154.004 16.6337 152.907 18.2561 152.155 20.044C151.403 21.832 151.01 23.7506 151 25.6902V40.6902C151.008 42.6315 151.398 44.5523 152.149 46.3425C152.9 48.1328 153.996 49.7575 155.375 51.1237C156.755 52.49 158.39 53.5709 160.187 54.3047C161.984 55.0385 163.909 55.4108 165.85 55.4002H210.85V70.2002H152.07V85.0002H210.94C212.88 85.0108 214.802 84.6391 216.598 83.9066C218.394 83.174 220.029 82.0949 221.407 80.7308C222.786 79.3667 223.883 77.7444 224.635 75.9564C225.387 74.1684 225.78 72.2498 225.79 70.3102V55.3102C225.782 53.3689 225.392 51.4482 224.641 49.6579C223.89 47.8676 222.794 46.2429 221.415 44.8767C220.035 43.5105 218.4 42.4296 216.603 41.6958C214.806 40.962 212.881 40.5897 210.94 40.6002Z" fill="white"/>
-<path d="M298 11H252.89C250.947 10.9842 249.02 11.3519 247.219 12.0821C245.419 12.8123 243.78 13.8905 242.397 15.2552C241.013 16.6198 239.913 18.2439 239.159 20.0345C238.404 21.8251 238.01 23.747 238 25.69V70.31C238.01 72.253 238.404 74.1749 239.159 75.9655C239.913 77.7561 241.013 79.3802 242.397 80.7448C243.78 82.1095 245.419 83.1877 247.219 83.9179C249.02 84.6481 250.947 85.0158 252.89 85H298C299.94 85.0105 301.862 84.6389 303.658 83.9064C305.454 83.1738 307.089 82.0947 308.467 80.7306C309.846 79.3665 310.943 77.7441 311.695 75.9562C312.447 74.1682 312.84 72.2496 312.85 70.31V25.69C312.84 23.7504 312.447 21.8318 311.695 20.0438C310.943 18.2559 309.846 16.6335 308.467 15.2694C307.089 13.9053 305.454 12.8262 303.658 12.0936C301.862 11.3611 299.94 10.9895 298 11ZM297.89 70.2H253V25.8H297.87L297.89 70.2Z" fill="white"/>
-<path d="M456 11.0001H412C410.06 10.9896 408.138 11.3612 406.342 12.0937C404.546 12.8263 402.911 13.9054 401.533 15.2695C400.154 16.6336 399.057 18.256 398.305 20.0439C397.553 21.8319 397.16 23.7505 397.15 25.6901V85.0001H412.15V60.6901H455.95V85.0001H470.95V25.6901C470.94 23.742 470.544 21.8152 469.786 20.0206C469.027 18.2261 467.922 16.5993 466.532 15.2338C465.143 13.8684 463.497 12.7914 461.689 12.0648C459.881 11.3382 457.948 10.9764 456 11.0001ZM455.89 45.8901H412.09V25.8001H455.89V45.8901Z" fill="white"/>
-<path d="M631.15 11.0002H587.15C585.21 10.9897 583.288 11.3613 581.492 12.0938C579.696 12.8264 578.062 13.9055 576.683 15.2696C575.304 16.6337 574.207 18.2561 573.455 20.044C572.703 21.832 572.31 23.7506 572.3 25.6902V85.0002H587.3V60.6902H631V85.0002H646V25.6902C645.99 23.7506 645.597 21.832 644.845 20.044C644.093 18.2561 642.996 16.6337 641.617 15.2696C640.238 13.9055 638.604 12.8264 636.808 12.0938C635.012 11.3613 633.09 10.9897 631.15 11.0002ZM631 45.8902H587.2V25.8002H631V45.8902Z" fill="white"/>
-<path d="M544 70.2001H538L516.55 17.2001C515.815 15.3716 514.55 13.8045 512.918 12.6999C511.286 11.5952 509.361 11.0033 507.39 11.0001H494.08C492.786 10.9935 491.504 11.2418 490.307 11.7307C489.109 12.2197 488.02 12.9397 487.1 13.8497C486.181 14.7598 485.45 15.8419 484.949 17.0345C484.448 18.227 484.187 19.5066 484.18 20.8001V85.0001H499.18V25.8001H505.18L526.62 78.8001C527.367 80.6251 528.642 82.1858 530.281 83.283C531.919 84.3803 533.848 84.9641 535.82 84.9601H549.13C550.424 84.9667 551.706 84.7185 552.903 84.2295C554.101 83.7406 555.19 83.0205 556.11 82.1105C557.029 81.2005 557.76 80.1183 558.261 78.9258C558.762 77.7332 559.023 76.4537 559.03 75.1601V11.0001H544V70.2001Z" fill="white"/>
-<path d="M341.1 11H326.1V70.31C326.11 72.2539 326.505 74.1766 327.26 75.9678C328.015 77.7591 329.116 79.3836 330.5 80.7484C331.884 82.1132 333.525 83.1912 335.326 83.9208C337.128 84.6504 339.056 85.0171 341 85H386V70.2H341.1V11Z" fill="white"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_1064_606" x1="10.81" y1="98.29" x2="98.89" y2="-1.01005" gradientUnits="userSpaceOnUse">
-<stop offset="0.08" stop-color="#9945FF"/>
-<stop offset="0.3" stop-color="#8752F3"/>
-<stop offset="0.5" stop-color="#5497D5"/>
-<stop offset="0.6" stop-color="#43B4CA"/>
-<stop offset="0.72" stop-color="#28E0B9"/>
-<stop offset="0.97" stop-color="#19FB9B"/>
-</linearGradient>
-<clipPath id="clip0_1064_606">
-<rect width="646" height="96" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/client/src/assets/icons/spedometer-icon.svg b/client/src/assets/icons/spedometer-icon.svg
deleted file mode 100644
index 19b13f44e..000000000
--- a/client/src/assets/icons/spedometer-icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12M22 12C22 6.47715 17.5228 2 12 2M22 12H19.5M2 12C2 6.47715 6.47715 2 12 2M2 12H4.5M12 2V4.5M19.0784 5L13.4999 10.5M19.0784 19.0784L18.8745 18.8745C18.1827 18.1827 17.8368 17.8368 17.4331 17.5894C17.0753 17.3701 16.6851 17.2085 16.2769 17.1105C15.8166 17 15.3274 17 14.349 17L9.65096 17C8.6726 17 8.18342 17 7.72307 17.1106C7.31493 17.2086 6.92475 17.3702 6.56686 17.5895C6.1632 17.8369 5.8173 18.1828 5.12549 18.8746L4.92163 19.0784M4.92163 5L6.65808 6.73645M14 12C14 13.1046 13.1046 14 12 14C10.8954 14 10 13.1046 10 12C10 10.8954 10.8954 10 12 10C13.1046 10 14 10.8954 14 12Z" stroke="black" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/speedometer-icon.svg b/client/src/assets/icons/speedometer-icon.svg
deleted file mode 100644
index 19b13f44e..000000000
--- a/client/src/assets/icons/speedometer-icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12M22 12C22 6.47715 17.5228 2 12 2M22 12H19.5M2 12C2 6.47715 6.47715 2 12 2M2 12H4.5M12 2V4.5M19.0784 5L13.4999 10.5M19.0784 19.0784L18.8745 18.8745C18.1827 18.1827 17.8368 17.8368 17.4331 17.5894C17.0753 17.3701 16.6851 17.2085 16.2769 17.1105C15.8166 17 15.3274 17 14.349 17L9.65096 17C8.6726 17 8.18342 17 7.72307 17.1106C7.31493 17.2086 6.92475 17.3702 6.56686 17.5895C6.1632 17.8369 5.8173 18.1828 5.12549 18.8746L4.92163 19.0784M4.92163 5L6.65808 6.73645M14 12C14 13.1046 13.1046 14 12 14C10.8954 14 10 13.1046 10 12C10 10.8954 10.8954 10 12 10C13.1046 10 14 10.8954 14 12Z" stroke="black" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/status-pages.svg b/client/src/assets/icons/status-pages.svg
deleted file mode 100644
index 97cea88fb..000000000
--- a/client/src/assets/icons/status-pages.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M16.2426 7.75738C18.5858 10.1005 18.5858 13.8995 16.2426 16.2427M7.75736 16.2426C5.41421 13.8995 5.41421 10.1005 7.75736 7.75735M4.92893 19.0711C1.02369 15.1658 1.02369 8.8342 4.92893 4.92896M19.0711 4.929C22.9763 8.83424 22.9763 15.1659 19.0711 19.0711M14 12C14 13.1046 13.1046 14 12 14C10.8954 14 10 13.1046 10 12C10 10.8955 10.8954 10 12 10C13.1046 10 14 10.8955 14 12Z" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/support.svg b/client/src/assets/icons/support.svg
deleted file mode 100644
index 7de16379a..000000000
--- a/client/src/assets/icons/support.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.13626 8.13628L3.92893 3.92896M3.92893 18.0711L8.16797 13.8321M13.8611 13.8638L18.0684 18.0711M18.0684 3.92896L13.8287 8.16862M21 11C21 16.5228 16.5228 21 11 21C5.47715 21 1 16.5228 1 11C1 5.47715 5.47715 1 11 1C16.5228 1 21 5.47715 21 11ZM15 11C15 13.2091 13.2091 15 11 15C8.79086 15 7 13.2091 7 11C7 8.79086 8.79086 7 11 7C13.2091 7 15 8.79086 15 11Z" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/top-right-arrow.svg b/client/src/assets/icons/top-right-arrow.svg
deleted file mode 100644
index d569cdd7e..000000000
--- a/client/src/assets/icons/top-right-arrow.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 17L17 7M17 7H7M17 7V17" stroke="#667085" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/trash-bin.svg b/client/src/assets/icons/trash-bin.svg
deleted file mode 100644
index 83bca0c6f..000000000
--- a/client/src/assets/icons/trash-bin.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="20" viewBox="0 0 18 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.3333 5V4.33333C12.3333 3.39991 12.3333 2.9332 12.1517 2.57668C11.9919 2.26308 11.7369 2.00811 11.4233 1.84832C11.0668 1.66667 10.6001 1.66667 9.66667 1.66667H8.33333C7.39991 1.66667 6.9332 1.66667 6.57668 1.84832C6.26308 2.00811 6.00811 2.26308 5.84832 2.57668C5.66667 2.9332 5.66667 3.39991 5.66667 4.33333V5M7.33333 9.58333V13.75M10.6667 9.58333V13.75M1.5 5H16.5M14.8333 5V14.3333C14.8333 15.7335 14.8333 16.4335 14.5608 16.9683C14.3212 17.4387 13.9387 17.8212 13.4683 18.0609C12.9335 18.3333 12.2335 18.3333 10.8333 18.3333H7.16667C5.76654 18.3333 5.06647 18.3333 4.53169 18.0609C4.06129 17.8212 3.67883 17.4387 3.43915 16.9683C3.16667 16.4335 3.16667 15.7335 3.16667 14.3333V5" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/up-arrow.svg b/client/src/assets/icons/up-arrow.svg
deleted file mode 100644
index 0f8f3bc34..000000000
--- a/client/src/assets/icons/up-arrow.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M18 15L12 9L6 15" stroke="#667085" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/uptime-icon.svg b/client/src/assets/icons/uptime-icon.svg
deleted file mode 100644
index 55706ae71..000000000
--- a/client/src/assets/icons/uptime-icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9 7H4.6C4.03995 7 3.75992 7 3.54601 7.10899C3.35785 7.20487 3.20487 7.35785 3.10899 7.54601C3 7.75992 3 8.03995 3 8.6V19.4C3 19.9601 3 20.2401 3.10899 20.454C3.20487 20.6422 3.35785 20.7951 3.54601 20.891C3.75992 21 4.03995 21 4.6 21H9M9 21H15M9 21L9 4.6C9 4.03995 9 3.75992 9.10899 3.54601C9.20487 3.35785 9.35785 3.20487 9.54601 3.10899C9.75992 3 10.0399 3 10.6 3L13.4 3C13.9601 3 14.2401 3 14.454 3.10899C14.6422 3.20487 14.7951 3.35785 14.891 3.54601C15 3.75992 15 4.03995 15 4.6V21M15 11H19.4C19.9601 11 20.2401 11 20.454 11.109C20.6422 11.2049 20.7951 11.3578 20.891 11.546C21 11.7599 21 12.0399 21 12.6V19.4C21 19.9601 21 20.2401 20.891 20.454C20.7951 20.6422 20.6422 20.7951 20.454 20.891C20.2401 21 19.9601 21 19.4 21H15" stroke="black" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/user-edit.svg b/client/src/assets/icons/user-edit.svg
deleted file mode 100644
index cbd1a252f..000000000
--- a/client/src/assets/icons/user-edit.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9 15.5H7.5C6.10444 15.5 5.40665 15.5 4.83886 15.6722C3.56045 16.06 2.56004 17.0605 2.17224 18.3389C2 18.9067 2 19.6044 2 21M14.5 7.5C14.5 9.98528 12.4853 12 10 12C7.51472 12 5.5 9.98528 5.5 7.5C5.5 5.01472 7.51472 3 10 3C12.4853 3 14.5 5.01472 14.5 7.5ZM11 21L14.1014 20.1139C14.2499 20.0715 14.3241 20.0502 14.3934 20.0184C14.4549 19.9902 14.5134 19.9558 14.5679 19.9158C14.6293 19.8707 14.6839 19.8161 14.7932 19.7068L21.25 13.25C21.9404 12.5597 21.9404 11.4403 21.25 10.75C20.5597 10.0596 19.4404 10.0596 18.75 10.75L12.2932 17.2068C12.1839 17.3161 12.1293 17.3707 12.0842 17.4321C12.0442 17.4866 12.0098 17.5451 11.9816 17.6066C11.9497 17.6759 11.9285 17.7501 11.8861 17.8987L11 21Z" stroke="#667085" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/user-two.svg b/client/src/assets/icons/user-two.svg
deleted file mode 100644
index 031b22787..000000000
--- a/client/src/assets/icons/user-two.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.6663 14V12.6667C14.6663 11.4241 13.8165 10.38 12.6663 10.084M10.333 2.19384C11.3103 2.58943 11.9997 3.54754 11.9997 4.66667C11.9997 5.78579 11.3103 6.7439 10.333 7.13949M11.333 14C11.333 12.7575 11.333 12.1362 11.13 11.6462C10.8594 10.9928 10.3402 10.4736 9.68683 10.203C9.19677 10 8.57552 10 7.33301 10H5.33301C4.0905 10 3.46924 10 2.97919 10.203C2.32578 10.4736 1.80665 10.9928 1.536 11.6462C1.33301 12.1362 1.33301 12.7575 1.33301 14M8.99967 4.66667C8.99967 6.13943 7.80577 7.33333 6.33301 7.33333C4.86025 7.33333 3.66634 6.13943 3.66634 4.66667C3.66634 3.19391 4.86025 2 6.33301 2C7.80577 2 8.99967 3.19391 8.99967 4.66667Z" stroke="#667085" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/user.svg b/client/src/assets/icons/user.svg
deleted file mode 100644
index 231c89d40..000000000
--- a/client/src/assets/icons/user.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.3337 14C13.3337 13.0696 13.3337 12.6044 13.2188 12.2259C12.9603 11.3736 12.2934 10.7067 11.4411 10.4482C11.0626 10.3333 10.5974 10.3333 9.66699 10.3333H6.33366C5.40328 10.3333 4.93809 10.3333 4.55956 10.4482C3.7073 10.7067 3.04035 11.3736 2.78182 12.2259C2.66699 12.6044 2.66699 13.0696 2.66699 14M11.0003 5C11.0003 6.65685 9.65718 8 8.00033 8C6.34347 8 5.00033 6.65685 5.00033 5C5.00033 3.34315 6.34347 2 8.00033 2C9.65718 2 11.0003 3.34315 11.0003 5Z" stroke="#667085" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/client/src/assets/icons/warning-icon.svg b/client/src/assets/icons/warning-icon.svg
deleted file mode 100644
index 468611758..000000000
--- a/client/src/assets/icons/warning-icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 8V12M12 16H12.01M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/server/jest.config.ts b/server/jest.config.ts
index 2bcfcbf21..fd0c87ad7 100644
--- a/server/jest.config.ts
+++ b/server/jest.config.ts
@@ -8,6 +8,11 @@ const config: Config = {
 		"^.+\\.(t|j)sx?$": ["ts-jest", { useESM: true, tsconfig: "./tsconfig.jest.json" }],
 	},
 	moduleNameMapper: {
+		"^@/validation/(.*)\\.js$": "<rootDir>/src/validation/$1.js",
+		"^@/utils/(AppError)\\.js$": "<rootDir>/src/utils/$1.ts",
+		"^@/utils/(.*)\\.js$": "<rootDir>/src/utils/$1.js",
+		"^@/(.*)\\.ts$": "<rootDir>/src/$1.ts",
+		"^@/(.*)\\.js$": "<rootDir>/src/$1.ts",
 		"^@/(.*)$": "<rootDir>/src/$1",
 	},
 	testMatch: ["<rootDir>/test/**/*.test.ts"],
diff --git a/server/src/config/services.ts b/server/src/config/services.ts
index c526a8abb..af49cc2d4 100644
--- a/server/src/config/services.ts
+++ b/server/src/config/services.ts
@@ -155,7 +155,7 @@ export const initializeServices = async ({
 
 	// Repositories
 	const monitorsRepository = new MongoMonitorsRepository();
-	const checksRepository = new MongoChecksRepository();
+	const checksRepository = new MongoChecksRepository(logger);
 	const monitorStatsRepository = new MongoMonitorStatsRepository();
 	const statusPagesRepository = new MongoStatusPagesRepository();
 
@@ -183,7 +183,17 @@ export const initializeServices = async ({
 		stringService,
 	});
 
-	const bufferService = new BufferService({ db, logger, envSettings, incidentService });
+	const checkService = new CheckService({
+		db,
+		settingsService,
+		stringService,
+		errorService,
+		monitorsRepository,
+		logger,
+		checksRepository,
+	});
+
+	const bufferService = new BufferService({ db, logger, envSettings, incidentService, checkService });
 
 	const statusService = new StatusService({ db, logger, buffer: bufferService, incidentService, monitorsRepository });
 
@@ -208,11 +218,11 @@ export const initializeServices = async ({
 		networkService,
 		statusService,
 		notificationService,
+		checkService,
+		buffer: bufferService,
 	});
 
 	const superSimpleQueue = await SuperSimpleQueue.create({
-		envSettings,
-		db,
 		logger,
 		helper: superSimpleQueueHelper,
 		monitorsRepository,
@@ -231,13 +241,7 @@ export const initializeServices = async ({
 		jobQueue: superSimpleQueue,
 		monitorsRepository,
 	});
-	const checkService = new CheckService({
-		db,
-		settingsService,
-		stringService,
-		errorService,
-		monitorsRepository,
-	});
+
 	const diagnosticService = new DiagnosticService();
 	const inviteService = new InviteService({
 		db,
diff --git a/server/src/db/models/Check.ts b/server/src/db/models/Check.ts
index c176aa3bb..94dfa873c 100644
--- a/server/src/db/models/Check.ts
+++ b/server/src/db/models/Check.ts
@@ -11,8 +11,7 @@ import type {
 	CheckMemoryInfo,
 	CheckMetadata,
 	CheckNetworkInterfaceInfo,
-	CheckTimings,
-	CheckTimingPhases,
+	GotTimings,
 	ILighthouseAudit,
 } from "@/types/check.js";
 
@@ -35,7 +34,7 @@ interface CheckDocument extends CheckDocumentBase {
 	_id: Types.ObjectId;
 }
 
-const timingPhasesSchema = new Schema<CheckTimingPhases>(
+const timingPhasesSchema = new Schema<GotTimings["phases"]>(
 	{
 		wait: { type: Number, default: 0 },
 		dns: { type: Number, default: 0 },
@@ -49,7 +48,7 @@ const timingPhasesSchema = new Schema<CheckTimingPhases>(
 	{ _id: false }
 );
 
-const timingsSchema = new Schema<CheckTimings>(
+const timingsSchema = new Schema<GotTimings>(
 	{
 		start: { type: Number, default: 0 },
 		socket: { type: Number, default: 0 },
diff --git a/server/src/repositories/checks/IChecksRepository.ts b/server/src/repositories/checks/IChecksRepository.ts
index 19faa0159..7b98ae7b6 100644
--- a/server/src/repositories/checks/IChecksRepository.ts
+++ b/server/src/repositories/checks/IChecksRepository.ts
@@ -1,4 +1,4 @@
-import type { Check, CheckAudits, MonitorType } from "@/types/index.js";
+import type { Check, MonitorType } from "@/types/index.js";
 import type { LatestChecksMap } from "@/repositories/checks/MongoChecksRepistory.js";
 
 export interface PageSpeedChecksResult {
@@ -55,6 +55,8 @@ export interface UptimeChecksResult {
 
 export interface IChecksRepository {
 	// create
+	createChecks(checks: Check[]): Promise<Check[]>;
+
 	// single fetch
 	// collection fetch
 	findLatestChecksByMonitorIds(monitorIds: string[], options?: { limitPerMonitor?: number }): Promise<LatestChecksMap>;
diff --git a/server/src/repositories/checks/MongoChecksRepistory.ts b/server/src/repositories/checks/MongoChecksRepistory.ts
index 3816d8cc5..7707a7b17 100644
--- a/server/src/repositories/checks/MongoChecksRepistory.ts
+++ b/server/src/repositories/checks/MongoChecksRepistory.ts
@@ -10,18 +10,27 @@ import type {
 	CheckMemoryInfo,
 	CheckMetadata,
 	CheckNetworkInterfaceInfo,
-	CheckTimings,
+	GotTimings,
 	MonitorType,
 } from "@/types/index.js";
 import { CheckModel, type CheckDocument } from "@/db/models/index.js";
 import mongoose from "mongoose";
 
+const SERVICE_NAME = "StatusService";
+
 export type LatestChecksMap = Record<string, Check[]>;
 type DateRange = { start: Date; end: Date };
 type HardwareAggregateData = { latestCheck: CheckDocument | null; totalChecks: number };
 type HardwareUpChecks = { totalChecks: number };
 
 class MongoChecksRepository implements IChecksRepository {
+	static SERVICE_NAME = SERVICE_NAME;
+
+	private logger: any;
+	constructor(logger: any) {
+		this.logger = logger;
+	}
+
 	private toEntity = (doc: CheckDocument): Check => {
 		const toStringId = (value: mongoose.Types.ObjectId | string | undefined | null): string => {
 			if (!value) {
@@ -44,7 +53,7 @@ class MongoChecksRepository implements IChecksRepository {
 			return toDateString(value);
 		};
 
-		const mapTimings = (timings?: CheckTimings): CheckTimings => {
+		const mapTimings = (timings?: GotTimings): GotTimings => {
 			const phases = timings?.phases ?? {
 				wait: 0,
 				dns: 0,
@@ -133,11 +142,11 @@ class MongoChecksRepository implements IChecksRepository {
 				return undefined;
 			}
 			return {
-				cls: audits.cls ?? 0,
-				si: audits.si ?? 0,
-				fcp: audits.fcp ?? 0,
-				lcp: audits.lcp ?? 0,
-				tbt: audits.tbt ?? 0,
+				cls: audits.cls,
+				si: audits.si,
+				fcp: audits.fcp,
+				lcp: audits.lcp,
+				tbt: audits.tbt,
 			};
 		};
 
@@ -176,6 +185,10 @@ class MongoChecksRepository implements IChecksRepository {
 		};
 	};
 
+	createChecks = async (checks: Check[]) => {
+		return await CheckModel.insertMany(checks);
+	};
+
 	findLatestChecksByMonitorIds = async (monitorIds: string[], options?: { limitPerMonitor?: number }): Promise<LatestChecksMap> => {
 		if (monitorIds.length === 0) {
 			return {};
diff --git a/server/src/service/business/checkService.ts b/server/src/service/business/checkService.ts
index 61e2fb6ad..3e6c727b5 100644
--- a/server/src/service/business/checkService.ts
+++ b/server/src/service/business/checkService.ts
@@ -1,4 +1,6 @@
-import { IMonitorsRepository } from "@/repositories/index.js";
+import { IChecksRepository, IMonitorsRepository } from "@/repositories/index.js";
+import type { MonitorType, MonitorStatusResponse, CheckErrorInfo, Check } from "@/types/index.js";
+import type { HardwareStatusPayload, PageSpeedStatusPayload } from "@/types/network.js";
 
 const SERVICE_NAME = "checkService";
 
@@ -10,31 +12,114 @@ class CheckService {
 	private stringService: any;
 	private errorService: any;
 	private monitorsRepository: IMonitorsRepository;
-
+	private checksRepository: IChecksRepository;
+	private logger: any;
 	constructor({
 		db,
 		settingsService,
 		stringService,
 		errorService,
 		monitorsRepository,
+		logger,
+		checksRepository,
 	}: {
 		db: any;
 		settingsService: any;
 		stringService: any;
 		errorService: any;
 		monitorsRepository: IMonitorsRepository;
+		logger: any;
+		checksRepository: IChecksRepository;
 	}) {
 		this.db = db;
 		this.settingsService = settingsService;
 		this.stringService = stringService;
 		this.errorService = errorService;
 		this.monitorsRepository = monitorsRepository;
+		this.logger = logger;
+		this.checksRepository = checksRepository;
 	}
 
 	get serviceName() {
 		return CheckService.SERVICE_NAME;
 	}
 
+	createChecks = async (checks: Check[]) => {
+		return this.checksRepository.createChecks(checks);
+	};
+
+	buildCheck = (statusResponse: MonitorStatusResponse<PageSpeedStatusPayload | HardwareStatusPayload | undefined>) => {
+		const { monitorId, teamId, type, status, responseTime, code, message, payload, timings } = statusResponse;
+
+		const check: Partial<Check> = {
+			metadata: {
+				monitorId,
+				teamId,
+				type,
+			},
+			status,
+			statusCode: code,
+			responseTime: responseTime || 0,
+			timings: timings,
+			message,
+		};
+
+		if (type === "pagespeed") {
+			const pageSpeedPayload = payload as PageSpeedStatusPayload | undefined;
+			if (!pageSpeedPayload) {
+				this.logger.warn({
+					message: "Failed to build check",
+					service: SERVICE_NAME,
+					method: "buildCheck",
+					details: "empty payload",
+				});
+				return undefined;
+			}
+			const categories = pageSpeedPayload.lighthouseResult?.categories ?? {};
+			const audits = pageSpeedPayload.lighthouseResult?.audits ?? {};
+			const mapAudit = (audit: any) => {
+				if (!audit || typeof audit !== "object") {
+					return undefined;
+				}
+				return {
+					id: audit.id,
+					title: audit.title,
+					score: typeof audit.score === "number" ? audit.score : (audit.score ?? null),
+					displayValue: audit.displayValue,
+					numericValue: typeof audit.numericValue === "number" ? audit.numericValue : undefined,
+					numericUnit: audit.numericUnit,
+				};
+			};
+			check.accessibility = (categories?.accessibility?.score || 0) * 100;
+			check.bestPractices = (categories?.["best-practices"]?.score || 0) * 100;
+			check.seo = (categories?.seo?.score || 0) * 100;
+			check.performance = (categories?.performance?.score || 0) * 100;
+			check.audits = {
+				cls: mapAudit(audits?.["cumulative-layout-shift"]),
+				si: mapAudit(audits?.["speed-index"]),
+				fcp: mapAudit(audits?.["first-contentful-paint"]),
+				lcp: mapAudit(audits?.["largest-contentful-paint"]),
+				tbt: mapAudit(audits?.["total-blocking-time"]),
+			};
+		}
+
+		if (type === "hardware") {
+			const hardwarePayload = payload as HardwareStatusPayload | undefined;
+			const { cpu, memory, disk, host, net } = hardwarePayload?.data ?? {};
+			const errorsSource = Array.isArray(hardwarePayload?.errors)
+				? hardwarePayload?.errors
+				: (hardwarePayload?.errors as { errors?: CheckErrorInfo[] } | undefined)?.errors;
+			check.cpu = cpu;
+			check.memory = memory;
+			check.disk = disk;
+			check.host = host;
+			check.errors = errorsSource;
+			check.capture = hardwarePayload?.capture;
+			check.net = net;
+		}
+		return check;
+	};
+
 	getChecksByMonitor = async ({ monitorId, query, teamId }: { monitorId: string; query: any; teamId: string }) => {
 		if (!monitorId) {
 			throw this.errorService.createBadRequestError("No monitor ID in request");
diff --git a/server/src/service/index.ts b/server/src/service/index.ts
index 4793f055b..a094f8b01 100644
--- a/server/src/service/index.ts
+++ b/server/src/service/index.ts
@@ -1 +1,2 @@
 export * from "@/service/business/monitorService.js";
+export * from "@/service/infrastructure/networkService.js";
diff --git a/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.js b/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.js
deleted file mode 100644
index a6637d4cc..000000000
--- a/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.js
+++ /dev/null
@@ -1,177 +0,0 @@
-import Scheduler from "super-simple-scheduler";
-const SERVICE_NAME = "JobQueue";
-
-class SuperSimpleQueue {
-	static SERVICE_NAME = SERVICE_NAME;
-
-	constructor({ envSettings, db, logger, helper, monitorsRepository }) {
-		this.envSettings = envSettings;
-		this.db = db;
-		this.logger = logger;
-		this.helper = helper;
-		this.monitorsRepository = monitorsRepository;
-	}
-
-	get serviceName() {
-		return SuperSimpleQueue.SERVICE_NAME;
-	}
-
-	static async create({ envSettings, db, logger, helper, monitorsRepository }) {
-		const instance = new SuperSimpleQueue({ envSettings, db, logger, helper, monitorsRepository });
-		await instance.init();
-		return instance;
-	}
-
-	init = async () => {
-		try {
-			this.scheduler = new Scheduler({
-				// storeType: "mongo",
-				// storeType: "redis",
-				logLevel: "debug",
-				debug: true,
-				// dbUri: this.envSettings.dbConnectionString,
-			});
-			this.scheduler.start();
-
-			this.scheduler.addTemplate("monitor-job", this.helper.getMonitorJob());
-			const monitors = await this.monitorsRepository.findAll();
-			for (const monitor of monitors) {
-				const randomOffset = Math.floor(Math.random() * 100);
-				setTimeout(() => {
-					this.addJob(monitor.id, monitor);
-				}, randomOffset);
-			}
-
-			return true;
-		} catch (error) {
-			this.logger.error({
-				message: "Failed to initialize SuperSimpleQueue",
-				service: SERVICE_NAME,
-				method: "init",
-				details: error,
-			});
-			return false;
-		}
-	};
-
-	addJob = async (monitorId, monitor) => {
-		this.scheduler.addJob({
-			id: monitorId,
-			template: "monitor-job",
-			repeat: monitor.interval,
-			active: monitor.isActive,
-			data: monitor,
-		});
-	};
-
-	deleteJob = async (monitor) => {
-		this.scheduler.removeJob(monitor.id);
-	};
-
-	pauseJob = async (monitor) => {
-		const result = this.scheduler.pauseJob(monitor.id);
-		if (result === false) {
-			throw new Error("Failed to resume monitor");
-		}
-		this.logger.debug({
-			message: `Paused monitor ${monitor.id}`,
-			service: SERVICE_NAME,
-			method: "pauseJob",
-		});
-	};
-
-	resumeJob = async (monitor) => {
-		const result = this.scheduler.resumeJob(monitor.id);
-		if (result === false) {
-			throw new Error("Failed to resume monitor");
-		}
-		this.logger.debug({
-			message: `Resumed monitor ${monitor.id}`,
-			service: SERVICE_NAME,
-			method: "resumeJob",
-		});
-	};
-
-	updateJob = async (monitor) => {
-		this.scheduler.updateJob(monitor.id, { repeat: monitor.interval, data: monitor });
-	};
-
-	shutdown = async () => {
-		this.scheduler.stop();
-	};
-
-	getMetrics = async () => {
-		const jobs = await this.scheduler.getJobs();
-		const metrics = jobs.reduce(
-			(acc, job) => {
-				acc.totalRuns += job.runCount || 0;
-				acc.totalFailures += job.failCount || 0;
-				acc.jobs++;
-				if (job.failCount > 0 && job.lastFailedAt >= job.lsatRunAt) {
-					acc.failingJobs++;
-				}
-
-				if (job.lockedAt) {
-					acc.activeJobs++;
-				}
-
-				if (job.failCount > 0) {
-					acc.jobsWithFailures.push({
-						monitorId: job.id,
-						monitorUrl: job?.data?.url || null,
-						monitorType: job?.data?.type || null,
-						failedAt: job.lastFailedAt,
-						failCount: job.failCount,
-						failReason: job.lastFailReason,
-					});
-				}
-				return acc;
-			},
-			{
-				jobs: 0,
-				activeJobs: 0,
-				failingJobs: 0,
-				jobsWithFailures: [],
-				totalRuns: 0,
-				totalFailures: 0,
-			}
-		);
-		return metrics;
-	};
-
-	getJobs = async () => {
-		const jobs = await this.scheduler.getJobs();
-		return jobs.map((job) => {
-			return {
-				monitorId: job.id,
-				monitorUrl: job?.data?.url || null,
-				monitorType: job?.data?.type || null,
-				monitorInterval: job?.data?.interval || null,
-				active: job.active,
-				lockedAt: job.lockedAt,
-				runCount: job.runCount || 0,
-				failCount: job.failCount || 0,
-				failReason: job.lastFailReason,
-				lastRunAt: job.lastRunAt,
-				lastFinishedAt: job.lastFinishedAt,
-				lastRunTook: job.lockedAt ? null : job.lastFinishedAt - job.lastRunAt,
-				lastFailedAt: job.lastFailedAt,
-			};
-		});
-	};
-
-	flushQueues = async () => {
-		const stopRes = this.scheduler.stop();
-		const flushRes = this.scheduler.flushJobs();
-		const initRes = await this.init();
-		return {
-			success: stopRes && flushRes && initRes,
-		};
-	};
-
-	obliterate = async () => {
-		console.log("obliterate not implemented");
-	};
-}
-
-export default SuperSimpleQueue;
diff --git a/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.ts b/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.ts
new file mode 100644
index 000000000..8fd55ff70
--- /dev/null
+++ b/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.ts
@@ -0,0 +1,254 @@
+import { IMonitorsRepository } from "@/repositories/index.js";
+import Scheduler from "super-simple-scheduler";
+const SERVICE_NAME = "JobQueue";
+
+type QueueJobFailure = {
+	monitorId: string | number;
+	monitorUrl: string | null;
+	monitorType: string | null;
+	failedAt: number | null;
+	failCount: number;
+	failReason: string | null;
+};
+
+type QueueMetrics = {
+	jobs: number;
+	activeJobs: number;
+	failingJobs: number;
+	jobsWithFailures: QueueJobFailure[];
+	totalRuns: number;
+	totalFailures: number;
+};
+
+type QueueJobSummary = {
+	monitorId: string | number;
+	monitorUrl: string | null;
+	monitorType: string | null;
+	monitorInterval: number | null;
+	active: boolean;
+	lockedAt: number | null;
+	runCount: number;
+	failCount: number;
+	failReason: string | null;
+	lastRunAt: number | null;
+	lastFinishedAt: number | null;
+	lastRunTook: number | null;
+	lastFailedAt: number | null;
+};
+
+export interface ISuperSimpleQueue {
+	readonly serviceName: string;
+	init(): Promise<boolean>;
+	addJob(monitorId: string, monitor: any): Promise<void>;
+	deleteJob(monitor: any): Promise<void>;
+	pauseJob(monitor: any): Promise<void>;
+	resumeJob(monitor: any): Promise<void>;
+	updateJob(monitor: any): Promise<void>;
+	shutdown(): Promise<void>;
+	getMetrics(): Promise<QueueMetrics>;
+	getJobs(): Promise<QueueJobSummary[]>;
+	flushQueues(): Promise<{ success: boolean }>;
+	obliterate(): Promise<void>;
+}
+
+class SuperSimpleQueue implements ISuperSimpleQueue {
+	static SERVICE_NAME = SERVICE_NAME;
+
+	private logger: any;
+	private helper: any;
+	private monitorsRepository: IMonitorsRepository;
+	private readonly scheduler: Scheduler;
+
+	constructor({
+		logger,
+		helper,
+		monitorsRepository,
+		scheduler,
+	}: {
+		logger: any;
+		helper: any;
+		monitorsRepository: IMonitorsRepository;
+		scheduler: Scheduler;
+	}) {
+		this.logger = logger;
+		this.helper = helper;
+		this.monitorsRepository = monitorsRepository;
+		this.scheduler = scheduler;
+	}
+
+	get serviceName() {
+		return SuperSimpleQueue.SERVICE_NAME;
+	}
+
+	static async create({ logger, helper, monitorsRepository }: { logger: any; helper: any; monitorsRepository: IMonitorsRepository }) {
+		const scheduler = new Scheduler({
+			// storeType: "mongo",
+			// storeType: "redis",
+			logLevel: "debug",
+			// dbUri: envSettings.dbConnectionString,
+		});
+		const instance = new SuperSimpleQueue({ logger, helper, monitorsRepository, scheduler });
+		await instance.init();
+		return instance;
+	}
+
+	init = async () => {
+		try {
+			this.scheduler.start();
+
+			this.scheduler.addTemplate("monitor-job", this.helper.getMonitorJob());
+			const monitors = await this.monitorsRepository.findAll();
+			if (!monitors) {
+				return true;
+			}
+			for (const monitor of monitors) {
+				const randomOffset = Math.floor(Math.random() * 100);
+				setTimeout(() => {
+					this.addJob(monitor.id, monitor);
+				}, randomOffset);
+			}
+
+			return true;
+		} catch (error) {
+			this.logger.error({
+				message: "Failed to initialize SuperSimpleQueue",
+				service: SERVICE_NAME,
+				method: "init",
+				details: error,
+			});
+			return false;
+		}
+	};
+
+	addJob = async (monitorId: string, monitor: any) => {
+		this.scheduler.addJob({
+			id: monitorId,
+			template: "monitor-job",
+			repeat: monitor.interval,
+			active: monitor.isActive,
+			data: monitor,
+		});
+	};
+
+	deleteJob = async (monitor: any) => {
+		this.scheduler.removeJob(monitor.id);
+	};
+
+	pauseJob = async (monitor: any) => {
+		const result = await this.scheduler.pauseJob(monitor.id);
+		if (result === false) {
+			throw new Error("Failed to resume monitor");
+		}
+		this.logger.debug({
+			message: `Paused monitor ${monitor.id}`,
+			service: SERVICE_NAME,
+			method: "pauseJob",
+		});
+	};
+
+	resumeJob = async (monitor: any) => {
+		const result = await this.scheduler.resumeJob(monitor.id);
+		if (result === false) {
+			throw new Error("Failed to resume monitor");
+		}
+		this.logger.debug({
+			message: `Resumed monitor ${monitor.id}`,
+			service: SERVICE_NAME,
+			method: "resumeJob",
+		});
+	};
+
+	updateJob = async (monitor: any) => {
+		this.scheduler.updateJob(monitor.id, { repeat: monitor.interval, data: monitor });
+	};
+
+	shutdown = async () => {
+		this.scheduler.stop();
+	};
+
+	getMetrics = async () => {
+		const jobs = await this.scheduler.getJobs();
+		const metrics = jobs.reduce(
+			(acc, job) => {
+				const runCount = job.runCount ?? 0;
+				const failCount = job.failCount ?? 0;
+				const lastFailedAt = job.lastFailedAt ?? 0;
+				const lastRunAt = job.lastRunAt ?? 0;
+				acc.totalRuns += runCount;
+				acc.totalFailures += failCount;
+				acc.jobs++;
+				if (failCount > 0 && lastFailedAt >= lastRunAt) {
+					acc.failingJobs++;
+				}
+
+				if (job.lockedAt) {
+					acc.activeJobs++;
+				}
+
+				if (failCount > 0) {
+					acc.jobsWithFailures.push({
+						monitorId: job.id,
+						monitorUrl: job?.data?.url || null,
+						monitorType: job?.data?.type || null,
+						failedAt: job.lastFailedAt ?? null,
+						failCount,
+						failReason: job.lastFailReason ?? null,
+					});
+				}
+				return acc;
+			},
+			{
+				jobs: 0,
+				activeJobs: 0,
+				failingJobs: 0,
+				jobsWithFailures: [] as Array<{
+					monitorId: string | number;
+					monitorUrl: any;
+					monitorType: any;
+					failedAt: number | null;
+					failCount: number;
+					failReason: string | null;
+				}>,
+				totalRuns: 0,
+				totalFailures: 0,
+			}
+		);
+		return metrics;
+	};
+
+	getJobs = async () => {
+		const jobs = await this.scheduler.getJobs();
+		return jobs.map((job) => {
+			return {
+				monitorId: job.id,
+				monitorUrl: job?.data?.url || null,
+				monitorType: job?.data?.type || null,
+				monitorInterval: job?.data?.interval || null,
+				active: job.active,
+				lockedAt: job.lockedAt ?? null,
+				runCount: job.runCount ?? 0,
+				failCount: job.failCount ?? 0,
+				failReason: job.lastFailReason ?? null,
+				lastRunAt: job.lastRunAt ?? null,
+				lastFinishedAt: job.lastFinishedAt ?? null,
+				lastRunTook: job.lockedAt ? null : (job.lastFinishedAt ?? 0) - (job.lastRunAt ?? 0),
+				lastFailedAt: job.lastFailedAt ?? null,
+			};
+		});
+	};
+
+	flushQueues = async () => {
+		const stopRes = await this.scheduler.stop();
+		const flushRes = await this.scheduler.flushJobs();
+		const initRes = await this.init();
+		return {
+			success: Boolean(stopRes && flushRes && initRes),
+		};
+	};
+
+	obliterate = async () => {
+		console.log("obliterate not implemented");
+	};
+}
+
+export default SuperSimpleQueue;
diff --git a/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js b/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.ts
similarity index 57%
rename from server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js
rename to server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.ts
index 3cd6b37a8..891635d56 100644
--- a/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js
+++ b/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.ts
@@ -1,23 +1,42 @@
 const SERVICE_NAME = "JobQueueHelper";
-
+import type { Monitor } from "@/types/monitor.js";
+import { AppError } from "@/utils/AppError.js";
+import { INetworkService } from "@/service/index.js";
 class SuperSimpleQueueHelper {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	/**
-	 * @param {{
-	 * 	db: import("../database.js").Database,
-	 * 	logger: import("../logger.js").Logger,
-	 * 	networkService: import("../networkService.js").NetworkService,
-	 * 	statusService: import("../statusService.js").StatusService,
-	 * 	notificationService: import("../notificationService.js").NotificationService
-	 * }}
-	 */
-	constructor({ db, logger, networkService, statusService, notificationService }) {
+	private db: any;
+	private logger: any;
+	private networkService: INetworkService;
+	private statusService: any;
+	private notificationService: any;
+	private checkService: any;
+	private buffer: any;
+
+	constructor({
+		db,
+		logger,
+		networkService,
+		statusService,
+		notificationService,
+		checkService,
+		buffer,
+	}: {
+		db: any;
+		logger: any;
+		networkService: INetworkService;
+		statusService: any;
+		notificationService: any;
+		checkService: any;
+		buffer: any;
+	}) {
 		this.db = db;
 		this.logger = logger;
 		this.networkService = networkService;
 		this.statusService = statusService;
 		this.notificationService = notificationService;
+		this.checkService = checkService;
+		this.buffer = buffer;
 	}
 
 	get serviceName() {
@@ -25,39 +44,48 @@ class SuperSimpleQueueHelper {
 	}
 
 	getMonitorJob = () => {
-		return async (monitor) => {
+		return async (monitor: Monitor) => {
 			try {
 				const monitorId = monitor.id;
 				const teamId = monitor.teamId;
 				if (!monitorId) {
-					throw new Error("No monitor id");
+					throw new AppError({ message: "No monitor id", service: SERVICE_NAME, method: "getMonitorJob" });
 				}
 
+				// Step 1.  Check for maintenacne window, if found, skip the check
 				const maintenanceWindowActive = await this.isInMaintenanceWindow(monitorId, teamId);
 				if (maintenanceWindowActive) {
-					this.logger.info({
+					this.logger.debug({
 						message: `Monitor ${monitorId} is in maintenance window`,
 						service: SERVICE_NAME,
 						method: "getMonitorJob",
 					});
 					return;
 				}
-				const networkResponse = await this.networkService.requestStatus(monitor);
 
-				if (!networkResponse) {
+				// Step 2.  Request monitor status
+				const status = await this.networkService.requestStatus(monitor);
+				if (!status) {
 					throw new Error("No network response");
 				}
 
-				const { monitor: updatedMonitor, statusChanged, prevStatus } = await this.statusService.updateStatus(networkResponse);
+				// Step 3.  Build check
+				const check = await this.checkService.buildCheck(status);
+
+				// Step 4 Add check to buffer
+				this.buffer.addToBuffer({ check });
+
+				// Step 4.  Update monitor status
+				const statusChangeResult = await this.statusService.updateMonitorStatus(status, check);
 
 				this.notificationService
 					.handleNotifications({
-						...networkResponse,
-						monitor: updatedMonitor,
-						prevStatus,
-						statusChanged,
+						...status,
+						monitor: statusChangeResult.monitor,
+						prevStatus: statusChangeResult.prevStatus,
+						statusChanged: statusChangeResult.statusChanged,
 					})
-					.catch((error) => {
+					.catch((error: any) => {
 						this.logger.error({
 							message: error.message,
 							service: SERVICE_NAME,
@@ -66,7 +94,7 @@ class SuperSimpleQueueHelper {
 							stack: error.stack,
 						});
 					});
-			} catch (error) {
+			} catch (error: any) {
 				this.logger.warn({
 					message: error.message,
 					service: error.service || SERVICE_NAME,
@@ -78,13 +106,13 @@ class SuperSimpleQueueHelper {
 		};
 	};
 
-	async isInMaintenanceWindow(monitorId, teamId) {
+	async isInMaintenanceWindow(monitorId: string, teamId: string) {
 		const maintenanceWindows = await this.db.maintenanceWindowModule.getMaintenanceWindowsByMonitorId({
-			monitorId: monitorId.toString(),
-			teamId: teamId.toString(),
+			monitorId: monitorId,
+			teamId: teamId,
 		});
 		// Check for active maintenance window:
-		const maintenanceWindowIsActive = maintenanceWindows.reduce((acc, window) => {
+		const maintenanceWindowIsActive = maintenanceWindows.reduce((acc: any, window: any) => {
 			if (window.active) {
 				const start = new Date(window.start);
 				const end = new Date(window.end);
diff --git a/server/src/service/infrastructure/bufferService.js b/server/src/service/infrastructure/bufferService.ts
similarity index 71%
rename from server/src/service/infrastructure/bufferService.js
rename to server/src/service/infrastructure/bufferService.ts
index a218f56a0..5a809eea5 100755
--- a/server/src/service/infrastructure/bufferService.js
+++ b/server/src/service/infrastructure/bufferService.ts
@@ -1,15 +1,38 @@
 import { config } from "@/config/index.js";
+import type { Check } from "@/types/index.js";
 
 const SERVICE_NAME = "BufferService";
 
 class BufferService {
 	static SERVICE_NAME = SERVICE_NAME;
-	constructor({ db, logger, envSettings, incidentService }) {
-		console.log(envSettings);
+	private BUFFER_TIMEOUT: number;
+	private db: any;
+	private logger: any;
+	private incidentService: any;
+	private SERVICE_NAME: string;
+	private buffer: any[];
+	private incidentBuffer: any[];
+	private bufferTimer: NodeJS.Timeout | null = null;
+	private checksService: any;
+
+	constructor({
+		db,
+		logger,
+		envSettings,
+		incidentService,
+		checkService,
+	}: {
+		db: any;
+		logger: any;
+		envSettings: any;
+		incidentService: any;
+		checkService: any;
+	}) {
 		this.BUFFER_TIMEOUT = config.NODE_ENV === "development" ? 10 : 1000 * 60 * 1; // 1 minute
 		this.db = db;
 		this.logger = logger;
 		this.incidentService = incidentService;
+		this.checksService = checkService;
 		this.SERVICE_NAME = SERVICE_NAME;
 		this.buffer = [];
 		this.incidentBuffer = [];
@@ -25,10 +48,10 @@ class BufferService {
 		return BufferService.SERVICE_NAME;
 	}
 
-	addToBuffer({ check }) {
+	addToBuffer({ check }: { check: Check }) {
 		try {
 			this.buffer.push(check);
-		} catch (error) {
+		} catch (error: any) {
 			this.logger.error({
 				message: error.message,
 				service: this.SERVICE_NAME,
@@ -38,7 +61,7 @@ class BufferService {
 		}
 	}
 
-	addIncidentToBuffer({ monitor, check, action = "create" }) {
+	addIncidentToBuffer({ monitor, check, action = "create" }: { monitor: any; check: Check; action?: string }) {
 		try {
 			if (!monitor || !check) {
 				this.logger.warn({
@@ -50,7 +73,7 @@ class BufferService {
 			}
 
 			this.incidentBuffer.push({ monitor, check, action });
-		} catch (error) {
+		} catch (error: any) {
 			this.logger.error({
 				message: error.message,
 				service: this.SERVICE_NAME,
@@ -60,20 +83,20 @@ class BufferService {
 		}
 	}
 
-	removeCheckFromBuffer(checkToRemove) {
+	removeCheckFromBuffer(checkToRemove: Check) {
 		try {
 			if (!checkToRemove) {
 				return false;
 			}
 
 			const index = this.buffer.findIndex((check) => {
-				if (checkToRemove._id && check._id) {
-					return check._id.toString() === checkToRemove._id.toString();
+				if (checkToRemove.id && check.id) {
+					return check.id.toString() === checkToRemove.id.toString();
 				}
 				return (
-					check.monitorId?.toString() === checkToRemove.monitorId?.toString() &&
-					check.teamId?.toString() === checkToRemove.teamId?.toString() &&
-					check.type === checkToRemove.type &&
+					check.monitorId?.toString() === checkToRemove.metadata.monitorId &&
+					check.teamId?.toString() === checkToRemove.metadata.teamId &&
+					check.type === checkToRemove.metadata.type &&
 					check.status === checkToRemove.status &&
 					check.statusCode === checkToRemove.statusCode &&
 					check.responseTime === checkToRemove.responseTime &&
@@ -87,7 +110,7 @@ class BufferService {
 			}
 
 			return false;
-		} catch (error) {
+		} catch (error: any) {
 			this.logger.error({
 				message: error.message,
 				service: this.SERVICE_NAME,
@@ -99,10 +122,13 @@ class BufferService {
 	}
 
 	scheduleNextFlush() {
+		if (this.bufferTimer) {
+			clearTimeout(this.bufferTimer);
+		}
 		this.bufferTimer = setTimeout(async () => {
 			try {
 				await this.flushBuffer();
-			} catch (error) {
+			} catch (error: any) {
 				this.logger.error({
 					message: `Error in flush cycle: ${error.message}`,
 					service: this.SERVICE_NAME,
@@ -118,9 +144,9 @@ class BufferService {
 	async flushBuffer() {
 		try {
 			if (this.buffer.length > 0) {
-				await this.db.checkModule.createChecks(this.buffer);
+				await this.checksService.createChecks(this.buffer);
 			}
-		} catch (error) {
+		} catch (error: any) {
 			this.logger.error({
 				message: error.message,
 				service: this.SERVICE_NAME,
@@ -133,7 +159,7 @@ class BufferService {
 			if (this.incidentBuffer.length > 0 && this.incidentService) {
 				await this.flushIncidentBuffer();
 			}
-		} catch (error) {
+		} catch (error: any) {
 			this.logger.error({
 				message: error.message,
 				service: this.SERVICE_NAME,
@@ -154,7 +180,7 @@ class BufferService {
 		try {
 			const itemsToProcess = [...this.incidentBuffer];
 			await this.incidentService.processIncidentsFromBuffer(itemsToProcess);
-		} catch (error) {
+		} catch (error: any) {
 			this.logger.error({
 				message: `Error flushing incident buffer: ${error.message}`,
 				service: this.SERVICE_NAME,
diff --git a/server/src/service/infrastructure/networkService.js b/server/src/service/infrastructure/networkService.ts
similarity index 65%
rename from server/src/service/infrastructure/networkService.js
rename to server/src/service/infrastructure/networkService.ts
index 2375e7233..e4e5972af 100644
--- a/server/src/service/infrastructure/networkService.js
+++ b/server/src/service/infrastructure/networkService.ts
@@ -1,10 +1,145 @@
+import { HTTPError, RequestError } from "got";
+import type { Got, Response } from "got";
+import type { Monitor, MonitorStatusResponse } from "@/types/index.js";
+
 import CacheableLookup from "cacheable-lookup";
 const SERVICE_NAME = "NetworkService";
 
-class NetworkService {
+type MonitorStatusResponseOverrides<T> = Partial<Omit<MonitorStatusResponse<T>, "monitorId" | "teamId" | "type">>;
+
+interface BuildStatusResponseArgs<T> {
+	monitor: Monitor;
+	response?: Response<T> | null;
+	error?: Error | RequestError | HTTPError | null;
+	payload?: T | null;
+	jsonPath?: string;
+	matchMethod?: MonitorStatusResponse["matchMethod"];
+	expectedValue?: string;
+	extracted?: unknown;
+	overrides?: MonitorStatusResponseOverrides<T>;
+}
+
+export interface INetworkService {
+	readonly serviceName: string;
+	requestStatus(monitor: Monitor): Promise<MonitorStatusResponse>;
+	requestWebhook(type: string, url: string, body: any): Promise<{ type: string; status: boolean; code: number; message: string; payload?: unknown }>;
+	requestPagerDuty(args: { message: string; routingKey: string; monitorUrl: string }): Promise<boolean>;
+	requestMatrix(args: { homeserverUrl: string; accessToken: string; roomId: string; message: string }): Promise<{
+		status: boolean;
+		code: number;
+		message: string;
+		payload?: unknown;
+	}>;
+}
+
+class NetworkService implements INetworkService {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	constructor({ axios, got, https, jmespath, GameDig, ping, logger, http, Docker, net, stringService, settingsService }) {
+	private TYPE_PING: string;
+	private TYPE_HTTP: string;
+	private TYPE_PAGESPEED: string;
+	private TYPE_HARDWARE: string;
+	private TYPE_DOCKER: string;
+	private TYPE_PORT: string;
+	private TYPE_GAME: string;
+	private SERVICE_NAME: string;
+	private NETWORK_ERROR: number;
+	private PING_ERROR: number;
+
+	private axios: any;
+	private got: Got;
+	private https: any;
+	private jmespath: any;
+	private GameDig: any;
+	private ping: any;
+	private logger: any;
+	private http: any;
+	private Docker: any;
+	private net: any;
+	private stringService: any;
+	private settingsService: any;
+
+	private buildStatusResponse = <T>({
+		monitor,
+		response,
+		error,
+		payload,
+		jsonPath,
+		matchMethod,
+		expectedValue,
+		extracted,
+		overrides,
+	}: BuildStatusResponseArgs<T>): MonitorStatusResponse<T> => {
+		if (error) {
+			const statusResponse: MonitorStatusResponse<T> = {
+				monitorId: monitor.id,
+				teamId: monitor.teamId,
+				type: monitor.type,
+				status: false,
+				code: this.NETWORK_ERROR,
+				message: error.message ?? "Network error",
+				responseTime: 0,
+				timings: undefined,
+				jsonPath,
+				matchMethod,
+				expectedValue,
+				extracted,
+				payload,
+			};
+			if (error instanceof HTTPError || error instanceof RequestError) {
+				statusResponse.code = error?.response?.statusCode ?? this.NETWORK_ERROR;
+				statusResponse.message = error.message;
+				statusResponse.responseTime = error.timings?.phases?.total ?? 0;
+				statusResponse.timings = error.timings;
+			}
+			return { ...statusResponse, ...(overrides ?? {}) };
+		}
+
+		return {
+			monitorId: monitor.id,
+			teamId: monitor.teamId,
+			type: monitor.type,
+			status: response?.ok ?? false,
+			code: response?.statusCode ?? this.NETWORK_ERROR,
+			message: response?.statusMessage ?? "",
+			responseTime: response?.timings?.phases?.total ?? 0,
+			timings: response?.timings,
+			payload: payload ?? response?.body,
+			jsonPath,
+			matchMethod,
+			expectedValue,
+			extracted,
+			...(overrides ?? {}),
+		};
+	};
+
+	constructor({
+		axios,
+		got,
+		https,
+		jmespath,
+		GameDig,
+		ping,
+		logger,
+		http,
+		Docker,
+		net,
+		stringService,
+		settingsService,
+	}: {
+		axios: any;
+		got: Got;
+		https: any;
+		jmespath: any;
+		GameDig: any;
+		ping: any;
+		logger: any;
+		http: any;
+		Docker: any;
+		net: any;
+		stringService: any;
+		settingsService: any;
+	}) {
 		this.TYPE_PING = "ping";
 		this.TYPE_HTTP = "http";
 		this.TYPE_PAGESPEED = "pagespeed";
@@ -17,11 +152,11 @@ class NetworkService {
 		this.PING_ERROR = 5001;
 		this.axios = axios;
 		this.https = https;
+		this.http = http;
 		this.jmespath = jmespath;
 		this.GameDig = GameDig;
 		this.ping = ping;
 		this.logger = logger;
-		this.http = http;
 		this.Docker = Docker;
 		this.net = net;
 		this.stringService = stringService;
@@ -38,13 +173,17 @@ class NetworkService {
 		});
 	}
 
+	get serviceName(): string {
+		return NetworkService.SERVICE_NAME;
+	}
+
 	// Helper functions
-	async timeRequest(operation) {
+	private async timeRequest<T>(operation: () => Promise<T>): Promise<{ response: T | null; responseTime: number; error: unknown }> {
 		const start = process.hrtime.bigint();
 		try {
 			const response = await operation();
 			const elapsedMs = Math.round(Number(process.hrtime.bigint() - start) / 1_000_000);
-			return { response, responseTime: elapsedMs };
+			return { response, responseTime: elapsedMs, error: null };
 		} catch (error) {
 			const elapsedMs = Math.round(Number(process.hrtime.bigint() - start) / 1_000_000);
 			return { response: null, responseTime: elapsedMs, error };
@@ -52,7 +191,7 @@ class NetworkService {
 	}
 
 	// Main entry point
-	async requestStatus(monitor) {
+	async requestStatus(monitor: Monitor): Promise<MonitorStatusResponse> {
 		const type = monitor?.type || "unknown";
 		switch (type) {
 			case this.TYPE_PING:
@@ -70,11 +209,11 @@ class NetworkService {
 			case this.TYPE_GAME:
 				return await this.requestGame(monitor);
 			default:
-				return await this.handleUnsupportedType(type);
+				return this.handleUnsupportedType(type);
 		}
 	}
 
-	async requestPing(monitor) {
+	private async requestPing(monitor: Monitor): Promise<MonitorStatusResponse> {
 		try {
 			if (!monitor?.url) {
 				throw new Error("Monitor URL is required");
@@ -94,44 +233,49 @@ class NetworkService {
 				throw new Error("Ping failed - no result returned");
 			}
 
-			const pingResponse = {
-				monitorId: monitor.id,
-				type: "ping",
-				status: response.alive,
-				code: 200,
-				responseTime: response.time,
-				message: "Success",
+			const pingResponse = this.buildStatusResponse({
+				monitor,
 				payload: response,
-			};
+				overrides: {
+					status: (response as { alive?: boolean })?.alive ?? false,
+					code: 200,
+					message: "Success",
+					responseTime: (response as { time?: number })?.time ?? 0,
+					payload: response,
+				},
+			});
 
 			if (error) {
 				pingResponse.status = false;
-				pingResponse.code = 200;
+				pingResponse.code = this.PING_ERROR;
 				pingResponse.message = "Ping failed";
 				return pingResponse;
 			}
 
 			return pingResponse;
-		} catch (err) {
+		} catch (err: any) {
 			err.service = this.SERVICE_NAME;
 			err.method = "requestPing";
 			throw err;
 		}
 	}
 
-	async requestHttp(monitor) {
+	private async requestHttp(monitor: Monitor): Promise<MonitorStatusResponse> {
 		const { url, secret, id, teamId, type, ignoreTlsErrors, jsonPath, matchMethod, expectedValue } = monitor;
-		const httpResponse = {
-			monitorId: id,
-			teamId: teamId,
-			type,
-		};
+		const httpResponse = this.buildStatusResponse({
+			monitor,
+			overrides: {
+				status: false,
+				code: this.NETWORK_ERROR,
+				message: "Request not executed",
+			},
+		});
 
 		try {
 			if (!url) {
 				throw new Error("Monitor URL is required");
 			}
-			const config = {
+			const config: Record<string, any> = {
 				headers: secret ? { Authorization: `Bearer ${secret}` } : undefined,
 			};
 
@@ -145,7 +289,7 @@ class NetworkService {
 
 			const response = await this.got(url, config);
 
-			let payload;
+			let payload: any;
 			const contentType = response.headers["content-type"];
 
 			if (contentType && contentType.includes("application/json")) {
@@ -158,12 +302,14 @@ class NetworkService {
 				payload = response.body;
 			}
 
-			httpResponse.code = response.statusCode;
-			httpResponse.status = response.ok;
-			httpResponse.message = response.statusMessage;
-			httpResponse.responseTime = response.timings.phases.total || 0;
-			httpResponse.payload = payload;
-			httpResponse.timings = response.timings || {};
+			Object.assign(httpResponse, {
+				code: response.statusCode,
+				status: response.ok,
+				message: response.statusMessage ?? "",
+				responseTime: response.timings.phases.total || 0,
+				payload,
+				timings: response.timings,
+			});
 
 			if (!expectedValue && !jsonPath) {
 				return httpResponse;
@@ -231,7 +377,7 @@ class NetworkService {
 				}
 			}
 			return httpResponse;
-		} catch (err) {
+		} catch (err: any) {
 			if (err.name === "HTTPError" || err.name === "RequestError") {
 				httpResponse.code = err?.response?.statusCode || this.NETWORK_ERROR;
 				httpResponse.status = false;
@@ -247,7 +393,7 @@ class NetworkService {
 		}
 	}
 
-	async requestPageSpeed(monitor) {
+	private async requestPageSpeed(monitor: Monitor): Promise<MonitorStatusResponse> {
 		try {
 			const url = monitor.url;
 			if (!url) {
@@ -269,24 +415,24 @@ class NetworkService {
 				...monitor,
 				url: pageSpeedUrl,
 			});
-		} catch (err) {
+		} catch (err: any) {
 			err.service = this.SERVICE_NAME;
 			err.method = "requestPageSpeed";
 			throw err;
 		}
 	}
 
-	async requestHardware(monitor) {
+	private async requestHardware(monitor: Monitor): Promise<MonitorStatusResponse> {
 		try {
 			return await this.requestHttp(monitor);
-		} catch (err) {
+		} catch (err: any) {
 			err.service = this.SERVICE_NAME;
 			err.method = "requestHardware";
 			throw err;
 		}
 	}
 
-	async requestDocker(monitor) {
+	private async requestDocker(monitor: Monitor): Promise<MonitorStatusResponse> {
 		try {
 			if (!monitor.url) {
 				throw new Error("Monitor URL is required");
@@ -297,10 +443,14 @@ class NetworkService {
 				handleError: true, // Enable error handling
 			});
 
-			const dockerResponse = {
-				monitorId: monitor.id,
-				type: monitor.type,
-			};
+			const dockerResponse = this.buildStatusResponse({
+				monitor,
+				overrides: {
+					status: false,
+					code: this.NETWORK_ERROR,
+					message: "No response",
+				},
+			});
 
 			const containers = await docker.listContainers({ all: true });
 
@@ -309,18 +459,18 @@ class NetworkService {
 
 			// Priority-based matching to avoid ambiguity:
 			// 1. Exact full ID match (64-char)
-			let exactIdMatch = containers.find((c) => c.Id.toLowerCase() === normalizedInput);
+			let exactIdMatch = containers.find((c: any) => c.Id.toLowerCase() === normalizedInput);
 
 			// 2. Exact container name match (case-insensitive)
-			let exactNameMatch = containers.find((c) =>
-				c.Names.some((name) => {
+			let exactNameMatch = containers.find((c: any) =>
+				c.Names.some((name: string) => {
 					const cleanName = name.replace(/^\/+/, "").toLowerCase();
 					return cleanName === normalizedInput;
 				})
 			);
 
 			// 3. Partial ID match (fallback for backwards compatibility)
-			let partialIdMatch = containers.find((c) => c.Id.toLowerCase().startsWith(normalizedInput));
+			let partialIdMatch = containers.find((c: any) => c.Id.toLowerCase().startsWith(normalizedInput));
 
 			// Select container based on priority
 			let targetContainer = exactIdMatch || exactNameMatch || partialIdMatch;
@@ -353,14 +503,15 @@ class NetworkService {
 					method: "requestDocker",
 					details: { url: monitor.url },
 				});
-				dockerResponse.status = 404;
 				dockerResponse.status = false;
 				dockerResponse.message = `Ambiguous container match for "${monitor.url}". Matched by: ${matchTypes.join(", ")}. Using ${exactIdMatch ? "exact ID" : exactNameMatch ? "exact name" : "partial ID"} match.`;
 				return dockerResponse;
 			}
 
 			const container = docker.getContainer(targetContainer.Id);
-			const { response, responseTime, error } = await this.timeRequest(() => container.inspect());
+			const { response, responseTime, error }: { response?: any; responseTime?: number; error?: any } = await this.timeRequest(() =>
+				container.inspect()
+			);
 
 			dockerResponse.responseTime = responseTime;
 			dockerResponse.status = response?.State?.Status === "running" ? true : false;
@@ -375,14 +526,14 @@ class NetworkService {
 			}
 
 			return dockerResponse;
-		} catch (err) {
+		} catch (err: any) {
 			err.service = this.SERVICE_NAME;
 			err.method = "requestDocker";
 			throw err;
 		}
 	}
 
-	async requestPort(monitor) {
+	private async requestPort(monitor: Monitor): Promise<MonitorStatusResponse> {
 		try {
 			const { url, port } = monitor;
 			const { response, responseTime, error } = await this.timeRequest(async () => {
@@ -405,21 +556,22 @@ class NetworkService {
 						reject(new Error("Connection timeout"));
 					});
 
-					socket.on("error", (err) => {
+					socket.on("error", (err: any) => {
 						socket.destroy();
 						reject(err);
 					});
 				});
 			});
 
-			const portResponse = {
-				code: 200,
-				status: response.success,
-				message: this.stringService.portSuccess,
-				monitorId: monitor.id,
-				type: monitor.type,
-				responseTime: responseTime,
-			};
+			const portResponse = this.buildStatusResponse({
+				monitor,
+				overrides: {
+					code: 200,
+					status: (response as { success?: boolean })?.success ?? false,
+					message: this.stringService.portSuccess,
+					responseTime,
+				},
+			});
 
 			if (error) {
 				portResponse.code = this.NETWORK_ERROR;
@@ -429,30 +581,31 @@ class NetworkService {
 			}
 
 			return portResponse;
-		} catch (error) {
+		} catch (error: any) {
 			error.service = this.SERVICE_NAME;
 			error.method = "requestTCP";
 			throw error;
 		}
 	}
 
-	async requestGame(monitor) {
+	private async requestGame(monitor: Monitor): Promise<MonitorStatusResponse> {
 		try {
 			const { url, port, gameId } = monitor;
 
-			const gameResponse = {
-				code: 200,
-				status: true,
-				message: "Success",
-				monitorId: monitor.id,
-				type: "game",
-			};
+			const gameResponse = this.buildStatusResponse({
+				monitor,
+				overrides: {
+					code: 200,
+					status: true,
+					message: "Success",
+				},
+			});
 
 			const state = await this.GameDig.query({
 				type: gameId,
 				host: url,
 				port: port,
-			}).catch((error) => {
+			}).catch((error: any) => {
 				this.logger.warn({
 					message: error.message,
 					service: this.SERVICE_NAME,
@@ -471,21 +624,25 @@ class NetworkService {
 			gameResponse.responseTime = state.ping;
 			gameResponse.payload = state;
 			return gameResponse;
-		} catch (error) {
+		} catch (error: any) {
 			error.service = this.SERVICE_NAME;
 			error.method = "requestPing";
 			throw error;
 		}
 	}
-	async handleUnsupportedType(type) {
-		const err = new Error(`Unsupported type: ${type}`);
-		err.service = this.SERVICE_NAME;
-		err.method = "getStatus";
-		throw err;
+	private async handleUnsupportedType(type: string): Promise<MonitorStatusResponse> {
+		return {
+			monitorId: "unknown",
+			teamId: "unknown",
+			type: "unknown",
+			status: false,
+			code: this.NETWORK_ERROR,
+			message: `Unsupported type: ${type}`,
+		};
 	}
 
 	// Other network requests unrelated to monitoring:
-	async requestWebhook(type, url, body) {
+	async requestWebhook(type: string, url: string, body: any) {
 		try {
 			const response = await this.axios.post(url, body, {
 				headers: {
@@ -500,7 +657,7 @@ class NetworkService {
 				message: `Successfully sent ${type} notification`,
 				payload: response.data,
 			};
-		} catch (error) {
+		} catch (error: any) {
 			this.logger.warn({
 				message: error.message,
 				service: this.SERVICE_NAME,
@@ -517,7 +674,7 @@ class NetworkService {
 		}
 	}
 
-	async requestPagerDuty({ message, routingKey, monitorUrl }) {
+	async requestPagerDuty({ message, routingKey, monitorUrl }: { message: string; routingKey: string; monitorUrl: string }) {
 		try {
 			const response = await this.axios.post(`https://events.pagerduty.com/v2/enqueue`, {
 				routing_key: routingKey,
@@ -532,7 +689,7 @@ class NetworkService {
 
 			if (response?.data?.status !== "success") return false;
 			return true;
-		} catch (error) {
+		} catch (error: any) {
 			error.details = error.response?.data;
 			error.service = this.SERVICE_NAME;
 			error.method = "requestPagerDuty";
@@ -540,7 +697,17 @@ class NetworkService {
 		}
 	}
 
-	async requestMatrix({ homeserverUrl, accessToken, roomId, message }) {
+	async requestMatrix({
+		homeserverUrl,
+		accessToken,
+		roomId,
+		message,
+	}: {
+		homeserverUrl: string;
+		accessToken: string;
+		roomId: string;
+		message: string;
+	}) {
 		try {
 			const url = `${homeserverUrl}/_matrix/client/v3/rooms/${roomId}/send/m.room.message?access_token=${accessToken}`;
 			const body = {
@@ -560,7 +727,7 @@ class NetworkService {
 				code: response.status,
 				message: "Successfully sent Matrix notification",
 			};
-		} catch (error) {
+		} catch (error: any) {
 			this.logger.warn({
 				message: error.message,
 				service: this.SERVICE_NAME,
diff --git a/server/src/service/infrastructure/statusService.js b/server/src/service/infrastructure/statusService.ts
similarity index 56%
rename from server/src/service/infrastructure/statusService.js
rename to server/src/service/infrastructure/statusService.ts
index 763b6d1fa..7d34017a5 100755
--- a/server/src/service/infrastructure/statusService.js
+++ b/server/src/service/infrastructure/statusService.ts
@@ -1,11 +1,38 @@
+import { IMonitorsRepository } from "@/repositories/index.js";
 import MonitorStats from "../../db/models/MonitorStats.js";
 import { CheckModel } from "@/db/models/index.js";
+import type {
+	CheckErrorInfo,
+	Monitor,
+	MonitorStatusResponse,
+	StatusChangeResult,
+	Check,
+	HardwareStatusPayload,
+	PageSpeedStatusPayload,
+} from "@/types/index.js";
 const SERVICE_NAME = "StatusService";
 
 class StatusService {
 	static SERVICE_NAME = SERVICE_NAME;
+	private db: any;
+	private logger: any;
+	private buffer: any;
+	private incidentService: any;
+	private monitorsRepository: IMonitorsRepository;
 
-	constructor({ db, logger, buffer, incidentService, monitorsRepository }) {
+	constructor({
+		db,
+		logger,
+		buffer,
+		incidentService,
+		monitorsRepository,
+	}: {
+		db: any;
+		logger: any;
+		buffer: any;
+		incidentService: any;
+		monitorsRepository: IMonitorsRepository;
+	}) {
 		this.db = db;
 		this.logger = logger;
 		this.buffer = buffer;
@@ -17,7 +44,7 @@ class StatusService {
 		return StatusService.SERVICE_NAME;
 	}
 
-	async updateRunningStats({ monitor, networkResponse }) {
+	async updateRunningStats({ monitor, networkResponse }: { monitor: Monitor; networkResponse: any }) {
 		try {
 			const monitorId = monitor.id;
 			const { responseTime, status } = networkResponse;
@@ -78,9 +105,9 @@ class StatusService {
 
 			await stats.save();
 			return true;
-		} catch (error) {
+		} catch (error: any) {
 			this.logger.error({
-				service: this.SERVICE_NAME,
+				service: SERVICE_NAME,
 				message: error.message,
 				method: "updateRunningStats",
 				stack: error.stack,
@@ -89,23 +116,13 @@ class StatusService {
 		}
 	}
 
-	getStatusString = (status) => {
+	getStatusString = (status: boolean | undefined) => {
 		if (status === true) return "up";
 		if (status === false) return "down";
 		return "unknown";
 	};
 
-	/**
-	 * Saves check if needed and adds to incident buffer
-	 * Removes check from checks buffer if it was saved immediately
-	 *
-	 * @param {Object} check - The check object
-	 * @param {Object} monitor - The monitor object
-	 * @param {string} action - The incident action ("create" or "resolve")
-	 * @param {string} errorContext - Context for error messages
-	 * @returns {Promise<void>}
-	 */
-	handleIncidentForCheck = async (check, monitor, action, errorContext = "incident handling") => {
+	handleIncidentForCheck = async (check: any, monitor: Monitor, action: any, errorContext = "incident handling") => {
 		try {
 			let savedCheck = check;
 
@@ -115,9 +132,9 @@ class StatusService {
 					savedCheck = await checkModel.save();
 
 					this.buffer.removeCheckFromBuffer(check);
-				} catch (checkError) {
+				} catch (checkError: any) {
 					this.logger.error({
-						service: this.SERVICE_NAME,
+						service: SERVICE_NAME,
 						method: "handleIncidentForCheck",
 						message: `Failed to save check immediately for ${errorContext}: ${checkError.message}`,
 						monitorId: monitor.id,
@@ -130,9 +147,9 @@ class StatusService {
 			if (savedCheck && savedCheck._id) {
 				try {
 					this.buffer.addIncidentToBuffer({ monitor, check: savedCheck, action });
-				} catch (incidentError) {
+				} catch (incidentError: any) {
 					this.logger.error({
-						service: this.SERVICE_NAME,
+						service: SERVICE_NAME,
 						method: "handleIncidentForCheck",
 						message: `Failed to add incident to buffer for ${errorContext}: ${incidentError.message}`,
 						monitorId: monitor.id,
@@ -141,9 +158,9 @@ class StatusService {
 					});
 				}
 			}
-		} catch (error) {
+		} catch (error: any) {
 			this.logger.error({
-				service: this.SERVICE_NAME,
+				service: SERVICE_NAME,
 				method: "handleIncidentForCheck",
 				message: `Error in ${errorContext}: ${error.message}`,
 				monitorId: monitor?.id,
@@ -151,27 +168,17 @@ class StatusService {
 			});
 		}
 	};
-	/**
-	 * Updates the status of a monitor based on the network response.
-	 *
-	 * @param {Object} networkResponse - The network response containing monitorId and status.
-	 * @param {string} networkResponse.monitorId - The ID of the monitor.
-	 * @param {string} networkResponse.status - The new status of the monitor.
-	 * @returns {Promise<Object>} - A promise that resolves to an object containinfg the monitor, statusChanged flag, and previous status if the status changed, or false if an error occurred.
-	 * @returns {Promise<Object>} returnObject - The object returned by the function.
-	 * @returns {Object} returnObject.monitor - The monitor object.
-	 * @returns {boolean} returnObject.statusChanged - Flag indicating if the status has changed.
-	 * @returns {boolean} returnObject.prevStatus - The previous status of the monitor
-	 */
-	updateStatus = async (networkResponse) => {
-		const check = this.buildCheck(networkResponse);
-		await this.insertCheck(check);
+
+	updateMonitorStatus = async (
+		statusResponse: MonitorStatusResponse<PageSpeedStatusPayload | HardwareStatusPayload | undefined>,
+		check: Check
+	): Promise<StatusChangeResult> => {
 		try {
-			const { monitorId, teamId, status, code } = networkResponse;
+			const { monitorId, teamId, status, code } = statusResponse;
 			const monitor = await this.monitorsRepository.findById(monitorId, teamId);
 
 			// Update running stats
-			this.updateRunningStats({ monitor, networkResponse });
+			this.updateRunningStats({ monitor, networkResponse: statusResponse });
 
 			// If the status window size has changed, empty
 			while (monitor.statusWindow.length > monitor.statusWindowSize) {
@@ -221,7 +228,7 @@ class StatusService {
 
 			if (statusChanged) {
 				this.logger.info({
-					service: this.SERVICE_NAME,
+					service: SERVICE_NAME,
 					message: `${monitor.name} went from ${this.getStatusString(prevStatus)} to ${this.getStatusString(newStatus)}`,
 					prevStatus,
 					newStatus,
@@ -242,7 +249,7 @@ class StatusService {
 
 					if (lastManuallyResolvedIncident && lastManuallyResolvedIncident.endTime) {
 						try {
-							const checksAfterResolution = await Check.find({
+							const checksAfterResolution = await CheckModel.find({
 								monitorId: monitor.id,
 								createdAt: { $gt: lastManuallyResolvedIncident.endTime },
 							})
@@ -258,9 +265,9 @@ class StatusService {
 							} else {
 								calculatedFailureRate = 0;
 							}
-						} catch (checkQueryError) {
+						} catch (checkQueryError: any) {
 							this.logger.error({
-								service: this.SERVICE_NAME,
+								service: SERVICE_NAME,
 								method: "updateStatus",
 								message: `Failed to query checks after manual resolution: ${checkQueryError.message}`,
 								monitorId: monitor.id,
@@ -272,9 +279,9 @@ class StatusService {
 					if (calculatedFailureRate >= monitor.statusWindowThreshold) {
 						await this.handleIncidentForCheck(check, monitor, "create", "threshold check without status change");
 					}
-				} catch (error) {
+				} catch (error: any) {
 					this.logger.error({
-						service: this.SERVICE_NAME,
+						service: SERVICE_NAME,
 						method: "updateStatus",
 						message: `Error handling threshold check without status change: ${error.message}`,
 						monitorId: monitor.id,
@@ -293,147 +300,31 @@ class StatusService {
 				code,
 				timestamp: new Date().getTime(),
 			};
-		} catch (error) {
-			error.service = this.SERVICE_NAME;
+		} catch (error: any) {
+			error.service = SERVICE_NAME;
 			error.method = "updateStatus";
 			throw error;
 		}
 	};
 
-	/**
-	 * Builds a check object from the network response.
-	 *
-	 * @param {Object} networkResponse - The network response object.
-	 * @param {string} networkResponse.monitorId - The monitor ID.
-	 * @param {string} networkResponse.type - The type of the response.
-	 * @param {string} networkResponse.status - The status of the response.
-	 * @param {number} networkResponse.responseTime - The response time.
-	 * @param {number} networkResponse.code - The status code.
-	 * @param {string} networkResponse.message - The message.
-	 * @param {Object} networkResponse.payload - The payload of the response.
-	 * @returns {Object} The check object.
-	 */
-	buildCheck = (networkResponse) => {
-		const {
-			monitorId,
-			teamId,
-			type,
-			status,
-			responseTime,
-			code,
-			message,
-			payload,
-			first_byte_took,
-			body_read_took,
-			dns_took,
-			conn_took,
-			connect_took,
-			tls_took,
-			timings,
-		} = networkResponse;
-
-		const check = {
-			metadata: {
-				monitorId,
-				teamId,
-				type,
-			},
-			status,
-			statusCode: code,
-			responseTime,
-			timings: timings || {},
-			message,
-			first_byte_took,
-			body_read_took,
-			dns_took,
-			conn_took,
-			connect_took,
-			tls_took,
-		};
-
-		if (type === "pagespeed") {
-			if (typeof payload === "undefined") {
-				this.logger.warn({
-					message: "Failed to build check",
-					service: this.SERVICE_NAME,
-					method: "buildCheck",
-					details: "empty payload",
-				});
-				return undefined;
-			}
-			const categories = payload?.lighthouseResult?.categories ?? {};
-			const audits = payload?.lighthouseResult?.audits ?? {};
-			const mapAudit = (audit) => {
-				if (!audit || typeof audit !== "object") {
-					return undefined;
-				}
-				return {
-					id: audit.id,
-					title: audit.title,
-					score: typeof audit.score === "number" ? audit.score : (audit.score ?? null),
-					displayValue: audit.displayValue,
-					numericValue: typeof audit.numericValue === "number" ? audit.numericValue : undefined,
-					numericUnit: audit.numericUnit,
-				};
-			};
-			check.accessibility = (categories?.accessibility?.score || 0) * 100;
-			check.bestPractices = (categories?.["best-practices"]?.score || 0) * 100;
-			check.seo = (categories?.seo?.score || 0) * 100;
-			check.performance = (categories?.performance?.score || 0) * 100;
-			check.audits = {
-				cls: mapAudit(audits?.["cumulative-layout-shift"]),
-				si: mapAudit(audits?.["speed-index"]),
-				fcp: mapAudit(audits?.["first-contentful-paint"]),
-				lcp: mapAudit(audits?.["largest-contentful-paint"]),
-				tbt: mapAudit(audits?.["total-blocking-time"]),
-			};
-		}
-
-		if (type === "hardware") {
-			const { cpu, memory, disk, host, net } = payload?.data ?? {};
-			const { errors } = payload?.errors ?? [];
-			check.cpu = cpu ?? {};
-			check.memory = memory ?? {};
-			check.disk = disk ?? {};
-			check.host = host ?? {};
-			check.errors = errors ?? [];
-			check.capture = payload?.capture ?? {};
-			check.net = net ?? {};
-		}
-		return check;
-	};
-
-	/**
-	 * Inserts a check into the database based on the network response.
-	 *
-	 * @param {Object} networkResponse - The network response object.
-	 * @param {string} networkResponse.monitorId - The monitor ID.
-	 * @param {string} networkResponse.type - The type of the response.
-	 * @param {string} networkResponse.status - The status of the response.
-	 * @param {number} networkResponse.responseTime - The response time.
-	 * @param {number} networkResponse.code - The status code.
-	 * @param {string} networkResponse.message - The message.
-	 * @param {Object} networkResponse.payload - The payload of the response.
-	 * @returns {Promise<void>} A promise that resolves when the check is inserted.
-	 */
-	insertCheck = async (check) => {
+	insertCheck = async (check: Check) => {
 		try {
 			if (typeof check === "undefined") {
 				this.logger.warn({
 					message: "Failed to build check",
-					service: this.SERVICE_NAME,
+					service: SERVICE_NAME,
 					method: "insertCheck",
 				});
 				return false;
 			}
 			this.buffer.addToBuffer({ check });
 			return true;
-		} catch (error) {
+		} catch (error: any) {
 			this.logger.error({
 				message: error.message,
-				service: error.service || this.SERVICE_NAME,
+				service: error.service || SERVICE_NAME,
 				method: error.method || "insertCheck",
-				details: error.details || `Error inserting check for monitor: ${check?.monitorId}`,
+				details: error.details || `Error inserting check for monitor: ${check?.metadata.monitorId}`,
 				stack: error.stack,
 			});
 		}
diff --git a/server/src/types/check.ts b/server/src/types/check.ts
index 28353497e..96c6f6e7f 100644
--- a/server/src/types/check.ts
+++ b/server/src/types/check.ts
@@ -1,4 +1,6 @@
 import type { MonitorType } from "@/types/index.js";
+import type { Response } from "got";
+export type GotTimings = Response["timings"];
 
 export interface CheckMetadata {
 	monitorId: string;
@@ -6,64 +8,41 @@ export interface CheckMetadata {
 	type: MonitorType;
 }
 
-export interface CheckTimingPhases {
-	wait: number;
-	dns: number;
-	tcp: number;
-	tls: number;
-	request: number;
-	firstByte: number;
-	download: number;
-	total: number;
-}
-
-export interface CheckTimings {
-	start: number;
-	socket: number;
-	lookup: number;
-	connect: number;
-	secureConnect: number;
-	upload: number;
-	response: number;
-	end: number;
-	phases: CheckTimingPhases;
-}
-
 export interface CheckCpuInfo {
-	physical_core: number;
-	logical_core: number;
-	frequency: number;
-	temperature: number[];
-	free_percent: number;
-	usage_percent: number;
+	physical_core?: number;
+	logical_core?: number;
+	frequency?: number;
+	temperature?: number[];
+	free_percent?: number;
+	usage_percent?: number;
 }
 
 export interface CheckMemoryInfo {
-	total_bytes: number;
-	available_bytes: number;
-	used_bytes: number;
-	usage_percent: number;
+	total_bytes?: number;
+	available_bytes?: number;
+	used_bytes?: number;
+	usage_percent?: number;
 }
 
 export interface CheckHostInfo {
-	os: string;
-	platform: string;
-	kernel_version: string;
+	os?: string;
+	platform?: string;
+	kernel_version?: string;
 }
 
 export interface CheckCaptureInfo {
-	version: string;
-	mode: string;
+	version?: string;
+	mode?: string;
 }
 
 export interface CheckDiskInfo {
-	device: string;
-	mountpoint: string;
-	read_speed_bytes: number;
-	write_speed_bytes: number;
-	total_bytes: number;
-	free_bytes: number;
-	usage_percent: number;
+	device?: string;
+	mountpoint?: string;
+	read_speed_bytes?: number;
+	write_speed_bytes?: number;
+	total_bytes?: number;
+	free_bytes?: number;
+	usage_percent?: number;
 }
 
 export interface CheckErrorInfo {
@@ -86,11 +65,11 @@ export interface CheckNetworkInterfaceInfo {
 }
 
 export interface CheckAudits {
-	cls: ILighthouseAudit;
-	si: ILighthouseAudit;
-	fcp: ILighthouseAudit;
-	lcp: ILighthouseAudit;
-	tbt: ILighthouseAudit;
+	cls?: ILighthouseAudit;
+	si?: ILighthouseAudit;
+	fcp?: ILighthouseAudit;
+	lcp?: ILighthouseAudit;
+	tbt?: ILighthouseAudit;
 }
 
 export interface ILighthouseAudit {
@@ -107,19 +86,19 @@ export interface Check {
 	metadata: CheckMetadata;
 	status: boolean;
 	responseTime: number;
-	timings: CheckTimings;
+	timings?: GotTimings;
 	statusCode: number;
 	message: string;
 	ack: boolean;
 	ackAt?: string | null;
 	expiry: string;
-	cpu: CheckCpuInfo;
-	memory: CheckMemoryInfo;
-	disk: CheckDiskInfo[];
-	host: CheckHostInfo;
-	errors: CheckErrorInfo[];
-	capture: CheckCaptureInfo;
-	net: CheckNetworkInterfaceInfo[];
+	cpu?: CheckCpuInfo;
+	memory?: CheckMemoryInfo;
+	disk?: CheckDiskInfo[];
+	host?: CheckHostInfo;
+	errors?: CheckErrorInfo[];
+	capture?: CheckCaptureInfo;
+	net?: CheckNetworkInterfaceInfo[];
 	accessibility?: number;
 	bestPractices?: number;
 	seo?: number;
diff --git a/server/src/types/index.ts b/server/src/types/index.ts
index 81620da03..4f71788f2 100644
--- a/server/src/types/index.ts
+++ b/server/src/types/index.ts
@@ -2,3 +2,4 @@ export * from "@/types/check.js";
 export * from "@/types/monitor.js";
 export * from "@/types/monitorStats.js";
 export * from "@/types/statusPage.js";
+export * from "@/types/network.js";
diff --git a/server/src/types/monitor.ts b/server/src/types/monitor.ts
index 4c8dc7528..dc3bd8c09 100644
--- a/server/src/types/monitor.ts
+++ b/server/src/types/monitor.ts
@@ -1,4 +1,4 @@
-export const MonitorTypes = ["http", "ping", "pagespeed", "hardware", "docker", "port", "game"] as const;
+export const MonitorTypes = ["http", "ping", "pagespeed", "hardware", "docker", "port", "game", "unknown"] as const;
 export type MonitorType = (typeof MonitorTypes)[number];
 
 export interface MonitorThresholds {
diff --git a/server/src/types/network.ts b/server/src/types/network.ts
new file mode 100644
index 000000000..10f89842f
--- /dev/null
+++ b/server/src/types/network.ts
@@ -0,0 +1,112 @@
+import type {
+	CheckCaptureInfo,
+	CheckCpuInfo,
+	CheckDiskInfo,
+	CheckErrorInfo,
+	CheckHostInfo,
+	CheckMemoryInfo,
+	CheckNetworkInterfaceInfo,
+	GotTimings,
+	ILighthouseAudit,
+	Monitor,
+	MonitorMatchMethod,
+	MonitorType,
+} from "@/types/index.js";
+
+export interface MonitorStatusResponse<T = unknown> {
+	monitorId: string;
+	teamId: string;
+	type: MonitorType;
+	status: boolean;
+	code: number;
+	message: string;
+	responseTime?: number;
+	payload?: T | null;
+	timings?: GotTimings;
+	first_byte_took?: number;
+	body_read_took?: number;
+	dns_took?: number;
+	conn_took?: number;
+	connect_took?: number;
+	tls_took?: number;
+	jsonPath?: string;
+	matchMethod?: MonitorMatchMethod;
+	expectedValue?: string;
+	extracted?: unknown;
+}
+
+export interface PingStatusPayload {
+	host: string;
+	numeric_host?: string;
+	alive: boolean;
+	time: number;
+	times?: number[];
+	output?: string;
+	min?: string;
+	max?: string;
+	avg?: string;
+	stddev?: string;
+	packetLoss?: string;
+}
+
+export type HttpStatusPayload = unknown;
+
+export interface PageSpeedCategoryScore {
+	score?: number | null;
+}
+
+export interface PageSpeedStatusPayload {
+	lighthouseResult?: {
+		categories?: {
+			accessibility?: PageSpeedCategoryScore;
+			"best-practices"?: PageSpeedCategoryScore;
+			performance?: PageSpeedCategoryScore;
+			seo?: PageSpeedCategoryScore;
+			[key: string]: PageSpeedCategoryScore | undefined;
+		};
+		audits?: Record<string, ILighthouseAudit | undefined>;
+	};
+	[key: string]: unknown;
+}
+
+export interface HardwareStatusMetrics {
+	cpu?: CheckCpuInfo;
+	memory?: CheckMemoryInfo;
+	disk?: CheckDiskInfo[];
+	host?: CheckHostInfo;
+	net?: CheckNetworkInterfaceInfo[];
+}
+
+export interface HardwareStatusPayload {
+	data?: HardwareStatusMetrics;
+	errors?: CheckErrorInfo[] | { errors?: CheckErrorInfo[] };
+	capture?: CheckCaptureInfo;
+	[key: string]: unknown;
+}
+
+export type DockerStatusPayload = Record<string, unknown>;
+
+export interface PortStatusPayload {
+	success: boolean;
+}
+
+export type GameStatusPayload = Record<string, unknown>;
+
+export interface MonitorPayloadMap {
+	ping: PingStatusPayload;
+	http: HttpStatusPayload;
+	pagespeed: PageSpeedStatusPayload;
+	hardware: HardwareStatusPayload;
+	docker: DockerStatusPayload;
+	port: PortStatusPayload;
+	game: GameStatusPayload;
+	default: unknown;
+}
+
+export type StatusChangeResult = {
+	monitor: Monitor;
+	statusChanged: boolean;
+	prevStatus: boolean | undefined;
+	code: number;
+	timestamp: number;
+};
diff --git a/server/test/superSimpleQueueHelper.test.ts b/server/test/superSimpleQueueHelper.test.ts
new file mode 100644
index 000000000..19caef876
--- /dev/null
+++ b/server/test/superSimpleQueueHelper.test.ts
@@ -0,0 +1,102 @@
+import { describe, expect, it, jest } from "@jest/globals";
+import SuperSimpleQueueHelper from "../src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.ts";
+import type { Monitor } from "../src/types/monitor.ts";
+
+const createLogger = () => ({ info: jest.fn(), error: jest.fn(), warn: jest.fn(), debug: jest.fn() });
+
+const createHelper = (overrides?: Partial<ConstructorParameters<typeof SuperSimpleQueueHelper>[0]>) => {
+	const maintenanceWindowModule = {
+		getMaintenanceWindowsByMonitorId: jest.fn().mockResolvedValue([]),
+	};
+	const statusServiceMock = {
+		updateMonitorStatus: jest.fn().mockResolvedValue({ monitor: { id: "m1" }, statusChanged: true, prevStatus: false }),
+	};
+	const helper = new SuperSimpleQueueHelper({
+		db: { maintenanceWindowModule },
+		logger: createLogger(),
+		networkService: { requestStatus: jest.fn() },
+		statusService: statusServiceMock,
+		notificationService: { handleNotifications: jest.fn().mockResolvedValue(undefined) },
+		...overrides,
+	});
+	return { helper, maintenanceWindowModule };
+};
+
+describe("SuperSimpleQueueHelper", () => {
+	describe("getMonitorJob", () => {
+		it("skips execution when monitor is in maintenance window", async () => {
+			const { helper } = createHelper();
+			const spy = jest.spyOn(helper, "isInMaintenanceWindow").mockResolvedValue(true);
+			const job = helper.getMonitorJob();
+			await job({ id: "m1", teamId: "team", interval: 60000 } as Monitor);
+			expect(helper["networkService"].requestStatus).not.toHaveBeenCalled();
+			expect(helper["logger"].debug).toHaveBeenCalledWith(
+				expect.objectContaining({ message: expect.stringContaining("Monitor m1 is in maintenance window") })
+			);
+			spy.mockRestore();
+		});
+
+		it("processes monitor status and notifications when active", async () => {
+			const networkResponse = { monitor: { id: "m1" }, status: true };
+			const updatedMonitor = { id: "m1", status: true };
+			const { helper } = createHelper({
+				networkService: { requestStatus: jest.fn().mockResolvedValue(networkResponse) },
+				statusService: {
+					updateMonitorStatus: jest.fn().mockResolvedValue({ monitor: updatedMonitor, statusChanged: true, prevStatus: false }),
+				},
+				notificationService: { handleNotifications: jest.fn().mockResolvedValue(undefined) },
+			});
+			jest.spyOn(helper, "isInMaintenanceWindow").mockResolvedValue(false);
+			const job = helper.getMonitorJob();
+			const monitor = { id: "m1", teamId: "team" } as Monitor;
+			await job(monitor);
+			expect(helper["networkService"].requestStatus).toHaveBeenCalledWith(monitor);
+			expect(helper["statusService"].updateMonitorStatus).toHaveBeenCalledWith(networkResponse);
+			expect(helper["notificationService"].handleNotifications).toHaveBeenCalledWith(
+				expect.objectContaining({ monitor: updatedMonitor, statusChanged: true, prevStatus: false })
+			);
+		});
+
+		it("throws when monitor id is missing", async () => {
+			const { helper } = createHelper();
+			const job = helper.getMonitorJob();
+			await expect(job({} as Monitor)).rejects.toThrow("No monitor id");
+			expect(helper["logger"].warn).toHaveBeenCalled();
+		});
+	});
+
+	describe("isInMaintenanceWindow", () => {
+		it("returns true when an active window spans now", async () => {
+			const now = new Date();
+			const { helper, maintenanceWindowModule } = createHelper();
+			maintenanceWindowModule.getMaintenanceWindowsByMonitorId.mockResolvedValue([
+				{
+					active: true,
+					start: new Date(now.getTime() - 1000).toISOString(),
+					end: new Date(now.getTime() + 1000).toISOString(),
+					repeat: 0,
+				},
+			]);
+			await expect(helper.isInMaintenanceWindow("m1", "team")).resolves.toBe(true);
+		});
+
+		it("returns true when repeat interval advances window into current time", async () => {
+			const now = Date.now();
+			const { helper, maintenanceWindowModule } = createHelper();
+			maintenanceWindowModule.getMaintenanceWindowsByMonitorId.mockResolvedValue([
+				{
+					active: true,
+					start: new Date(now - 7200000).toISOString(),
+					end: new Date(now - 6600000).toISOString(),
+					repeat: 3600000,
+				},
+			]);
+			await expect(helper.isInMaintenanceWindow("m1", "team")).resolves.toBe(true);
+		});
+
+		it("returns false when no active windows exist", async () => {
+			const { helper } = createHelper();
+			await expect(helper.isInMaintenanceWindow("m1", "team")).resolves.toBe(false);
+		});
+	});
+});
diff --git a/server/tsconfig.jest.json b/server/tsconfig.jest.json
index 928b0977c..80c321cf6 100644
--- a/server/tsconfig.jest.json
+++ b/server/tsconfig.jest.json
@@ -3,7 +3,8 @@
 	"compilerOptions": {
 		"rootDir": ".",
 		"types": ["jest"],
-		"noEmit": true
+		"noEmit": true,
+		"resolveJsonModule": true
 	},
 	"include": ["src", "test"]
 }
diff --git a/server/tsconfig.json b/server/tsconfig.json
index cbb874656..bdb3a7b0e 100644
--- a/server/tsconfig.json
+++ b/server/tsconfig.json
@@ -4,7 +4,7 @@
 		"allowJs": true,
 		"checkJs": false,
 		"paths": {
-			"@/*": ["./src/*"] // allows "@/db" -> "./src/db"
+			"@/*": ["./src/*"]
 		},
 		"outDir": "./dist",
 		"strict": true,