This is an automated email from the ASF dual-hosted git repository.
diegopucci pushed a commit to branch geido/refactor/icons-typing-support
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to
refs/heads/geido/refactor/icons-typing-support by this push:
new 829efa1934 chore(Icons): Named export
829efa1934 is described below
commit 829efa1934e16b5ce86207759f242b63ddfa65fa
Author: Diego Pucci <[email protected]>
AuthorDate: Fri Mar 28 13:58:39 2025 +0200
chore(Icons): Named export
---
.../src/SqlLab/components/QueryLimitSelect/index.tsx | 2 +-
superset-frontend/src/SqlLab/components/QueryTable/index.tsx | 2 +-
superset-frontend/src/SqlLab/components/ResultSet/index.tsx | 2 +-
.../src/SqlLab/components/RunQueryActionButton/index.tsx | 2 +-
.../src/SqlLab/components/SaveDatasetActionButton/index.tsx | 2 +-
.../src/SqlLab/components/ShareSqlLabQuery/index.tsx | 2 +-
superset-frontend/src/SqlLab/components/ShowSQL/index.tsx | 2 +-
superset-frontend/src/SqlLab/components/SouthPane/index.tsx | 2 +-
superset-frontend/src/SqlLab/components/SqlEditor/index.tsx | 2 +-
.../src/SqlLab/components/SqlEditorLeftBar/index.tsx | 2 +-
.../src/SqlLab/components/SqlEditorTabHeader/index.tsx | 2 +-
.../src/SqlLab/components/TabbedSqlEditors/index.tsx | 2 +-
superset-frontend/src/SqlLab/components/TableElement/index.tsx | 2 +-
superset-frontend/src/SqlLab/components/TablePreview/index.tsx | 2 +-
superset-frontend/src/components/AlteredSliceTag/index.tsx | 2 +-
superset-frontend/src/components/CertifiedBadge/index.tsx | 2 +-
.../src/components/Chart/DisabledMenuItemTooltip.tsx | 2 +-
.../src/components/Chart/DrillBy/DrillByMenuItems.tsx | 2 +-
.../components/Chart/DrillDetail/DrillDetailTableControls.tsx | 2 +-
.../src/components/CopyToClipboard/CopyToClipboard.stories.tsx | 2 +-
.../src/components/Datasource/CollectionTable.tsx | 2 +-
.../src/components/Datasource/DatasourceEditor.jsx | 2 +-
.../src/components/Datasource/DatasourceModal.tsx | 2 +-
superset-frontend/src/components/Dropdown/index.tsx | 2 +-
.../components/DropdownContainer/DropdownContainer.test.tsx | 2 +-
superset-frontend/src/components/DropdownContainer/index.tsx | 2 +-
.../src/components/ErrorMessage/BasicErrorAlert.tsx | 2 +-
superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx | 2 +-
superset-frontend/src/components/ErrorMessage/IssueCode.tsx | 2 +-
superset-frontend/src/components/FaveStar/index.tsx | 2 +-
.../src/components/Form/LabeledErrorBoundInput.tsx | 2 +-
superset-frontend/src/components/GridTable/Header.tsx | 2 +-
superset-frontend/src/components/GridTable/HeaderMenu.tsx | 2 +-
superset-frontend/src/components/IconButton/index.tsx | 2 +-
.../src/components/IconTooltip/IconTooltip.stories.tsx | 2 +-
superset-frontend/src/components/Icons/Icons.stories.tsx | 2 +-
superset-frontend/src/components/Icons/index.tsx | 10 +++++++---
.../src/components/IndeterminateCheckbox/index.tsx | 2 +-
superset-frontend/src/components/InfoTooltip/index.tsx | 2 +-
.../src/components/Label/reusable/DatasetTypeLabel.tsx | 2 +-
.../src/components/Label/reusable/PublishedLabel.tsx | 2 +-
superset-frontend/src/components/LastUpdated/index.tsx | 2 +-
superset-frontend/src/components/ListView/ActionsBar.tsx | 2 +-
superset-frontend/src/components/ListView/Filters/Search.tsx | 2 +-
superset-frontend/src/components/ListView/ListView.tsx | 2 +-
.../src/components/ListViewCard/ListViewCard.stories.tsx | 2 +-
superset-frontend/src/components/MessageToasts/Toast.tsx | 2 +-
superset-frontend/src/components/MetadataBar/ContentConfig.tsx | 2 +-
.../src/components/PageHeaderWithActions/index.tsx | 2 +-
superset-frontend/src/components/Popover/Popover.test.tsx | 2 +-
superset-frontend/src/components/PopoverDropdown/index.tsx | 2 +-
superset-frontend/src/components/PopoverSection/index.tsx | 2 +-
superset-frontend/src/components/Radio/Radio.stories.tsx | 2 +-
superset-frontend/src/components/RefreshLabel/index.tsx | 2 +-
superset-frontend/src/components/Select/AsyncSelect.tsx | 2 +-
superset-frontend/src/components/Select/styles.tsx | 2 +-
superset-frontend/src/components/Select/utils.tsx | 2 +-
.../components/Table/header-renderers/HeaderWithRadioGroup.tsx | 2 +-
superset-frontend/src/components/TableCollection/index.tsx | 2 +-
superset-frontend/src/components/TableSelector/index.tsx | 2 +-
superset-frontend/src/components/Tabs/Tabs.tsx | 2 +-
superset-frontend/src/components/Tags/Tag.tsx | 2 +-
superset-frontend/src/components/Timer/index.tsx | 2 +-
superset-frontend/src/components/Tooltip/Tooltip.test.tsx | 2 +-
.../src/components/WarningIconWithTooltip/index.tsx | 2 +-
.../dashboard/components/DashboardBuilder/DashboardBuilder.tsx | 2 +-
superset-frontend/src/dashboard/components/DashboardGrid.jsx | 2 +-
.../src/dashboard/components/DeleteComponentButton.tsx | 2 +-
.../components/FiltersBadge/FilterIndicator/index.tsx | 2 +-
.../src/dashboard/components/FiltersBadge/index.tsx | 2 +-
superset-frontend/src/dashboard/components/Header/index.jsx | 2 +-
superset-frontend/src/dashboard/components/SliceAdder.tsx | 2 +-
.../src/dashboard/components/SliceHeader/index.tsx | 2 +-
.../src/dashboard/components/SliceHeaderControls/index.tsx | 2 +-
.../src/dashboard/components/URLShortLinkButton/index.tsx | 2 +-
superset-frontend/src/dashboard/components/dnd/DragHandle.tsx | 2 +-
.../components/filterscope/renderFilterScopeTreeNodes.jsx | 2 +-
.../src/dashboard/components/gridComponents/Column.jsx | 2 +-
.../src/dashboard/components/gridComponents/Row.jsx | 2 +-
.../src/dashboard/components/gridComponents/Tabs.jsx | 2 +-
.../nativeFilters/FilterBar/CrossFilters/CrossFilterTitle.tsx | 2 +-
.../CrossFilters/ScopingModal/ChartsScopingListPanel.tsx | 2 +-
.../FilterBar/CrossFilters/ScopingModal/ScopingTreePanel.tsx | 2 +-
.../nativeFilters/FilterBar/FilterBarSettings/index.tsx | 2 +-
.../nativeFilters/FilterBar/FilterControls/FilterControls.tsx | 2 +-
.../nativeFilters/FilterBar/FilterControls/FilterDivider.tsx | 2 +-
.../components/nativeFilters/FilterBar/Header/index.tsx | 2 +-
.../dashboard/components/nativeFilters/FilterBar/Vertical.tsx | 2 +-
.../components/nativeFilters/FilterCard/DependenciesRow.tsx | 2 +-
.../dashboard/components/nativeFilters/FilterCard/NameRow.tsx | 2 +-
.../nativeFilters/FiltersConfigModal/DraggableFilter.tsx | 2 +-
.../nativeFilters/FiltersConfigModal/FilterTitleContainer.tsx | 2 +-
.../nativeFilters/FiltersConfigModal/FilterTitlePane.tsx | 2 +-
.../FiltersConfigModal/FiltersConfigForm/DependencyList.tsx | 2 +-
.../FiltersConfigForm/FilterScope/ScopingTree.tsx | 2 +-
.../FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx | 2 +-
.../nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx | 2 +-
superset-frontend/src/explore/components/ControlHeader.tsx | 2 +-
.../src/explore/components/ControlPanelsContainer.tsx | 2 +-
.../src/explore/components/DataTableControl/index.tsx | 2 +-
.../src/explore/components/DataTablesPane/DataTablesPane.tsx | 2 +-
.../DatasourcePanel/DatasourcePanelDragOption/index.tsx | 2 +-
.../explore/components/DatasourcePanel/DatasourcePanelItem.tsx | 2 +-
.../src/explore/components/ExploreChartHeader/index.jsx | 2 +-
.../src/explore/components/ExportToCSVDropdown/index.tsx | 2 +-
.../src/explore/components/PropertiesModal/index.tsx | 2 +-
.../src/explore/components/RunQueryButton/index.tsx | 2 +-
.../components/controls/AnnotationLayerControl/index.tsx | 2 +-
.../explore/components/controls/CollectionControl/index.jsx | 2 +-
.../explore/components/controls/ColorSchemeControl/index.tsx | 2 +-
.../components/controls/ColumnConfigControl/constants.tsx | 2 +-
.../ConditionalFormattingControl.tsx | 2 +-
.../explore/components/controls/DatasourceControl/index.jsx | 2 +-
.../components/controls/DateFilterControl/DateFilterLabel.tsx | 2 +-
.../controls/DateFilterControl/components/DateLabel.tsx | 2 +-
.../DndColumnSelectControl/DndColumnSelectPopoverTitle.jsx | 2 +-
.../controls/DndColumnSelectControl/DndSelectLabel.tsx | 2 +-
.../components/controls/DndColumnSelectControl/Option.tsx | 2 +-
.../controls/FilterControl/AdhocFilterControl/index.jsx | 2 +-
.../components/controls/LayerConfigsControl/FlatLayerTree.tsx | 2 +-
.../components/controls/LayerConfigsControl/LayerTreeItem.tsx | 2 +-
.../controls/MetricControl/AdhocMetricEditPopoverTitle.tsx | 2 +-
.../components/controls/MetricControl/MetricsControl.jsx | 2 +-
.../src/explore/components/controls/OptionControls/index.tsx | 2 +-
.../components/controls/VizTypeControl/FastVizSwitcher.tsx | 2 +-
.../components/controls/VizTypeControl/VizTypeGallery.tsx | 2 +-
.../explore/components/controls/VizTypeControl/constants.tsx | 2 +-
.../useExploreAdditionalActionsMenu/DashboardsSubMenu.tsx | 2 +-
.../components/useExploreAdditionalActionsMenu/index.jsx | 2 +-
superset-frontend/src/features/alerts/AlertReportModal.tsx | 2 +-
.../src/features/alerts/components/AlertStatusIcon.tsx | 2 +-
.../src/features/alerts/components/NotificationMethod.tsx | 2 +-
.../src/features/alerts/components/RecipientIcon.tsx | 2 +-
.../src/features/alerts/components/ValidatedPanelHeader.tsx | 2 +-
.../src/features/annotationLayers/AnnotationLayerModal.tsx | 2 +-
superset-frontend/src/features/annotations/AnnotationModal.tsx | 2 +-
superset-frontend/src/features/charts/ChartCard.tsx | 2 +-
.../src/features/cssTemplates/CssTemplateModal.tsx | 2 +-
superset-frontend/src/features/dashboards/DashboardCard.tsx | 2 +-
.../DatabaseModal/DatabaseConnectionForm/EncryptedField.tsx | 2 +-
.../DatabaseModal/DatabaseConnectionForm/TableCatalog.tsx | 2 +-
.../src/features/databases/DatabaseModal/SSHTunnelForm.tsx | 2 +-
.../src/features/databases/DatabaseModal/index.tsx | 2 +-
.../src/features/databases/UploadDataModel/index.tsx | 2 +-
.../features/datasets/AddDataset/DatasetPanel/DatasetPanel.tsx | 2 +-
.../datasets/AddDataset/EditDataset/UsageTab/index.tsx | 2 +-
.../src/features/datasets/AddDataset/Header/index.tsx | 2 +-
superset-frontend/src/features/home/ActivityTable.tsx | 2 +-
superset-frontend/src/features/home/ChartTable.tsx | 2 +-
superset-frontend/src/features/home/DashboardTable.tsx | 2 +-
superset-frontend/src/features/home/LanguagePicker.tsx | 2 +-
superset-frontend/src/features/home/Menu.tsx | 2 +-
superset-frontend/src/features/home/RightMenu.tsx | 2 +-
superset-frontend/src/features/home/SavedQueries.tsx | 2 +-
superset-frontend/src/features/home/SubMenu.tsx | 2 +-
.../src/features/queries/SyntaxHighlighterCopy.tsx | 2 +-
.../reports/ReportModal/HeaderReportDropdown/index.tsx | 2 +-
superset-frontend/src/features/reports/ReportModal/index.tsx | 2 +-
superset-frontend/src/features/rls/RowLevelSecurityModal.tsx | 2 +-
superset-frontend/src/features/tags/TagCard.tsx | 2 +-
superset-frontend/src/pages/AlertReportList/index.tsx | 2 +-
superset-frontend/src/pages/AnnotationLayerList/index.tsx | 2 +-
superset-frontend/src/pages/AnnotationList/index.tsx | 2 +-
superset-frontend/src/pages/ChartCreation/index.tsx | 2 +-
superset-frontend/src/pages/ChartList/index.tsx | 2 +-
superset-frontend/src/pages/CssTemplateList/index.tsx | 2 +-
superset-frontend/src/pages/DashboardList/index.tsx | 2 +-
superset-frontend/src/pages/DatabaseList/index.tsx | 2 +-
superset-frontend/src/pages/DatasetList/index.tsx | 2 +-
superset-frontend/src/pages/QueryHistoryList/index.tsx | 2 +-
superset-frontend/src/pages/RowLevelSecurityList/index.tsx | 2 +-
superset-frontend/src/pages/SavedQueryList/index.tsx | 2 +-
superset-frontend/src/pages/Tags/index.tsx | 2 +-
173 files changed, 179 insertions(+), 175 deletions(-)
diff --git a/superset-frontend/src/SqlLab/components/QueryLimitSelect/index.tsx
b/superset-frontend/src/SqlLab/components/QueryLimitSelect/index.tsx
index 696310fce9..9e2e89aad0 100644
--- a/superset-frontend/src/SqlLab/components/QueryLimitSelect/index.tsx
+++ b/superset-frontend/src/SqlLab/components/QueryLimitSelect/index.tsx
@@ -20,7 +20,7 @@ import { useDispatch } from 'react-redux';
import { t } from '@superset-ui/core';
import { Dropdown } from 'src/components/Dropdown';
import { Menu } from 'src/components/Menu';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { queryEditorSetQueryLimit } from 'src/SqlLab/actions/sqlLab';
import useQueryEditor from 'src/SqlLab/hooks/useQueryEditor';
import Button from 'src/components/Button';
diff --git a/superset-frontend/src/SqlLab/components/QueryTable/index.tsx
b/superset-frontend/src/SqlLab/components/QueryTable/index.tsx
index c120d51446..547808a7ba 100644
--- a/superset-frontend/src/SqlLab/components/QueryTable/index.tsx
+++ b/superset-frontend/src/SqlLab/components/QueryTable/index.tsx
@@ -32,7 +32,7 @@ import {
import TableView from 'src/components/TableView';
import Button from 'src/components/Button';
import { fDuration, extendedDayjs } from 'src/utils/dates';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Label from 'src/components/Label';
import { Tooltip } from 'src/components/Tooltip';
import { SqlLabRootState } from 'src/SqlLab/types';
diff --git a/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
b/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
index 4d6d4ee6c1..9cd7669c3c 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
@@ -79,7 +79,7 @@ import {
LOG_ACTIONS_SQLLAB_CREATE_CHART,
LOG_ACTIONS_SQLLAB_DOWNLOAD_CSV,
} from 'src/logger/LogUtils';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { findPermission } from 'src/utils/findPermission';
import ExploreCtasResultsButton from '../ExploreCtasResultsButton';
import ExploreResultsButton from '../ExploreResultsButton';
diff --git
a/superset-frontend/src/SqlLab/components/RunQueryActionButton/index.tsx
b/superset-frontend/src/SqlLab/components/RunQueryActionButton/index.tsx
index 815a405663..8086b34747 100644
--- a/superset-frontend/src/SqlLab/components/RunQueryActionButton/index.tsx
+++ b/superset-frontend/src/SqlLab/components/RunQueryActionButton/index.tsx
@@ -21,7 +21,7 @@ import { useMemo, FC, ReactElement } from 'react';
import { t, styled, useTheme, SupersetTheme } from '@superset-ui/core';
import Button from 'src/components/Button';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { DropdownButton } from 'src/components/DropdownButton';
import { detectOS } from 'src/utils/common';
import { QueryButtonProps } from 'src/SqlLab/types';
diff --git
a/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx
b/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx
index 4b0eab7be4..8ca8eba893 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import { t, useTheme } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { DropdownButton } from 'src/components/DropdownButton';
import Button from 'src/components/Button';
diff --git a/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/index.tsx
b/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/index.tsx
index 0216078e0d..e641c0f349 100644
--- a/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/index.tsx
@@ -24,7 +24,7 @@ import {
css,
} from '@superset-ui/core';
import Button from 'src/components/Button';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import withToasts from 'src/components/MessageToasts/withToasts';
import CopyToClipboard from 'src/components/CopyToClipboard';
import useQueryEditor from 'src/SqlLab/hooks/useQueryEditor';
diff --git a/superset-frontend/src/SqlLab/components/ShowSQL/index.tsx
b/superset-frontend/src/SqlLab/components/ShowSQL/index.tsx
index 525baa7b0b..409cd5af46 100644
--- a/superset-frontend/src/SqlLab/components/ShowSQL/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ShowSQL/index.tsx
@@ -21,7 +21,7 @@ import sql from
'react-syntax-highlighter/dist/cjs/languages/hljs/sql';
import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
import { IconTooltip } from 'src/components/IconTooltip';
import ModalTrigger from 'src/components/ModalTrigger';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
SyntaxHighlighter.registerLanguage('sql', sql);
diff --git a/superset-frontend/src/SqlLab/components/SouthPane/index.tsx
b/superset-frontend/src/SqlLab/components/SouthPane/index.tsx
index 7ddf8f2b07..af91855fb0 100644
--- a/superset-frontend/src/SqlLab/components/SouthPane/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SouthPane/index.tsx
@@ -25,7 +25,7 @@ import { css, styled, t, useTheme } from '@superset-ui/core';
import { removeTables, setActiveSouthPaneTab } from
'src/SqlLab/actions/sqlLab';
import Label from 'src/components/Label';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { SqlLabRootState } from 'src/SqlLab/types';
import QueryHistory from '../QueryHistory';
import {
diff --git a/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx
b/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx
index 88646a6772..8df7d4a0ce 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx
@@ -61,7 +61,7 @@ import { Skeleton } from 'src/components';
import { Switch } from 'src/components/Switch';
import { Input } from 'src/components/Input';
import { Menu } from 'src/components/Menu';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { detectOS } from 'src/utils/common';
import {
addNewQueryEditor,
diff --git a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx
b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx
index 59fd26023f..d896da2a9f 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx
@@ -36,7 +36,7 @@ import {
import Button from 'src/components/Button';
import { t, styled, css, SupersetTheme } from '@superset-ui/core';
import Collapse from 'src/components/Collapse';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { TableSelectorMultiple } from 'src/components/TableSelector';
import { IconTooltip } from 'src/components/IconTooltip';
import useQueryEditor from 'src/SqlLab/hooks/useQueryEditor';
diff --git
a/superset-frontend/src/SqlLab/components/SqlEditorTabHeader/index.tsx
b/superset-frontend/src/SqlLab/components/SqlEditorTabHeader/index.tsx
index 77a9338ab4..a7be15f8dd 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditorTabHeader/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditorTabHeader/index.tsx
@@ -38,7 +38,7 @@ import {
toggleLeftBar,
} from 'src/SqlLab/actions/sqlLab';
import { QueryEditor, SqlLabRootState } from 'src/SqlLab/types';
-import Icons, { IconType } from 'src/components/Icons';
+import { Icons, IconType } from 'src/components/Icons';
const TabTitleWrapper = styled.div`
display: flex;
diff --git a/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.tsx
b/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.tsx
index 272ca6b567..8d9a36da55 100644
--- a/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.tsx
+++ b/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.tsx
@@ -36,7 +36,7 @@ import * as Actions from 'src/SqlLab/actions/sqlLab';
import { EmptyState } from 'src/components/EmptyState';
import getBootstrapData from 'src/utils/getBootstrapData';
import { locationContext } from 'src/pages/SqlLab/LocationContext';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import SqlEditor from '../SqlEditor';
import SqlEditorTabHeader from '../SqlEditorTabHeader';
diff --git a/superset-frontend/src/SqlLab/components/TableElement/index.tsx
b/superset-frontend/src/SqlLab/components/TableElement/index.tsx
index 80fd781460..7768b31182 100644
--- a/superset-frontend/src/SqlLab/components/TableElement/index.tsx
+++ b/superset-frontend/src/SqlLab/components/TableElement/index.tsx
@@ -45,7 +45,7 @@ import ModalTrigger from 'src/components/ModalTrigger';
import Loading from 'src/components/Loading';
import useEffectEvent from 'src/hooks/useEffectEvent';
import { ActionType } from 'src/types/Action';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import ColumnElement, { ColumnKeyTypeType } from '../ColumnElement';
import ShowSQL from '../ShowSQL';
diff --git a/superset-frontend/src/SqlLab/components/TablePreview/index.tsx
b/superset-frontend/src/SqlLab/components/TablePreview/index.tsx
index 20fb6b7bc0..ad224894b0 100644
--- a/superset-frontend/src/SqlLab/components/TablePreview/index.tsx
+++ b/superset-frontend/src/SqlLab/components/TablePreview/index.tsx
@@ -30,7 +30,7 @@ import {
t,
} from '@superset-ui/core';
import AutoSizer from 'react-virtualized-auto-sizer';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import type { SqlLabRootState } from 'src/SqlLab/types';
import { Skeleton, AntdBreadcrumb as Breadcrumb, Button } from
'src/components';
import { Dropdown } from 'src/components/Dropdown';
diff --git a/superset-frontend/src/components/AlteredSliceTag/index.tsx
b/superset-frontend/src/components/AlteredSliceTag/index.tsx
index a12d035e96..d433fe5326 100644
--- a/superset-frontend/src/components/AlteredSliceTag/index.tsx
+++ b/superset-frontend/src/components/AlteredSliceTag/index.tsx
@@ -23,7 +23,7 @@ import { QueryFormData, t } from '@superset-ui/core';
import { sanitizeFormData } from 'src/explore/exploreUtils/formData';
import getControlsForVizType from 'src/utils/getControlsForVizType';
import Label from 'src/components/Label';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { safeStringify } from 'src/utils/safeStringify';
import { Tooltip } from 'src/components/Tooltip';
import ModalTrigger from '../ModalTrigger';
diff --git a/superset-frontend/src/components/CertifiedBadge/index.tsx
b/superset-frontend/src/components/CertifiedBadge/index.tsx
index 65179d046e..2af0f864d5 100644
--- a/superset-frontend/src/components/CertifiedBadge/index.tsx
+++ b/superset-frontend/src/components/CertifiedBadge/index.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import { t, useTheme } from '@superset-ui/core';
-import Icons, { IconType } from 'src/components/Icons';
+import { Icons, IconType } from 'src/components/Icons';
import { Tooltip } from 'src/components/Tooltip';
export interface CertifiedBadgeProps {
diff --git a/superset-frontend/src/components/Chart/DisabledMenuItemTooltip.tsx
b/superset-frontend/src/components/Chart/DisabledMenuItemTooltip.tsx
index 33eb662114..89ceddb9ea 100644
--- a/superset-frontend/src/components/Chart/DisabledMenuItemTooltip.tsx
+++ b/superset-frontend/src/components/Chart/DisabledMenuItemTooltip.tsx
@@ -19,7 +19,7 @@
import { ReactNode } from 'react';
import { css, SupersetTheme } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { Tooltip } from 'src/components/Tooltip';
export const MenuItemTooltip = ({
diff --git
a/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx
b/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx
index 4752d9b6c1..73920dfcaa 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx
@@ -45,7 +45,7 @@ import {
import rison from 'rison';
import { debounce } from 'lodash';
import { FixedSizeList as List } from 'react-window';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { Input } from 'src/components/Input';
import { useToasts } from 'src/components/MessageToasts/withToasts';
import Loading from 'src/components/Loading';
diff --git
a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.tsx
b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.tsx
index 378f9e8099..1c756dd9c5 100644
---
a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.tsx
+++
b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.tsx
@@ -27,7 +27,7 @@ import {
useTheme,
} from '@superset-ui/core';
import RowCountLabel from 'src/explore/components/RowCountLabel';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
export type TableControlsProps = {
filters: BinaryQueryObjectFilterClause[];
diff --git
a/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.stories.tsx
b/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.stories.tsx
index 73880a7ac9..bd82ec84a4 100644
---
a/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.stories.tsx
+++
b/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.stories.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import Button from 'src/components/Button';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import ToastContainer from 'src/components/MessageToasts/ToastContainer';
import CopyToClipboard from '.';
diff --git a/superset-frontend/src/components/Datasource/CollectionTable.tsx
b/superset-frontend/src/components/Datasource/CollectionTable.tsx
index 22e9df44f3..5147a552c8 100644
--- a/superset-frontend/src/components/Datasource/CollectionTable.tsx
+++ b/superset-frontend/src/components/Datasource/CollectionTable.tsx
@@ -29,7 +29,7 @@ import { InfoTooltipWithTrigger } from
'@superset-ui/chart-controls';
import { t, styled } from '@superset-ui/core';
import Button from 'src/components/Button';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Fieldset from './Fieldset';
import { recurseReactClone } from './utils';
diff --git a/superset-frontend/src/components/Datasource/DatasourceEditor.jsx
b/superset-frontend/src/components/Datasource/DatasourceEditor.jsx
index 057cff7b34..dce962a6ce 100644
--- a/superset-frontend/src/components/Datasource/DatasourceEditor.jsx
+++ b/superset-frontend/src/components/Datasource/DatasourceEditor.jsx
@@ -51,7 +51,7 @@ import TextControl from
'src/explore/components/controls/TextControl';
import TextAreaControl from 'src/explore/components/controls/TextAreaControl';
import SpatialControl from 'src/explore/components/controls/SpatialControl';
import withToasts from 'src/components/MessageToasts/withToasts';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import CurrencyControl from 'src/explore/components/controls/CurrencyControl';
import CollectionTable from './CollectionTable';
import Fieldset from './Fieldset';
diff --git a/superset-frontend/src/components/Datasource/DatasourceModal.tsx
b/superset-frontend/src/components/Datasource/DatasourceModal.tsx
index e25f4d349a..1055e51f44 100644
--- a/superset-frontend/src/components/Datasource/DatasourceModal.tsx
+++ b/superset-frontend/src/components/Datasource/DatasourceModal.tsx
@@ -31,7 +31,7 @@ import {
css,
} from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Modal from 'src/components/Modal';
import AsyncEsmComponent from 'src/components/AsyncEsmComponent';
import ErrorMessageWithStackTrace from
'src/components/ErrorMessage/ErrorMessageWithStackTrace';
diff --git a/superset-frontend/src/components/Dropdown/index.tsx
b/superset-frontend/src/components/Dropdown/index.tsx
index faf12c0973..99079e87ad 100644
--- a/superset-frontend/src/components/Dropdown/index.tsx
+++ b/superset-frontend/src/components/Dropdown/index.tsx
@@ -29,7 +29,7 @@ import {
DropdownProps as AntdDropdownProps,
} from 'antd-v5';
import { styled } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
const MenuDots = styled.div`
width: ${({ theme }) => theme.gridUnit * 0.75}px;
diff --git
a/superset-frontend/src/components/DropdownContainer/DropdownContainer.test.tsx
b/superset-frontend/src/components/DropdownContainer/DropdownContainer.test.tsx
index d5475c01d5..7833a1313b 100644
---
a/superset-frontend/src/components/DropdownContainer/DropdownContainer.test.tsx
+++
b/superset-frontend/src/components/DropdownContainer/DropdownContainer.test.tsx
@@ -18,7 +18,7 @@
*/
import { screen, render, userEvent } from 'spec/helpers/testing-library';
import Button from '../Button';
-import Icons from '../Icons';
+import { Icons } from '../Icons';
import DropdownContainer from '.';
const generateItems = (n: number) =>
diff --git a/superset-frontend/src/components/DropdownContainer/index.tsx
b/superset-frontend/src/components/DropdownContainer/index.tsx
index 0d2da00f8d..0735ba289e 100644
--- a/superset-frontend/src/components/DropdownContainer/index.tsx
+++ b/superset-frontend/src/components/DropdownContainer/index.tsx
@@ -35,7 +35,7 @@ import { Global } from '@emotion/react';
import { css, t, useTheme, usePrevious } from '@superset-ui/core';
import { useResizeDetector } from 'react-resize-detector';
import Badge from '../Badge';
-import Icons from '../Icons';
+import { Icons } from '../Icons';
import Button from '../Button';
import Popover from '../Popover';
import { Tooltip } from '../Tooltip';
diff --git a/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx
b/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx
index acebb720f4..1bad6a8a52 100644
--- a/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx
+++ b/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import { ErrorLevel, styled, useTheme } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
const StyledContainer = styled.div<{ level: ErrorLevel }>`
display: flex;
diff --git a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
index 8e0d3ea513..b04b0f1f0a 100644
--- a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
+++ b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
@@ -19,7 +19,7 @@
import { useState } from 'react';
import { Tooltip } from 'src/components/Tooltip';
import Modal from 'src/components/Modal';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Alert from 'src/components/Alert';
import { t, useTheme } from '@superset-ui/core';
diff --git a/superset-frontend/src/components/ErrorMessage/IssueCode.tsx
b/superset-frontend/src/components/ErrorMessage/IssueCode.tsx
index 35cf3ec8d9..af8ab9c791 100644
--- a/superset-frontend/src/components/ErrorMessage/IssueCode.tsx
+++ b/superset-frontend/src/components/ErrorMessage/IssueCode.tsx
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { useTheme } from '@superset-ui/core';
interface IssueCodeProps {
diff --git a/superset-frontend/src/components/FaveStar/index.tsx
b/superset-frontend/src/components/FaveStar/index.tsx
index 262be12df3..83a75b1ad6 100644
--- a/superset-frontend/src/components/FaveStar/index.tsx
+++ b/superset-frontend/src/components/FaveStar/index.tsx
@@ -21,7 +21,7 @@ import { useCallback, useEffect, MouseEvent } from 'react';
import { css, t, styled, useTheme } from '@superset-ui/core';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
export interface FaveStarProps {
itemId: number;
diff --git a/superset-frontend/src/components/Form/LabeledErrorBoundInput.tsx
b/superset-frontend/src/components/Form/LabeledErrorBoundInput.tsx
index c669c1d2d1..5ef9024dea 100644
--- a/superset-frontend/src/components/Form/LabeledErrorBoundInput.tsx
+++ b/superset-frontend/src/components/Form/LabeledErrorBoundInput.tsx
@@ -20,7 +20,7 @@ import { styled, css, SupersetTheme, t } from
'@superset-ui/core';
import { Tooltip } from 'src/components/Tooltip';
import { Input } from 'src/components/Input';
import InfoTooltip from 'src/components/InfoTooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Button from 'src/components/Button';
import errorIcon from 'src/assets/images/icons/error.svg';
import FormItem from './FormItem';
diff --git a/superset-frontend/src/components/GridTable/Header.tsx
b/superset-frontend/src/components/GridTable/Header.tsx
index c613f9b5d2..03af51ccf5 100644
--- a/superset-frontend/src/components/GridTable/Header.tsx
+++ b/superset-frontend/src/components/GridTable/Header.tsx
@@ -20,7 +20,7 @@ import { useCallback, useEffect, useRef, useState } from
'react';
import { styled, useTheme, t } from '@superset-ui/core';
import type { Column, GridApi } from 'ag-grid-community';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { PIVOT_COL_ID } from './constants';
import HeaderMenu from './HeaderMenu';
diff --git a/superset-frontend/src/components/GridTable/HeaderMenu.tsx
b/superset-frontend/src/components/GridTable/HeaderMenu.tsx
index 5d327104b5..c9e14c4b1a 100644
--- a/superset-frontend/src/components/GridTable/HeaderMenu.tsx
+++ b/superset-frontend/src/components/GridTable/HeaderMenu.tsx
@@ -20,7 +20,7 @@ import { useCallback } from 'react';
import { styled, t } from '@superset-ui/core';
import type { Column, ColumnPinnedType, GridApi } from 'ag-grid-community';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { MenuDotsDropdown, DropdownProps } from 'src/components/Dropdown';
import { Menu } from 'src/components/Menu';
import copyTextToClipboard from 'src/utils/copy';
diff --git a/superset-frontend/src/components/IconButton/index.tsx
b/superset-frontend/src/components/IconButton/index.tsx
index 654e4089f5..f6b0650776 100644
--- a/superset-frontend/src/components/IconButton/index.tsx
+++ b/superset-frontend/src/components/IconButton/index.tsx
@@ -18,7 +18,7 @@
*/
import { styled } from '@superset-ui/core';
import Button, { ButtonProps as AntdButtonProps } from 'src/components/Button';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import LinesEllipsis from 'react-lines-ellipsis';
export interface IconButtonProps extends AntdButtonProps {
diff --git
a/superset-frontend/src/components/IconTooltip/IconTooltip.stories.tsx
b/superset-frontend/src/components/IconTooltip/IconTooltip.stories.tsx
index 2e5f3a280a..44b193e553 100644
--- a/superset-frontend/src/components/IconTooltip/IconTooltip.stories.tsx
+++ b/superset-frontend/src/components/IconTooltip/IconTooltip.stories.tsx
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { css, useTheme } from '@superset-ui/core';
import { IconTooltip, Props } from '.';
diff --git a/superset-frontend/src/components/Icons/Icons.stories.tsx
b/superset-frontend/src/components/Icons/Icons.stories.tsx
index 3c4f4ab3d8..672192e06b 100644
--- a/superset-frontend/src/components/Icons/Icons.stories.tsx
+++ b/superset-frontend/src/components/Icons/Icons.stories.tsx
@@ -19,7 +19,7 @@
import { useState } from 'react';
import { styled, supersetTheme } from '@superset-ui/core';
import { Input } from 'antd-v5';
-import Icons, { IconNameType } from '.';
+import { Icons, IconNameType } from '.';
import IconType from './types';
import { BaseIconComponent } from './BaseIcon';
diff --git a/superset-frontend/src/components/Icons/index.tsx
b/superset-frontend/src/components/Icons/index.tsx
index 2142815e6d..1861e1545a 100644
--- a/superset-frontend/src/components/Icons/index.tsx
+++ b/superset-frontend/src/components/Icons/index.tsx
@@ -23,6 +23,12 @@ import AsyncIcon from './AsyncIcon';
import IconType from './types';
export type { IconType };
+/**
+ * Filename is going to be inferred from the icon name.
+ * i.e. BigNumberChartTile => assets/images/icons/big_number_chart_tile
+ */
+
+// TODO @geido: Prefix custom icons
const customIcons = [
'Ballot',
@@ -70,9 +76,7 @@ export type IconNameType =
type IconComponentType = Record<IconNameType, FC<IconType>>;
-const Icons: IconComponentType = {
+export const Icons: IconComponentType = {
...antdEnhancedIcons,
...iconOverrides,
};
-
-export default Icons;
diff --git a/superset-frontend/src/components/IndeterminateCheckbox/index.tsx
b/superset-frontend/src/components/IndeterminateCheckbox/index.tsx
index 64cac112d7..4cf13aa50c 100644
--- a/superset-frontend/src/components/IndeterminateCheckbox/index.tsx
+++ b/superset-frontend/src/components/IndeterminateCheckbox/index.tsx
@@ -26,7 +26,7 @@ import {
} from 'react';
import { styled } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
export interface IndeterminateCheckboxProps {
indeterminate: boolean;
diff --git a/superset-frontend/src/components/InfoTooltip/index.tsx
b/superset-frontend/src/components/InfoTooltip/index.tsx
index 3ade7f0efa..5062506afc 100644
--- a/superset-frontend/src/components/InfoTooltip/index.tsx
+++ b/superset-frontend/src/components/InfoTooltip/index.tsx
@@ -19,7 +19,7 @@
import { styled, useTheme, css } from '@superset-ui/core';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { ActionType } from 'src/types/Action';
export interface InfoTooltipProps {
diff --git
a/superset-frontend/src/components/Label/reusable/DatasetTypeLabel.tsx
b/superset-frontend/src/components/Label/reusable/DatasetTypeLabel.tsx
index e1f7fe75c7..e779f37999 100644
--- a/superset-frontend/src/components/Label/reusable/DatasetTypeLabel.tsx
+++ b/superset-frontend/src/components/Label/reusable/DatasetTypeLabel.tsx
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Label from 'src/components/Label';
import { t, useTheme } from '@superset-ui/core';
diff --git a/superset-frontend/src/components/Label/reusable/PublishedLabel.tsx
b/superset-frontend/src/components/Label/reusable/PublishedLabel.tsx
index ddff92e010..b25a3a64a1 100644
--- a/superset-frontend/src/components/Label/reusable/PublishedLabel.tsx
+++ b/superset-frontend/src/components/Label/reusable/PublishedLabel.tsx
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Label from 'src/components/Label';
import { t, useTheme } from '@superset-ui/core';
diff --git a/superset-frontend/src/components/LastUpdated/index.tsx
b/superset-frontend/src/components/LastUpdated/index.tsx
index f108d33680..91bee1997d 100644
--- a/superset-frontend/src/components/LastUpdated/index.tsx
+++ b/superset-frontend/src/components/LastUpdated/index.tsx
@@ -25,7 +25,7 @@ import {
import { extendedDayjs } from 'src/utils/dates';
import { t, styled, css } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import dayjs from 'dayjs';
const REFRESH_INTERVAL = 60000; // every minute
diff --git a/superset-frontend/src/components/ListView/ActionsBar.tsx
b/superset-frontend/src/components/ListView/ActionsBar.tsx
index fc5357b81e..e04f5475af 100644
--- a/superset-frontend/src/components/ListView/ActionsBar.tsx
+++ b/superset-frontend/src/components/ListView/ActionsBar.tsx
@@ -19,7 +19,7 @@
import { ReactElement } from 'react';
import { styled } from '@superset-ui/core';
import { Tooltip, TooltipPlacement } from 'src/components/Tooltip';
-import Icons, { IconNameType } from 'src/components/Icons';
+import { Icons, IconNameType } from 'src/components/Icons';
export type ActionProps = {
label: string;
diff --git a/superset-frontend/src/components/ListView/Filters/Search.tsx
b/superset-frontend/src/components/ListView/Filters/Search.tsx
index da0243310a..313467ab96 100644
--- a/superset-frontend/src/components/ListView/Filters/Search.tsx
+++ b/superset-frontend/src/components/ListView/Filters/Search.tsx
@@ -25,7 +25,7 @@ import {
} from 'react';
import { t, styled, useTheme, css } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { Input as AntdInput } from 'src/components/Input';
import { SELECT_WIDTH } from 'src/components/ListView/utils';
import { FormLabel } from 'src/components/Form';
diff --git a/superset-frontend/src/components/ListView/ListView.tsx
b/superset-frontend/src/components/ListView/ListView.tsx
index 3249d0b0a7..13ea7f9113 100644
--- a/superset-frontend/src/components/ListView/ListView.tsx
+++ b/superset-frontend/src/components/ListView/ListView.tsx
@@ -21,7 +21,7 @@ import { useCallback, useEffect, useRef, useState, ReactNode
} from 'react';
import Alert from 'src/components/Alert';
import cx from 'classnames';
import Button from 'src/components/Button';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import IndeterminateCheckbox from 'src/components/IndeterminateCheckbox';
import Pagination from 'src/components/Pagination';
import TableCollection from 'src/components/TableCollection';
diff --git
a/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx
b/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx
index 61ff54d60b..d3f81b23f0 100644
--- a/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx
+++ b/superset-frontend/src/components/ListViewCard/ListViewCard.stories.tsx
@@ -19,7 +19,7 @@
import { action } from '@storybook/addon-actions';
import { Dropdown } from 'src/components/Dropdown';
import { Menu } from 'src/components/Menu';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import FaveStar from 'src/components/FaveStar';
import ListViewCard from '.';
diff --git a/superset-frontend/src/components/MessageToasts/Toast.tsx
b/superset-frontend/src/components/MessageToasts/Toast.tsx
index 96d9063429..6b67846c22 100644
--- a/superset-frontend/src/components/MessageToasts/Toast.tsx
+++ b/superset-frontend/src/components/MessageToasts/Toast.tsx
@@ -20,7 +20,7 @@ import { styled, css, SupersetTheme } from
'@superset-ui/core';
import cx from 'classnames';
import { Interweave } from 'interweave';
import { useCallback, useEffect, useRef, useState } from 'react';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { ToastType, ToastMeta } from './types';
const ToastContainer = styled.div`
diff --git a/superset-frontend/src/components/MetadataBar/ContentConfig.tsx
b/superset-frontend/src/components/MetadataBar/ContentConfig.tsx
index 8a349637db..9ea1bd740f 100644
--- a/superset-frontend/src/components/MetadataBar/ContentConfig.tsx
+++ b/superset-frontend/src/components/MetadataBar/ContentConfig.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import { ensureIsArray, styled, t } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { ContentType, MetadataType } from '.';
const Header = styled.div`
diff --git a/superset-frontend/src/components/PageHeaderWithActions/index.tsx
b/superset-frontend/src/components/PageHeaderWithActions/index.tsx
index 8880ab0071..62c27ad811 100644
--- a/superset-frontend/src/components/PageHeaderWithActions/index.tsx
+++ b/superset-frontend/src/components/PageHeaderWithActions/index.tsx
@@ -20,13 +20,13 @@ import { ReactNode, ReactElement } from 'react';
import { css, SupersetTheme, t, useTheme } from '@superset-ui/core';
import { Dropdown, DropdownProps } from 'src/components/Dropdown';
import { TooltipPlacement } from 'src/components/Tooltip';
+import { Icons } from 'src/components/Icons';
import {
DynamicEditableTitle,
DynamicEditableTitleProps,
} from '../DynamicEditableTitle';
import CertifiedBadge, { CertifiedBadgeProps } from '../CertifiedBadge';
import FaveStar, { FaveStarProps } from '../FaveStar';
-import Icons from '../Icons';
import Button from '../Button';
export const menuTriggerStyles = (theme: SupersetTheme) => css`
diff --git a/superset-frontend/src/components/Popover/Popover.test.tsx
b/superset-frontend/src/components/Popover/Popover.test.tsx
index 6dcfe2c544..92bf0576b6 100644
--- a/superset-frontend/src/components/Popover/Popover.test.tsx
+++ b/superset-frontend/src/components/Popover/Popover.test.tsx
@@ -23,7 +23,7 @@ import {
waitFor,
} from 'spec/helpers/testing-library';
import { supersetTheme } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Button from 'src/components/Button';
import Popover from 'src/components/Popover';
diff --git a/superset-frontend/src/components/PopoverDropdown/index.tsx
b/superset-frontend/src/components/PopoverDropdown/index.tsx
index b781ff6ce4..2c3c4d2407 100644
--- a/superset-frontend/src/components/PopoverDropdown/index.tsx
+++ b/superset-frontend/src/components/PopoverDropdown/index.tsx
@@ -21,7 +21,7 @@ import cx from 'classnames';
import { styled, useTheme } from '@superset-ui/core';
import { Dropdown } from 'src/components/Dropdown';
import { Menu } from 'src/components/Menu';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
export interface OptionProps {
value: string;
diff --git a/superset-frontend/src/components/PopoverSection/index.tsx
b/superset-frontend/src/components/PopoverSection/index.tsx
index 9a687357d8..bbff815388 100644
--- a/superset-frontend/src/components/PopoverSection/index.tsx
+++ b/superset-frontend/src/components/PopoverSection/index.tsx
@@ -19,7 +19,7 @@
import { MouseEventHandler, ReactNode } from 'react';
import { css, useTheme } from '@superset-ui/core';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
export interface PopoverSectionProps {
title: string;
diff --git a/superset-frontend/src/components/Radio/Radio.stories.tsx
b/superset-frontend/src/components/Radio/Radio.stories.tsx
index 81e33498ae..90b5c9b5a2 100644
--- a/superset-frontend/src/components/Radio/Radio.stories.tsx
+++ b/superset-frontend/src/components/Radio/Radio.stories.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import { Space } from 'src/components/Space';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { css } from '@superset-ui/core';
import { Radio, RadioProps, RadioGroupWrapperProps } from './index';
diff --git a/superset-frontend/src/components/RefreshLabel/index.tsx
b/superset-frontend/src/components/RefreshLabel/index.tsx
index 1fb7771f4f..153b6225b7 100644
--- a/superset-frontend/src/components/RefreshLabel/index.tsx
+++ b/superset-frontend/src/components/RefreshLabel/index.tsx
@@ -19,7 +19,7 @@
import { MouseEventHandler, forwardRef } from 'react';
import { SupersetTheme } from '@superset-ui/core';
import { Tooltip } from 'src/components/Tooltip';
-import Icons, { IconType } from 'src/components/Icons';
+import { Icons, IconType } from 'src/components/Icons';
export interface RefreshLabelProps {
onClick: MouseEventHandler<HTMLSpanElement>;
diff --git a/superset-frontend/src/components/Select/AsyncSelect.tsx
b/superset-frontend/src/components/Select/AsyncSelect.tsx
index 29c6fd1283..4615f93418 100644
--- a/superset-frontend/src/components/Select/AsyncSelect.tsx
+++ b/superset-frontend/src/components/Select/AsyncSelect.tsx
@@ -40,7 +40,7 @@ import {
// eslint-disable-next-line no-restricted-imports
import { LabeledValue as AntdLabeledValue } from 'antd/lib/select'; // TODO:
Remove antd
import { debounce, isEqual, uniq } from 'lodash';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { FAST_DEBOUNCE, SLOW_DEBOUNCE } from 'src/constants';
import {
getValue,
diff --git a/superset-frontend/src/components/Select/styles.tsx
b/superset-frontend/src/components/Select/styles.tsx
index 726f6af628..5ccc4a5fa5 100644
--- a/superset-frontend/src/components/Select/styles.tsx
+++ b/superset-frontend/src/components/Select/styles.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import { styled } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
// eslint-disable-next-line no-restricted-imports
import { Spin, Tag } from 'antd'; // TODO: Remove antd
// eslint-disable-next-line no-restricted-imports
diff --git a/superset-frontend/src/components/Select/utils.tsx
b/superset-frontend/src/components/Select/utils.tsx
index 0c21ec228e..7025b7951a 100644
--- a/superset-frontend/src/components/Select/utils.tsx
+++ b/superset-frontend/src/components/Select/utils.tsx
@@ -20,7 +20,7 @@ import { ensureIsArray, t } from '@superset-ui/core';
// eslint-disable-next-line no-restricted-imports
import AntdSelect, { LabeledValue as AntdLabeledValue } from
'antd/lib/select'; // TODO: Remove antd
import { ReactElement, RefObject } from 'react';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { StyledHelperText, StyledLoadingText, StyledSpin } from './styles';
import { LabeledValue, RawValue, SelectOptionsType, V } from './types';
diff --git
a/superset-frontend/src/components/Table/header-renderers/HeaderWithRadioGroup.tsx
b/superset-frontend/src/components/Table/header-renderers/HeaderWithRadioGroup.tsx
index fe43fd8954..c6e9562301 100644
---
a/superset-frontend/src/components/Table/header-renderers/HeaderWithRadioGroup.tsx
+++
b/superset-frontend/src/components/Table/header-renderers/HeaderWithRadioGroup.tsx
@@ -19,7 +19,7 @@
import { useState } from 'react';
import { css, useTheme } from '@superset-ui/core';
import { Radio } from 'src/components/Radio';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Popover from 'src/components/Popover';
export interface HeaderWithRadioGroupProps {
diff --git a/superset-frontend/src/components/TableCollection/index.tsx
b/superset-frontend/src/components/TableCollection/index.tsx
index 5644db53b7..d48c7a78ed 100644
--- a/superset-frontend/src/components/TableCollection/index.tsx
+++ b/superset-frontend/src/components/TableCollection/index.tsx
@@ -20,7 +20,7 @@ import { memo } from 'react';
import cx from 'classnames';
import { TableInstance } from 'react-table';
import { styled } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
interface TableCollectionProps {
getTableProps: (userProps?: any) => any;
diff --git a/superset-frontend/src/components/TableSelector/index.tsx
b/superset-frontend/src/components/TableSelector/index.tsx
index a46be82822..f0e7798861 100644
--- a/superset-frontend/src/components/TableSelector/index.tsx
+++ b/superset-frontend/src/components/TableSelector/index.tsx
@@ -34,7 +34,7 @@ import {
} from '@superset-ui/core';
import { Select } from 'src/components';
import { FormLabel } from 'src/components/Form';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import DatabaseSelector, {
DatabaseObject,
} from 'src/components/DatabaseSelector';
diff --git a/superset-frontend/src/components/Tabs/Tabs.tsx
b/superset-frontend/src/components/Tabs/Tabs.tsx
index c12712976b..ac05e0c3aa 100644
--- a/superset-frontend/src/components/Tabs/Tabs.tsx
+++ b/superset-frontend/src/components/Tabs/Tabs.tsx
@@ -19,7 +19,7 @@
import { css, styled } from '@superset-ui/core';
// eslint-disable-next-line no-restricted-imports
import AntdTabs, { TabsProps as AntdTabsProps } from 'antd/lib/tabs'; // TODO:
Remove antd
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
export interface TabsProps extends AntdTabsProps {
fullWidth?: boolean;
diff --git a/superset-frontend/src/components/Tags/Tag.tsx
b/superset-frontend/src/components/Tags/Tag.tsx
index 063000b0fb..6bb3223c67 100644
--- a/superset-frontend/src/components/Tags/Tag.tsx
+++ b/superset-frontend/src/components/Tags/Tag.tsx
@@ -22,7 +22,7 @@ import TagType from 'src/types/TagType';
import { Tag as AntdTag } from 'antd-v5';
import { useMemo } from 'react';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
const StyledTag = styled(AntdTag)`
${({ theme }) => `
diff --git a/superset-frontend/src/components/Timer/index.tsx
b/superset-frontend/src/components/Timer/index.tsx
index 00d7c1a751..a9136657a4 100644
--- a/superset-frontend/src/components/Timer/index.tsx
+++ b/superset-frontend/src/components/Timer/index.tsx
@@ -19,7 +19,7 @@
import { useEffect, useRef, useState } from 'react';
import { styled, useTheme } from '@superset-ui/core';
import Label, { Type } from 'src/components/Label';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { now, fDuration } from 'src/utils/dates';
diff --git a/superset-frontend/src/components/Tooltip/Tooltip.test.tsx
b/superset-frontend/src/components/Tooltip/Tooltip.test.tsx
index 95f66e6e74..8b2d418894 100644
--- a/superset-frontend/src/components/Tooltip/Tooltip.test.tsx
+++ b/superset-frontend/src/components/Tooltip/Tooltip.test.tsx
@@ -19,7 +19,7 @@
import { render, screen, userEvent } from 'spec/helpers/testing-library';
import { supersetTheme } from '@superset-ui/core';
import Button from 'src/components/Button';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { Tooltip } from '.';
test('starts hidden with default props', () => {
diff --git a/superset-frontend/src/components/WarningIconWithTooltip/index.tsx
b/superset-frontend/src/components/WarningIconWithTooltip/index.tsx
index 94638d4923..543b3fc29a 100644
--- a/superset-frontend/src/components/WarningIconWithTooltip/index.tsx
+++ b/superset-frontend/src/components/WarningIconWithTooltip/index.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import { useTheme, SafeMarkdown } from '@superset-ui/core';
-import Icons, { IconType } from 'src/components/Icons';
+import { Icons, IconType } from 'src/components/Icons';
import { Tooltip } from 'src/components/Tooltip';
export interface WarningIconWithTooltipProps {
diff --git
a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
index c1f8cfe76d..52af9ae9b2 100644
---
a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
+++
b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
@@ -32,7 +32,7 @@ import { useDispatch, useSelector } from 'react-redux';
import ErrorBoundary from 'src/components/ErrorBoundary';
import BuilderComponentPane from
'src/dashboard/components/BuilderComponentPane';
import DashboardHeader from 'src/dashboard/components/Header';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import IconButton from 'src/dashboard/components/IconButton';
import { Droppable } from 'src/dashboard/components/dnd/DragDroppable';
import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
diff --git a/superset-frontend/src/dashboard/components/DashboardGrid.jsx
b/superset-frontend/src/dashboard/components/DashboardGrid.jsx
index 46167ae2c8..3ab498145d 100644
--- a/superset-frontend/src/dashboard/components/DashboardGrid.jsx
+++ b/superset-frontend/src/dashboard/components/DashboardGrid.jsx
@@ -22,7 +22,7 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';
import { addAlpha, css, styled, t } from '@superset-ui/core';
import { EmptyState } from 'src/components/EmptyState';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { componentShape } from '../util/propShapes';
import DashboardComponent from '../containers/DashboardComponent';
import { Droppable } from './dnd/DragDroppable';
diff --git
a/superset-frontend/src/dashboard/components/DeleteComponentButton.tsx
b/superset-frontend/src/dashboard/components/DeleteComponentButton.tsx
index 9c1231c127..221d544493 100644
--- a/superset-frontend/src/dashboard/components/DeleteComponentButton.tsx
+++ b/superset-frontend/src/dashboard/components/DeleteComponentButton.tsx
@@ -18,7 +18,7 @@
*/
import { MouseEventHandler, FC } from 'react';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import IconButton from './IconButton';
type DeleteComponentButtonProps = {
diff --git
a/superset-frontend/src/dashboard/components/FiltersBadge/FilterIndicator/index.tsx
b/superset-frontend/src/dashboard/components/FiltersBadge/FilterIndicator/index.tsx
index 8eb1cf4c64..9d9509b304 100644
---
a/superset-frontend/src/dashboard/components/FiltersBadge/FilterIndicator/index.tsx
+++
b/superset-frontend/src/dashboard/components/FiltersBadge/FilterIndicator/index.tsx
@@ -19,7 +19,7 @@
import { forwardRef } from 'react';
import { css } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { getFilterValueForDisplay } from
'src/dashboard/components/nativeFilters/utils';
import {
FilterValue,
diff --git a/superset-frontend/src/dashboard/components/FiltersBadge/index.tsx
b/superset-frontend/src/dashboard/components/FiltersBadge/index.tsx
index 5f544d6996..216dac4006 100644
--- a/superset-frontend/src/dashboard/components/FiltersBadge/index.tsx
+++ b/superset-frontend/src/dashboard/components/FiltersBadge/index.tsx
@@ -37,7 +37,7 @@ import {
t,
usePrevious,
} from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { setDirectPathToChild } from 'src/dashboard/actions/dashboardState';
import { useChartLayoutItems } from 'src/dashboard/util/useChartLayoutItems';
import Badge from 'src/components/Badge';
diff --git a/superset-frontend/src/dashboard/components/Header/index.jsx
b/superset-frontend/src/dashboard/components/Header/index.jsx
index 4c1cb49ab8..cdc587cef0 100644
--- a/superset-frontend/src/dashboard/components/Header/index.jsx
+++ b/superset-frontend/src/dashboard/components/Header/index.jsx
@@ -36,7 +36,7 @@ import {
LOG_ACTIONS_FORCE_REFRESH_DASHBOARD,
LOG_ACTIONS_TOGGLE_EDIT_DASHBOARD,
} from 'src/logger/LogUtils';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { Button } from 'src/components/';
import { findPermission } from 'src/utils/findPermission';
import { Tooltip } from 'src/components/Tooltip';
diff --git a/superset-frontend/src/dashboard/components/SliceAdder.tsx
b/superset-frontend/src/dashboard/components/SliceAdder.tsx
index 5c965d9cc5..d861c8ff32 100644
--- a/superset-frontend/src/dashboard/components/SliceAdder.tsx
+++ b/superset-frontend/src/dashboard/components/SliceAdder.tsx
@@ -27,7 +27,7 @@ import { Input } from 'src/components/Input';
import { Select } from 'src/components';
import Loading from 'src/components/Loading';
import Button from 'src/components/Button';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import {
LocalStorageKeys,
getItem,
diff --git a/superset-frontend/src/dashboard/components/SliceHeader/index.tsx
b/superset-frontend/src/dashboard/components/SliceHeader/index.tsx
index ab93f04520..3de1296610 100644
--- a/superset-frontend/src/dashboard/components/SliceHeader/index.tsx
+++ b/superset-frontend/src/dashboard/components/SliceHeader/index.tsx
@@ -32,7 +32,7 @@ import EditableTitle from 'src/components/EditableTitle';
import SliceHeaderControls from 'src/dashboard/components/SliceHeaderControls';
import { SliceHeaderControlsProps } from
'src/dashboard/components/SliceHeaderControls/types';
import FiltersBadge from 'src/dashboard/components/FiltersBadge';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { RootState } from 'src/dashboard/types';
import { getSliceHeaderTooltip } from
'src/dashboard/util/getSliceHeaderTooltip';
import { DashboardPageIdContext } from
'src/dashboard/containers/DashboardPage';
diff --git
a/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
b/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
index 1c31b67529..83b1639278 100644
--- a/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
+++ b/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
@@ -46,7 +46,7 @@ import ShareMenuItems from
'src/dashboard/components/menu/ShareMenuItems';
import downloadAsImage from 'src/utils/downloadAsImage';
import { getSliceHeaderTooltip } from
'src/dashboard/util/getSliceHeaderTooltip';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import ModalTrigger from 'src/components/ModalTrigger';
import ViewQueryModal from 'src/explore/components/controls/ViewQueryModal';
import { ResultsPaneOnDashboard } from 'src/explore/components/DataTablesPane';
diff --git
a/superset-frontend/src/dashboard/components/URLShortLinkButton/index.tsx
b/superset-frontend/src/dashboard/components/URLShortLinkButton/index.tsx
index 317fa98113..106e240d62 100644
--- a/superset-frontend/src/dashboard/components/URLShortLinkButton/index.tsx
+++ b/superset-frontend/src/dashboard/components/URLShortLinkButton/index.tsx
@@ -24,7 +24,7 @@ import { getDashboardPermalink } from 'src/utils/urlUtils';
import { useToasts } from 'src/components/MessageToasts/withToasts';
import { shallowEqual, useSelector } from 'react-redux';
import { RootState } from 'src/dashboard/types';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
export type URLShortLinkButtonProps = {
dashboardId: number;
diff --git a/superset-frontend/src/dashboard/components/dnd/DragHandle.tsx
b/superset-frontend/src/dashboard/components/dnd/DragHandle.tsx
index 0ba008a327..ab941a6386 100644
--- a/superset-frontend/src/dashboard/components/dnd/DragHandle.tsx
+++ b/superset-frontend/src/dashboard/components/dnd/DragHandle.tsx
@@ -18,7 +18,7 @@
*/
import { LegacyRef } from 'react';
import { css, styled } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
interface DragHandleProps {
position: 'left' | 'top';
diff --git
a/superset-frontend/src/dashboard/components/filterscope/renderFilterScopeTreeNodes.jsx
b/superset-frontend/src/dashboard/components/filterscope/renderFilterScopeTreeNodes.jsx
index c1e7b672a4..38d720fc46 100644
---
a/superset-frontend/src/dashboard/components/filterscope/renderFilterScopeTreeNodes.jsx
+++
b/superset-frontend/src/dashboard/components/filterscope/renderFilterScopeTreeNodes.jsx
@@ -18,7 +18,7 @@
*/
import cx from 'classnames';
import { styled } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { CHART_TYPE } from 'src/dashboard/util/componentTypes';
const ChartIcon = styled(Icons.BarChartOutlined)`
diff --git
a/superset-frontend/src/dashboard/components/gridComponents/Column.jsx
b/superset-frontend/src/dashboard/components/gridComponents/Column.jsx
index ed16a7d4d0..612b8d5ef6 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Column.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Column.jsx
@@ -20,7 +20,7 @@ import { Fragment, useCallback, useState, useMemo, memo }
from 'react';
import PropTypes from 'prop-types';
import cx from 'classnames';
import { css, styled, t } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
import DeleteComponentButton from
'src/dashboard/components/DeleteComponentButton';
import {
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
b/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
index 7dca12167b..a353d85c3b 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Row.jsx
@@ -44,7 +44,7 @@ import DragHandle from
'src/dashboard/components/dnd/DragHandle';
import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
import DeleteComponentButton from
'src/dashboard/components/DeleteComponentButton';
import HoverMenu from 'src/dashboard/components/menu/HoverMenu';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import IconButton from 'src/dashboard/components/IconButton';
import BackgroundStyleDropdown from
'src/dashboard/components/menu/BackgroundStyleDropdown';
import WithPopoverMenu from 'src/dashboard/components/menu/WithPopoverMenu';
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx
b/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx
index a5ec5e5017..0a699bc33e 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx
@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
import { styled, t, usePrevious, css } from '@superset-ui/core';
import { useSelector } from 'react-redux';
import { LineEditableTabs } from 'src/components/Tabs';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { LOG_ACTIONS_SELECT_DASHBOARD_TAB } from 'src/logger/LogUtils';
import Modal from 'src/components/Modal';
import { DROP_LEFT, DROP_RIGHT } from 'src/dashboard/util/getDropPosition';
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilterTitle.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilterTitle.tsx
index 714e3be34e..be3797d028 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilterTitle.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/CrossFilterTitle.tsx
@@ -26,7 +26,7 @@ import {
} from '@superset-ui/core';
import { Tooltip } from 'src/components/Tooltip';
import { FilterBarOrientation } from 'src/dashboard/types';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { ellipsisCss } from './styles';
const StyledCrossFilterTitle = styled.div`
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ChartsScopingListPanel.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ChartsScopingListPanel.tsx
index 6ccd23a32f..85506affe0 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ChartsScopingListPanel.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ChartsScopingListPanel.tsx
@@ -27,7 +27,7 @@ import {
} from 'src/dashboard/types';
import { useSelector } from 'react-redux';
import { CHART_TYPE } from 'src/dashboard/util/componentTypes';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Button from 'src/components/Button';
import { FilterTitle } from
'src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitleContainer';
import { NEW_CHART_SCOPING_ID } from './constants';
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingTreePanel.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingTreePanel.tsx
index 997340cc6e..bd1012caa0 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingTreePanel.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CrossFilters/ScopingModal/ScopingTreePanel.tsx
@@ -37,7 +37,7 @@ import {
} from 'src/dashboard/types';
import { CHART_TYPE } from 'src/dashboard/util/componentTypes';
import { SelectOptionsType } from 'src/components/Select/types';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { Tooltip } from 'src/components/Tooltip';
import Alert from 'src/components/Alert';
import { NEW_CHART_SCOPING_ID } from './constants';
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/index.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/index.tsx
index 277a2bcfcb..ee940f068d 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/index.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/index.tsx
@@ -26,7 +26,7 @@ import {
saveFilterBarOrientation,
saveCrossFiltersSetting,
} from 'src/dashboard/actions/dashboardInfo';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Checkbox from 'src/components/Checkbox';
import { Dropdown } from 'src/components/Dropdown';
import { Button } from 'src/components';
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
index a1c69fcfd7..7f1e7fded0 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
@@ -50,7 +50,7 @@ import { FilterBarOrientation, RootState } from
'src/dashboard/types';
import DropdownContainer, {
Ref as DropdownContainerRef,
} from 'src/components/DropdownContainer';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { useChartIds } from 'src/dashboard/util/charts/useChartIds';
import { useChartLayoutItems } from 'src/dashboard/util/useChartLayoutItems';
import { FiltersOutOfScopeCollapsible } from '../FiltersOutOfScopeCollapsible';
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterDivider.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterDivider.tsx
index d8b86e6084..ea55624cd2 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterDivider.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterDivider.tsx
@@ -23,7 +23,7 @@ import {
useCSSTextTruncation,
truncationCSS,
} from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { Tooltip } from 'src/components/Tooltip';
import { FilterBarOrientation } from 'src/dashboard/types';
import { FilterDividerProps } from './types';
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx
index 8183d77205..6e9a3f1c68 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Header/index.tsx
@@ -19,7 +19,7 @@
/* eslint-disable no-param-reassign */
import { css, styled, t } from '@superset-ui/core';
import { memo, FC } from 'react';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Button from 'src/components/Button';
import { getFilterBarTestId } from '../utils';
import FilterBarSettings from '../FilterBarSettings';
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Vertical.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Vertical.tsx
index 4d1f955c04..417c425648 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Vertical.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Vertical.tsx
@@ -31,7 +31,7 @@ import {
} from 'react';
import cx from 'classnames';
import { styled, t, useTheme } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Loading from 'src/components/Loading';
import { EmptyState } from 'src/components/EmptyState';
import { getFilterBarTestId } from './utils';
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/DependenciesRow.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/DependenciesRow.tsx
index 60fa99f3c5..a58ee02414 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/DependenciesRow.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/DependenciesRow.tsx
@@ -19,7 +19,7 @@
import { memo, useCallback, useMemo } from 'react';
import { useDispatch } from 'react-redux';
import { css, t, useTheme, useTruncation } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { setDirectPathToChild } from 'src/dashboard/actions/dashboardState';
import {
DependencyItem,
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/NameRow.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/NameRow.tsx
index 1463f918f3..0773e328cb 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/NameRow.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FilterCard/NameRow.tsx
@@ -18,7 +18,7 @@
*/
import { useSelector } from 'react-redux';
import { css, SupersetTheme, useTheme, useTruncation } from
'@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { useFilterConfigModal } from
'src/dashboard/components/nativeFilters/FilterBar/FilterConfigurationLink/useFilterConfigModal';
import { RootState } from 'src/dashboard/types';
import { Row, FilterName, InternalRow } from './Styles';
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/DraggableFilter.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/DraggableFilter.tsx
index f16ceba6bc..59b109dfb3 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/DraggableFilter.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/DraggableFilter.tsx
@@ -25,7 +25,7 @@ import {
useDrop,
XYCoord,
} from 'react-dnd';
-import Icons, { IconType } from 'src/components/Icons';
+import { Icons, IconType } from 'src/components/Icons';
interface TitleContainerProps {
readonly isDragging: boolean;
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitleContainer.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitleContainer.tsx
index 8accde195f..b8bc7963f1 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitleContainer.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitleContainer.tsx
@@ -19,7 +19,7 @@
import { forwardRef, ReactNode } from 'react';
import { styled, t, useTheme } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { FilterRemoval } from './types';
import DraggableFilter from './DraggableFilter';
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitlePane.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitlePane.tsx
index 501ee8a952..2c4b4ba0c3 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitlePane.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitlePane.tsx
@@ -20,7 +20,7 @@ import { useRef, FC } from 'react';
import { NativeFilterType, styled, t, useTheme } from '@superset-ui/core';
import { Button } from 'src/components';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import FilterTitleContainer from './FilterTitleContainer';
import { FilterRemoval } from './types';
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DependencyList.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DependencyList.tsx
index c258396252..74571397df 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DependencyList.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DependencyList.tsx
@@ -18,7 +18,7 @@
*/
import { useState } from 'react';
import { styled, t } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { Select } from 'src/components';
import { CollapsibleControl } from './CollapsibleControl';
import { INPUT_WIDTH } from './constants';
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/ScopingTree.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/ScopingTree.tsx
index 9921e6e8e9..6ad9e5e4f0 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/ScopingTree.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/ScopingTree.tsx
@@ -22,7 +22,7 @@ import { NativeFilterScope } from '@superset-ui/core';
import { Tree } from 'src/components';
import { DASHBOARD_ROOT_ID } from 'src/dashboard/util/constants';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { useFilterScopeTree } from './state';
import { findFilterScope, getTreeCheckedItems } from './utils';
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
index 8a0851f95e..7ef4e6bacb 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
@@ -64,7 +64,7 @@ import Collapse from 'src/components/Collapse';
import BasicErrorAlert from 'src/components/ErrorMessage/BasicErrorAlert';
import ErrorMessageWithStackTrace from
'src/components/ErrorMessage/ErrorMessageWithStackTrace';
import { FormItem } from 'src/components/Form';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Loading from 'src/components/Loading';
import { addDangerToast } from 'src/components/MessageToasts/actions';
import { Radio } from 'src/components/Radio';
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx
b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx
index 0add3cd65f..cc06eb0833 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx
@@ -30,7 +30,7 @@ import {
} from '@superset-ui/core';
import { useDispatch } from 'react-redux';
import { AntdForm } from 'src/components';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import ErrorBoundary from 'src/components/ErrorBoundary';
import { StyledModal } from 'src/components/Modal';
import { testWithId } from 'src/utils/testUtils';
diff --git a/superset-frontend/src/explore/components/ControlHeader.tsx
b/superset-frontend/src/explore/components/ControlHeader.tsx
index cf94c24355..750019dc4e 100644
--- a/superset-frontend/src/explore/components/ControlHeader.tsx
+++ b/superset-frontend/src/explore/components/ControlHeader.tsx
@@ -21,7 +21,7 @@ import { t, css, useTheme, SupersetTheme } from
'@superset-ui/core';
import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
import { Tooltip } from 'src/components/Tooltip';
import { FormLabel } from 'src/components/Form';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
type ValidationError = string;
diff --git
a/superset-frontend/src/explore/components/ControlPanelsContainer.tsx
b/superset-frontend/src/explore/components/ControlPanelsContainer.tsx
index 77e5580fd7..9f9937339e 100644
--- a/superset-frontend/src/explore/components/ControlPanelsContainer.tsx
+++ b/superset-frontend/src/explore/components/ControlPanelsContainer.tsx
@@ -66,7 +66,7 @@ import { getSectionsToRender } from
'src/explore/controlUtils';
import { ExploreActions } from 'src/explore/actions/exploreActions';
import { ChartState, ExplorePageState } from 'src/explore/types';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import ControlRow from './ControlRow';
import Control from './Control';
import { ExploreAlert } from './ExploreAlert';
diff --git
a/superset-frontend/src/explore/components/DataTableControl/index.tsx
b/superset-frontend/src/explore/components/DataTableControl/index.tsx
index a54dcb5093..d95876213f 100644
--- a/superset-frontend/src/explore/components/DataTableControl/index.tsx
+++ b/superset-frontend/src/explore/components/DataTableControl/index.tsx
@@ -37,7 +37,7 @@ import {
SLOW_DEBOUNCE,
} from 'src/constants';
import { Radio } from 'src/components/Radio';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Button from 'src/components/Button';
import Popover from 'src/components/Popover';
import { prepareCopyToClipboardTabularData } from 'src/utils/common';
diff --git
a/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
b/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
index 65b3d60e23..051caa405c 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
@@ -24,7 +24,7 @@ import {
t,
useTheme,
} from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Tabs from 'src/components/Tabs';
import {
getItem,
diff --git
a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/index.tsx
b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/index.tsx
index eb3ed8981a..aaafd6fa55 100644
---
a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/index.tsx
+++
b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelDragOption/index.tsx
@@ -25,7 +25,7 @@ import {
StyledColumnOption,
StyledMetricOption,
} from 'src/explore/components/optionRenderers';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { DatasourcePanelDndItem } from '../types';
diff --git
a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelItem.tsx
b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelItem.tsx
index 8ef29b9966..0ca8f92e16 100644
---
a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelItem.tsx
+++
b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanelItem.tsx
@@ -20,7 +20,7 @@ import { CSSProperties, FC } from 'react';
import { css, Metric, styled, t, useTheme } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import DatasourcePanelDragOption from './DatasourcePanelDragOption';
import { DndItemType } from '../DndItemType';
import { DndItemValue } from './types';
diff --git
a/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx
b/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx
index b7e76b2170..db7d19a706 100644
--- a/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx
+++ b/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx
@@ -25,7 +25,7 @@ import { css, logging, SupersetClient, t, useTheme } from
'@superset-ui/core';
import { chartPropShape } from 'src/dashboard/util/propShapes';
import AlteredSliceTag from 'src/components/AlteredSliceTag';
import Button from 'src/components/Button';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import PropertiesModal from 'src/explore/components/PropertiesModal';
import { sliceUpdated } from 'src/explore/actions/exploreActions';
import { PageHeaderWithActions } from 'src/components/PageHeaderWithActions';
diff --git
a/superset-frontend/src/explore/components/ExportToCSVDropdown/index.tsx
b/superset-frontend/src/explore/components/ExportToCSVDropdown/index.tsx
index 4307a6bca2..d539c4f47a 100644
--- a/superset-frontend/src/explore/components/ExportToCSVDropdown/index.tsx
+++ b/superset-frontend/src/explore/components/ExportToCSVDropdown/index.tsx
@@ -19,7 +19,7 @@
import { ReactChild, useCallback, Key } from 'react';
import { t, styled } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { Dropdown } from 'src/components/Dropdown';
import { Menu } from 'src/components/Menu';
diff --git a/superset-frontend/src/explore/components/PropertiesModal/index.tsx
b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
index dba9031e81..7427949a9a 100644
--- a/superset-frontend/src/explore/components/PropertiesModal/index.tsx
+++ b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
@@ -36,7 +36,7 @@ import {
useTheme,
css,
} from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Chart, { Slice } from 'src/types/Chart';
import withToasts from 'src/components/MessageToasts/withToasts';
import { loadTags } from 'src/components/Tags/utils';
diff --git a/superset-frontend/src/explore/components/RunQueryButton/index.tsx
b/superset-frontend/src/explore/components/RunQueryButton/index.tsx
index 80e14fc3b0..c866f638e8 100644
--- a/superset-frontend/src/explore/components/RunQueryButton/index.tsx
+++ b/superset-frontend/src/explore/components/RunQueryButton/index.tsx
@@ -20,7 +20,7 @@
import { ReactNode } from 'react';
import { t, useTheme } from '@superset-ui/core';
import Button from 'src/components/Button';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
export type RunQueryButtonProps = {
loading: boolean;
diff --git
a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.tsx
b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.tsx
index 6a5be7ce1f..2110feecd9 100644
---
a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.tsx
+++
b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.tsx
@@ -37,7 +37,7 @@ import CustomListItem from
'src/explore/components/controls/CustomListItem';
import { ChartState, ExplorePageState } from 'src/explore/types';
import { AnyAction } from 'redux';
import { ThunkDispatch } from 'redux-thunk';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import ControlPopover, {
getSectionContainerElement,
} from '../ControlPopover/ControlPopover';
diff --git
a/superset-frontend/src/explore/components/controls/CollectionControl/index.jsx
b/superset-frontend/src/explore/components/controls/CollectionControl/index.jsx
index 7b25047c0a..1e4c9b454d 100644
---
a/superset-frontend/src/explore/components/controls/CollectionControl/index.jsx
+++
b/superset-frontend/src/explore/components/controls/CollectionControl/index.jsx
@@ -27,7 +27,7 @@ import {
SortableElement,
arrayMove,
} from 'react-sortable-hoc';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import {
HeaderContainer,
AddIconButton,
diff --git
a/superset-frontend/src/explore/components/controls/ColorSchemeControl/index.tsx
b/superset-frontend/src/explore/components/controls/ColorSchemeControl/index.tsx
index 40e0c463bf..c1e620c6db 100644
---
a/superset-frontend/src/explore/components/controls/ColorSchemeControl/index.tsx
+++
b/superset-frontend/src/explore/components/controls/ColorSchemeControl/index.tsx
@@ -33,7 +33,7 @@ import AntdSelect from 'antd/lib/select'; // TODO: Remove antd
import { sortBy } from 'lodash';
import ControlHeader from 'src/explore/components/ControlHeader';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { SelectOptionsType } from 'src/components/Select/types';
import { StyledSelect } from 'src/components/Select/styles';
import { handleFilterOptionHelper } from 'src/components/Select/utils';
diff --git
a/superset-frontend/src/explore/components/controls/ColumnConfigControl/constants.tsx
b/superset-frontend/src/explore/components/controls/ColumnConfigControl/constants.tsx
index fbe7da6544..ea58e4777d 100644
---
a/superset-frontend/src/explore/components/controls/ColumnConfigControl/constants.tsx
+++
b/superset-frontend/src/explore/components/controls/ColumnConfigControl/constants.tsx
@@ -24,7 +24,7 @@ import {
D3_TIME_FORMAT_DOCS,
D3_TIME_FORMAT_OPTIONS,
} from '@superset-ui/chart-controls';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { ColumnConfigFormLayout } from './types';
export type SharedColumnConfigProp =
diff --git
a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.tsx
b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.tsx
index aabfade6b2..3b5b9d9490 100644
---
a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.tsx
+++
b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.tsx
@@ -19,7 +19,7 @@
import { useEffect, useState } from 'react';
import { styled, css, t, useTheme } from '@superset-ui/core';
import { Comparator } from '@superset-ui/chart-controls';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import ControlHeader from 'src/explore/components/ControlHeader';
import { FormattingPopover } from './FormattingPopover';
import {
diff --git
a/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
b/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
index 8f866af430..9bea9432b2 100644
---
a/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
+++
b/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
@@ -33,7 +33,7 @@ import { getUrlParam } from 'src/utils/urlUtils';
import { Dropdown } from 'src/components/Dropdown';
import { Menu } from 'src/components/Menu';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import {
ChangeDatasourceModal,
DatasourceModal,
diff --git
a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
index 5f200ea589..421019e653 100644
---
a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
+++
b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
@@ -31,7 +31,7 @@ import Button from 'src/components/Button';
import ControlHeader from 'src/explore/components/ControlHeader';
import Modal from 'src/components/Modal';
import { Divider } from 'src/components/Divider';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Select from 'src/components/Select/Select';
import { Tooltip } from 'src/components/Tooltip';
import { useDebouncedEffect } from 'src/explore/exploreUtils';
diff --git
a/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateLabel.tsx
b/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateLabel.tsx
index e44c0322a0..859b19d4e5 100644
---
a/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateLabel.tsx
+++
b/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateLabel.tsx
@@ -20,7 +20,7 @@
import { forwardRef, MouseEvent, ReactNode, RefObject } from 'react';
import { css, styled, t } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
export type DateLabelProps = {
name?: string;
diff --git
a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelectPopoverTitle.jsx
b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelectPopoverTitle.jsx
index a4dec16e3f..4b2dc77ae1 100644
---
a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelectPopoverTitle.jsx
+++
b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelectPopoverTitle.jsx
@@ -20,7 +20,7 @@ import { useCallback, useState } from 'react';
import { t, styled, useTheme } from '@superset-ui/core';
import { Input } from 'src/components/Input';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
const StyledInput = styled(Input)`
border-radius: ${({ theme }) => theme.borderRadius};
diff --git
a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx
b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx
index e2dd15674f..3ef1331745 100644
---
a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx
+++
b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndSelectLabel.tsx
@@ -29,7 +29,7 @@ import {
DatasourcePanelDndItem,
DndItemValue,
} from 'src/explore/components/DatasourcePanel/types';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { DndItemType } from '../../DndItemType';
import { DraggingContext, DropzoneContext } from '../../ExploreContainer';
diff --git
a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.tsx
b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.tsx
index 2234bef94d..b85fed4662 100644
---
a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.tsx
+++
b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/Option.tsx
@@ -18,7 +18,7 @@
*/
import { useCallback } from 'react';
import { css, styled, t, useTheme } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import {
CaretContainer,
CloseContainer,
diff --git
a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx
b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx
index 85186773f6..de3b515fe0 100644
---
a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx
+++
b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.jsx
@@ -42,7 +42,7 @@ import {
HeaderContainer,
LabelsContainer,
} from 'src/explore/components/controls/OptionControls';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Modal from 'src/components/Modal';
import AdhocFilterPopoverTrigger from
'src/explore/components/controls/FilterControl/AdhocFilterPopoverTrigger';
import AdhocFilterOption from
'src/explore/components/controls/FilterControl/AdhocFilterOption';
diff --git
a/superset-frontend/src/explore/components/controls/LayerConfigsControl/FlatLayerTree.tsx
b/superset-frontend/src/explore/components/controls/LayerConfigsControl/FlatLayerTree.tsx
index 4e48988ded..604cfb9929 100644
---
a/superset-frontend/src/explore/components/controls/LayerConfigsControl/FlatLayerTree.tsx
+++
b/superset-frontend/src/explore/components/controls/LayerConfigsControl/FlatLayerTree.tsx
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { css, styled, t } from '@superset-ui/core';
// eslint-disable-next-line no-restricted-imports
import { Button, Tree } from 'antd'; // TODO: Remove antd
diff --git
a/superset-frontend/src/explore/components/controls/LayerConfigsControl/LayerTreeItem.tsx
b/superset-frontend/src/explore/components/controls/LayerConfigsControl/LayerTreeItem.tsx
index a92cc98fe3..4fcbf0ec06 100644
---
a/superset-frontend/src/explore/components/controls/LayerConfigsControl/LayerTreeItem.tsx
+++
b/superset-frontend/src/explore/components/controls/LayerConfigsControl/LayerTreeItem.tsx
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
// eslint-disable-next-line no-restricted-imports
import { Button, Tag } from 'antd'; // TODO: Remove antd
import { FC } from 'react';
diff --git
a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.tsx
b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.tsx
index 41d6649c94..753b5e75df 100644
---
a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.tsx
+++
b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.tsx
@@ -28,7 +28,7 @@ import {
import { t, styled, useTheme } from '@superset-ui/core';
import { Input } from 'src/components/Input';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
const TitleLabel = styled.span`
display: inline-block;
diff --git
a/superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx
b/superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx
index 0376be5e6d..b94f790e32 100644
---
a/superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx
+++
b/superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx
@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
import { ensureIsArray, t, useTheme, usePrevious } from '@superset-ui/core';
import { isEqual } from 'lodash';
import ControlHeader from 'src/explore/components/ControlHeader';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import {
AddIconButton,
AddControlLabel,
diff --git
a/superset-frontend/src/explore/components/controls/OptionControls/index.tsx
b/superset-frontend/src/explore/components/controls/OptionControls/index.tsx
index 38cc934379..5d52db70bb 100644
--- a/superset-frontend/src/explore/components/controls/OptionControls/index.tsx
+++ b/superset-frontend/src/explore/components/controls/OptionControls/index.tsx
@@ -22,7 +22,7 @@ import { useDrag, useDrop, DropTargetMonitor } from
'react-dnd';
import { styled, t, useTheme, keyframes, css } from '@superset-ui/core';
import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { savedMetricType } from
'src/explore/components/controls/MetricControl/types';
import AdhocMetric from
'src/explore/components/controls/MetricControl/AdhocMetric';
import { StyledMetricOption } from '../../optionRenderers';
diff --git
a/superset-frontend/src/explore/components/controls/VizTypeControl/FastVizSwitcher.tsx
b/superset-frontend/src/explore/components/controls/VizTypeControl/FastVizSwitcher.tsx
index dafdfb6a34..ebb19884fd 100644
---
a/superset-frontend/src/explore/components/controls/VizTypeControl/FastVizSwitcher.tsx
+++
b/superset-frontend/src/explore/components/controls/VizTypeControl/FastVizSwitcher.tsx
@@ -19,7 +19,7 @@
import { memo, useMemo } from 'react';
import { useSelector } from 'react-redux';
import { css, SupersetTheme } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { getChartKey } from 'src/explore/exploreUtils';
import { ExplorePageState } from 'src/explore/types';
import { FastVizSwitcherProps } from './types';
diff --git
a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx
b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx
index 85236ca3a4..13512e5d8c 100644
---
a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx
+++
b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx
@@ -44,7 +44,7 @@ import { Tooltip } from 'src/components/Tooltip';
import { Input } from 'src/components/Input';
import Label from 'src/components/Label';
import { usePluginContext } from 'src/components/DynamicPlugins';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { nativeFilterGate } from
'src/dashboard/components/nativeFilters/utils';
import scrollIntoView from 'scroll-into-view-if-needed';
diff --git
a/superset-frontend/src/explore/components/controls/VizTypeControl/constants.tsx
b/superset-frontend/src/explore/components/controls/VizTypeControl/constants.tsx
index 1d7b0206b8..c57513ab4d 100644
---
a/superset-frontend/src/explore/components/controls/VizTypeControl/constants.tsx
+++
b/superset-frontend/src/explore/components/controls/VizTypeControl/constants.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import { VizType } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { VizMeta } from './types';
export const FEATURED_CHARTS: VizMeta[] = [
diff --git
a/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/DashboardsSubMenu.tsx
b/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/DashboardsSubMenu.tsx
index 44db4de824..8101621712 100644
---
a/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/DashboardsSubMenu.tsx
+++
b/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/DashboardsSubMenu.tsx
@@ -19,7 +19,7 @@
import { useState } from 'react';
import { css, t, useTheme } from '@superset-ui/core';
import { Input } from 'src/components/Input';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { Menu } from 'src/components/Menu';
import { Link } from 'react-router-dom';
diff --git
a/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/index.jsx
b/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/index.jsx
index 6f7b64bc2e..f605a96b54 100644
---
a/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/index.jsx
+++
b/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/index.jsx
@@ -27,7 +27,7 @@ import {
useTheme,
VizType,
} from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { Menu } from 'src/components/Menu';
import ModalTrigger from 'src/components/ModalTrigger';
import Button from 'src/components/Button';
diff --git a/superset-frontend/src/features/alerts/AlertReportModal.tsx
b/superset-frontend/src/features/alerts/AlertReportModal.tsx
index 0f619e8fa5..ba2e9db945 100644
--- a/superset-frontend/src/features/alerts/AlertReportModal.tsx
+++ b/superset-frontend/src/features/alerts/AlertReportModal.tsx
@@ -71,7 +71,7 @@ import {
} from 'src/features/alerts/types';
import { useSelector } from 'react-redux';
import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import NumberInput from './components/NumberInput';
import { AlertReportCronScheduler } from
'./components/AlertReportCronScheduler';
import { NotificationMethod } from './components/NotificationMethod';
diff --git
a/superset-frontend/src/features/alerts/components/AlertStatusIcon.tsx
b/superset-frontend/src/features/alerts/components/AlertStatusIcon.tsx
index 9dbe345300..d80d982e94 100644
--- a/superset-frontend/src/features/alerts/components/AlertStatusIcon.tsx
+++ b/superset-frontend/src/features/alerts/components/AlertStatusIcon.tsx
@@ -18,7 +18,7 @@
*/
import { t, SupersetTheme, useTheme } from '@superset-ui/core';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { AlertState } from '../types';
function getStatusColor(
diff --git
a/superset-frontend/src/features/alerts/components/NotificationMethod.tsx
b/superset-frontend/src/features/alerts/components/NotificationMethod.tsx
index 46613607da..0266b5c64e 100644
--- a/superset-frontend/src/features/alerts/components/NotificationMethod.tsx
+++ b/superset-frontend/src/features/alerts/components/NotificationMethod.tsx
@@ -35,7 +35,7 @@ import {
useTheme,
} from '@superset-ui/core';
import { Select } from 'src/components';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import RefreshLabel from 'src/components/RefreshLabel';
import {
NotificationMethodOption,
diff --git a/superset-frontend/src/features/alerts/components/RecipientIcon.tsx
b/superset-frontend/src/features/alerts/components/RecipientIcon.tsx
index 13dc2b92c7..05a131bf13 100644
--- a/superset-frontend/src/features/alerts/components/RecipientIcon.tsx
+++ b/superset-frontend/src/features/alerts/components/RecipientIcon.tsx
@@ -19,7 +19,7 @@
import { SupersetTheme, css } from '@superset-ui/core';
import { ReactElement } from 'react';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { NotificationMethodOption } from '../types';
const notificationStyledIcon = (theme: SupersetTheme) => css`
diff --git
a/superset-frontend/src/features/alerts/components/ValidatedPanelHeader.tsx
b/superset-frontend/src/features/alerts/components/ValidatedPanelHeader.tsx
index 611161bc54..46411bbc3f 100644
--- a/superset-frontend/src/features/alerts/components/ValidatedPanelHeader.tsx
+++ b/superset-frontend/src/features/alerts/components/ValidatedPanelHeader.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import { t, useTheme } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
const ValidatedPanelHeader = ({
title,
diff --git
a/superset-frontend/src/features/annotationLayers/AnnotationLayerModal.tsx
b/superset-frontend/src/features/annotationLayers/AnnotationLayerModal.tsx
index 2af51d0510..726c2a51ce 100644
--- a/superset-frontend/src/features/annotationLayers/AnnotationLayerModal.tsx
+++ b/superset-frontend/src/features/annotationLayers/AnnotationLayerModal.tsx
@@ -21,7 +21,7 @@ import { FunctionComponent, useState, useEffect, ChangeEvent
} from 'react';
import { css, styled, t, useTheme } from '@superset-ui/core';
import { useSingleViewResource } from 'src/views/CRUD/hooks';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Modal from 'src/components/Modal';
import withToasts from 'src/components/MessageToasts/withToasts';
diff --git a/superset-frontend/src/features/annotations/AnnotationModal.tsx
b/superset-frontend/src/features/annotations/AnnotationModal.tsx
index 1889177909..3b1fc92bdf 100644
--- a/superset-frontend/src/features/annotations/AnnotationModal.tsx
+++ b/superset-frontend/src/features/annotations/AnnotationModal.tsx
@@ -22,7 +22,7 @@ import { css, styled, t, useTheme } from '@superset-ui/core';
import { useSingleViewResource } from 'src/views/CRUD/hooks';
import { RangePicker } from 'src/components/DatePicker';
import { extendedDayjs } from 'src/utils/dates';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Modal from 'src/components/Modal';
import withToasts from 'src/components/MessageToasts/withToasts';
import { JsonEditor } from 'src/components/AsyncAceEditor';
diff --git a/superset-frontend/src/features/charts/ChartCard.tsx
b/superset-frontend/src/features/charts/ChartCard.tsx
index c841201752..b662670133 100644
--- a/superset-frontend/src/features/charts/ChartCard.tsx
+++ b/superset-frontend/src/features/charts/ChartCard.tsx
@@ -19,7 +19,7 @@
import { isFeatureEnabled, FeatureFlag, t, css } from '@superset-ui/core';
import { Link, useHistory } from 'react-router-dom';
import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Chart from 'src/types/Chart';
import ListViewCard from 'src/components/ListViewCard';
diff --git a/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx
b/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx
index e325b08fd3..85a90d6089 100644
--- a/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx
+++ b/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx
@@ -21,7 +21,7 @@ import { FunctionComponent, useState, useEffect, ChangeEvent
} from 'react';
import { css, styled, t, useTheme } from '@superset-ui/core';
import { useSingleViewResource } from 'src/views/CRUD/hooks';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Modal from 'src/components/Modal';
import withToasts from 'src/components/MessageToasts/withToasts';
import { CssEditor } from 'src/components/AsyncAceEditor';
diff --git a/superset-frontend/src/features/dashboards/DashboardCard.tsx
b/superset-frontend/src/features/dashboards/DashboardCard.tsx
index edfd28f6d0..fb5bae9c11 100644
--- a/superset-frontend/src/features/dashboards/DashboardCard.tsx
+++ b/superset-frontend/src/features/dashboards/DashboardCard.tsx
@@ -28,7 +28,7 @@ import { CardStyles } from 'src/views/CRUD/utils';
import { Dropdown } from 'src/components/Dropdown';
import { Menu } from 'src/components/Menu';
import ListViewCard from 'src/components/ListViewCard';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { PublishedLabel } from 'src/components/Label';
import FacePile from 'src/components/FacePile';
import FaveStar from 'src/components/FaveStar';
diff --git
a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/EncryptedField.tsx
b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/EncryptedField.tsx
index 93b9ce7cb3..c10859993a 100644
---
a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/EncryptedField.tsx
+++
b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/EncryptedField.tsx
@@ -20,7 +20,7 @@ import { useRef, useState } from 'react';
import { SupersetTheme, t } from '@superset-ui/core';
import { Button, AntdSelect } from 'src/components';
import FormLabel from 'src/components/Form/FormLabel';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { DatabaseParameters, FieldPropTypes } from '../../types';
import { infoTooltip, CredentialInfoForm } from '../styles';
diff --git
a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/TableCatalog.tsx
b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/TableCatalog.tsx
index 91b6a63c0b..cb30054364 100644
---
a/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/TableCatalog.tsx
+++
b/superset-frontend/src/features/databases/DatabaseModal/DatabaseConnectionForm/TableCatalog.tsx
@@ -19,7 +19,7 @@
import { css, SupersetTheme, t } from '@superset-ui/core';
import ValidatedInput from 'src/components/Form/LabeledErrorBoundInput';
import FormLabel from 'src/components/Form/FormLabel';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { StyledFooterButton, StyledCatalogTable } from '../styles';
import { CatalogObject, FieldPropTypes } from '../../types';
diff --git
a/superset-frontend/src/features/databases/DatabaseModal/SSHTunnelForm.tsx
b/superset-frontend/src/features/databases/DatabaseModal/SSHTunnelForm.tsx
index 7a4a72ff53..2a1daf4823 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/SSHTunnelForm.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/SSHTunnelForm.tsx
@@ -24,7 +24,7 @@ import { Radio } from 'src/components/Radio';
import { Input, TextArea } from 'src/components/Input';
// eslint-disable-next-line no-restricted-imports
import { Input as AntdInput, Tooltip } from 'antd'; // TODO: Remove antd
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { DatabaseObject, FieldPropTypes } from '../types';
import { AuthType } from '.';
diff --git a/superset-frontend/src/features/databases/DatabaseModal/index.tsx
b/superset-frontend/src/features/databases/DatabaseModal/index.tsx
index 055c97ebd9..6efe47bdd2 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/index.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/index.tsx
@@ -51,7 +51,7 @@ import withToasts from
'src/components/MessageToasts/withToasts';
import ValidatedInput from 'src/components/Form/LabeledErrorBoundInput';
import ErrorMessageWithStackTrace from
'src/components/ErrorMessage/ErrorMessageWithStackTrace';
import ErrorAlert from 'src/components/ImportModal/ErrorAlert';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import {
testDatabaseConnection,
useSingleViewResource,
diff --git a/superset-frontend/src/features/databases/UploadDataModel/index.tsx
b/superset-frontend/src/features/databases/UploadDataModel/index.tsx
index 39dd14f82d..55681b5c1b 100644
--- a/superset-frontend/src/features/databases/UploadDataModel/index.tsx
+++ b/superset-frontend/src/features/databases/UploadDataModel/index.tsx
@@ -43,7 +43,7 @@ import {
Select,
Upload,
} from 'src/components';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { Input, InputNumber } from 'src/components/Input';
import rison from 'rison';
// eslint-disable-next-line no-restricted-imports
diff --git
a/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/DatasetPanel.tsx
b/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/DatasetPanel.tsx
index 103467b629..f838c86f07 100644
---
a/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/DatasetPanel.tsx
+++
b/superset-frontend/src/features/datasets/AddDataset/DatasetPanel/DatasetPanel.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import { t, styled } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Alert from 'src/components/Alert';
import Table, { ColumnsType, TableSize } from 'src/components/Table';
// @ts-ignore
diff --git
a/superset-frontend/src/features/datasets/AddDataset/EditDataset/UsageTab/index.tsx
b/superset-frontend/src/features/datasets/AddDataset/EditDataset/UsageTab/index.tsx
index 289a67f5aa..32786105b9 100644
---
a/superset-frontend/src/features/datasets/AddDataset/EditDataset/UsageTab/index.tsx
+++
b/superset-frontend/src/features/datasets/AddDataset/EditDataset/UsageTab/index.tsx
@@ -34,7 +34,7 @@ import Table, {
} from 'src/components/Table';
import { EmptyState } from 'src/components/EmptyState';
import ChartImage from 'src/assets/images/chart.svg';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { useToasts } from 'src/components/MessageToasts/withToasts';
import { useListViewResource } from 'src/views/CRUD/hooks';
import { FilterOperator } from 'src/components/ListView';
diff --git
a/superset-frontend/src/features/datasets/AddDataset/Header/index.tsx
b/superset-frontend/src/features/datasets/AddDataset/Header/index.tsx
index b2f8f475aa..60fc8a22a6 100644
--- a/superset-frontend/src/features/datasets/AddDataset/Header/index.tsx
+++ b/superset-frontend/src/features/datasets/AddDataset/Header/index.tsx
@@ -20,7 +20,7 @@ import { Dispatch } from 'react';
import { t } from '@superset-ui/core';
import { PageHeaderWithActions } from 'src/components/PageHeaderWithActions';
import Button from 'src/components/Button';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { Menu } from 'src/components/Menu';
import { TooltipPlacement } from 'src/components/Tooltip';
import {
diff --git a/superset-frontend/src/features/home/ActivityTable.tsx
b/superset-frontend/src/features/home/ActivityTable.tsx
index c6a6d2359a..5974855e70 100644
--- a/superset-frontend/src/features/home/ActivityTable.tsx
+++ b/superset-frontend/src/features/home/ActivityTable.tsx
@@ -30,7 +30,7 @@ import {
getEditedObjects,
} from 'src/views/CRUD/utils';
import { Chart } from 'src/types/Chart';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import SubMenu from './SubMenu';
import EmptyState from './EmptyState';
import { WelcomeTable, RecentActivity } from './types';
diff --git a/superset-frontend/src/features/home/ChartTable.tsx
b/superset-frontend/src/features/home/ChartTable.tsx
index 38ec864259..66222d6755 100644
--- a/superset-frontend/src/features/home/ChartTable.tsx
+++ b/superset-frontend/src/features/home/ChartTable.tsx
@@ -44,7 +44,7 @@ import Chart from 'src/types/Chart';
import handleResourceExport from 'src/utils/export';
import Loading from 'src/components/Loading';
import ErrorBoundary from 'src/components/ErrorBoundary';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import EmptyState from './EmptyState';
import { WelcomeTable } from './types';
import SubMenu from './SubMenu';
diff --git a/superset-frontend/src/features/home/DashboardTable.tsx
b/superset-frontend/src/features/home/DashboardTable.tsx
index 56a65a5cb4..7dfab69652 100644
--- a/superset-frontend/src/features/home/DashboardTable.tsx
+++ b/superset-frontend/src/features/home/DashboardTable.tsx
@@ -40,7 +40,7 @@ import Loading from 'src/components/Loading';
import DeleteModal from 'src/components/DeleteModal';
import PropertiesModal from 'src/dashboard/components/PropertiesModal';
import DashboardCard from 'src/features/dashboards/DashboardCard';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import EmptyState from './EmptyState';
import SubMenu from './SubMenu';
import { WelcomeTable } from './types';
diff --git a/superset-frontend/src/features/home/LanguagePicker.tsx
b/superset-frontend/src/features/home/LanguagePicker.tsx
index da181d3821..90a492062e 100644
--- a/superset-frontend/src/features/home/LanguagePicker.tsx
+++ b/superset-frontend/src/features/home/LanguagePicker.tsx
@@ -18,7 +18,7 @@
*/
import { MainNav as Menu } from 'src/components/Menu';
import { styled, css, useTheme } from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
const { SubMenu } = Menu;
export interface Languages {
diff --git a/superset-frontend/src/features/home/Menu.tsx
b/superset-frontend/src/features/home/Menu.tsx
index 4d24fcb432..3a15f4ff5e 100644
--- a/superset-frontend/src/features/home/Menu.tsx
+++ b/superset-frontend/src/features/home/Menu.tsx
@@ -25,7 +25,7 @@ import { MainNav, MenuMode } from 'src/components/Menu';
import { Tooltip } from 'src/components/Tooltip';
import { NavLink, useLocation } from 'react-router-dom';
import { GenericLink } from 'src/components/GenericLink/GenericLink';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { useUiConfig } from 'src/components/UiConfigContext';
import { URL_PARAMS } from 'src/constants';
import {
diff --git a/superset-frontend/src/features/home/RightMenu.tsx
b/superset-frontend/src/features/home/RightMenu.tsx
index d798d037e7..8d35c6a64a 100644
--- a/superset-frontend/src/features/home/RightMenu.tsx
+++ b/superset-frontend/src/features/home/RightMenu.tsx
@@ -37,7 +37,7 @@ import {
} from '@superset-ui/core';
import { Menu } from 'src/components/Menu';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Label from 'src/components/Label';
import { findPermission } from 'src/utils/findPermission';
import { isUserAdmin } from 'src/dashboard/util/permissionUtils';
diff --git a/superset-frontend/src/features/home/SavedQueries.tsx
b/superset-frontend/src/features/home/SavedQueries.tsx
index 7258e6d401..65c34a8bfc 100644
--- a/superset-frontend/src/features/home/SavedQueries.tsx
+++ b/superset-frontend/src/features/home/SavedQueries.tsx
@@ -30,7 +30,7 @@ import { Menu } from 'src/components/Menu';
import { copyQueryLink, useListViewResource } from 'src/views/CRUD/hooks';
import ListViewCard from 'src/components/ListViewCard';
import DeleteModal from 'src/components/DeleteModal';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { User } from 'src/types/bootstrapTypes';
import {
CardContainer,
diff --git a/superset-frontend/src/features/home/SubMenu.tsx
b/superset-frontend/src/features/home/SubMenu.tsx
index 7f917a14a8..7945e76da9 100644
--- a/superset-frontend/src/features/home/SubMenu.tsx
+++ b/superset-frontend/src/features/home/SubMenu.tsx
@@ -26,7 +26,7 @@ import { debounce } from 'lodash';
import { Row } from 'src/components';
import { Menu, MenuMode, MainNav } from 'src/components/Menu';
import Button, { OnClickHandler } from 'src/components/Button';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { MenuObjectProps } from 'src/types/bootstrapTypes';
const StyledHeader = styled.div`
diff --git a/superset-frontend/src/features/queries/SyntaxHighlighterCopy.tsx
b/superset-frontend/src/features/queries/SyntaxHighlighterCopy.tsx
index b144d71c41..6a019141c1 100644
--- a/superset-frontend/src/features/queries/SyntaxHighlighterCopy.tsx
+++ b/superset-frontend/src/features/queries/SyntaxHighlighterCopy.tsx
@@ -24,7 +24,7 @@ import markdownSyntax from
'react-syntax-highlighter/dist/cjs/languages/hljs/mar
import jsonSyntax from 'react-syntax-highlighter/dist/cjs/languages/hljs/json';
import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
import SyntaxHighlighter from 'react-syntax-highlighter/dist/cjs/light';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { ToastProps } from 'src/components/MessageToasts/withToasts';
import copyTextToClipboard from 'src/utils/copy';
diff --git
a/superset-frontend/src/features/reports/ReportModal/HeaderReportDropdown/index.tsx
b/superset-frontend/src/features/reports/ReportModal/HeaderReportDropdown/index.tsx
index ad2b2fa862..2fff224dbc 100644
---
a/superset-frontend/src/features/reports/ReportModal/HeaderReportDropdown/index.tsx
+++
b/superset-frontend/src/features/reports/ReportModal/HeaderReportDropdown/index.tsx
@@ -29,7 +29,7 @@ import {
getExtensionsRegistry,
usePrevious,
} from '@superset-ui/core';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { Switch } from 'src/components/Switch';
import { AlertObject } from 'src/features/alerts/types';
import { Menu } from 'src/components/Menu';
diff --git a/superset-frontend/src/features/reports/ReportModal/index.tsx
b/superset-frontend/src/features/reports/ReportModal/index.tsx
index aa84619eba..2d7e6c85fd 100644
--- a/superset-frontend/src/features/reports/ReportModal/index.tsx
+++ b/superset-frontend/src/features/reports/ReportModal/index.tsx
@@ -39,7 +39,7 @@ import {
import Alert from 'src/components/Alert';
import TimezoneSelector from 'src/components/TimezoneSelector';
import LabeledErrorBoundInput from
'src/components/Form/LabeledErrorBoundInput';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { CronError } from 'src/components/CronPicker';
import { Radio, RadioChangeEvent } from 'src/components/Radio';
import { Input } from 'src/components/Input';
diff --git a/superset-frontend/src/features/rls/RowLevelSecurityModal.tsx
b/superset-frontend/src/features/rls/RowLevelSecurityModal.tsx
index 6f155afe84..70461fc412 100644
--- a/superset-frontend/src/features/rls/RowLevelSecurityModal.tsx
+++ b/superset-frontend/src/features/rls/RowLevelSecurityModal.tsx
@@ -20,7 +20,7 @@
import { css, styled, SupersetClient, useTheme, t } from '@superset-ui/core';
import Modal from 'src/components/Modal';
import { useCallback, useEffect, useMemo, useState } from 'react';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import Select from 'src/components/Select/Select';
import { TextArea } from 'src/components/Input';
import AsyncSelect from 'src/components/Select/AsyncSelect';
diff --git a/superset-frontend/src/features/tags/TagCard.tsx
b/superset-frontend/src/features/tags/TagCard.tsx
index 0bf1008f46..2da403bc72 100644
--- a/superset-frontend/src/features/tags/TagCard.tsx
+++ b/superset-frontend/src/features/tags/TagCard.tsx
@@ -23,7 +23,7 @@ import { Dropdown } from 'src/components/Dropdown';
import { Menu } from 'src/components/Menu';
import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
import ListViewCard from 'src/components/ListViewCard';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { Tag } from 'src/views/CRUD/types';
import { deleteTags } from 'src/features/tags/tags';
import { Button } from 'src/components';
diff --git a/superset-frontend/src/pages/AlertReportList/index.tsx
b/superset-frontend/src/pages/AlertReportList/index.tsx
index c33743fb0c..2d24444d24 100644
--- a/superset-frontend/src/pages/AlertReportList/index.tsx
+++ b/superset-frontend/src/pages/AlertReportList/index.tsx
@@ -57,7 +57,7 @@ import AlertReportModal from
'src/features/alerts/AlertReportModal';
import { AlertObject, AlertState } from 'src/features/alerts/types';
import { ModifiedInfo } from 'src/components/AuditInfo';
import { QueryObjectColumns } from 'src/views/CRUD/types';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
const extensionsRegistry = getExtensionsRegistry();
diff --git a/superset-frontend/src/pages/AnnotationLayerList/index.tsx
b/superset-frontend/src/pages/AnnotationLayerList/index.tsx
index 652dff1763..253d33c0d3 100644
--- a/superset-frontend/src/pages/AnnotationLayerList/index.tsx
+++ b/superset-frontend/src/pages/AnnotationLayerList/index.tsx
@@ -37,7 +37,7 @@ import AnnotationLayerModal from
'src/features/annotationLayers/AnnotationLayerM
import { AnnotationLayerObject } from 'src/features/annotationLayers/types';
import { ModifiedInfo } from 'src/components/AuditInfo';
import { QueryObjectColumns } from 'src/views/CRUD/types';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
const PAGE_SIZE = 25;
diff --git a/superset-frontend/src/pages/AnnotationList/index.tsx
b/superset-frontend/src/pages/AnnotationList/index.tsx
index 171204e9cd..70a41024f6 100644
--- a/superset-frontend/src/pages/AnnotationList/index.tsx
+++ b/superset-frontend/src/pages/AnnotationList/index.tsx
@@ -41,7 +41,7 @@ import { createErrorHandler } from 'src/views/CRUD/utils';
import { AnnotationObject } from 'src/features/annotations/types';
import AnnotationModal from 'src/features/annotations/AnnotationModal';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
const PAGE_SIZE = 25;
diff --git a/superset-frontend/src/pages/ChartCreation/index.tsx
b/superset-frontend/src/pages/ChartCreation/index.tsx
index 17fa9908e1..77e86a3b99 100644
--- a/superset-frontend/src/pages/ChartCreation/index.tsx
+++ b/superset-frontend/src/pages/ChartCreation/index.tsx
@@ -45,7 +45,7 @@ import {
Dataset,
DatasetSelectLabel,
} from 'src/features/datasets/DatasetSelectLabel';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
export interface ChartCreationProps extends RouteComponentProps {
user: UserWithPermissionsAndRoles;
diff --git a/superset-frontend/src/pages/ChartList/index.tsx
b/superset-frontend/src/pages/ChartList/index.tsx
index b2158b09a2..197e0a425f 100644
--- a/superset-frontend/src/pages/ChartList/index.tsx
+++ b/superset-frontend/src/pages/ChartList/index.tsx
@@ -62,7 +62,7 @@ import ImportModelsModal from
'src/components/ImportModal/index';
import Chart from 'src/types/Chart';
import Tag from 'src/types/TagType';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { nativeFilterGate } from
'src/dashboard/components/nativeFilters/utils';
import InfoTooltip from 'src/components/InfoTooltip';
import CertifiedBadge from 'src/components/CertifiedBadge';
diff --git a/superset-frontend/src/pages/CssTemplateList/index.tsx
b/superset-frontend/src/pages/CssTemplateList/index.tsx
index e1853ad89e..13ad661c45 100644
--- a/superset-frontend/src/pages/CssTemplateList/index.tsx
+++ b/superset-frontend/src/pages/CssTemplateList/index.tsx
@@ -37,7 +37,7 @@ import CssTemplateModal from
'src/features/cssTemplates/CssTemplateModal';
import { TemplateObject } from 'src/features/cssTemplates/types';
import { ModifiedInfo } from 'src/components/AuditInfo';
import { QueryObjectColumns } from 'src/views/CRUD/types';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
const PAGE_SIZE = 25;
diff --git a/superset-frontend/src/pages/DashboardList/index.tsx
b/superset-frontend/src/pages/DashboardList/index.tsx
index 3543cde0f0..2331dffdfc 100644
--- a/superset-frontend/src/pages/DashboardList/index.tsx
+++ b/superset-frontend/src/pages/DashboardList/index.tsx
@@ -52,7 +52,7 @@ import Owner from 'src/types/Owner';
import Tag from 'src/types/TagType';
import withToasts from 'src/components/MessageToasts/withToasts';
import FacePile from 'src/components/FacePile';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import DeleteModal from 'src/components/DeleteModal';
import FaveStar from 'src/components/FaveStar';
import PropertiesModal from 'src/dashboard/components/PropertiesModal';
diff --git a/superset-frontend/src/pages/DatabaseList/index.tsx
b/superset-frontend/src/pages/DatabaseList/index.tsx
index 3d15141d71..c1a83dc8f1 100644
--- a/superset-frontend/src/pages/DatabaseList/index.tsx
+++ b/superset-frontend/src/pages/DatabaseList/index.tsx
@@ -42,7 +42,7 @@ import DeleteModal from 'src/components/DeleteModal';
import { getUrlParam } from 'src/utils/urlUtils';
import { URL_PARAMS } from 'src/constants';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { isUserAdmin } from 'src/dashboard/util/permissionUtils';
import ListView, { FilterOperator, Filters } from 'src/components/ListView';
import handleResourceExport from 'src/utils/export';
diff --git a/superset-frontend/src/pages/DatasetList/index.tsx
b/superset-frontend/src/pages/DatasetList/index.tsx
index 5ae4bdb5ee..fbd07fb236 100644
--- a/superset-frontend/src/pages/DatasetList/index.tsx
+++ b/superset-frontend/src/pages/DatasetList/index.tsx
@@ -49,7 +49,7 @@ import SubMenu, { SubMenuProps, ButtonProps } from
'src/features/home/SubMenu';
import Owner from 'src/types/Owner';
import withToasts from 'src/components/MessageToasts/withToasts';
import { Tooltip } from 'src/components/Tooltip';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import FacePile from 'src/components/FacePile';
import CertifiedBadge from 'src/components/CertifiedBadge';
import InfoTooltip from 'src/components/InfoTooltip';
diff --git a/superset-frontend/src/pages/QueryHistoryList/index.tsx
b/superset-frontend/src/pages/QueryHistoryList/index.tsx
index 20d610e27d..3986291aea 100644
--- a/superset-frontend/src/pages/QueryHistoryList/index.tsx
+++ b/superset-frontend/src/pages/QueryHistoryList/index.tsx
@@ -50,7 +50,7 @@ import github from
'react-syntax-highlighter/dist/cjs/styles/hljs/github';
import { DATETIME_WITH_TIME_ZONE, TIME_WITH_MS } from 'src/constants';
import { QueryObject, QueryObjectColumns } from 'src/views/CRUD/types';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import QueryPreviewModal from 'src/features/queries/QueryPreviewModal';
import { addSuccessToast } from 'src/components/MessageToasts/actions';
import getOwnerName from 'src/utils/getOwnerName';
diff --git a/superset-frontend/src/pages/RowLevelSecurityList/index.tsx
b/superset-frontend/src/pages/RowLevelSecurityList/index.tsx
index 8a2383772c..ac08540cf8 100644
--- a/superset-frontend/src/pages/RowLevelSecurityList/index.tsx
+++ b/superset-frontend/src/pages/RowLevelSecurityList/index.tsx
@@ -19,7 +19,7 @@
import { t, styled, SupersetClient, useTheme, css } from '@superset-ui/core';
import { useMemo, useState } from 'react';
import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import ListView, {
FetchDataConfig,
FilterOperator,
diff --git a/superset-frontend/src/pages/SavedQueryList/index.tsx
b/superset-frontend/src/pages/SavedQueryList/index.tsx
index bfae504721..9a4ca9df7a 100644
--- a/superset-frontend/src/pages/SavedQueryList/index.tsx
+++ b/superset-frontend/src/pages/SavedQueryList/index.tsx
@@ -57,7 +57,7 @@ import Tag from 'src/types/TagType';
import ImportModelsModal from 'src/components/ImportModal/index';
import { ModifiedInfo } from 'src/components/AuditInfo';
import { loadTags } from 'src/components/Tags/utils';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes';
import SavedQueryPreviewModal from
'src/features/queries/SavedQueryPreviewModal';
import { findPermission } from 'src/utils/findPermission';
diff --git a/superset-frontend/src/pages/Tags/index.tsx
b/superset-frontend/src/pages/Tags/index.tsx
index 95e782bd74..448afad88f 100644
--- a/superset-frontend/src/pages/Tags/index.tsx
+++ b/superset-frontend/src/pages/Tags/index.tsx
@@ -39,7 +39,7 @@ import ListView, {
} from 'src/components/ListView';
import { dangerouslyGetItemDoNotUse } from 'src/utils/localStorageHelpers';
import withToasts from 'src/components/MessageToasts/withToasts';
-import Icons from 'src/components/Icons';
+import { Icons } from 'src/components/Icons';
import { Tooltip } from 'src/components/Tooltip';
import { Link } from 'react-router-dom';
import { deleteTags } from 'src/features/tags/tags';
