diff --git a/src/custom/CatalogDetail/ActionButton.tsx b/src/custom/CatalogDetail/ActionButton.tsx
index 808835277..e7a9806d7 100644
--- a/src/custom/CatalogDetail/ActionButton.tsx
+++ b/src/custom/CatalogDetail/ActionButton.tsx
@@ -1,11 +1,10 @@
 import _ from 'lodash';
 import React from 'react';
 import { CircularProgress } from '../../base';
+import { CopyIcon, KanvasIcon } from '../../icons';
 import Download from '../../icons/Download/Download';
 import { charcoal } from '../../theme';
 import { Pattern } from '../CustomCatalog/CustomCard';
-import CopyIcon from './Icons/CopyIcon';
-import KanvasIcon from './Icons/Kanvas';
 import { downloadFilter, downloadYaml, slugify } from './helper';
 import { ActionButton, LinkUrl, StyledActionWrapper } from './style';
 import { RESOURCE_TYPES } from './types';
diff --git a/src/custom/CatalogDetail/ChallengesSection.tsx b/src/custom/CatalogDetail/ChallengesSection.tsx
index 5110607b6..7bec37c9f 100644
--- a/src/custom/CatalogDetail/ChallengesSection.tsx
+++ b/src/custom/CatalogDetail/ChallengesSection.tsx
@@ -1,8 +1,8 @@
 import { useEffect, useState } from 'react';
 import { ListItemIcon } from '../../base';
+import { ChallengesIcon } from '../../icons';
 import { useTheme } from '../../theme';
 import CollapsibleSection from './CollapsibleSection';
-import ChallengesIcon from './Icons/ChallengesIcon';
 import { slugify } from './helper';
 import { LabelDiv } from './style';
 import { FilteredAcademyData } from './types';
diff --git a/src/custom/CatalogDetail/CollapsibleSection.tsx b/src/custom/CatalogDetail/CollapsibleSection.tsx
index 24739f486..49c417947 100644
--- a/src/custom/CatalogDetail/CollapsibleSection.tsx
+++ b/src/custom/CatalogDetail/CollapsibleSection.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import ExpandLessIcon from '@mui/icons-material/ExpandLess';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
-import { Collapse, List, ListItemText } from '@mui/material';
+import { Collapse, List, ListItemText } from '../../base';
 import { InfoTooltip } from '../CustomTooltip';
 import { SideContainer, SideTitleButton } from './style';
 
diff --git a/src/custom/CatalogDetail/ContentClassInfo.tsx b/src/custom/CatalogDetail/ContentClassInfo.tsx
index 5f2174993..5a9b871e2 100644
--- a/src/custom/CatalogDetail/ContentClassInfo.tsx
+++ b/src/custom/CatalogDetail/ContentClassInfo.tsx
@@ -1,5 +1,5 @@
-import { Box } from '@mui/material';
 import React from 'react';
+import { Box } from '../../base';
 import { InfoTooltip } from '../CustomTooltip';
 import { ContentDetailsPoints, ContentDetailsText } from '../Typography';
 import { CONTENT_CLASS, formatToTitleCase } from './helper';
diff --git a/src/custom/CatalogDetail/LearningSection.tsx b/src/custom/CatalogDetail/LearningSection.tsx
index 2763b2c37..ffc003c72 100644
--- a/src/custom/CatalogDetail/LearningSection.tsx
+++ b/src/custom/CatalogDetail/LearningSection.tsx
@@ -1,8 +1,8 @@
 import React, { useEffect, useState } from 'react';
 import { ListItemIcon } from '../../base';
+import { LearningIcon } from '../../icons';
 import { useTheme } from '../../theme';
 import CollapsibleSection from './CollapsibleSection';
-import LearningIcon from './Icons/LearningIcon';
 import { slugify } from './helper';
 import { LabelDiv } from './style';
 import { FilteredAcademyData } from './types';
diff --git a/src/custom/CatalogDetail/OverviewSection.tsx b/src/custom/CatalogDetail/OverviewSection.tsx
index 756d2f7f2..a933226f7 100644
--- a/src/custom/CatalogDetail/OverviewSection.tsx
+++ b/src/custom/CatalogDetail/OverviewSection.tsx
@@ -1,5 +1,5 @@
-import { Grid } from '@mui/material';
 import React from 'react';
+import { Grid } from '../../base';
 import { Pattern } from '../CustomCatalog/CustomCard';
 import ContentClassInfo from './ContentClassInfo';
 import MetricsDisplay from './MetricsDisplay';
diff --git a/src/custom/CatalogDetail/SocialSharePopper.tsx b/src/custom/CatalogDetail/SocialSharePopper.tsx
index ae3bf24be..ad6ae2cf3 100644
--- a/src/custom/CatalogDetail/SocialSharePopper.tsx
+++ b/src/custom/CatalogDetail/SocialSharePopper.tsx
@@ -1,18 +1,10 @@
-import {
-  ClickAwayListener,
-  Fade,
-  IconButton,
-  Paper,
-  Popper,
-  Tooltip,
-  useTheme
-} from '@mui/material';
+import { Fade } from '@mui/material';
 import React from 'react';
 import { FacebookShareButton, LinkedinShareButton, TwitterShareButton } from 'react-share';
-import { ShareIcon } from '../../icons';
+import { ClickAwayListener, IconButton, Paper, Popper, Tooltip } from '../../base';
+import { ChainIcon, FacebookIcon, LinkedinIcon, ShareIcon, TwitterIcon } from '../../icons';
+import { useTheme } from '../../theme';
 import { Pattern } from '../CustomCatalog/CustomCard';
-import ChainIcon from './Icons/ChainIcon';
-import { FacebookIcon, LinkedinIcon, TwitterIcon } from './Icons/SocialMediaIcon';
 import { CopyShareIconWrapper, VisibilityChip } from './style';
 
 interface SocialSharePopperProps {