diff --git a/app/client/src/pages/Editor/MainContainerLayoutControl.tsx b/app/client/src/pages/Editor/MainContainerLayoutControl.tsx
index 11121ea23f..8ffcdc0317 100644
--- a/app/client/src/pages/Editor/MainContainerLayoutControl.tsx
+++ b/app/client/src/pages/Editor/MainContainerLayoutControl.tsx
@@ -1,14 +1,10 @@
-import { ReactComponent as DesktopIcon } from "assets/icons/ads/app-icons/monitor-alt.svg";
-import { ReactComponent as MultiDeviceIcon } from "assets/icons/ads/app-icons/monitor-smartphone-alt.svg";
-import { ReactComponent as MobileIcon } from "assets/icons/ads/app-icons/smartphone-alt.svg";
-import { ReactComponent as TabletIcon } from "assets/icons/ads/app-icons/tablet-alt.svg";
-import { ReactComponent as TabletLandscapeIcon } from "assets/icons/ads/app-icons/tabletr-alt.svg";
 import classNames from "classnames";
 import React, { useCallback, useMemo } from "react";
 import { useDispatch, useSelector } from "react-redux";
 
 import { updateApplicationLayout } from "actions/applicationActions";
-import { IconName, TooltipComponent } from "design-system-old";
+import { Colors } from "constants/Colors";
+import { Icon, IconName, IconSize, TooltipComponent } from "design-system-old";
 import {
   AppLayoutConfig,
   SupportedLayouts,
@@ -18,13 +14,6 @@ import {
   getCurrentApplicationLayout,
 } from "selectors/editorSelectors";
 
-const IconObj: any = {
-  FLUID: <MultiDeviceIcon />,
-  DESKTOP: <DesktopIcon />,
-  TABLET: <TabletIcon />,
-  TABLET_LARGE: <TabletLandscapeIcon />,
-  MOBILE: <MobileIcon />,
-};
 interface AppsmithLayoutConfigOption {
   name: string;
   type: SupportedLayouts;
@@ -151,9 +140,11 @@ export function MainContainerLayoutControl() {
                 ref={(input) => buttonRefs.push(input)}
                 tabIndex={index === focusedIndex ? 0 : -1}
               >
-                <div style={{ width: "16px", height: "16px" }}>
-                  {IconObj[layoutOption.type]}
-                </div>
+                <Icon
+                  fillColor={Colors.BLACK}
+                  name={layoutOption.icon}
+                  size={layoutOption.iconSize || IconSize.MEDIUM}
+                />
               </button>
             </TooltipComponent>
           );