diff --git a/client/src/Components/inputs/Radio.tsx b/client/src/Components/inputs/Radio.tsx
index ad8dc3374..01e968188 100644
--- a/client/src/Components/inputs/Radio.tsx
+++ b/client/src/Components/inputs/Radio.tsx
@@ -1,52 +1,13 @@
 import Radio from "@mui/material/Radio";
 import type { RadioProps } from "@mui/material/Radio";
 import { useTheme } from "@mui/material/styles";
-import { Circle, CircleDot } from "lucide-react";
 import FormControlLabel from "@mui/material/FormControlLabel";
 import Typography from "@mui/material/Typography";
 
 interface RadioInputProps extends RadioProps {}
 
 export const RadioInput = ({ ...props }: RadioInputProps) => {
-	const theme = useTheme();
-	return (
-		<Radio
-			{...props}
-			icon={
-				<Circle
-					size={16}
-					strokeWidth={1.5}
-				/>
-			}
-			checkedIcon={
-				<CircleDot
-					size={14}
-					strokeWidth={1.5}
-				/>
-			}
-			sx={{
-				padding: 0,
-				mt: theme.spacing(0.5),
-				color: theme.palette.text.secondary,
-				"&.Mui-checked": {
-					color: theme.palette.primary.main,
-					"& svg circle": {
-						fill: theme.palette.primary.main,
-					},
-				},
-				"& .MuiSvgIcon-root": {
-					fontSize: 16,
-				},
-				"& svg": {
-					stroke: "currentColor",
-				},
-				"& svg path, & svg line, & svg polyline, & svg rect, & svg circle": {
-					stroke: "currentColor",
-					fill: "none",
-				},
-			}}
-		/>
-	);
+	return <Radio {...props} />;
 };
 
 export const RadioWithDescription = ({
@@ -79,7 +40,6 @@ export const RadioWithDescription = ({
 					backgroundColor: theme.palette.background.paper,
 				},
 				"& .MuiButtonBase-root": {
-					p: 0,
 					mr: theme.spacing(6),
 				},
 			}}
diff --git a/client/src/Utils/Theme/Theme.ts b/client/src/Utils/Theme/Theme.ts
index bd175e8d1..806cfd4f9 100644
--- a/client/src/Utils/Theme/Theme.ts
+++ b/client/src/Utils/Theme/Theme.ts
@@ -151,6 +151,113 @@ export const theme = (mode: string, palette: any) =>
 					},
 				},
 			},
+
+			MuiSwitch: {
+				defaultProps: { disableRipple: true },
+				styleOverrides: {
+					root: {
+						width: 36,
+						height: 20,
+						padding: "0 6px 0 0",
+						boxSizing: "content-box",
+						overflow: "visible",
+					},
+					switchBase: ({ theme }) => ({
+						padding: 2,
+						"&.Mui-checked": {
+							transform: "translateX(16px)",
+							color: "#fff",
+							"& + .MuiSwitch-track": {
+								backgroundColor: theme.palette.primary.main,
+								opacity: 1,
+								border: 0,
+							},
+						},
+					}),
+					thumb: {
+						width: 16,
+						height: 16,
+						boxShadow: "0 1px 2px rgba(16, 24, 40, 0.1)",
+					},
+					track: ({ theme }) => ({
+						borderRadius: 999,
+						backgroundColor:
+							theme.palette.mode === "dark"
+								? "rgba(255,255,255,0.16)"
+								: theme.palette.action.disabledBackground,
+						opacity: 1,
+					}),
+				},
+			},
+
+			MuiRadio: {
+				defaultProps: { disableRipple: true },
+				styleOverrides: {
+					root: ({ theme }) => ({
+						padding: theme.spacing(2),
+						color: theme.palette.divider,
+						"& .MuiSvgIcon-root": {
+							fontSize: 20,
+							transition: "none",
+						},
+						"&.Mui-checked": {
+							color: theme.palette.primary.main,
+						},
+						"&.Mui-checked .MuiSvgIcon-root:last-of-type": {
+							transform: "scale(0.6)",
+						},
+					}),
+				},
+			},
+
+			MuiSlider: {
+				styleOverrides: {
+					root: ({ theme }) => ({
+						height: 4,
+						padding: "13px 0",
+						color: theme.palette.primary.main,
+					}),
+					rail: ({ theme }) => ({
+						height: 4,
+						borderRadius: 999,
+						opacity: 1,
+						backgroundColor:
+							theme.palette.mode === "dark"
+								? "rgba(255,255,255,0.16)"
+								: theme.palette.action.disabledBackground,
+					}),
+					track: {
+						height: 4,
+						borderRadius: 999,
+						border: "none",
+					},
+					thumb: ({ theme }) => ({
+						width: 18,
+						height: 18,
+						backgroundColor: theme.palette.background.paper,
+						border: `2px solid ${theme.palette.primary.main}`,
+						boxShadow: "0 1px 2px rgba(16, 24, 40, 0.1)",
+						"&:hover, &.Mui-focusVisible": {
+							boxShadow: `0 0 0 6px ${theme.palette.primary.main}1f`,
+						},
+						"&.Mui-active": {
+							boxShadow: `0 0 0 8px ${theme.palette.primary.main}29`,
+						},
+						"&::before": { display: "none" },
+					}),
+					mark: ({ theme }) => ({
+						width: 2,
+						height: 2,
+						borderRadius: 999,
+						backgroundColor: theme.palette.text.disabled,
+						opacity: 0.5,
+					}),
+					markActive: ({ theme }) => ({
+						backgroundColor: theme.palette.primary.main,
+						opacity: 0.5,
+					}),
+				},
+			},
 		},
 		shape: {
 			borderRadius: 2,