diff --git a/src/Accordion/AccordionItem.svelte b/src/Accordion/AccordionItem.svelte
index 2ffed134..da532cfb 100644
--- a/src/Accordion/AccordionItem.svelte
+++ b/src/Accordion/AccordionItem.svelte
@@ -15,7 +15,7 @@
   export let iconDescription = "Expand/Collapse";
 
   import { onMount, getContext } from "svelte";
-  import ChevronRight16 from "carbon-icons-svelte/lib/ChevronRight16/ChevronRight16.svelte";
+  import ChevronRight16 from "../icons/ChevronRight16.svelte";
 
   let initialDisabled = disabled;
 
diff --git a/src/Accordion/AccordionSkeleton.svelte b/src/Accordion/AccordionSkeleton.svelte
index 34179668..bd798afc 100644
--- a/src/Accordion/AccordionSkeleton.svelte
+++ b/src/Accordion/AccordionSkeleton.svelte
@@ -17,7 +17,7 @@
   /** Set to `false` to close the first accordion item */
   export let open = true;
 
-  import ChevronRight16 from "carbon-icons-svelte/lib/ChevronRight16/ChevronRight16.svelte";
+  import ChevronRight16 from "../icons/ChevronRight16.svelte";
   import SkeletonText from "../SkeletonText/SkeletonText.svelte";
 </script>
 
diff --git a/src/CodeSnippet/CodeSnippet.svelte b/src/CodeSnippet/CodeSnippet.svelte
index 1a1ddec0..8484d852 100644
--- a/src/CodeSnippet/CodeSnippet.svelte
+++ b/src/CodeSnippet/CodeSnippet.svelte
@@ -89,7 +89,7 @@
   export let ref = null;
 
   import { createEventDispatcher, tick } from "svelte";
-  import ChevronDown16 from "carbon-icons-svelte/lib/ChevronDown16/ChevronDown16.svelte";
+  import ChevronDown16 from "../icons/ChevronDown16.svelte";
   import Button from "../Button/Button.svelte";
   import Copy from "../Copy/Copy.svelte";
   import CopyButton from "../CopyButton/CopyButton.svelte";
diff --git a/src/ComboBox/ComboBox.svelte b/src/ComboBox/ComboBox.svelte
index 162358c5..ab76c03d 100644
--- a/src/ComboBox/ComboBox.svelte
+++ b/src/ComboBox/ComboBox.svelte
@@ -97,7 +97,7 @@
   import { createEventDispatcher, afterUpdate, tick } from "svelte";
   import Checkmark16 from "carbon-icons-svelte/lib/Checkmark16/Checkmark16.svelte";
   import WarningFilled16 from "carbon-icons-svelte/lib/WarningFilled16/WarningFilled16.svelte";
-  import WarningAltFilled16 from "carbon-icons-svelte/lib/WarningAltFilled16/WarningAltFilled16.svelte";
+  import WarningAltFilled16 from "../icons/WarningAltFilled16.svelte";
   import ListBox from "../ListBox/ListBox.svelte";
   import ListBoxField from "../ListBox/ListBoxField.svelte";
   import ListBoxMenu from "../ListBox/ListBoxMenu.svelte";
diff --git a/src/ComposedModal/ModalHeader.svelte b/src/ComposedModal/ModalHeader.svelte
index f96aa078..e2370bef 100644
--- a/src/ComposedModal/ModalHeader.svelte
+++ b/src/ComposedModal/ModalHeader.svelte
@@ -21,7 +21,7 @@
   export let iconDescription = "Close";
 
   import { getContext } from "svelte";
-  import Close20 from "carbon-icons-svelte/lib/Close20/Close20.svelte";
+  import Close20 from "../icons/Close20.svelte";
 
   const { closeModal, updateLabel } = getContext("ComposedModal");
 
diff --git a/src/ContextMenu/ContextMenuOption.svelte b/src/ContextMenu/ContextMenuOption.svelte
index b5df8ec1..ac03391d 100644
--- a/src/ContextMenu/ContextMenuOption.svelte
+++ b/src/ContextMenu/ContextMenuOption.svelte
@@ -51,7 +51,7 @@
   import { onMount, getContext, createEventDispatcher, tick } from "svelte";
   import ContextMenu from "./ContextMenu.svelte";
   import Checkmark16 from "carbon-icons-svelte/lib/Checkmark16/Checkmark16.svelte";
-  import CaretRight16 from "carbon-icons-svelte/lib/CaretRight16/CaretRight16.svelte";
+  import CaretRight16 from "../icons/CaretRight16.svelte";
 
   const dispatch = createEventDispatcher();
   const ctx = getContext("ContextMenu");
diff --git a/src/CopyButton/CopyButton.svelte b/src/CopyButton/CopyButton.svelte
index da001717..78ecd259 100644
--- a/src/CopyButton/CopyButton.svelte
+++ b/src/CopyButton/CopyButton.svelte
@@ -23,7 +23,7 @@
   };
 
   import Copy from "../Copy/Copy.svelte";
-  import Copy16 from "carbon-icons-svelte/lib/Copy16/Copy16.svelte";
+  import Copy16 from "../icons/Copy16.svelte";
   import { createEventDispatcher } from "svelte";
 
   const dispatch = createEventDispatcher();
diff --git a/src/DataTable/DataTable.svelte b/src/DataTable/DataTable.svelte
index 4b833d4e..8acdf8af 100644
--- a/src/DataTable/DataTable.svelte
+++ b/src/DataTable/DataTable.svelte
@@ -102,7 +102,7 @@
 
   import { createEventDispatcher, setContext } from "svelte";
   import { writable, derived } from "svelte/store";
-  import ChevronRight16 from "carbon-icons-svelte/lib/ChevronRight16/ChevronRight16.svelte";
+  import ChevronRight16 from "../icons/ChevronRight16.svelte";
   import { InlineCheckbox } from "../Checkbox";
   import { RadioButton } from "../RadioButton";
   import Table from "./Table.svelte";
diff --git a/src/DataTable/TableHeader.svelte b/src/DataTable/TableHeader.svelte
index eab38726..4060bf87 100644
--- a/src/DataTable/TableHeader.svelte
+++ b/src/DataTable/TableHeader.svelte
@@ -16,7 +16,7 @@
 
   import { getContext } from "svelte";
   import ArrowUp20 from "carbon-icons-svelte/lib/ArrowUp20/ArrowUp20.svelte";
-  import ArrowsVertical20 from "carbon-icons-svelte/lib/ArrowsVertical20/ArrowsVertical20.svelte";
+  import ArrowsVertical20 from "../icons/ArrowsVertical20.svelte";
 
   const { sortHeader, tableSortable, add } = getContext("DataTable");
 
diff --git a/src/DataTable/ToolbarMenu.svelte b/src/DataTable/ToolbarMenu.svelte
index 80402075..236ab948 100644
--- a/src/DataTable/ToolbarMenu.svelte
+++ b/src/DataTable/ToolbarMenu.svelte
@@ -2,7 +2,7 @@
   /** @extends {"../OverflowMenu/OverflowMenu.svelte"} OverflowMenuProps */
 
   import { getContext } from "svelte";
-  import Settings16 from "carbon-icons-svelte/lib/Settings16";
+  import Settings16 from "../icons/Settings16.svelte";
   import { OverflowMenu } from "../OverflowMenu";
 
   const ctx = getContext("Toolbar");
diff --git a/src/DatePicker/DatePickerInput.svelte b/src/DatePicker/DatePickerInput.svelte
index 67eb6e6c..f6c3e8d4 100644
--- a/src/DatePicker/DatePickerInput.svelte
+++ b/src/DatePicker/DatePickerInput.svelte
@@ -56,7 +56,7 @@
   import { getContext } from "svelte";
   import Calendar16 from "carbon-icons-svelte/lib/Calendar16/Calendar16.svelte";
   import WarningFilled16 from "carbon-icons-svelte/lib/WarningFilled16/WarningFilled16.svelte";
-  import WarningAltFilled16 from "carbon-icons-svelte/lib/WarningAltFilled16/WarningAltFilled16.svelte";
+  import WarningAltFilled16 from "../icons/WarningAltFilled16.svelte";
 
   const {
     range,
diff --git a/src/Dropdown/Dropdown.svelte b/src/Dropdown/Dropdown.svelte
index 2ab13f4e..67c27d2b 100644
--- a/src/Dropdown/Dropdown.svelte
+++ b/src/Dropdown/Dropdown.svelte
@@ -98,7 +98,7 @@
 
   import { createEventDispatcher } from "svelte";
   import WarningFilled16 from "carbon-icons-svelte/lib/WarningFilled16/WarningFilled16.svelte";
-  import WarningAltFilled16 from "carbon-icons-svelte/lib/WarningAltFilled16/WarningAltFilled16.svelte";
+  import WarningAltFilled16 from "../icons/WarningAltFilled16.svelte";
   import {
     ListBox,
     ListBoxMenu,
diff --git a/src/FileUploader/Filename.svelte b/src/FileUploader/Filename.svelte
index 6128daa6..7221142e 100644
--- a/src/FileUploader/Filename.svelte
+++ b/src/FileUploader/Filename.svelte
@@ -13,7 +13,7 @@
 
   import Close16 from "carbon-icons-svelte/lib/Close16";
   import CheckmarkFilled16 from "carbon-icons-svelte/lib/CheckmarkFilled16";
-  import WarningFilled16 from "carbon-icons-svelte/lib/WarningFilled16";
+  import WarningFilled16 from "../icons/WarningFilled16.svelte";
   import { Loading } from "../Loading";
 </script>
 
diff --git a/src/InlineLoading/InlineLoading.svelte b/src/InlineLoading/InlineLoading.svelte
index 96d92b45..5671cc33 100644
--- a/src/InlineLoading/InlineLoading.svelte
+++ b/src/InlineLoading/InlineLoading.svelte
@@ -22,7 +22,7 @@
 
   import { createEventDispatcher, afterUpdate, onMount } from "svelte";
   import CheckmarkFilled16 from "carbon-icons-svelte/lib/CheckmarkFilled16/CheckmarkFilled16.svelte";
-  import ErrorFilled16 from "carbon-icons-svelte/lib/ErrorFilled16/ErrorFilled16.svelte";
+  import ErrorFilled16 from "../icons/ErrorFilled16.svelte";
   import Loading from "../Loading/Loading.svelte";
 
   const dispatch = createEventDispatcher();
diff --git a/src/Link/OutboundLink.svelte b/src/Link/OutboundLink.svelte
index f37512d6..124324d8 100644
--- a/src/Link/OutboundLink.svelte
+++ b/src/Link/OutboundLink.svelte
@@ -2,7 +2,7 @@
   /** @extends {"./Link.svelte"} LinkProps */
 
   import Link from "./Link.svelte";
-  import Launch16 from "carbon-icons-svelte/lib/Launch16/Launch16.svelte";
+  import Launch16 from "../icons/Launch16.svelte";
 </script>
 
 <Link
diff --git a/src/ListBox/ListBoxMenuIcon.svelte b/src/ListBox/ListBoxMenuIcon.svelte
index d1cd1485..b6f82f2b 100644
--- a/src/ListBox/ListBoxMenuIcon.svelte
+++ b/src/ListBox/ListBoxMenuIcon.svelte
@@ -15,7 +15,7 @@
    */
   export let translateWithId = (id) => defaultTranslations[id];
 
-  import ChevronDown16 from "carbon-icons-svelte/lib/ChevronDown16";
+  import ChevronDown16 from "../icons/ChevronDown16.svelte";
 
   const defaultTranslations = {
     [translationIds.close]: "Close menu",
diff --git a/src/ListBox/ListBoxSelection.svelte b/src/ListBox/ListBoxSelection.svelte
index ef094b4a..3ef0701d 100644
--- a/src/ListBox/ListBoxSelection.svelte
+++ b/src/ListBox/ListBoxSelection.svelte
@@ -28,7 +28,7 @@
   export let ref = null;
 
   import { createEventDispatcher, getContext } from "svelte";
-  import Close16 from "carbon-icons-svelte/lib/Close16";
+  import Close16 from "../icons/Close16.svelte";
 
   const defaultTranslations = {
     [translationIds.clearAll]: "Clear all selected items",
diff --git a/src/Modal/Modal.svelte b/src/Modal/Modal.svelte
index f1cee727..cd7ac834 100644
--- a/src/Modal/Modal.svelte
+++ b/src/Modal/Modal.svelte
@@ -81,7 +81,7 @@
   export let ref = null;
 
   import { createEventDispatcher, onMount, afterUpdate } from "svelte";
-  import Close20 from "carbon-icons-svelte/lib/Close20/Close20.svelte";
+  import Close20 from "../icons/Close20.svelte";
   import Button from "../Button/Button.svelte";
 
   const dispatch = createEventDispatcher();
diff --git a/src/MultiSelect/MultiSelect.svelte b/src/MultiSelect/MultiSelect.svelte
index c2a1f37e..f1f5e243 100644
--- a/src/MultiSelect/MultiSelect.svelte
+++ b/src/MultiSelect/MultiSelect.svelte
@@ -148,7 +148,7 @@
 
   import { afterUpdate, createEventDispatcher, setContext } from "svelte";
   import WarningFilled16 from "carbon-icons-svelte/lib/WarningFilled16/WarningFilled16.svelte";
-  import WarningAltFilled16 from "carbon-icons-svelte/lib/WarningAltFilled16/WarningAltFilled16.svelte";
+  import WarningAltFilled16 from "../icons/WarningAltFilled16.svelte";
   import Checkbox from "../Checkbox/Checkbox.svelte";
   import {
     ListBox,
diff --git a/src/Notification/NotificationButton.svelte b/src/Notification/NotificationButton.svelte
index e7e42823..db65618b 100644
--- a/src/Notification/NotificationButton.svelte
+++ b/src/Notification/NotificationButton.svelte
@@ -20,7 +20,7 @@
   /** Specify the ARIA label for the icon */
   export let iconDescription = "Close icon";
 
-  import Close20 from "carbon-icons-svelte/lib/Close20/Close20.svelte";
+  import Close20 from "../icons/Close20.svelte";
 </script>
 
 <!-- svelte-ignore a11y-mouse-events-have-key-events -->
diff --git a/src/Notification/NotificationIcon.svelte b/src/Notification/NotificationIcon.svelte
index 5b49cb68..563d6ecb 100644
--- a/src/Notification/NotificationIcon.svelte
+++ b/src/Notification/NotificationIcon.svelte
@@ -19,7 +19,7 @@
   import InformationFilled20 from "carbon-icons-svelte/lib/InformationFilled20/InformationFilled20.svelte";
   import InformationSquareFilled20 from "carbon-icons-svelte/lib/InformationSquareFilled20/InformationSquareFilled20.svelte";
   import WarningFilled20 from "carbon-icons-svelte/lib/WarningFilled20/WarningFilled20.svelte";
-  import WarningAltFilled20 from "carbon-icons-svelte/lib/WarningAltFilled20/WarningAltFilled20.svelte";
+  import WarningAltFilled20 from "../icons/WarningAltFilled20.svelte";
 
   const icons = {
     error: ErrorFilled20,
diff --git a/src/NumberInput/NumberInput.svelte b/src/NumberInput/NumberInput.svelte
index e97246be..7f85e711 100644
--- a/src/NumberInput/NumberInput.svelte
+++ b/src/NumberInput/NumberInput.svelte
@@ -108,7 +108,7 @@
   import Subtract16 from "carbon-icons-svelte/lib/Subtract16/Subtract16.svelte";
   import WarningFilled16 from "carbon-icons-svelte/lib/WarningFilled16/WarningFilled16.svelte";
   import WarningAltFilled16 from "carbon-icons-svelte/lib/WarningAltFilled16/WarningAltFilled16.svelte";
-  import EditOff16 from "carbon-icons-svelte/lib/EditOff16/EditOff16.svelte";
+  import EditOff16 from "../icons/EditOff16.svelte";
 
   const defaultTranslations = {
     [translationIds.increment]: "Increment number",
diff --git a/src/OverflowMenu/OverflowMenu.svelte b/src/OverflowMenu/OverflowMenu.svelte
index e5ae78fd..8fe8d662 100644
--- a/src/OverflowMenu/OverflowMenu.svelte
+++ b/src/OverflowMenu/OverflowMenu.svelte
@@ -62,7 +62,7 @@
   } from "svelte";
   import { writable } from "svelte/store";
   import OverflowMenuVertical16 from "carbon-icons-svelte/lib/OverflowMenuVertical16/OverflowMenuVertical16.svelte";
-  import OverflowMenuHorizontal16 from "carbon-icons-svelte/lib/OverflowMenuHorizontal16/OverflowMenuHorizontal16.svelte";
+  import OverflowMenuHorizontal16 from "../icons/OverflowMenuHorizontal16.svelte";
 
   const ctxBreadcrumbItem = getContext("BreadcrumbItem");
   const dispatch = createEventDispatcher();
diff --git a/src/Pagination/Pagination.svelte b/src/Pagination/Pagination.svelte
index 200b3644..3976647b 100644
--- a/src/Pagination/Pagination.svelte
+++ b/src/Pagination/Pagination.svelte
@@ -72,7 +72,7 @@
 
   import { createEventDispatcher } from "svelte";
   import CaretLeft16 from "carbon-icons-svelte/lib/CaretLeft16/CaretLeft16.svelte";
-  import CaretRight16 from "carbon-icons-svelte/lib/CaretRight16/CaretRight16.svelte";
+  import CaretRight16 from "../icons/CaretRight16.svelte";
   import Button from "../Button/Button.svelte";
   import Select from "../Select/Select.svelte";
   import SelectItem from "../Select/SelectItem.svelte";
diff --git a/src/PaginationNav/PaginationNav.svelte b/src/PaginationNav/PaginationNav.svelte
index d8fe9d3d..ecce3e39 100644
--- a/src/PaginationNav/PaginationNav.svelte
+++ b/src/PaginationNav/PaginationNav.svelte
@@ -25,7 +25,7 @@
 
   import { afterUpdate, createEventDispatcher } from "svelte";
   import CaretLeft16 from "carbon-icons-svelte/lib/CaretLeft16/CaretLeft16.svelte";
-  import CaretRight16 from "carbon-icons-svelte/lib/CaretRight16/CaretRight16.svelte";
+  import CaretRight16 from "../icons/CaretRight16.svelte";
   import PaginationItem from "./PaginationItem.svelte";
   import PaginationOverflow from "./PaginationOverflow.svelte";
   import Button from "../Button/Button.svelte";
diff --git a/src/PaginationNav/PaginationOverflow.svelte b/src/PaginationNav/PaginationOverflow.svelte
index 7f4ccb5c..67d8d1db 100644
--- a/src/PaginationNav/PaginationOverflow.svelte
+++ b/src/PaginationNav/PaginationOverflow.svelte
@@ -10,7 +10,7 @@
   export let count = 0;
 
   import { createEventDispatcher } from "svelte";
-  import OverflowMenuHorizontal16 from "carbon-icons-svelte/lib/OverflowMenuHorizontal16/OverflowMenuHorizontal16.svelte";
+  import OverflowMenuHorizontal16 from "../icons/OverflowMenuHorizontal16.svelte";
   import PaginationItem from "./PaginationItem.svelte";
 
   const dispatch = createEventDispatcher();
diff --git a/src/ProgressIndicator/ProgressStep.svelte b/src/ProgressIndicator/ProgressStep.svelte
index 0ccfbe92..6ecedfef 100644
--- a/src/ProgressIndicator/ProgressStep.svelte
+++ b/src/ProgressIndicator/ProgressStep.svelte
@@ -25,7 +25,7 @@
 
   import { onMount, getContext } from "svelte";
   import CheckmarkOutline16 from "carbon-icons-svelte/lib/CheckmarkOutline16/CheckmarkOutline16.svelte";
-  import Warning16 from "carbon-icons-svelte/lib/Warning16/Warning16.svelte";
+  import Warning16 from "../icons/Warning16.svelte";
 
   let step = {};
 
diff --git a/src/Search/Search.svelte b/src/Search/Search.svelte
index 7539c8df..4ce83af9 100644
--- a/src/Search/Search.svelte
+++ b/src/Search/Search.svelte
@@ -73,7 +73,7 @@
   import { createEventDispatcher } from "svelte";
   import Close16 from "carbon-icons-svelte/lib/Close16/Close16.svelte";
   import Close20 from "carbon-icons-svelte/lib/Close20/Close20.svelte";
-  import Search16 from "carbon-icons-svelte/lib/Search16/Search16.svelte";
+  import Search16 from "../icons/Search16.svelte";
   import SearchSkeleton from "./SearchSkeleton.svelte";
 
   const dispatch = createEventDispatcher();
diff --git a/src/Select/Select.svelte b/src/Select/Select.svelte
index 3f4804f2..f46ad513 100644
--- a/src/Select/Select.svelte
+++ b/src/Select/Select.svelte
@@ -64,7 +64,7 @@
   import { writable } from "svelte/store";
   import ChevronDown16 from "carbon-icons-svelte/lib/ChevronDown16/ChevronDown16.svelte";
   import WarningFilled16 from "carbon-icons-svelte/lib/WarningFilled16/WarningFilled16.svelte";
-  import WarningAltFilled16 from "carbon-icons-svelte/lib/WarningAltFilled16/WarningAltFilled16.svelte";
+  import WarningAltFilled16 from "../icons/WarningAltFilled16.svelte";
 
   const dispatch = createEventDispatcher();
   const selectedValue = writable(selected);
diff --git a/src/Tabs/Tabs.svelte b/src/Tabs/Tabs.svelte
index a7b7f7b5..7ff549f7 100644
--- a/src/Tabs/Tabs.svelte
+++ b/src/Tabs/Tabs.svelte
@@ -22,7 +22,7 @@
 
   import { createEventDispatcher, afterUpdate, setContext } from "svelte";
   import { writable, derived } from "svelte/store";
-  import ChevronDownGlyph from "carbon-icons-svelte/lib/ChevronDownGlyph/ChevronDownGlyph.svelte";
+  import ChevronDownGlyph from "../icons/ChevronDownGlyph.svelte";
 
   const dispatch = createEventDispatcher();
 
diff --git a/src/Tag/Tag.svelte b/src/Tag/Tag.svelte
index 71c12a0f..a7174d95 100644
--- a/src/Tag/Tag.svelte
+++ b/src/Tag/Tag.svelte
@@ -35,7 +35,7 @@
   export let id = "ccs-" + Math.random().toString(36);
 
   import { createEventDispatcher } from "svelte";
-  import Close16 from "carbon-icons-svelte/lib/Close16/Close16.svelte";
+  import Close16 from "../icons/Close16.svelte";
   import TagSkeleton from "./TagSkeleton.svelte";
 
   const dispatch = createEventDispatcher();
diff --git a/src/TextArea/TextArea.svelte b/src/TextArea/TextArea.svelte
index 6eba89fe..5d43749b 100644
--- a/src/TextArea/TextArea.svelte
+++ b/src/TextArea/TextArea.svelte
@@ -44,7 +44,7 @@
   /** Obtain a reference to the textarea HTML element */
   export let ref = null;
 
-  import WarningFilled16 from "carbon-icons-svelte/lib/WarningFilled16";
+  import WarningFilled16 from "../icons/WarningFilled16.svelte";
 
   $: errorId = `error-${id}`;
 </script>
diff --git a/src/TextInput/PasswordInput.svelte b/src/TextInput/PasswordInput.svelte
index 4bba5b54..7e22a734 100644
--- a/src/TextInput/PasswordInput.svelte
+++ b/src/TextInput/PasswordInput.svelte
@@ -84,7 +84,7 @@
   import WarningFilled16 from "carbon-icons-svelte/lib/WarningFilled16/WarningFilled16.svelte";
   import WarningAltFilled16 from "carbon-icons-svelte/lib/WarningAltFilled16/WarningAltFilled16.svelte";
   import View16 from "carbon-icons-svelte/lib/View16/View16.svelte";
-  import ViewOff16 from "carbon-icons-svelte/lib/ViewOff16/ViewOff16.svelte";
+  import ViewOff16 from "../icons/ViewOff16.svelte";
 
   const ctx = getContext("Form");
 
diff --git a/src/TextInput/TextInput.svelte b/src/TextInput/TextInput.svelte
index e663d9b6..e7a170d3 100644
--- a/src/TextInput/TextInput.svelte
+++ b/src/TextInput/TextInput.svelte
@@ -68,7 +68,7 @@
   import { getContext } from "svelte";
   import WarningFilled16 from "carbon-icons-svelte/lib/WarningFilled16/WarningFilled16.svelte";
   import WarningAltFilled16 from "carbon-icons-svelte/lib/WarningAltFilled16/WarningAltFilled16.svelte";
-  import EditOff16 from "carbon-icons-svelte/lib/EditOff16/EditOff16.svelte";
+  import EditOff16 from "../icons/EditOff16.svelte";
 
   const ctx = getContext("Form");
 
diff --git a/src/Tile/ExpandableTile.svelte b/src/Tile/ExpandableTile.svelte
index 47c4f72b..288d550c 100644
--- a/src/Tile/ExpandableTile.svelte
+++ b/src/Tile/ExpandableTile.svelte
@@ -33,7 +33,7 @@
   export let ref = null;
 
   import { afterUpdate } from "svelte";
-  import ChevronDown16 from "carbon-icons-svelte/lib/ChevronDown16/ChevronDown16.svelte";
+  import ChevronDown16 from "../icons/ChevronDown16.svelte";
 
   let refContent = null;
   let refAbove = null;
diff --git a/src/Tile/RadioTile.svelte b/src/Tile/RadioTile.svelte
index 3a4820e1..2738bc03 100644
--- a/src/Tile/RadioTile.svelte
+++ b/src/Tile/RadioTile.svelte
@@ -24,7 +24,7 @@
   export let name = "";
 
   import { getContext } from "svelte";
-  import CheckmarkFilled16 from "carbon-icons-svelte/lib/CheckmarkFilled16/CheckmarkFilled16.svelte";
+  import CheckmarkFilled16 from "../icons/CheckmarkFilled16.svelte";
 
   const { add, update, selectedValue } = getContext("TileGroup");
 
diff --git a/src/Tile/SelectableTile.svelte b/src/Tile/SelectableTile.svelte
index 90fc019a..1a394b15 100644
--- a/src/Tile/SelectableTile.svelte
+++ b/src/Tile/SelectableTile.svelte
@@ -33,7 +33,7 @@
   export let ref = null;
 
   import { createEventDispatcher } from "svelte";
-  import CheckmarkFilled16 from "carbon-icons-svelte/lib/CheckmarkFilled16/CheckmarkFilled16.svelte";
+  import CheckmarkFilled16 from "../icons/CheckmarkFilled16.svelte";
 
   const dispatch = createEventDispatcher();
 
diff --git a/src/TimePicker/TimePickerSelect.svelte b/src/TimePicker/TimePickerSelect.svelte
index 44164163..b379fc8d 100644
--- a/src/TimePicker/TimePickerSelect.svelte
+++ b/src/TimePicker/TimePickerSelect.svelte
@@ -34,7 +34,7 @@
 
   import { setContext } from "svelte";
   import { writable } from "svelte/store";
-  import ChevronDownGlyph from "carbon-icons-svelte/lib/ChevronDownGlyph";
+  import ChevronDownGlyph from "../icons/ChevronDownGlyph.svelte";
 
   const selectedValue = writable(value);
 
diff --git a/src/Tooltip/Tooltip.svelte b/src/Tooltip/Tooltip.svelte
index 590ac926..0635c38c 100644
--- a/src/Tooltip/Tooltip.svelte
+++ b/src/Tooltip/Tooltip.svelte
@@ -65,7 +65,7 @@
 
   import { createEventDispatcher, afterUpdate, setContext } from "svelte";
   import { writable } from "svelte/store";
-  import Information16 from "carbon-icons-svelte/lib/Information16/Information16.svelte";
+  import Information16 from "../icons/Information16.svelte";
 
   const dispatch = createEventDispatcher();
   const tooltipOpen = writable(open);
diff --git a/src/TreeView/TreeViewNodeList.svelte b/src/TreeView/TreeViewNodeList.svelte
index 07666c37..c6171217 100644
--- a/src/TreeView/TreeViewNodeList.svelte
+++ b/src/TreeView/TreeViewNodeList.svelte
@@ -21,7 +21,7 @@
   export let icon = undefined;
 
   import { afterUpdate, getContext } from "svelte";
-  import CaretDown16 from "carbon-icons-svelte/lib/CaretDown16/CaretDown16.svelte";
+  import CaretDown16 from "../icons/CaretDown16.svelte";
   import TreeViewNode, { computeTreeLeafDepth } from "./TreeViewNode.svelte";
 
   let ref = null;
diff --git a/src/UIShell/GlobalHeader/Header.svelte b/src/UIShell/GlobalHeader/Header.svelte
index 5204349e..fbaeee25 100644
--- a/src/UIShell/GlobalHeader/Header.svelte
+++ b/src/UIShell/GlobalHeader/Header.svelte
@@ -61,7 +61,7 @@
   export let iconClose = Close20;
 
   import Close20 from "carbon-icons-svelte/lib/Close20/Close20.svelte";
-  import Menu20 from "carbon-icons-svelte/lib/Menu20/Menu20.svelte";
+  import Menu20 from "../../icons/Menu20.svelte";
   import { shouldRenderHamburgerMenu } from "../navStore";
   import HamburgerMenu from "../SideNav/HamburgerMenu.svelte";
 
diff --git a/src/UIShell/GlobalHeader/HeaderAction.svelte b/src/UIShell/GlobalHeader/HeaderAction.svelte
index d7628cb8..4afd13b0 100644
--- a/src/UIShell/GlobalHeader/HeaderAction.svelte
+++ b/src/UIShell/GlobalHeader/HeaderAction.svelte
@@ -38,7 +38,7 @@
   import { createEventDispatcher } from "svelte";
   import { slide } from "svelte/transition";
   import Close20 from "carbon-icons-svelte/lib/Close20/Close20.svelte";
-  import AppSwitcher20 from "carbon-icons-svelte/lib/AppSwitcher20/AppSwitcher20.svelte";
+  import AppSwitcher20 from "../../icons/AppSwitcher20.svelte";
   import Icon from "../../Icon/Icon.svelte";
 
   const dispatch = createEventDispatcher();
diff --git a/src/UIShell/GlobalHeader/HeaderActionSearch.svelte b/src/UIShell/GlobalHeader/HeaderActionSearch.svelte
index bd181ac2..ea8eec49 100644
--- a/src/UIShell/GlobalHeader/HeaderActionSearch.svelte
+++ b/src/UIShell/GlobalHeader/HeaderActionSearch.svelte
@@ -14,7 +14,7 @@
 
   import { createEventDispatcher } from "svelte";
   import Close20 from "carbon-icons-svelte/lib/Close20";
-  import Search20 from "carbon-icons-svelte/lib/Search20";
+  import Search20 from "../../icons/Search20.svelte";
   import searchStore from "../searchStore";
 
   const dispatch = createEventDispatcher();
diff --git a/src/UIShell/GlobalHeader/HeaderNavMenu.svelte b/src/UIShell/GlobalHeader/HeaderNavMenu.svelte
index 5c351aaa..74334d5a 100644
--- a/src/UIShell/GlobalHeader/HeaderNavMenu.svelte
+++ b/src/UIShell/GlobalHeader/HeaderNavMenu.svelte
@@ -14,7 +14,7 @@
   /** Obtain a reference to the HTML anchor element */
   export let ref = null;
 
-  import ChevronDown16 from "carbon-icons-svelte/lib/ChevronDown16";
+  import ChevronDown16 from "../../icons/ChevronDown16.svelte";
 </script>
 
 <svelte:window
diff --git a/src/UIShell/HeaderSearch.svelte b/src/UIShell/HeaderSearch.svelte
index 9306e3aa..c8240674 100644
--- a/src/UIShell/HeaderSearch.svelte
+++ b/src/UIShell/HeaderSearch.svelte
@@ -28,7 +28,7 @@
 
   import { createEventDispatcher, tick } from "svelte";
   import Close20 from "carbon-icons-svelte/lib/Close20/Close20.svelte";
-  import Search20 from "carbon-icons-svelte/lib/Search20/Search20.svelte";
+  import Search20 from "../icons/Search20.svelte";
 
   const dispatch = createEventDispatcher();
 
diff --git a/src/UIShell/SideNav/HamburgerMenu.svelte b/src/UIShell/SideNav/HamburgerMenu.svelte
index fa184a13..b16a957b 100644
--- a/src/UIShell/SideNav/HamburgerMenu.svelte
+++ b/src/UIShell/SideNav/HamburgerMenu.svelte
@@ -26,7 +26,7 @@
   export let ref = null;
 
   import Close20 from "carbon-icons-svelte/lib/Close20/Close20.svelte";
-  import Menu20 from "carbon-icons-svelte/lib/Menu20/Menu20.svelte";
+  import Menu20 from "../../icons/Menu20.svelte";
 </script>
 
 <button
diff --git a/src/UIShell/SideNav/SideNavMenu.svelte b/src/UIShell/SideNav/SideNavMenu.svelte
index ebbdb6ff..f261cf96 100644
--- a/src/UIShell/SideNav/SideNavMenu.svelte
+++ b/src/UIShell/SideNav/SideNavMenu.svelte
@@ -17,7 +17,7 @@
   /** Obtain a reference to the HTML button element */
   export let ref = null;
 
-  import ChevronDown16 from "carbon-icons-svelte/lib/ChevronDown16/ChevronDown16.svelte";
+  import ChevronDown16 from "../../icons/ChevronDown16.svelte";
 </script>
 
 <li class:bx--side-nav__item="{true}" class:bx--side-nav__item--icon="{icon}">