diff --git a/superset-frontend/src/components/Icons/AntdEnhanced.tsx b/superset-frontend/src/components/Icons/AntdEnhanced.tsx
index 703c909e2..f4ed96f6f 100644
--- a/superset-frontend/src/components/Icons/AntdEnhanced.tsx
+++ b/superset-frontend/src/components/Icons/AntdEnhanced.tsx
@@ -17,10 +17,95 @@
  * under the License.
  */
 
-import * as AntdIcons from '@ant-design/icons/lib/icons';
+// NOTE: Targeted import (as opposed to `import *`) is important here for proper tree-shaking
+import {
+  AlignCenterOutlined,
+  AlignLeftOutlined,
+  AlignRightOutlined,
+  ApartmentOutlined,
+  BarChartOutlined,
+  BookOutlined,
+  CalendarOutlined,
+  CheckOutlined,
+  CheckSquareOutlined,
+  CloseOutlined,
+  ConsoleSqlOutlined,
+  CopyOutlined,
+  DatabaseOutlined,
+  DeleteFilled,
+  DownOutlined,
+  EditOutlined,
+  ExclamationCircleOutlined,
+  EyeOutlined,
+  EyeInvisibleOutlined,
+  FallOutlined,
+  FileImageOutlined,
+  FileOutlined,
+  FireOutlined,
+  FullscreenExitOutlined,
+  FullscreenOutlined,
+  FundProjectionScreenOutlined,
+  InfoCircleOutlined,
+  InsertRowBelowOutlined,
+  MonitorOutlined,
+  PlusCircleOutlined,
+  PlusOutlined,
+  ReloadOutlined,
+  RightOutlined,
+  SaveOutlined,
+  SearchOutlined,
+  SettingOutlined,
+  StopOutlined,
+  TagsOutlined,
+  UpOutlined,
+  UserOutlined,
+} from '@ant-design/icons';
 import { StyledIcon } from './Icon';
 import IconType from './IconType';
 
+const AntdIcons = {
+  AlignCenterOutlined,
+  AlignLeftOutlined,
+  AlignRightOutlined,
+  ApartmentOutlined,
+  BarChartOutlined,
+  BookOutlined,
+  CalendarOutlined,
+  CheckOutlined,
+  CheckSquareOutlined,
+  CloseOutlined,
+  ConsoleSqlOutlined,
+  CopyOutlined,
+  DatabaseOutlined,
+  DeleteFilled,
+  DownOutlined,
+  EditOutlined,
+  ExclamationCircleOutlined,
+  EyeOutlined,
+  EyeInvisibleOutlined,
+  FallOutlined,
+  FileImageOutlined,
+  FileOutlined,
+  FireOutlined,
+  FullscreenExitOutlined,
+  FullscreenOutlined,
+  FundProjectionScreenOutlined,
+  InfoCircleOutlined,
+  InsertRowBelowOutlined,
+  MonitorOutlined,
+  PlusCircleOutlined,
+  PlusOutlined,
+  ReloadOutlined,
+  RightOutlined,
+  SaveOutlined,
+  SearchOutlined,
+  SettingOutlined,
+  StopOutlined,
+  TagsOutlined,
+  UpOutlined,
+  UserOutlined,
+};
+
 const AntdEnhancedIcons = Object.keys(AntdIcons)
   .filter(k => !k.includes('TwoTone'))
   .map(k => ({