diff --git a/portal-ui/src/icons/LoginMinIOLogo.tsx b/portal-ui/src/icons/LoginMinIOLogo.tsx
index 5de85cd2f..bc98ecd41 100644
--- a/portal-ui/src/icons/LoginMinIOLogo.tsx
+++ b/portal-ui/src/icons/LoginMinIOLogo.tsx
@@ -24,6 +24,7 @@ const LoginMinIOLogo = (props: SVGProps<SVGSVGElement>) => (
     height="49.568"
     viewBox="0 0 284.616 49.568"
     className={"min-icon"}
+    fill={"currentcolor"}
     {...props}
   >
     <g transform="translate(0.5 0.5)">
diff --git a/portal-ui/src/icons/SidebarMenus/MenuIcons.tsx b/portal-ui/src/icons/SidebarMenus/index.ts
similarity index 65%
rename from portal-ui/src/icons/SidebarMenus/MenuIcons.tsx
rename to portal-ui/src/icons/SidebarMenus/index.ts
index dd55d7169..2bcee3cb4 100644
--- a/portal-ui/src/icons/SidebarMenus/MenuIcons.tsx
+++ b/portal-ui/src/icons/SidebarMenus/index.ts
@@ -1,22 +1,37 @@
-export { default as UsersMenuIcon } from "./UsersMenuIcon";
-export { default as MenuCollapsedIcon } from "./MenuCollapsedIcon";
-export { default as MenuExpandedIcon } from "./MenuExpandedIcon";
-export { default as BucketsMenuIcon } from "./BucketsMenuIcon";
-export { default as IdentityMenuIcon } from "./IdentityMenuIcon";
-export { default as MonitoringMenuIcon } from "./MonitoringMenuIcon";
-export { default as HealthMenuIcon } from "./HealthMenuIcon";
-export { default as GroupsMenuIcon } from "./GroupsMenuIcon";
-export { default as AccountsMenuIcon } from "./AccountsMenuIcon";
-export { default as LogsMenuIcon } from "./LogsMenuIcon";
-export { default as MetricsMenuIcon } from "./MetricsMenuIcon";
-export { default as AuditLogsMenuIcon } from "./AuditLogsMenuIcon";
-export { default as TraceMenuIcon } from "./TraceMenuIcon";
-export { default as DrivesMenuIcon } from "./DrivesMenuIcon";
-export { default as AccessMenuIcon } from "./AccessMenuIcon";
-export { default as SupportMenuIcon } from "./SupportMenuIcon";
-export { default as RegisterMenuIcon } from "./RegisterMenuIcon";
-export { default as DiagnosticsMenuIcon } from "./DiagnosticsMenuIcon";
-export { default as PerformanceMenuIcon } from "./PerformanceMenuIcon";
-export { default as CallHomeMenuIcon } from "./CallHomeMenuIcon";
+//  This file is part of MinIO Console Server
+//  Copyright (c) 2022 MinIO, Inc.
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Affero General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 export { default as InspectMenuIcon } from "./InspectMenuIcon";
+export { default as AuditLogsMenuIcon } from "./AuditLogsMenuIcon";
+export { default as HealthMenuIcon } from "./HealthMenuIcon";
+export { default as MenuExpandedIcon } from "./MenuExpandedIcon";
+export { default as TraceMenuIcon } from "./TraceMenuIcon";
+export { default as GroupsMenuIcon } from "./GroupsMenuIcon";
+export { default as MenuCollapsedIcon } from "./MenuCollapsedIcon";
+export { default as MetricsMenuIcon } from "./MetricsMenuIcon";
+export { default as IdentityMenuIcon } from "./IdentityMenuIcon";
+export { default as LogsMenuIcon } from "./LogsMenuIcon";
+export { default as MonitoringMenuIcon } from "./MonitoringMenuIcon";
+export { default as SupportMenuIcon } from "./SupportMenuIcon";
+export { default as PerformanceMenuIcon } from "./PerformanceMenuIcon";
+export { default as DiagnosticsMenuIcon } from "./DiagnosticsMenuIcon";
+export { default as AccessMenuIcon } from "./AccessMenuIcon";
+export { default as RegisterMenuIcon } from "./RegisterMenuIcon";
+export { default as DrivesMenuIcon } from "./DrivesMenuIcon";
+export { default as AccountsMenuIcon } from "./AccountsMenuIcon";
 export { default as ProfileMenuIcon } from "./ProfileMenuIcon";
+export { default as CallHomeMenuIcon } from "./CallHomeMenuIcon";
+export { default as BucketsMenuIcon } from "./BucketsMenuIcon";
+export { default as UsersMenuIcon } from "./UsersMenuIcon";
diff --git a/portal-ui/src/icons/index.ts b/portal-ui/src/icons/index.ts
index deec556b5..23357c87c 100644
--- a/portal-ui/src/icons/index.ts
+++ b/portal-ui/src/icons/index.ts
@@ -14,152 +14,155 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-export { default as AccountIcon } from "./AccountIcon";
-export { default as AddFolderIcon } from "./AddFolderIcon";
-export { default as AddIcon } from "./AddIcon";
-export { default as AllBucketsIcon } from "./AllBucketsIcon";
-export { default as ArrowIcon } from "./ArrowIcon";
-export { default as ArrowRightIcon } from "./ArrowRightIcon";
-export { default as BackSettingsIcon } from "./BackSettingsIcon";
-export { default as BucketsIcon } from "./BucketsIcon";
-export { default as CalendarIcon } from "./CalendarIcon";
-export { default as CircleIcon } from "./CircleIcon";
-export { default as ClustersIcon } from "./ClustersIcon";
-export { default as CollapseIcon } from "./CollapseIcon";
-export { default as ComputerLineIcon } from "./ComputerLineIcon";
-export { default as ConfigurationsListIcon } from "./ConfigurationsListIcon";
-export { default as ConsoleIcon } from "./ConsoleIcon";
-export { default as ConsoleLogo } from "./ConsoleLogo";
-export { default as CopyIcon } from "./CopyIcon";
-export { default as CreateIcon } from "./CreateIcon";
-export { default as DashboardIcon } from "./DashboardIcon";
-export { default as DeleteIcon } from "./DeleteIcon";
-export { default as DiagnosticsIcon } from "./DiagnosticsIcon";
-export { default as DocumentationIcon } from "./DocumentationIcon";
-export { default as DownloadIcon } from "./DownloadIcon";
-export { default as DownloadStatIcon } from "./DownloadStatIcon";
-export { default as DrivesIcon } from "./DrivesIcon";
-export { default as EditIcon } from "./EditIcon";
-export { default as EgressIcon } from "./EgressIcon";
-export { default as FileBookIcon } from "./FileBookIcon";
-export { default as FileCloudIcon } from "./FileCloudIcon";
-export { default as FileCodeIcon } from "./FileCodeIcon";
-export { default as FileConfigIcon } from "./FileConfigIcon";
-export { default as FileDbIcon } from "./FileDbIcon";
-export { default as FileFontIcon } from "./FileFontIcon";
-export { default as FileImageIcon } from "./FileImageIcon";
-export { default as FileLinkIcon } from "./FileLinkIcon";
+export { default as EditorThemeSwitchIcon } from "./EditorThemeSwitchIcon";
 export { default as FileLockIcon } from "./FileLockIcon";
-export { default as FileMissingIcon } from "./FileMissingIcon";
-export { default as FileMusicIcon } from "./FileMusicIcon";
-export { default as FilePdfIcon } from "./FilePdfIcon";
-export { default as FilePptIcon } from "./FilePptIcon";
-export { default as FileTxtIcon } from "./FileTxtIcon";
-export { default as FileVideoIcon } from "./FileVideoIcon";
-export { default as FileWorldIcon } from "./FileWorldIcon";
 export { default as FileXlsIcon } from "./FileXlsIcon";
-export { default as FileZipIcon } from "./FileZipIcon";
-export { default as FolderIcon } from "./FolderIcon";
-export { default as GroupsIcon } from "./GroupsIcon";
-export { default as HealIcon } from "./HealIcon";
-export { default as HelpIcon } from "./HelpIcon";
-export { default as HistoryIcon } from "./HistoryIcon";
-export { default as IAMPoliciesIcon } from "./IAMPoliciesIcon";
-export { default as JSONIcon } from "./JSONIcon";
-export { default as LambdaBalloonIcon } from "./LambdaBalloonIcon";
-export { default as LambdaIcon } from "./LambdaIcon";
-export { default as LambdaNotificationsIcon } from "./LambdaNotificationsIcon";
-export { default as LicenseIcon } from "./LicenseIcon";
-export { default as LockIcon } from "./LockIcon";
-export { default as LogoutIcon } from "./LogoutIcon";
-export { default as LogsIcon } from "./LogsIcon";
-export { default as MirroringIcon } from "./MirroringIcon";
-export { default as MultipleBucketsIcon } from "./MultipleBucketsIcon";
-export { default as NewAccountIcon } from "./NewAccountIcon";
-export { default as NextArrowIcon } from "./NextArrowIcon";
-export { default as ObjectBrowserFolderIcon } from "./ObjectBrowserFolderIcon";
-export { default as ObjectBrowser1Icon } from "./ObjectBrowser1Icon";
-export { default as ObjectBrowserIcon } from "./ObjectBrowserIcon";
-export { default as ObjectManagerIcon } from "./ObjectManagerIcon";
-export { default as OpenListIcon } from "./OpenListIcon";
-export { default as OperatorLogo } from "./OperatorLogo";
-export { default as PermissionIcon } from "./PermissionIcon";
-export { default as PreviewIcon } from "./PreviewIcon";
-export { default as PrometheusIcon } from "./PrometheusIcon";
-export { default as RecoverIcon } from "./RecoverIcon";
-export { default as RedoIcon } from "./RedoIcon";
-export { default as RefreshIcon } from "./RefreshIcon";
-export { default as RemoveIcon } from "./RemoveIcon";
-export { default as ReportedUsageIcon } from "./ReportedUsageIcon";
-export { default as SearchIcon } from "./SearchIcon";
-export { default as SelectMultipleIcon } from "./SelectMultipleIcon";
-export { default as ServersIcon } from "./ServersIcon";
-export { default as ServiceAccountIcon } from "./ServiceAccountIcon";
-export { default as ServiceAccountsIcon } from "./ServiceAccountsIcon";
-export { default as SettingsIcon } from "./SettingsIcon";
-export { default as ShareIcon } from "./ShareIcon";
+export { default as DisabledIcon } from "./DisabledIcon";
+export { default as FormatDrivesIcon } from "./FormatDrivesIcon";
 export { default as SpeedtestIcon } from "./SpeedtestIcon";
 export { default as StorageIcon } from "./StorageIcon";
-export { default as SyncIcon } from "./SyncIcon";
-export { default as TenantsIcon } from "./TenantsIcon";
-export { default as TenantsOutlineIcon } from "./TenantsOutlineIcon";
-export { default as TiersIcon } from "./TiersIcon";
-export { default as ToolsIcon } from "./ToolsIcon";
-export { default as TotalObjectsIcon } from "./TotalObjectsIcon";
-export { default as TraceIcon } from "./TraceIcon";
-export { default as TrashIcon } from "./TrashIcon";
-export { default as UploadFile } from "./UploadFile";
-export { default as UploadFolderIcon } from "./UploadFolderIcon";
-export { default as UploadIcon } from "./UploadIcon";
-export { default as UploadStatIcon } from "./UploadStatIcon";
-export { default as UptimeIcon } from "./UptimeIcon";
-export { default as UsersIcon } from "./UsersIcon";
+export { default as RefreshIcon } from "./RefreshIcon";
 export { default as VersionIcon } from "./VersionIcon";
-export { default as WarnIcon } from "./WarnIcon";
-export { default as WarpIcon } from "./WarpIcon";
-export { default as WatchIcon } from "./WatchIcon";
-export { default as ClosePanelIcon } from "./ClosePanelIcon";
-export { default as LoginMinIOLogo } from "./LoginMinIOLogo";
-
-/*Modal Title Icons **/
-export { default as AddAccessRuleIcon } from "./AddAccessRuleIcon";
-export { default as AddMembersToGroupIcon } from "./AddMembersToGroupIcon";
-export { default as AddNewTagIcon } from "./AddNewTagIcon";
-export { default as ChangeAccessPolicyIcon } from "./ChangeAccessPolicyIcon";
-export { default as ChangePasswordIcon } from "./ChangePasswordIcon";
-export { default as CreateGroupIcon } from "./CreateGroupIcon";
-export { default as CreateNewPathIcon } from "./CreateNewPathIcon";
-export { default as CreateUserIcon } from "./CreateUserIcon";
-export { default as DriveFormatErrorsIcon } from "./DriveFormatErrorsIcon";
-export { default as EditYamlIcon } from "./EditYamlIcon";
-export { default as BucketEncryptionIcon } from "./BucketEncryptionIcon";
-export { default as BucketQuotaIcon } from "./BucketQuotaIcon";
-export { default as NewPoolIcon } from "./NewPoolIcon";
-export { default as FormatDrivesIcon } from "./FormatDrivesIcon";
-export { default as LifecycleConfigIcon } from "./LifecycleConfigIcon";
-export { default as ServiceAccountCredentialsIcon } from "./ServiceAccountCredentialsIcon";
-export { default as ObjectPreviewIcon } from "./ObjectPreviewIcon";
-export { default as BucketReplicationIcon } from "./BucketReplicationIcon";
-export { default as EventSubscriptionIcon } from "./EventSubscriptionIcon";
-export { default as ConfirmModalIcon } from "./ConfirmModalIcon";
-export { default as ConfirmDeleteIcon } from "./ConfirmDeleteIcon";
-export { default as EnabledIcon } from "./EnabledIcon";
-export { default as DisabledIcon } from "./DisabledIcon";
-export { default as HardBucketQuotaIcon } from "./HardBucketQuotaIcon";
-export { default as ReportedUsageFullIcon } from "./ReportedUsageFullIcon";
-export { default as TiersNotAvailableIcon } from "./TiersNotAvailableIcon";
-export { default as MinIOTierIcon } from "./MinIOTierIcon";
-export { default as MinIOTierIconXs } from "./MinIOTierIconXs";
-export { default as AzureTierIcon } from "./AzureTierIcon";
-export { default as AzureTierIconXs } from "./AzureTierIconXs";
-export { default as GoogleTierIcon } from "./GoogleTierIcon";
-export { default as GoogleTierIconXs } from "./GoogleTierIconXs";
-export { default as S3TierIcon } from "./S3TierIcon";
-export { default as S3TierIconXs } from "./S3TierIconXs";
-export { default as EditorThemeSwitchIcon } from "./EditorThemeSwitchIcon";
-export { default as PasswordKeyIcon } from "./PasswordKeyIcon";
+export { default as LambdaBalloonIcon } from "./LambdaBalloonIcon";
+export { default as FileZipIcon } from "./FileZipIcon";
 export { default as HelpIconFilled } from "./HelpIconFilled";
-export { default as CallHomeFeatureIcon } from "./CallHomeFeatureIcon";
-export { default as DiagnosticsFeatureIcon } from "./DiagnosticsFeatureIcon";
-export { default as PerformanceFeatureIcon } from "./PerformanceFeatureIcon";
+export { default as ShareIcon } from "./ShareIcon";
+export { default as FolderIcon } from "./FolderIcon";
+export { default as EditIcon } from "./EditIcon";
+export { default as JSONIcon } from "./JSONIcon";
+export { default as SearchIcon } from "./SearchIcon";
+export { default as WarnIcon } from "./WarnIcon";
+export { default as CircleIcon } from "./CircleIcon";
+export { default as FileCloudIcon } from "./FileCloudIcon";
+export { default as ObjectBrowserFolderIcon } from "./ObjectBrowserFolderIcon";
+export { default as RedoIcon } from "./RedoIcon";
+export { default as ChangeAccessPolicyIcon } from "./ChangeAccessPolicyIcon";
+export { default as FileMusicIcon } from "./FileMusicIcon";
+export { default as ServersIcon } from "./ServersIcon";
+export { default as ClosePanelIcon } from "./ClosePanelIcon";
+export { default as MinIOTierIconXs } from "./MinIOTierIconXs";
+export { default as DashboardIcon } from "./DashboardIcon";
+export { default as ClustersIcon } from "./ClustersIcon";
+export { default as MirroringIcon } from "./MirroringIcon";
+export { default as ToolsIcon } from "./ToolsIcon";
+export { default as ArrowIcon } from "./ArrowIcon";
+export { default as ServiceAccountIcon } from "./ServiceAccountIcon";
+export { default as OnlineRegistrationBackIcon } from "./OnlineRegistrationBackIcon";
+export { default as ConfigurationsListIcon } from "./ConfigurationsListIcon";
+export { default as WatchIcon } from "./WatchIcon";
+export { default as ServiceAccountCredentialsIcon } from "./ServiceAccountCredentialsIcon";
+export { default as HealIcon } from "./HealIcon";
+export { default as LoginMinIOLogo } from "./LoginMinIOLogo";
+export { default as S3TierIcon } from "./S3TierIcon";
+export { default as ArrowRightIcon } from "./ArrowRightIcon";
+export { default as PreviewIcon } from "./PreviewIcon";
+export { default as BucketQuotaIcon } from "./BucketQuotaIcon";
+export { default as OperatorLogo } from "./OperatorLogo";
+export { default as SelectMultipleIcon } from "./SelectMultipleIcon";
+export { default as DeleteIcon } from "./DeleteIcon";
+export { default as EditYamlIcon } from "./EditYamlIcon";
+export { default as ReportedUsageIcon } from "./ReportedUsageIcon";
+export { default as PrometheusIcon } from "./PrometheusIcon";
+export { default as ConfirmModalIcon } from "./ConfirmModalIcon";
+export { default as NextArrowIcon } from "./NextArrowIcon";
+export { default as FileConfigIcon } from "./FileConfigIcon";
+export { default as PermissionIcon } from "./PermissionIcon";
+export { default as GoogleTierIcon } from "./GoogleTierIcon";
+export { default as AccountIcon } from "./AccountIcon";
+export { default as AddAccessRuleIcon } from "./AddAccessRuleIcon";
+export { default as FilePdfIcon } from "./FilePdfIcon";
+export { default as FileFontIcon } from "./FileFontIcon";
+export { default as UptimeIcon } from "./UptimeIcon";
+export { default as EnabledIcon } from "./EnabledIcon";
+export { default as ObjectPreviewIcon } from "./ObjectPreviewIcon";
+export { default as TenantsOutlineIcon } from "./TenantsOutlineIcon";
+export { default as DrivesIcon } from "./DrivesIcon";
+export { default as CreateNewPathIcon } from "./CreateNewPathIcon";
+export { default as HelpIcon } from "./HelpIcon";
+export { default as FileLinkIcon } from "./FileLinkIcon";
+export { default as ReportedUsageFullIcon } from "./ReportedUsageFullIcon";
+export { default as AddNewTagIcon } from "./AddNewTagIcon";
+export { default as OnlineRegistrationIcon } from "./OnlineRegistrationIcon";
+export { default as DiagnosticsIcon } from "./DiagnosticsIcon";
+export { default as ObjectBrowser1Icon } from "./ObjectBrowser1Icon";
+export { default as MinIOTierIcon } from "./MinIOTierIcon";
+export { default as WarpIcon } from "./WarpIcon";
+export { default as CopyIcon } from "./CopyIcon";
+export { default as OpenListIcon } from "./OpenListIcon";
+export { default as MultipleBucketsIcon } from "./MultipleBucketsIcon";
+export { default as FileImageIcon } from "./FileImageIcon";
+export { default as AddMembersToGroupIcon } from "./AddMembersToGroupIcon";
+export { default as OfflineRegistrationBackIcon } from "./OfflineRegistrationBackIcon";
+export { default as ConsoleLogo } from "./ConsoleLogo";
 export { default as PrometheusErrorIcon } from "./PrometheusErrorIcon";
+export { default as LifecycleConfigIcon } from "./LifecycleConfigIcon";
+export { default as DriveFormatErrorsIcon } from "./DriveFormatErrorsIcon";
+export { default as VerifiedIcon } from "./VerifiedIcon";
+export { default as CallHomeFeatureIcon } from "./CallHomeFeatureIcon";
+export { default as TraceIcon } from "./TraceIcon";
+export { default as AddIcon } from "./AddIcon";
+export { default as GoogleTierIconXs } from "./GoogleTierIconXs";
+export { default as LambdaNotificationsIcon } from "./LambdaNotificationsIcon";
+export { default as FileWorldIcon } from "./FileWorldIcon";
+export { default as BackSettingsIcon } from "./BackSettingsIcon";
+export { default as LicenseIcon } from "./LicenseIcon";
+export { default as RemoveIcon } from "./RemoveIcon";
+export { default as FileBookIcon } from "./FileBookIcon";
+export { default as TiersNotAvailableIcon } from "./TiersNotAvailableIcon";
+export { default as PerformanceFeatureIcon } from "./PerformanceFeatureIcon";
+export { default as AddFolderIcon } from "./AddFolderIcon";
+export { default as S3TierIconXs } from "./S3TierIconXs";
+export { default as IAMPoliciesIcon } from "./IAMPoliciesIcon";
+export { default as UsersIcon } from "./UsersIcon";
+export { default as EgressIcon } from "./EgressIcon";
+export { default as BucketEncryptionIcon } from "./BucketEncryptionIcon";
+export { default as DocumentationIcon } from "./DocumentationIcon";
+export { default as DiagnosticsFeatureIcon } from "./DiagnosticsFeatureIcon";
+export { default as PasswordKeyIcon } from "./PasswordKeyIcon";
+export { default as TrashIcon } from "./TrashIcon";
+export { default as EventSubscriptionIcon } from "./EventSubscriptionIcon";
+export { default as DownloadIcon } from "./DownloadIcon";
+export { default as ComputerLineIcon } from "./ComputerLineIcon";
+export { default as AllBucketsIcon } from "./AllBucketsIcon";
+export { default as FileMissingIcon } from "./FileMissingIcon";
+export { default as LambdaIcon } from "./LambdaIcon";
+export { default as GroupsIcon } from "./GroupsIcon";
+export { default as DownloadStatIcon } from "./DownloadStatIcon";
+export { default as UploadFolderIcon } from "./UploadFolderIcon";
+export { default as TiersIcon } from "./TiersIcon";
+export { default as NewAccountIcon } from "./NewAccountIcon";
+export { default as CreateGroupIcon } from "./CreateGroupIcon";
+export { default as FileCodeIcon } from "./FileCodeIcon";
+export { default as CollapseIcon } from "./CollapseIcon";
+export { default as ConfirmDeleteIcon } from "./ConfirmDeleteIcon";
+export { default as OfflineRegistrationIcon } from "./OfflineRegistrationIcon";
+export { default as TenantsIcon } from "./TenantsIcon";
+export { default as UploadFile } from "./UploadFile";
+export { default as CreateIcon } from "./CreateIcon";
+export { default as NewPoolIcon } from "./NewPoolIcon";
+export { default as SyncIcon } from "./SyncIcon";
+export { default as LogoutIcon } from "./LogoutIcon";
+export { default as AzureTierIconXs } from "./AzureTierIconXs";
+export { default as TotalObjectsIcon } from "./TotalObjectsIcon";
+export { default as HistoryIcon } from "./HistoryIcon";
+export { default as CreateUserIcon } from "./CreateUserIcon";
+export { default as BucketsIcon } from "./BucketsIcon";
+export { default as UploadStatIcon } from "./UploadStatIcon";
+export { default as BucketReplicationIcon } from "./BucketReplicationIcon";
+export { default as ObjectManagerIcon } from "./ObjectManagerIcon";
+export { default as ObjectBrowserIcon } from "./ObjectBrowserIcon";
+export { default as RecoverIcon } from "./RecoverIcon";
+export { default as FilePptIcon } from "./FilePptIcon";
+export { default as SettingsIcon } from "./SettingsIcon";
+export { default as UploadIcon } from "./UploadIcon";
+export { default as FileDbIcon } from "./FileDbIcon";
+export { default as AzureTierIcon } from "./AzureTierIcon";
+export { default as FileTxtIcon } from "./FileTxtIcon";
+export { default as CalendarIcon } from "./CalendarIcon";
+export { default as ServiceAccountsIcon } from "./ServiceAccountsIcon";
+export { default as LogsIcon } from "./LogsIcon";
+export { default as HardBucketQuotaIcon } from "./HardBucketQuotaIcon";
+export { default as ConsoleIcon } from "./ConsoleIcon";
+export { default as FileVideoIcon } from "./FileVideoIcon";
+export { default as ChangePasswordIcon } from "./ChangePasswordIcon";
+export { default as LockIcon } from "./LockIcon";
diff --git a/portal-ui/src/screens/Console/Common/IconsScreen.tsx b/portal-ui/src/screens/Console/Common/IconsScreen.tsx
index 2037e6ad4..5842ece8b 100644
--- a/portal-ui/src/screens/Console/Common/IconsScreen.tsx
+++ b/portal-ui/src/screens/Console/Common/IconsScreen.tsx
@@ -14,119 +14,23 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import React from "react";
+import React, { useState } from "react";
 import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
 import { Theme } from "@mui/material/styles";
 import createStyles from "@mui/styles/createStyles";
 import withStyles from "@mui/styles/withStyles";
-import { Grid } from "@mui/material";
 import {
-  AccountIcon,
-  AddFolderIcon,
-  AddIcon,
-  AllBucketsIcon,
-  ArrowIcon,
-  ArrowRightIcon,
-  BackSettingsIcon,
-  BucketsIcon,
-  CalendarIcon,
-  CircleIcon,
-  ClosePanelIcon,
-  ClustersIcon,
-  CollapseIcon,
-  ComputerLineIcon,
-  ConfigurationsListIcon,
-  ConsoleIcon,
-  ConsoleLogo,
-  CopyIcon,
-  CreateIcon,
-  DashboardIcon,
-  DeleteIcon,
-  DiagnosticsIcon,
-  DocumentationIcon,
-  DownloadIcon,
-  DownloadStatIcon,
-  DrivesIcon,
-  EditIcon,
-  EgressIcon,
-  FileBookIcon,
-  FileCloudIcon,
-  FileCodeIcon,
-  FileConfigIcon,
-  FileDbIcon,
-  FileFontIcon,
-  FileImageIcon,
-  FileLinkIcon,
-  FileLockIcon,
-  FileMissingIcon,
-  FileMusicIcon,
-  FilePdfIcon,
-  FilePptIcon,
-  FileTxtIcon,
-  FileVideoIcon,
-  FileWorldIcon,
-  FileXlsIcon,
-  FileZipIcon,
-  FolderIcon,
-  GroupsIcon,
-  HealIcon,
-  HelpIcon,
-  HistoryIcon,
-  IAMPoliciesIcon,
-  LambdaBalloonIcon,
-  LambdaIcon,
-  LambdaNotificationsIcon,
-  LicenseIcon,
-  LockIcon,
-  LogoutIcon,
-  LogsIcon,
-  MirroringIcon,
-  MultipleBucketsIcon,
-  NewAccountIcon,
-  NextArrowIcon,
-  ObjectBrowser1Icon,
-  ObjectBrowserFolderIcon,
-  ObjectBrowserIcon,
-  ObjectManagerIcon,
-  OpenListIcon,
-  OperatorLogo,
-  PermissionIcon,
-  PreviewIcon,
-  PrometheusIcon,
-  RecoverIcon,
-  RedoIcon,
-  RefreshIcon,
-  RemoveIcon,
-  ReportedUsageIcon,
-  SearchIcon,
-  SelectMultipleIcon,
-  ServersIcon,
-  ServiceAccountIcon,
-  ServiceAccountsIcon,
-  SettingsIcon,
-  ShareIcon,
-  SpeedtestIcon,
-  StorageIcon,
-  SyncIcon,
-  TenantsIcon,
-  TenantsOutlineIcon,
-  TiersIcon,
-  ToolsIcon,
-  TotalObjectsIcon,
-  TraceIcon,
-  TrashIcon,
-  UploadFile,
-  UploadFolderIcon,
-  UploadIcon,
-  UploadStatIcon,
-  UptimeIcon,
-  UsersIcon,
-  VersionIcon,
-  WarpIcon,
-  WatchIcon,
-} from "../../../icons";
-import WarnIcon from "../../../icons/WarnIcon";
-import JSONIcon from "../../../icons/JSONIcon";
+  FormControl,
+  FormControlLabel,
+  FormLabel,
+  Grid,
+  Radio,
+  RadioGroup,
+} from "@mui/material";
+
+import * as cicons from "../../../icons";
+import * as micons from "../../../icons/SidebarMenus";
+import clsx from "clsx";
 
 interface IIconsScreenSimple {
   classes: any;
@@ -139,433 +43,931 @@ const styles = (theme: Theme) =>
       fontSize: 12,
       wordWrap: "break-word",
     },
+    def: {},
+    red: {
+      "& .min-icon": {
+        color: "red",
+      },
+    },
   });
 
 const IconsScreen = ({ classes }: IIconsScreenSimple) => {
+  const [color, setColor] = useState<string>("default");
   return (
     <div className={classes.container}>
-      <Grid container spacing={4} textAlign={"center"} className={classes.root}>
-        <Grid item xs={3} sm={2} md={1}>
-          <AccountIcon /> <br />
-          AccountIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <AddFolderIcon /> <br />
-          AddFolderIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <AddIcon /> <br />
-          AddIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <AllBucketsIcon /> <br />
-          AllBucketsIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <ArrowIcon /> <br />
-          ArrowIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <ArrowRightIcon /> <br />
-          ArrowRightIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <BackSettingsIcon /> <br />
-          BackSettingsIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <BucketsIcon /> <br />
-          BucketsIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <CalendarIcon /> <br />
-          CalendarIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <CircleIcon /> <br />
-          CircleIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <ClosePanelIcon /> <br />
-          ClosePanelIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <ClustersIcon /> <br />
-          ClustersIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <CollapseIcon /> <br />
-          CollapseIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <ComputerLineIcon /> <br />
-          ComputerLineIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <ConfigurationsListIcon /> <br />
-          ConfigurationsListIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <ConsoleIcon /> <br />
-          ConsoleIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <ConsoleLogo /> <br />
+      <Grid container>
+        <FormControl>
+          <FormLabel id="demo-radio-buttons-group-label">Color</FormLabel>
+          <RadioGroup
+            row
+            aria-labelledby="demo-radio-buttons-group-label"
+            defaultValue="default"
+            name="radio-buttons-group"
+            onChange={(c) => {
+              setColor(c.target.value);
+            }}
+          >
+            <FormControlLabel value="def" control={<Radio />} label="Default" />
+            <FormControlLabel value="red" control={<Radio />} label="Color" />
+          </RadioGroup>
+        </FormControl>
+      </Grid>
+      <h1>Logos</h1>
+      <Grid
+        container
+        spacing={4}
+        textAlign={"center"}
+        className={clsx(classes.root, {
+          [classes.red]: color === "red",
+        })}
+      >
+        <Grid item xs={3}>
+          <cicons.ConsoleLogo /> <br />
           ConsoleLogo
         </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <CopyIcon /> <br />
-          CopyIcon
+        <Grid item xs={3}>
+          <cicons.LoginMinIOLogo /> <br />
+          LoginMinIOLogo
         </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <CreateIcon /> <br />
-          CreateIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <DashboardIcon /> <br />
-          DashboardIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <DeleteIcon /> <br />
-          DeleteIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <DiagnosticsIcon /> <br />
-          DiagnosticsIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <DocumentationIcon /> <br />
-          DocumentationIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <DownloadIcon /> <br />
-          DownloadIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <DownloadStatIcon /> <br />
-          DownloadStatIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <DrivesIcon /> <br />
-          DrivesIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <EditIcon /> <br />
-          EditIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <EgressIcon /> <br />
-          EgressIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FileBookIcon /> <br />
-          FileBookIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FileCloudIcon /> <br />
-          FileCloudIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FileCodeIcon /> <br />
-          FileCodeIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FileConfigIcon /> <br />
-          FileConfigIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FileDbIcon /> <br />
-          FileDbIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FileFontIcon /> <br />
-          FileFontIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FileImageIcon /> <br />
-          FileImageIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FileLinkIcon /> <br />
-          FileLinkIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FileLockIcon /> <br />
-          FileLockIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FileMissingIcon /> <br />
-          FileMissingIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FileMusicIcon /> <br />
-          FileMusicIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FilePdfIcon /> <br />
-          FilePdfIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FilePptIcon /> <br />
-          FilePptIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FileTxtIcon /> <br />
-          FileTxtIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FileVideoIcon /> <br />
-          FileVideoIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FileWorldIcon /> <br />
-          FileWorldIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FileXlsIcon /> <br />
-          FileXlsIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FileZipIcon /> <br />
-          FileZipIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <FolderIcon /> <br />
-          FolderIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <GroupsIcon /> <br />
-          GroupsIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <HealIcon /> <br />
-          HealIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <HelpIcon /> <br />
-          HelpIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <HistoryIcon /> <br />
-          HistoryIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <IAMPoliciesIcon /> <br />
-          IAMPoliciesIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <JSONIcon /> <br />
-          JSONIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <LambdaBalloonIcon /> <br />
-          LambdaBalloonIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <LambdaIcon /> <br />
-          LambdaIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <LambdaNotificationsIcon /> <br />
-          LambdaNotificationsIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <LicenseIcon /> <br />
-          LicenseIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <LockIcon /> <br />
-          LockIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <LogoutIcon /> <br />
-          LogoutIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <LogsIcon /> <br />
-          LogsIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <MirroringIcon /> <br />
-          MirroringIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <MultipleBucketsIcon /> <br />
-          MultipleBucketsIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <NewAccountIcon /> <br />
-          NewAccountIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <NextArrowIcon /> <br />
-          NextArrowIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <ObjectBrowser1Icon /> <br />
-          ObjectBrowser1Icon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <ObjectBrowserFolderIcon /> <br />
-          ObjectBrowserFolderIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <ObjectBrowserIcon /> <br />
-          ObjectBrowserIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <ObjectManagerIcon /> <br />
-          ObjectManagerIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <OpenListIcon /> <br />
-          OpenListIcon
-        </Grid>
-        <Grid item xs={3} sm={2} md={1}>
-          <OperatorLogo /> <br />
+
+        <Grid item xs={3}>
+          <cicons.OperatorLogo /> <br />
           OperatorLogo
         </Grid>
+      </Grid>
+      <h1>Icons</h1>
+      <Grid
+        container
+        spacing={4}
+        textAlign={"center"}
+        className={clsx(classes.root, {
+          [classes.red]: color === "red",
+        })}
+      >
         <Grid item xs={3} sm={2} md={1}>
-          <PermissionIcon /> <br />
+          <cicons.AccountIcon /> <br />
+          AccountIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.AddAccessRuleIcon /> <br />
+          AddAccessRuleIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.AddFolderIcon /> <br />
+          AddFolderIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.AddIcon /> <br />
+          AddIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.AddMembersToGroupIcon /> <br />
+          AddMembersToGroupIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.AddNewTagIcon /> <br />
+          AddNewTagIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.AllBucketsIcon /> <br />
+          AllBucketsIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ArrowIcon /> <br />
+          ArrowIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ArrowRightIcon /> <br />
+          ArrowRightIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.AzureTierIcon /> <br />
+          AzureTierIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.AzureTierIconXs /> <br />
+          AzureTierIconXs
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.BackSettingsIcon /> <br />
+          BackSettingsIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.BucketEncryptionIcon /> <br />
+          BucketEncryptionIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.BucketQuotaIcon /> <br />
+          BucketQuotaIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.BucketReplicationIcon /> <br />
+          BucketReplicationIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.BucketsIcon /> <br />
+          BucketsIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.CalendarIcon /> <br />
+          CalendarIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.CallHomeFeatureIcon /> <br />
+          CallHomeFeatureIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ChangeAccessPolicyIcon /> <br />
+          ChangeAccessPolicyIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ChangePasswordIcon /> <br />
+          ChangePasswordIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.CircleIcon /> <br />
+          CircleIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ClosePanelIcon /> <br />
+          ClosePanelIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ClustersIcon /> <br />
+          ClustersIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.CollapseIcon /> <br />
+          CollapseIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ComputerLineIcon /> <br />
+          ComputerLineIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ConfigurationsListIcon /> <br />
+          ConfigurationsListIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ConfirmDeleteIcon /> <br />
+          ConfirmDeleteIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ConfirmModalIcon /> <br />
+          ConfirmModalIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ConsoleIcon /> <br />
+          ConsoleIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.CopyIcon /> <br />
+          CopyIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.CreateGroupIcon /> <br />
+          CreateGroupIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.CreateIcon /> <br />
+          CreateIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.CreateNewPathIcon /> <br />
+          CreateNewPathIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.CreateUserIcon /> <br />
+          CreateUserIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.DashboardIcon /> <br />
+          DashboardIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.DeleteIcon /> <br />
+          DeleteIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.DiagnosticsFeatureIcon /> <br />
+          DiagnosticsFeatureIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.DiagnosticsIcon /> <br />
+          DiagnosticsIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.DisabledIcon /> <br />
+          DisabledIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.DocumentationIcon /> <br />
+          DocumentationIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.DownloadIcon /> <br />
+          DownloadIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.DownloadStatIcon /> <br />
+          DownloadStatIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.DriveFormatErrorsIcon /> <br />
+          DriveFormatErrorsIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.DrivesIcon /> <br />
+          DrivesIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.EditIcon /> <br />
+          EditIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.EditYamlIcon /> <br />
+          EditYamlIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.EditorThemeSwitchIcon /> <br />
+          EditorThemeSwitchIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.EgressIcon /> <br />
+          EgressIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.EnabledIcon /> <br />
+          EnabledIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.EventSubscriptionIcon /> <br />
+          EventSubscriptionIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FileBookIcon /> <br />
+          FileBookIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FileCloudIcon /> <br />
+          FileCloudIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FileCodeIcon /> <br />
+          FileCodeIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FileConfigIcon /> <br />
+          FileConfigIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FileDbIcon /> <br />
+          FileDbIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FileFontIcon /> <br />
+          FileFontIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FileImageIcon /> <br />
+          FileImageIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FileLinkIcon /> <br />
+          FileLinkIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FileLockIcon /> <br />
+          FileLockIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FileMissingIcon /> <br />
+          FileMissingIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FileMusicIcon /> <br />
+          FileMusicIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FilePdfIcon /> <br />
+          FilePdfIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FilePptIcon /> <br />
+          FilePptIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FileTxtIcon /> <br />
+          FileTxtIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FileVideoIcon /> <br />
+          FileVideoIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FileWorldIcon /> <br />
+          FileWorldIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FileXlsIcon /> <br />
+          FileXlsIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FileZipIcon /> <br />
+          FileZipIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FolderIcon /> <br />
+          FolderIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.FormatDrivesIcon /> <br />
+          FormatDrivesIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.GoogleTierIcon /> <br />
+          GoogleTierIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.GoogleTierIconXs /> <br />
+          GoogleTierIconXs
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.GroupsIcon /> <br />
+          GroupsIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.HardBucketQuotaIcon /> <br />
+          HardBucketQuotaIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.HealIcon /> <br />
+          HealIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.HelpIcon /> <br />
+          HelpIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.HelpIconFilled /> <br />
+          HelpIconFilled
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.HistoryIcon /> <br />
+          HistoryIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.IAMPoliciesIcon /> <br />
+          IAMPoliciesIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.JSONIcon /> <br />
+          JSONIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.LambdaBalloonIcon /> <br />
+          LambdaBalloonIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.LambdaIcon /> <br />
+          LambdaIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.LambdaNotificationsIcon /> <br />
+          LambdaNotificationsIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.LicenseIcon /> <br />
+          LicenseIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.LifecycleConfigIcon /> <br />
+          LifecycleConfigIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.LockIcon /> <br />
+          LockIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.LogoutIcon /> <br />
+          LogoutIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.LogsIcon /> <br />
+          LogsIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.MinIOTierIcon /> <br />
+          MinIOTierIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.MinIOTierIconXs /> <br />
+          MinIOTierIconXs
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.MirroringIcon /> <br />
+          MirroringIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.MultipleBucketsIcon /> <br />
+          MultipleBucketsIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.NewAccountIcon /> <br />
+          NewAccountIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.NewPoolIcon /> <br />
+          NewPoolIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.NextArrowIcon /> <br />
+          NextArrowIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ObjectBrowser1Icon /> <br />
+          ObjectBrowser1Icon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ObjectBrowserFolderIcon /> <br />
+          ObjectBrowserFolderIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ObjectBrowserIcon /> <br />
+          ObjectBrowserIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ObjectManagerIcon /> <br />
+          ObjectManagerIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ObjectPreviewIcon /> <br />
+          ObjectPreviewIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.OfflineRegistrationBackIcon /> <br />
+          OfflineRegistrationBackIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.OfflineRegistrationIcon /> <br />
+          OfflineRegistrationIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.OnlineRegistrationBackIcon /> <br />
+          OnlineRegistrationBackIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.OnlineRegistrationIcon /> <br />
+          OnlineRegistrationIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.OpenListIcon /> <br />
+          OpenListIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.PasswordKeyIcon /> <br />
+          PasswordKeyIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.PerformanceFeatureIcon /> <br />
+          PerformanceFeatureIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.PermissionIcon /> <br />
           PermissionIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <PreviewIcon /> <br />
+          <cicons.PreviewIcon /> <br />
           PreviewIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <PrometheusIcon /> <br />
+          <cicons.PrometheusErrorIcon /> <br />
+          PrometheusErrorIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.PrometheusIcon /> <br />
           PrometheusIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <RecoverIcon /> <br />
+          <cicons.RecoverIcon /> <br />
           RecoverIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <RedoIcon /> <br />
+          <cicons.RedoIcon /> <br />
           RedoIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <RefreshIcon /> <br />
+          <cicons.RefreshIcon /> <br />
           RefreshIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <RemoveIcon /> <br />
+          <cicons.RemoveIcon /> <br />
           RemoveIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <ReportedUsageIcon /> <br />
+          <cicons.ReportedUsageFullIcon /> <br />
+          ReportedUsageFullIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ReportedUsageIcon /> <br />
           ReportedUsageIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <SearchIcon /> <br />
+          <cicons.S3TierIcon /> <br />
+          S3TierIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.S3TierIconXs /> <br />
+          S3TierIconXs
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.SearchIcon /> <br />
           SearchIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <SelectMultipleIcon /> <br />
+          <cicons.SelectMultipleIcon /> <br />
           SelectMultipleIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <ServersIcon /> <br />
+          <cicons.ServersIcon /> <br />
           ServersIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <ServiceAccountIcon /> <br />
+          <cicons.ServiceAccountCredentialsIcon /> <br />
+          ServiceAccountCredentialsIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ServiceAccountIcon /> <br />
           ServiceAccountIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <ServiceAccountsIcon /> <br />
+          <cicons.ServiceAccountsIcon /> <br />
           ServiceAccountsIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <SettingsIcon /> <br />
+          <cicons.SettingsIcon /> <br />
           SettingsIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <ShareIcon /> <br />
+          <cicons.ShareIcon /> <br />
           ShareIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <SpeedtestIcon /> <br />
+          <cicons.SpeedtestIcon /> <br />
           SpeedtestIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <StorageIcon /> <br />
+          <cicons.StorageIcon /> <br />
           StorageIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <SyncIcon /> <br />
+          <cicons.SyncIcon /> <br />
           SyncIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <TenantsIcon /> <br />
+          <cicons.TenantsIcon /> <br />
           TenantsIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <TenantsOutlineIcon /> <br />
+          <cicons.TenantsOutlineIcon /> <br />
           TenantsOutlineIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <TiersIcon /> <br />
+          <cicons.TiersIcon /> <br />
           TiersIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <ToolsIcon /> <br />
+          <cicons.TiersNotAvailableIcon /> <br />
+          TiersNotAvailableIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.ToolsIcon /> <br />
           ToolsIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <TotalObjectsIcon /> <br />
+          <cicons.TotalObjectsIcon /> <br />
           TotalObjectsIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <TraceIcon /> <br />
+          <cicons.TraceIcon /> <br />
           TraceIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <TrashIcon /> <br />
+          <cicons.TrashIcon /> <br />
           TrashIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <UploadFile /> <br />
+          <cicons.UploadFile /> <br />
           UploadFile
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <UploadFolderIcon /> <br />
+          <cicons.UploadFolderIcon /> <br />
           UploadFolderIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <UploadIcon /> <br />
+          <cicons.UploadIcon /> <br />
           UploadIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <UploadStatIcon /> <br />
+          <cicons.UploadStatIcon /> <br />
           UploadStatIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <UptimeIcon /> <br />
+          <cicons.UptimeIcon /> <br />
           UptimeIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <UsersIcon /> <br />
+          <cicons.UsersIcon /> <br />
           UsersIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <VersionIcon /> <br />
+          <cicons.VerifiedIcon /> <br />
+          VerifiedIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <cicons.VersionIcon /> <br />
           VersionIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <WarnIcon /> <br />
+          <cicons.WarnIcon /> <br />
           WarnIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <WarpIcon /> <br />
+          <cicons.WarpIcon /> <br />
           WarpIcon
         </Grid>
+
         <Grid item xs={3} sm={2} md={1}>
-          <WatchIcon /> <br />
+          <cicons.WatchIcon /> <br />
           WatchIcon
         </Grid>
       </Grid>
+      <h1>Menu Icons</h1>
+      <Grid
+        container
+        spacing={4}
+        textAlign={"center"}
+        className={clsx(classes.root, {
+          [classes.red]: color === "red",
+        })}
+      >
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.AccessMenuIcon /> <br />
+          AccessMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.AccountsMenuIcon /> <br />
+          AccountsMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.AuditLogsMenuIcon /> <br />
+          AuditLogsMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.BucketsMenuIcon /> <br />
+          BucketsMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.CallHomeMenuIcon /> <br />
+          CallHomeMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.DiagnosticsMenuIcon /> <br />
+          DiagnosticsMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.DrivesMenuIcon /> <br />
+          DrivesMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.GroupsMenuIcon /> <br />
+          GroupsMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.HealthMenuIcon /> <br />
+          HealthMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.IdentityMenuIcon /> <br />
+          IdentityMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.InspectMenuIcon /> <br />
+          InspectMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.LogsMenuIcon /> <br />
+          LogsMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.MenuCollapsedIcon /> <br />
+          MenuCollapsedIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.MenuExpandedIcon /> <br />
+          MenuExpandedIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.MetricsMenuIcon /> <br />
+          MetricsMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.MonitoringMenuIcon /> <br />
+          MonitoringMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.PerformanceMenuIcon /> <br />
+          PerformanceMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.ProfileMenuIcon /> <br />
+          ProfileMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.RegisterMenuIcon /> <br />
+          RegisterMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.SupportMenuIcon /> <br />
+          SupportMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.TraceMenuIcon /> <br />
+          TraceMenuIcon
+        </Grid>
+
+        <Grid item xs={3} sm={2} md={1}>
+          <micons.UsersMenuIcon /> <br />
+          UsersMenuIcon
+        </Grid>
+      </Grid>
     </div>
   );
 };
diff --git a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionButton.tsx b/portal-ui/src/screens/Console/Common/TableWrapper/TableActionButton.tsx
index 7d8c4fc38..710601c18 100644
--- a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionButton.tsx
+++ b/portal-ui/src/screens/Console/Common/TableWrapper/TableActionButton.tsx
@@ -76,7 +76,7 @@ const defineIcon = (type: string, selected: boolean) => {
     case "disable":
       return <DisableIcon active={selected} />;
     case "format":
-      return <FormatDriveIcon active={selected} />;
+      return <FormatDriveIcon />;
     case "preview":
       return <PreviewIcon />;
   }
diff --git a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/FormatDriveIcon.tsx b/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/FormatDriveIcon.tsx
index cddc077e6..d909a4917 100644
--- a/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/FormatDriveIcon.tsx
+++ b/portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/FormatDriveIcon.tsx
@@ -1,20 +1,17 @@
-import React from "react";
-import { IIcon, selected, unSelected } from "./common";
+import React, { SVGProps } from "react";
 
-const FormatDriveIcon = ({ active = false }: IIcon) => {
-  return (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width="16"
-      height="16"
-      viewBox="0 0 24 24"
-    >
-      <path
-        fill={active ? selected : unSelected}
-        d="M20 16h2v-2h-2v2zm0-9v5h2V7h-2zM10 4c-4.42 0-8 3.58-8 8s3.58 8 8 8 8-3.58 8-8-3.58-8-8-8zm0 10c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z"
-      ></path>
-    </svg>
-  );
-};
+const FormatDriveIcon = (props: SVGProps<SVGSVGElement>) => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width="16"
+    height="16"
+    viewBox="0 0 24 24"
+    className={`min-icon`}
+    fill={"currentcolor"}
+    {...props}
+  >
+    <path d="M20 16h2v-2h-2v2zm0-9v5h2V7h-2zM10 4c-4.42 0-8 3.58-8 8s3.58 8 8 8 8-3.58 8-8-3.58-8-8-8zm0 10c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z"></path>
+  </svg>
+);
 
 export default FormatDriveIcon;
diff --git a/portal-ui/src/screens/Console/Health.tsx b/portal-ui/src/screens/Console/Health.tsx
index f4fa45597..949efc029 100644
--- a/portal-ui/src/screens/Console/Health.tsx
+++ b/portal-ui/src/screens/Console/Health.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { HealthMenuIcon } from "../../icons/SidebarMenus/MenuIcons";
+import { HealthMenuIcon } from "../../icons/SidebarMenus";
 import FeatureNotAvailablePage from "./Common/Components/FeatureNotAvailablePage";
 
 const Health = () => {
diff --git a/portal-ui/src/screens/Console/Menu/MenuItem.tsx b/portal-ui/src/screens/Console/Menu/MenuItem.tsx
index 85a8e2346..040cc62b3 100644
--- a/portal-ui/src/screens/Console/Menu/MenuItem.tsx
+++ b/portal-ui/src/screens/Console/Menu/MenuItem.tsx
@@ -33,7 +33,7 @@ import List from "@mui/material/List";
 import {
   MenuCollapsedIcon,
   MenuExpandedIcon,
-} from "../../../icons/SidebarMenus/MenuIcons";
+} from "../../../icons/SidebarMenus";
 import { hasPermission } from "../../../common/SecureComponent/SecureComponent";
 import {
   CONSOLE_UI_RESOURCE,
diff --git a/portal-ui/src/screens/Console/Tools/Tools.tsx b/portal-ui/src/screens/Console/Tools/Tools.tsx
index d1bddb0cd..4a4fb5831 100644
--- a/portal-ui/src/screens/Console/Tools/Tools.tsx
+++ b/portal-ui/src/screens/Console/Tools/Tools.tsx
@@ -22,7 +22,7 @@ import ToolsList from "./ToolsPanel/ToolsList";
 import Register from "../Support/Register";
 import { IAM_PAGES } from "../../../common/SecureComponent/permissions";
 import FeatureNotAvailablePage from "../Common/Components/FeatureNotAvailablePage";
-import { SupportMenuIcon } from "../../../icons/SidebarMenus/MenuIcons";
+import { SupportMenuIcon } from "../../../icons/SidebarMenus";
 
 const Tools = () => {
   return (
diff --git a/portal-ui/src/screens/Console/valid-routes.ts b/portal-ui/src/screens/Console/valid-routes.ts
index d830bea0a..77169143a 100644
--- a/portal-ui/src/screens/Console/valid-routes.ts
+++ b/portal-ui/src/screens/Console/valid-routes.ts
@@ -39,7 +39,7 @@ import {
   SupportMenuIcon,
   TraceMenuIcon,
   UsersMenuIcon,
-} from "../../icons/SidebarMenus/MenuIcons";
+} from "../../icons/SidebarMenus";
 import { hasPermission } from "../../common/SecureComponent/SecureComponent";
 import WatchIcon from "../../icons/WatchIcon";
 import RegisterMenuIcon from "../../icons/SidebarMenus/RegisterMenuIcon";
diff --git a/portal-ui/src/screens/LoginPage/LoginPage.tsx b/portal-ui/src/screens/LoginPage/LoginPage.tsx
index 8ec775b6b..10ce447da 100644
--- a/portal-ui/src/screens/LoginPage/LoginPage.tsx
+++ b/portal-ui/src/screens/LoginPage/LoginPage.tsx
@@ -129,6 +129,7 @@ const styles = (theme: Theme) =>
         },
         "& .left-logo": {
           "& .min-icon": {
+            color: "white",
             width: 108,
           },
           marginBottom: 10,