diff --git a/packages/core/stories/badge/dot-badge.qa.stories.tsx b/packages/core/stories/badge/dot-badge.qa.stories.tsx
new file mode 100644
index 00000000000..ca953fe4ceb
--- /dev/null
+++ b/packages/core/stories/badge/dot-badge.qa.stories.tsx
@@ -0,0 +1,61 @@
+import { Badge, GridLayout } from "@salt-ds/core";
+import type { Meta, StoryFn } from "@storybook/react";
+import {
+  QAContainer,
+  QAContainerNoStyleInjection,
+  type QAContainerNoStyleInjectionProps,
+  type QAContainerProps,
+} from "docs/components";
+import { allIcons } from "./icon.all";
+
+export default {
+  title: "Core/Badge/Dot Badge QA",
+  component: Badge,
+} as Meta<typeof Badge>;
+
+const AllIcons: StoryFn = () => {
+  return (
+    <GridLayout columns="repeat(25, auto)" gap={1}>
+      {allIcons.map((IconComponent) => (
+        <Badge key={IconComponent.displayName}>
+          <IconComponent />
+        </Badge>
+      ))}
+    </GridLayout>
+  );
+};
+
+export const AllExamples: StoryFn<QAContainerProps> = (props) => (
+  <QAContainer height={1700} width={1700} {...props}>
+    <AllIcons />
+  </QAContainer>
+);
+
+AllExamples.parameters = {
+  chromatic: {
+    disableSnapshot: false,
+    modes: {
+      theme: {
+        themeNext: "disable",
+      },
+      themeNext: {
+        themeNext: "enable",
+        corner: "rounded",
+        accent: "teal",
+        // Ignore headingFont given font is not loaded
+      },
+    },
+  },
+};
+
+export const NoStyleInjectionGrid: StoryFn<QAContainerNoStyleInjectionProps> = (
+  props,
+) => (
+  <QAContainerNoStyleInjection height={1700} width={1700} {...props}>
+    <AllIcons />
+  </QAContainerNoStyleInjection>
+);
+
+NoStyleInjectionGrid.parameters = {
+  chromatic: { disableSnapshot: false },
+};
diff --git a/packages/core/stories/badge/icon.all.ts b/packages/core/stories/badge/icon.all.ts
new file mode 100644
index 00000000000..b858e448a2b
--- /dev/null
+++ b/packages/core/stories/badge/icon.all.ts
@@ -0,0 +1,837 @@
+// WARNING: This file was generated by a script. Do not modify it manually
+
+import {
+  AccessibleIcon,
+  AccessibleSolidIcon,
+  AddIcon,
+  AddDocumentIcon,
+  AddDocumentSolidIcon,
+  ApiIcon,
+  AppSwitcherIcon,
+  ArrowDownIcon,
+  ArrowLeftIcon,
+  ArrowRightIcon,
+  ArrowUpIcon,
+  AttachIcon,
+  BankIcon,
+  BankCheckIcon,
+  BankCheckSolidIcon,
+  BankSolidIcon,
+  BarChartIcon,
+  BatteryIcon,
+  BatterySolidIcon,
+  BookmarkIcon,
+  BookmarkSolidIcon,
+  BooleanIcon,
+  BooleanSolidIcon,
+  BrowserIcon,
+  BrowserSolidIcon,
+  BuildingIcon,
+  BuildingsIcon,
+  BuildingSolidIcon,
+  BuildingsSolidIcon,
+  BuildReportIcon,
+  BuildReportSolidIcon,
+  CalculatorIcon,
+  CalculatorSolidIcon,
+  CalendarIcon,
+  CalendarSolidIcon,
+  CallIcon,
+  CallSolidIcon,
+  CartIcon,
+  CartSolidIcon,
+  ChatIcon,
+  ChatGroupIcon,
+  ChatGroupSolidIcon,
+  ChatSolidIcon,
+  ChattingIcon,
+  ChattingSolidIcon,
+  ChevronDownIcon,
+  ChevronLeftIcon,
+  ChevronRightIcon,
+  ChevronUpIcon,
+  ClockIcon,
+  ClockSolidIcon,
+  CloneIcon,
+  CloseIcon,
+  ClosedcaptionIcon,
+  ClosedcaptionDisabledIcon,
+  ClosedcaptionDisabledSolidIcon,
+  ClosedcaptionSolidIcon,
+  CloseSmallIcon,
+  CloudIcon,
+  CloudDisabledIcon,
+  CloudDisabledSolidIcon,
+  CloudDownloadIcon,
+  CloudDownloadSolidIcon,
+  CloudSolidIcon,
+  CloudSuccessIcon,
+  CloudSuccessSolidIcon,
+  CloudSyncIcon,
+  CloudSyncSolidIcon,
+  CloudUploadIcon,
+  CloudUploadSolidIcon,
+  CoffeeIcon,
+  CoffeeSolidIcon,
+  CollapseIcon,
+  CollapseAllIcon,
+  ColumnChooserIcon,
+  ColumnChooserSolidIcon,
+  CommentaryIcon,
+  CommentarySolidIcon,
+  CompassIcon,
+  CompassSolidIcon,
+  CookieIcon,
+  CookieSolidIcon,
+  CopyIcon,
+  CopySolidIcon,
+  CreditCardIcon,
+  CreditCardSolidIcon,
+  CropsIcon,
+  CropsSolidIcon,
+  CsvIcon,
+  CsvSolidIcon,
+  CutIcon,
+  DarkIcon,
+  DarkSolidIcon,
+  DashboardIcon,
+  DashboardSolidIcon,
+  DatabaseIcon,
+  DatabaseSolidIcon,
+  DeleteIcon,
+  DeleteSolidIcon,
+  DevicesIcon,
+  DevicesSolidIcon,
+  DiamondIcon,
+  DisplayIcon,
+  DisplaySolidIcon,
+  DocumentIcon,
+  DocumentSolidIcon,
+  DoubleChevronDownIcon,
+  DoubleChevronLeftIcon,
+  DoubleChevronRightIcon,
+  DoubleChevronUpIcon,
+  DownloadIcon,
+  DragRowIcon,
+  EditIcon,
+  EditSolidIcon,
+  ErrorIcon,
+  ErrorExecuteIcon,
+  ErrorSolidIcon,
+  ExpandIcon,
+  ExpandAllIcon,
+  ExportIcon,
+  ExportSolidIcon,
+  FavoriteIcon,
+  FavoriteSolidIcon,
+  FilterIcon,
+  FilterClearIcon,
+  FilterClearSolidIcon,
+  FilterSolidIcon,
+  FlagIcon,
+  FlagSolidIcon,
+  FolderClosedIcon,
+  FolderClosedSolidIcon,
+  FolderOpenIcon,
+  FolderOpenSolidIcon,
+  Forward10Icon,
+  Forward15Icon,
+  Forward30Icon,
+  Forward5Icon,
+  GithubIcon,
+  GlobeIcon,
+  GlobeSolidIcon,
+  GridIcon,
+  GridSolidIcon,
+  GroupIcon,
+  GroupSolidIcon,
+  GuideClosedIcon,
+  GuideClosedSolidIcon,
+  GuideOpenIcon,
+  GuideOpenSolidIcon,
+  HeadphonesIcon,
+  HeadphonesDisabledIcon,
+  HeadphonesDisabledSolidIcon,
+  HeadphonesSolidIcon,
+  HelpIcon,
+  HelpSolidIcon,
+  HiddenIcon,
+  HiddenSolidIcon,
+  HistoryIcon,
+  HomeIcon,
+  HomeSolidIcon,
+  HospitalIcon,
+  HospitalSolidIcon,
+  IconFigmaIcon,
+  ImageIcon,
+  ImageSolidIcon,
+  ImportIcon,
+  ImportSolidIcon,
+  InboxIcon,
+  InboxSolidIcon,
+  InfoIcon,
+  InfoSolidIcon,
+  JigsawIcon,
+  JigsawSolidIcon,
+  KeyIcon,
+  KeyBackspaceIcon,
+  KeyCapslockIcon,
+  KeyCommandIcon,
+  KeyControlIcon,
+  KeyEnterIcon,
+  KeyOptionIcon,
+  KeyShiftIcon,
+  KeySolidIcon,
+  KeyTabIcon,
+  LaptopIcon,
+  LaptopSolidIcon,
+  LayersIcon,
+  LayersSolidIcon,
+  LightIcon,
+  LightSolidIcon,
+  LineChartIcon,
+  LineChartSolidIcon,
+  LinkedIcon,
+  ListIcon,
+  LoaderIcon,
+  LocationIcon,
+  LocationSolidIcon,
+  LockedIcon,
+  LockedSolidIcon,
+  ManIcon,
+  ManSolidIcon,
+  ManWomanIcon,
+  ManWomanSolidIcon,
+  MapIcon,
+  MapSolidIcon,
+  MarkerIcon,
+  MarkerSolidIcon,
+  MaximizeIcon,
+  MaximizeSolidIcon,
+  MedicalKitIcon,
+  MedicalKitSolidIcon,
+  MenuIcon,
+  MessageIcon,
+  MessageSolidIcon,
+  MicroMenuIcon,
+  MicrophoneIcon,
+  MicrophoneDisabledIcon,
+  MicrophoneDisabledSolidIcon,
+  MicrophoneSolidIcon,
+  MinimizeIcon,
+  MobileIcon,
+  MobileSolidIcon,
+  MouseIcon,
+  MouseSolidIcon,
+  MoveAllIcon,
+  MoveHorizontalIcon,
+  MoveVerticalIcon,
+  MusicIcon,
+  MusicDisabledIcon,
+  MusicDisabledSolidIcon,
+  MusicSolidIcon,
+  NoteIcon,
+  NoteSolidIcon,
+  NotificationIcon,
+  NotificationReadIcon,
+  NotificationReadSolidIcon,
+  NotificationSolidIcon,
+  OverflowMenuIcon,
+  PasteIcon,
+  PasteSolidIcon,
+  PauseIcon,
+  PauseSolidIcon,
+  PdfIcon,
+  PdfSolidIcon,
+  PicnicIcon,
+  PicnicSolidIcon,
+  PinIcon,
+  PinSolidIcon,
+  PivotIcon,
+  PivotSolidIcon,
+  PlaceInIcon,
+  PlayIcon,
+  PlaySolidIcon,
+  PotFoodIcon,
+  PotFoodSolidIcon,
+  PresentationIcon,
+  PresentationSolidIcon,
+  PriceLadderIcon,
+  PrintIcon,
+  PrintSolidIcon,
+  ProgressCancelledIcon,
+  ProgressClosedIcon,
+  ProgressCompleteIcon,
+  ProgressDraftIcon,
+  ProgressInprogressIcon,
+  ProgressOnholdIcon,
+  ProgressPendingIcon,
+  ProgressRejectedIcon,
+  ProgressTodoIcon,
+  ProtectionIcon,
+  ProtectionSolidIcon,
+  ReceiptIcon,
+  ReceiptSolidIcon,
+  RedoIcon,
+  RefreshIcon,
+  RemoveIcon,
+  RemoveDocumentIcon,
+  RemoveDocumentSolidIcon,
+  Replay10Icon,
+  Replay15Icon,
+  Replay30Icon,
+  Replay5Icon,
+  RestoreIcon,
+  RunReportIcon,
+  RunReportSolidIcon,
+  SaltShakerIcon,
+  SaltShakerSolidIcon,
+  SaveIcon,
+  SaveSolidIcon,
+  ScalesIcon,
+  ScalesSolidIcon,
+  ScheduleTimeIcon,
+  ScheduleTimeSolidIcon,
+  SearchIcon,
+  SearchSolidIcon,
+  SemanticDissatisfiedIcon,
+  SemanticDissatisfiedSolidIcon,
+  SemanticNeutralIcon,
+  SemanticNeutralSolidIcon,
+  SemanticSatisfiedIcon,
+  SemanticSatisfiedSolidIcon,
+  SemanticVeryDissatisfiedIcon,
+  SemanticVeryDissatisfiedSolidIcon,
+  SemanticVerySatisfiedIcon,
+  SemanticVerySatisfiedSolidIcon,
+  SendIcon,
+  SendSolidIcon,
+  SettingsIcon,
+  SettingsSolidIcon,
+  ShareIcon,
+  ShareSolidIcon,
+  SignalIcon,
+  SignpostIcon,
+  SignpostSolidIcon,
+  SortableAlphaIcon,
+  SortableNumIcon,
+  SortAlphaAscendIcon,
+  SortAlphaDescendIcon,
+  SortAscendIcon,
+  SortDescendIcon,
+  SortNumAscendIcon,
+  SortNumDescendIcon,
+  SparkleIcon,
+  SparkleSolidIcon,
+  StackoverflowIcon,
+  StepActiveIcon,
+  StepDefaultIcon,
+  StepSuccessIcon,
+  StethoscopeIcon,
+  StethoscopeSolidIcon,
+  StorageIcon,
+  StorageSolidIcon,
+  StorefrontIcon,
+  StorefrontSolidIcon,
+  StringNumberIcon,
+  StringTextIcon,
+  SuccessIcon,
+  SuccessSmallIcon,
+  SuccessSmallSolidIcon,
+  SuccessSolidIcon,
+  SuccessTickIcon,
+  SumIcon,
+  SumSolidIcon,
+  SwapIcon,
+  SymphonyIcon,
+  SyncIcon,
+  TagIcon,
+  TagClearIcon,
+  TagClearSolidIcon,
+  TagSolidIcon,
+  TailsIcon,
+  TailsSolidIcon,
+  TargetIcon,
+  TearOutIcon,
+  ThumbsDownIcon,
+  ThumbsDownSolidIcon,
+  ThumbsUpIcon,
+  ThumbsUpSolidIcon,
+  ToteIcon,
+  ToteSolidIcon,
+  TreeIcon,
+  TreeSolidIcon,
+  TriangleDownIcon,
+  TriangleLeftIcon,
+  TriangleRightIcon,
+  TriangleRightDownIcon,
+  TriangleUpIcon,
+  TypeIcon,
+  TypeSolidIcon,
+  UndoIcon,
+  UngroupIcon,
+  UngroupSolidIcon,
+  UniversalAccessIcon,
+  UniversalAccessSolidIcon,
+  UnlinkedIcon,
+  UnlockedIcon,
+  UnlockedSolidIcon,
+  UploadIcon,
+  UrgencyCriticalIcon,
+  UrgencyHighIcon,
+  UrgencyLowIcon,
+  UrgencyMediumIcon,
+  UrgencyNoneIcon,
+  UserIcon,
+  UserAdminIcon,
+  UserAdminSolidIcon,
+  UserBadgeIcon,
+  UserGroupIcon,
+  UserGroupSolidIcon,
+  UserSolidIcon,
+  UtensilsIcon,
+  UtensilsSolidIcon,
+  VideoIcon,
+  VideoDisabledIcon,
+  VideoSolidIcon,
+  VisibleIcon,
+  VisibleSolidIcon,
+  VolumeDownIcon,
+  VolumeOffIcon,
+  VolumeUpIcon,
+  WarningIcon,
+  WarningSolidIcon,
+  WatchIcon,
+  WatchSolidIcon,
+  WaveformIcon,
+  WeightIcon,
+  WeightSolidIcon,
+  WifiIcon,
+  WifiDisabledIcon,
+  WomanIcon,
+  WomanSolidIcon,
+  WoodlandIcon,
+  WoodlandSolidIcon,
+  XlsIcon,
+  XlsSolidIcon,
+  ZipIcon,
+  ZipSolidIcon,
+} from "@salt-ds/icons";
+
+export const allIcons = [
+  AccessibleIcon,
+  AccessibleSolidIcon,
+  AddIcon,
+  AddDocumentIcon,
+  AddDocumentSolidIcon,
+  ApiIcon,
+  AppSwitcherIcon,
+  ArrowDownIcon,
+  ArrowLeftIcon,
+  ArrowRightIcon,
+  ArrowUpIcon,
+  AttachIcon,
+  BankIcon,
+  BankCheckIcon,
+  BankCheckSolidIcon,
+  BankSolidIcon,
+  BarChartIcon,
+  BatteryIcon,
+  BatterySolidIcon,
+  BookmarkIcon,
+  BookmarkSolidIcon,
+  BooleanIcon,
+  BooleanSolidIcon,
+  BrowserIcon,
+  BrowserSolidIcon,
+  BuildingIcon,
+  BuildingsIcon,
+  BuildingSolidIcon,
+  BuildingsSolidIcon,
+  BuildReportIcon,
+  BuildReportSolidIcon,
+  CalculatorIcon,
+  CalculatorSolidIcon,
+  CalendarIcon,
+  CalendarSolidIcon,
+  CallIcon,
+  CallSolidIcon,
+  CartIcon,
+  CartSolidIcon,
+  ChatIcon,
+  ChatGroupIcon,
+  ChatGroupSolidIcon,
+  ChatSolidIcon,
+  ChattingIcon,
+  ChattingSolidIcon,
+  ChevronDownIcon,
+  ChevronLeftIcon,
+  ChevronRightIcon,
+  ChevronUpIcon,
+  ClockIcon,
+  ClockSolidIcon,
+  CloneIcon,
+  CloseIcon,
+  ClosedcaptionIcon,
+  ClosedcaptionDisabledIcon,
+  ClosedcaptionDisabledSolidIcon,
+  ClosedcaptionSolidIcon,
+  CloseSmallIcon,
+  CloudIcon,
+  CloudDisabledIcon,
+  CloudDisabledSolidIcon,
+  CloudDownloadIcon,
+  CloudDownloadSolidIcon,
+  CloudSolidIcon,
+  CloudSuccessIcon,
+  CloudSuccessSolidIcon,
+  CloudSyncIcon,
+  CloudSyncSolidIcon,
+  CloudUploadIcon,
+  CloudUploadSolidIcon,
+  CoffeeIcon,
+  CoffeeSolidIcon,
+  CollapseIcon,
+  CollapseAllIcon,
+  ColumnChooserIcon,
+  ColumnChooserSolidIcon,
+  CommentaryIcon,
+  CommentarySolidIcon,
+  CompassIcon,
+  CompassSolidIcon,
+  CookieIcon,
+  CookieSolidIcon,
+  CopyIcon,
+  CopySolidIcon,
+  CreditCardIcon,
+  CreditCardSolidIcon,
+  CropsIcon,
+  CropsSolidIcon,
+  CsvIcon,
+  CsvSolidIcon,
+  CutIcon,
+  DarkIcon,
+  DarkSolidIcon,
+  DashboardIcon,
+  DashboardSolidIcon,
+  DatabaseIcon,
+  DatabaseSolidIcon,
+  DeleteIcon,
+  DeleteSolidIcon,
+  DevicesIcon,
+  DevicesSolidIcon,
+  DiamondIcon,
+  DisplayIcon,
+  DisplaySolidIcon,
+  DocumentIcon,
+  DocumentSolidIcon,
+  DoubleChevronDownIcon,
+  DoubleChevronLeftIcon,
+  DoubleChevronRightIcon,
+  DoubleChevronUpIcon,
+  DownloadIcon,
+  DragRowIcon,
+  EditIcon,
+  EditSolidIcon,
+  ErrorIcon,
+  ErrorExecuteIcon,
+  ErrorSolidIcon,
+  ExpandIcon,
+  ExpandAllIcon,
+  ExportIcon,
+  ExportSolidIcon,
+  FavoriteIcon,
+  FavoriteSolidIcon,
+  FilterIcon,
+  FilterClearIcon,
+  FilterClearSolidIcon,
+  FilterSolidIcon,
+  FlagIcon,
+  FlagSolidIcon,
+  FolderClosedIcon,
+  FolderClosedSolidIcon,
+  FolderOpenIcon,
+  FolderOpenSolidIcon,
+  Forward10Icon,
+  Forward15Icon,
+  Forward30Icon,
+  Forward5Icon,
+  GithubIcon,
+  GlobeIcon,
+  GlobeSolidIcon,
+  GridIcon,
+  GridSolidIcon,
+  GroupIcon,
+  GroupSolidIcon,
+  GuideClosedIcon,
+  GuideClosedSolidIcon,
+  GuideOpenIcon,
+  GuideOpenSolidIcon,
+  HeadphonesIcon,
+  HeadphonesDisabledIcon,
+  HeadphonesDisabledSolidIcon,
+  HeadphonesSolidIcon,
+  HelpIcon,
+  HelpSolidIcon,
+  HiddenIcon,
+  HiddenSolidIcon,
+  HistoryIcon,
+  HomeIcon,
+  HomeSolidIcon,
+  HospitalIcon,
+  HospitalSolidIcon,
+  IconFigmaIcon,
+  ImageIcon,
+  ImageSolidIcon,
+  ImportIcon,
+  ImportSolidIcon,
+  InboxIcon,
+  InboxSolidIcon,
+  InfoIcon,
+  InfoSolidIcon,
+  JigsawIcon,
+  JigsawSolidIcon,
+  KeyIcon,
+  KeyBackspaceIcon,
+  KeyCapslockIcon,
+  KeyCommandIcon,
+  KeyControlIcon,
+  KeyEnterIcon,
+  KeyOptionIcon,
+  KeyShiftIcon,
+  KeySolidIcon,
+  KeyTabIcon,
+  LaptopIcon,
+  LaptopSolidIcon,
+  LayersIcon,
+  LayersSolidIcon,
+  LightIcon,
+  LightSolidIcon,
+  LineChartIcon,
+  LineChartSolidIcon,
+  LinkedIcon,
+  ListIcon,
+  LoaderIcon,
+  LocationIcon,
+  LocationSolidIcon,
+  LockedIcon,
+  LockedSolidIcon,
+  ManIcon,
+  ManSolidIcon,
+  ManWomanIcon,
+  ManWomanSolidIcon,
+  MapIcon,
+  MapSolidIcon,
+  MarkerIcon,
+  MarkerSolidIcon,
+  MaximizeIcon,
+  MaximizeSolidIcon,
+  MedicalKitIcon,
+  MedicalKitSolidIcon,
+  MenuIcon,
+  MessageIcon,
+  MessageSolidIcon,
+  MicroMenuIcon,
+  MicrophoneIcon,
+  MicrophoneDisabledIcon,
+  MicrophoneDisabledSolidIcon,
+  MicrophoneSolidIcon,
+  MinimizeIcon,
+  MobileIcon,
+  MobileSolidIcon,
+  MouseIcon,
+  MouseSolidIcon,
+  MoveAllIcon,
+  MoveHorizontalIcon,
+  MoveVerticalIcon,
+  MusicIcon,
+  MusicDisabledIcon,
+  MusicDisabledSolidIcon,
+  MusicSolidIcon,
+  NoteIcon,
+  NoteSolidIcon,
+  NotificationIcon,
+  NotificationReadIcon,
+  NotificationReadSolidIcon,
+  NotificationSolidIcon,
+  OverflowMenuIcon,
+  PasteIcon,
+  PasteSolidIcon,
+  PauseIcon,
+  PauseSolidIcon,
+  PdfIcon,
+  PdfSolidIcon,
+  PicnicIcon,
+  PicnicSolidIcon,
+  PinIcon,
+  PinSolidIcon,
+  PivotIcon,
+  PivotSolidIcon,
+  PlaceInIcon,
+  PlayIcon,
+  PlaySolidIcon,
+  PotFoodIcon,
+  PotFoodSolidIcon,
+  PresentationIcon,
+  PresentationSolidIcon,
+  PriceLadderIcon,
+  PrintIcon,
+  PrintSolidIcon,
+  ProgressCancelledIcon,
+  ProgressClosedIcon,
+  ProgressCompleteIcon,
+  ProgressDraftIcon,
+  ProgressInprogressIcon,
+  ProgressOnholdIcon,
+  ProgressPendingIcon,
+  ProgressRejectedIcon,
+  ProgressTodoIcon,
+  ProtectionIcon,
+  ProtectionSolidIcon,
+  ReceiptIcon,
+  ReceiptSolidIcon,
+  RedoIcon,
+  RefreshIcon,
+  RemoveIcon,
+  RemoveDocumentIcon,
+  RemoveDocumentSolidIcon,
+  Replay10Icon,
+  Replay15Icon,
+  Replay30Icon,
+  Replay5Icon,
+  RestoreIcon,
+  RunReportIcon,
+  RunReportSolidIcon,
+  SaltShakerIcon,
+  SaltShakerSolidIcon,
+  SaveIcon,
+  SaveSolidIcon,
+  ScalesIcon,
+  ScalesSolidIcon,
+  ScheduleTimeIcon,
+  ScheduleTimeSolidIcon,
+  SearchIcon,
+  SearchSolidIcon,
+  SemanticDissatisfiedIcon,
+  SemanticDissatisfiedSolidIcon,
+  SemanticNeutralIcon,
+  SemanticNeutralSolidIcon,
+  SemanticSatisfiedIcon,
+  SemanticSatisfiedSolidIcon,
+  SemanticVeryDissatisfiedIcon,
+  SemanticVeryDissatisfiedSolidIcon,
+  SemanticVerySatisfiedIcon,
+  SemanticVerySatisfiedSolidIcon,
+  SendIcon,
+  SendSolidIcon,
+  SettingsIcon,
+  SettingsSolidIcon,
+  ShareIcon,
+  ShareSolidIcon,
+  SignalIcon,
+  SignpostIcon,
+  SignpostSolidIcon,
+  SortableAlphaIcon,
+  SortableNumIcon,
+  SortAlphaAscendIcon,
+  SortAlphaDescendIcon,
+  SortAscendIcon,
+  SortDescendIcon,
+  SortNumAscendIcon,
+  SortNumDescendIcon,
+  SparkleIcon,
+  SparkleSolidIcon,
+  StackoverflowIcon,
+  StepActiveIcon,
+  StepDefaultIcon,
+  StepSuccessIcon,
+  StethoscopeIcon,
+  StethoscopeSolidIcon,
+  StorageIcon,
+  StorageSolidIcon,
+  StorefrontIcon,
+  StorefrontSolidIcon,
+  StringNumberIcon,
+  StringTextIcon,
+  SuccessIcon,
+  SuccessSmallIcon,
+  SuccessSmallSolidIcon,
+  SuccessSolidIcon,
+  SuccessTickIcon,
+  SumIcon,
+  SumSolidIcon,
+  SwapIcon,
+  SymphonyIcon,
+  SyncIcon,
+  TagIcon,
+  TagClearIcon,
+  TagClearSolidIcon,
+  TagSolidIcon,
+  TailsIcon,
+  TailsSolidIcon,
+  TargetIcon,
+  TearOutIcon,
+  ThumbsDownIcon,
+  ThumbsDownSolidIcon,
+  ThumbsUpIcon,
+  ThumbsUpSolidIcon,
+  ToteIcon,
+  ToteSolidIcon,
+  TreeIcon,
+  TreeSolidIcon,
+  TriangleDownIcon,
+  TriangleLeftIcon,
+  TriangleRightIcon,
+  TriangleRightDownIcon,
+  TriangleUpIcon,
+  TypeIcon,
+  TypeSolidIcon,
+  UndoIcon,
+  UngroupIcon,
+  UngroupSolidIcon,
+  UniversalAccessIcon,
+  UniversalAccessSolidIcon,
+  UnlinkedIcon,
+  UnlockedIcon,
+  UnlockedSolidIcon,
+  UploadIcon,
+  UrgencyCriticalIcon,
+  UrgencyHighIcon,
+  UrgencyLowIcon,
+  UrgencyMediumIcon,
+  UrgencyNoneIcon,
+  UserIcon,
+  UserAdminIcon,
+  UserAdminSolidIcon,
+  UserBadgeIcon,
+  UserGroupIcon,
+  UserGroupSolidIcon,
+  UserSolidIcon,
+  UtensilsIcon,
+  UtensilsSolidIcon,
+  VideoIcon,
+  VideoDisabledIcon,
+  VideoSolidIcon,
+  VisibleIcon,
+  VisibleSolidIcon,
+  VolumeDownIcon,
+  VolumeOffIcon,
+  VolumeUpIcon,
+  WarningIcon,
+  WarningSolidIcon,
+  WatchIcon,
+  WatchSolidIcon,
+  WaveformIcon,
+  WeightIcon,
+  WeightSolidIcon,
+  WifiIcon,
+  WifiDisabledIcon,
+  WomanIcon,
+  WomanSolidIcon,
+  WoodlandIcon,
+  WoodlandSolidIcon,
+  XlsIcon,
+  XlsSolidIcon,
+  ZipIcon,
+  ZipSolidIcon,
+];
diff --git a/packages/icons/scripts/generateIcons.mjs b/packages/icons/scripts/generateIcons.mjs
index 0da67b6b4ea..8a5e17e2e89 100644
--- a/packages/icons/scripts/generateIcons.mjs
+++ b/packages/icons/scripts/generateIcons.mjs
@@ -310,6 +310,7 @@ const cssOutputPath = path.join(__dirname, "../saltIcons.css");
 const fileArg = process.argv.splice(2).join("|");
 const templatePath = path.join(__dirname, "./templateIcon.mustache");
 const allPath = path.join(basePath, "../stories/icon.all.ts");
+const allCorePath = path.join(basePath, "../../core/stories/badge/icon.all.ts");
 const siteAllPath = path.join(
   basePath,
   "../../../site/src/components/icon-preview/allIconsList.ts",
@@ -325,4 +326,5 @@ const icons = await generateIconComponents({
 await generateCssAsBg({ basePath, cssOutputPath, fileArg });
 await generateIndex({ icons, componentsPath });
 await generateIconAll({ icons, allPath });
+await generateIconAll({ icons, allPath: allCorePath });
 await generateIconAllSite({ icons, siteAllPath });
diff --git a/packages/icons/stories/icon.all.ts b/packages/icons/stories/icon.all.ts
index d3ff4e691d3..b858e448a2b 100644
--- a/packages/icons/stories/icon.all.ts
+++ b/packages/icons/stories/icon.all.ts
@@ -3,9 +3,9 @@
 import {
   AccessibleIcon,
   AccessibleSolidIcon,
+  AddIcon,
   AddDocumentIcon,
   AddDocumentSolidIcon,
-  AddIcon,
   ApiIcon,
   AppSwitcherIcon,
   ArrowDownIcon,
@@ -13,9 +13,9 @@ import {
   ArrowRightIcon,
   ArrowUpIcon,
   AttachIcon,
+  BankIcon,
   BankCheckIcon,
   BankCheckSolidIcon,
-  BankIcon,
   BankSolidIcon,
   BarChartIcon,
   BatteryIcon,
@@ -26,12 +26,12 @@ import {
   BooleanSolidIcon,
   BrowserIcon,
   BrowserSolidIcon,
-  BuildReportIcon,
-  BuildReportSolidIcon,
   BuildingIcon,
-  BuildingSolidIcon,
   BuildingsIcon,
+  BuildingSolidIcon,
   BuildingsSolidIcon,
+  BuildReportIcon,
+  BuildReportSolidIcon,
   CalculatorIcon,
   CalculatorSolidIcon,
   CalendarIcon,
@@ -40,9 +40,9 @@ import {
   CallSolidIcon,
   CartIcon,
   CartSolidIcon,
+  ChatIcon,
   ChatGroupIcon,
   ChatGroupSolidIcon,
-  ChatIcon,
   ChatSolidIcon,
   ChattingIcon,
   ChattingSolidIcon,
@@ -54,16 +54,16 @@ import {
   ClockSolidIcon,
   CloneIcon,
   CloseIcon,
-  CloseSmallIcon,
+  ClosedcaptionIcon,
   ClosedcaptionDisabledIcon,
   ClosedcaptionDisabledSolidIcon,
-  ClosedcaptionIcon,
   ClosedcaptionSolidIcon,
+  CloseSmallIcon,
+  CloudIcon,
   CloudDisabledIcon,
   CloudDisabledSolidIcon,
   CloudDownloadIcon,
   CloudDownloadSolidIcon,
-  CloudIcon,
   CloudSolidIcon,
   CloudSuccessIcon,
   CloudSuccessSolidIcon,
@@ -73,8 +73,8 @@ import {
   CloudUploadSolidIcon,
   CoffeeIcon,
   CoffeeSolidIcon,
-  CollapseAllIcon,
   CollapseIcon,
+  CollapseAllIcon,
   ColumnChooserIcon,
   ColumnChooserSolidIcon,
   CommentaryIcon,
@@ -115,18 +115,18 @@ import {
   DragRowIcon,
   EditIcon,
   EditSolidIcon,
-  ErrorExecuteIcon,
   ErrorIcon,
+  ErrorExecuteIcon,
   ErrorSolidIcon,
-  ExpandAllIcon,
   ExpandIcon,
+  ExpandAllIcon,
   ExportIcon,
   ExportSolidIcon,
   FavoriteIcon,
   FavoriteSolidIcon,
+  FilterIcon,
   FilterClearIcon,
   FilterClearSolidIcon,
-  FilterIcon,
   FilterSolidIcon,
   FlagIcon,
   FlagSolidIcon,
@@ -134,10 +134,10 @@ import {
   FolderClosedSolidIcon,
   FolderOpenIcon,
   FolderOpenSolidIcon,
-  Forward5Icon,
   Forward10Icon,
   Forward15Icon,
   Forward30Icon,
+  Forward5Icon,
   GithubIcon,
   GlobeIcon,
   GlobeSolidIcon,
@@ -149,9 +149,9 @@ import {
   GuideClosedSolidIcon,
   GuideOpenIcon,
   GuideOpenSolidIcon,
+  HeadphonesIcon,
   HeadphonesDisabledIcon,
   HeadphonesDisabledSolidIcon,
-  HeadphonesIcon,
   HeadphonesSolidIcon,
   HelpIcon,
   HelpSolidIcon,
@@ -173,12 +173,12 @@ import {
   InfoSolidIcon,
   JigsawIcon,
   JigsawSolidIcon,
+  KeyIcon,
   KeyBackspaceIcon,
   KeyCapslockIcon,
   KeyCommandIcon,
   KeyControlIcon,
   KeyEnterIcon,
-  KeyIcon,
   KeyOptionIcon,
   KeyShiftIcon,
   KeySolidIcon,
@@ -214,9 +214,9 @@ import {
   MessageIcon,
   MessageSolidIcon,
   MicroMenuIcon,
+  MicrophoneIcon,
   MicrophoneDisabledIcon,
   MicrophoneDisabledSolidIcon,
-  MicrophoneIcon,
   MicrophoneSolidIcon,
   MinimizeIcon,
   MobileIcon,
@@ -226,9 +226,9 @@ import {
   MoveAllIcon,
   MoveHorizontalIcon,
   MoveVerticalIcon,
+  MusicIcon,
   MusicDisabledIcon,
   MusicDisabledSolidIcon,
-  MusicIcon,
   MusicSolidIcon,
   NoteIcon,
   NoteSolidIcon,
@@ -274,13 +274,13 @@ import {
   ReceiptSolidIcon,
   RedoIcon,
   RefreshIcon,
+  RemoveIcon,
   RemoveDocumentIcon,
   RemoveDocumentSolidIcon,
-  RemoveIcon,
-  Replay5Icon,
   Replay10Icon,
   Replay15Icon,
   Replay30Icon,
+  Replay5Icon,
   RestoreIcon,
   RunReportIcon,
   RunReportSolidIcon,
@@ -313,14 +313,14 @@ import {
   SignalIcon,
   SignpostIcon,
   SignpostSolidIcon,
+  SortableAlphaIcon,
+  SortableNumIcon,
   SortAlphaAscendIcon,
   SortAlphaDescendIcon,
   SortAscendIcon,
   SortDescendIcon,
   SortNumAscendIcon,
   SortNumDescendIcon,
-  SortableAlphaIcon,
-  SortableNumIcon,
   SparkleIcon,
   SparkleSolidIcon,
   StackoverflowIcon,
@@ -345,9 +345,9 @@ import {
   SwapIcon,
   SymphonyIcon,
   SyncIcon,
+  TagIcon,
   TagClearIcon,
   TagClearSolidIcon,
-  TagIcon,
   TagSolidIcon,
   TailsIcon,
   TailsSolidIcon,
@@ -363,8 +363,8 @@ import {
   TreeSolidIcon,
   TriangleDownIcon,
   TriangleLeftIcon,
-  TriangleRightDownIcon,
   TriangleRightIcon,
+  TriangleRightDownIcon,
   TriangleUpIcon,
   TypeIcon,
   TypeSolidIcon,
@@ -382,17 +382,17 @@ import {
   UrgencyLowIcon,
   UrgencyMediumIcon,
   UrgencyNoneIcon,
+  UserIcon,
   UserAdminIcon,
   UserAdminSolidIcon,
   UserBadgeIcon,
   UserGroupIcon,
   UserGroupSolidIcon,
-  UserIcon,
   UserSolidIcon,
   UtensilsIcon,
   UtensilsSolidIcon,
-  VideoDisabledIcon,
   VideoIcon,
+  VideoDisabledIcon,
   VideoSolidIcon,
   VisibleIcon,
   VisibleSolidIcon,
@@ -406,8 +406,8 @@ import {
   WaveformIcon,
   WeightIcon,
   WeightSolidIcon,
-  WifiDisabledIcon,
   WifiIcon,
+  WifiDisabledIcon,
   WomanIcon,
   WomanSolidIcon,
   WoodlandIcon,
diff --git a/site/src/components/icon-preview/allIconsList.ts b/site/src/components/icon-preview/allIconsList.ts
index a44382fb76d..e541f3e79da 100644
--- a/site/src/components/icon-preview/allIconsList.ts
+++ b/site/src/components/icon-preview/allIconsList.ts
@@ -3,9 +3,9 @@
 import {
   AccessibleIcon,
   AccessibleSolidIcon,
+  AddIcon,
   AddDocumentIcon,
   AddDocumentSolidIcon,
-  AddIcon,
   ApiIcon,
   AppSwitcherIcon,
   ArrowDownIcon,
@@ -13,9 +13,9 @@ import {
   ArrowRightIcon,
   ArrowUpIcon,
   AttachIcon,
+  BankIcon,
   BankCheckIcon,
   BankCheckSolidIcon,
-  BankIcon,
   BankSolidIcon,
   BarChartIcon,
   BatteryIcon,
@@ -26,12 +26,12 @@ import {
   BooleanSolidIcon,
   BrowserIcon,
   BrowserSolidIcon,
-  BuildReportIcon,
-  BuildReportSolidIcon,
   BuildingIcon,
-  BuildingSolidIcon,
   BuildingsIcon,
+  BuildingSolidIcon,
   BuildingsSolidIcon,
+  BuildReportIcon,
+  BuildReportSolidIcon,
   CalculatorIcon,
   CalculatorSolidIcon,
   CalendarIcon,
@@ -40,9 +40,9 @@ import {
   CallSolidIcon,
   CartIcon,
   CartSolidIcon,
+  ChatIcon,
   ChatGroupIcon,
   ChatGroupSolidIcon,
-  ChatIcon,
   ChatSolidIcon,
   ChattingIcon,
   ChattingSolidIcon,
@@ -54,16 +54,16 @@ import {
   ClockSolidIcon,
   CloneIcon,
   CloseIcon,
-  CloseSmallIcon,
+  ClosedcaptionIcon,
   ClosedcaptionDisabledIcon,
   ClosedcaptionDisabledSolidIcon,
-  ClosedcaptionIcon,
   ClosedcaptionSolidIcon,
+  CloseSmallIcon,
+  CloudIcon,
   CloudDisabledIcon,
   CloudDisabledSolidIcon,
   CloudDownloadIcon,
   CloudDownloadSolidIcon,
-  CloudIcon,
   CloudSolidIcon,
   CloudSuccessIcon,
   CloudSuccessSolidIcon,
@@ -73,8 +73,8 @@ import {
   CloudUploadSolidIcon,
   CoffeeIcon,
   CoffeeSolidIcon,
-  CollapseAllIcon,
   CollapseIcon,
+  CollapseAllIcon,
   ColumnChooserIcon,
   ColumnChooserSolidIcon,
   CommentaryIcon,
@@ -115,18 +115,18 @@ import {
   DragRowIcon,
   EditIcon,
   EditSolidIcon,
-  ErrorExecuteIcon,
   ErrorIcon,
+  ErrorExecuteIcon,
   ErrorSolidIcon,
-  ExpandAllIcon,
   ExpandIcon,
+  ExpandAllIcon,
   ExportIcon,
   ExportSolidIcon,
   FavoriteIcon,
   FavoriteSolidIcon,
+  FilterIcon,
   FilterClearIcon,
   FilterClearSolidIcon,
-  FilterIcon,
   FilterSolidIcon,
   FlagIcon,
   FlagSolidIcon,
@@ -134,10 +134,10 @@ import {
   FolderClosedSolidIcon,
   FolderOpenIcon,
   FolderOpenSolidIcon,
-  Forward5Icon,
   Forward10Icon,
   Forward15Icon,
   Forward30Icon,
+  Forward5Icon,
   GithubIcon,
   GlobeIcon,
   GlobeSolidIcon,
@@ -149,9 +149,9 @@ import {
   GuideClosedSolidIcon,
   GuideOpenIcon,
   GuideOpenSolidIcon,
+  HeadphonesIcon,
   HeadphonesDisabledIcon,
   HeadphonesDisabledSolidIcon,
-  HeadphonesIcon,
   HeadphonesSolidIcon,
   HelpIcon,
   HelpSolidIcon,
@@ -173,12 +173,12 @@ import {
   InfoSolidIcon,
   JigsawIcon,
   JigsawSolidIcon,
+  KeyIcon,
   KeyBackspaceIcon,
   KeyCapslockIcon,
   KeyCommandIcon,
   KeyControlIcon,
   KeyEnterIcon,
-  KeyIcon,
   KeyOptionIcon,
   KeyShiftIcon,
   KeySolidIcon,
@@ -214,9 +214,9 @@ import {
   MessageIcon,
   MessageSolidIcon,
   MicroMenuIcon,
+  MicrophoneIcon,
   MicrophoneDisabledIcon,
   MicrophoneDisabledSolidIcon,
-  MicrophoneIcon,
   MicrophoneSolidIcon,
   MinimizeIcon,
   MobileIcon,
@@ -226,9 +226,9 @@ import {
   MoveAllIcon,
   MoveHorizontalIcon,
   MoveVerticalIcon,
+  MusicIcon,
   MusicDisabledIcon,
   MusicDisabledSolidIcon,
-  MusicIcon,
   MusicSolidIcon,
   NoteIcon,
   NoteSolidIcon,
@@ -274,13 +274,13 @@ import {
   ReceiptSolidIcon,
   RedoIcon,
   RefreshIcon,
+  RemoveIcon,
   RemoveDocumentIcon,
   RemoveDocumentSolidIcon,
-  RemoveIcon,
-  Replay5Icon,
   Replay10Icon,
   Replay15Icon,
   Replay30Icon,
+  Replay5Icon,
   RestoreIcon,
   RunReportIcon,
   RunReportSolidIcon,
@@ -313,14 +313,14 @@ import {
   SignalIcon,
   SignpostIcon,
   SignpostSolidIcon,
+  SortableAlphaIcon,
+  SortableNumIcon,
   SortAlphaAscendIcon,
   SortAlphaDescendIcon,
   SortAscendIcon,
   SortDescendIcon,
   SortNumAscendIcon,
   SortNumDescendIcon,
-  SortableAlphaIcon,
-  SortableNumIcon,
   SparkleIcon,
   SparkleSolidIcon,
   StackoverflowIcon,
@@ -345,9 +345,9 @@ import {
   SwapIcon,
   SymphonyIcon,
   SyncIcon,
+  TagIcon,
   TagClearIcon,
   TagClearSolidIcon,
-  TagIcon,
   TagSolidIcon,
   TailsIcon,
   TailsSolidIcon,
@@ -363,8 +363,8 @@ import {
   TreeSolidIcon,
   TriangleDownIcon,
   TriangleLeftIcon,
-  TriangleRightDownIcon,
   TriangleRightIcon,
+  TriangleRightDownIcon,
   TriangleUpIcon,
   TypeIcon,
   TypeSolidIcon,
@@ -382,17 +382,17 @@ import {
   UrgencyLowIcon,
   UrgencyMediumIcon,
   UrgencyNoneIcon,
+  UserIcon,
   UserAdminIcon,
   UserAdminSolidIcon,
   UserBadgeIcon,
   UserGroupIcon,
   UserGroupSolidIcon,
-  UserIcon,
   UserSolidIcon,
   UtensilsIcon,
   UtensilsSolidIcon,
-  VideoDisabledIcon,
   VideoIcon,
+  VideoDisabledIcon,
   VideoSolidIcon,
   VisibleIcon,
   VisibleSolidIcon,
@@ -406,8 +406,8 @@ import {
   WaveformIcon,
   WeightIcon,
   WeightSolidIcon,
-  WifiDisabledIcon,
   WifiIcon,
+  WifiDisabledIcon,
   WomanIcon,
   WomanSolidIcon,
   WoodlandIcon,