diff --git a/COMPONENT_INDEX.md b/COMPONENT_INDEX.md
index 55f13c2b..068b9ebd 100644
--- a/COMPONENT_INDEX.md
+++ b/COMPONENT_INDEX.md
@@ -1608,19 +1608,12 @@ export interface HeaderActionSlideTransition {
 
 ### Props
 
-| Prop name  | Kind             | Reactive | Type                                                         | Default value                  | Description                                                                                                   |
-| :--------- | :--------------- | :------- | :----------------------------------------------------------- | ------------------------------ | ------------------------------------------------------------------------------------------------------------- |
-| ref        | <code>let</code> | Yes      | <code>null &#124; HTMLButtonElement</code>                   | <code>null</code>              | Obtain a reference to the button HTML element                                                                 |
-| isOpen     | <code>let</code> | Yes      | <code>boolean</code>                                         | <code>false</code>             | Set to `true` to open the panel                                                                               |
-| icon       | <code>let</code> | No       | <code>typeof import("carbon-icons-svelte").CarbonIcon</code> | --                             | Specify the icon from `carbon-icons-svelte` to render                                                         |
-| closeIcon  | <code>let</code> | No       | <code>typeof import("carbon-icons-svelte").CarbonIcon</code> | --                             | Specify the close icon from `carbon-icons-svelte` to render                                                   |
-| text       | <code>let</code> | No       | <code>string</code>                                          | --                             | Specify the text<br />Alternatively, use the named slot "text" (e.g., &lt;div slot="text"&gt;...&lt;/div&gt;) |
-| transition | <code>let</code> | No       | <code>false &#124; HeaderActionSlideTransition</code>        | <code>{ duration: 200 }</code> | Customize the panel transition (i.e., `transition:slide`)<br />Set to `false` to disable the transition       |
 | Prop name  | Kind             | Reactive | Type                                                  | Default value                  | Description                                                                                                   |
 | :--------- | :--------------- | :------- | :---------------------------------------------------- | ------------------------------ | ------------------------------------------------------------------------------------------------------------- |
 | ref        | <code>let</code> | Yes      | <code>null &#124; HTMLButtonElement</code>            | <code>null</code>              | Obtain a reference to the button HTML element                                                                 |
 | isOpen     | <code>let</code> | Yes      | <code>boolean</code>                                  | <code>false</code>             | Set to `true` to open the panel                                                                               |
 | icon       | <code>let</code> | No       | <code>typeof import("svelte").SvelteComponent</code>  | --                             | Specify the icon from `carbon-icons-svelte` to render                                                         |
+| closeIcon  | <code>let</code> | No       | <code>typeof import("svelte").SvelteComponent</code>  | --                             | Specify the close icon from `carbon-icons-svelte` to render                                                   |
 | text       | <code>let</code> | No       | <code>string</code>                                   | --                             | Specify the text<br />Alternatively, use the named slot "text" (e.g., &lt;div slot="text"&gt;...&lt;/div&gt;) |
 | transition | <code>let</code> | No       | <code>false &#124; HeaderActionSlideTransition</code> | <code>{ duration: 200 }</code> | Customize the panel transition (i.e., `transition:slide`)<br />Set to `false` to disable the transition       |
 
@@ -4753,7 +4746,7 @@ export type TreeNodeId = string | number;
 export interface TreeNode {
   id: TreeNodeId;
   text: string;
-  icon?: typeof import("carbon-icons-svelte").CarbonIcon;
+  icon?: typeof import("svelte").SvelteComponent;
   disabled?: boolean;
   expanded?: boolean;
 }
diff --git a/docs/src/COMPONENT_API.json b/docs/src/COMPONENT_API.json
index 4593ecf5..e201e2ae 100644
--- a/docs/src/COMPONENT_API.json
+++ b/docs/src/COMPONENT_API.json
@@ -4383,7 +4383,7 @@
           "name": "closeIcon",
           "kind": "let",
           "description": "Specify the close icon from `carbon-icons-svelte` to render",
-          "type": "typeof import(\"carbon-icons-svelte\").CarbonIcon",
+          "type": "typeof import(\"svelte\").SvelteComponent",
           "isFunction": false,
           "isFunctionDeclaration": false,
           "constant": false,
@@ -13252,9 +13252,9 @@
           "ts": "type TreeNodeId = string | number"
         },
         {
-          "type": "{ id: TreeNodeId; text: string; icon?: typeof import(\"carbon-icons-svelte\").CarbonIcon; disabled?: boolean; expanded?: boolean; }",
+          "type": "{ id: TreeNodeId; text: string; icon?: typeof import(\"svelte\").SvelteComponent; disabled?: boolean; expanded?: boolean; }",
           "name": "TreeNode",
-          "ts": "interface TreeNode { id: TreeNodeId; text: string; icon?: typeof import(\"carbon-icons-svelte\").CarbonIcon; disabled?: boolean; expanded?: boolean; }"
+          "ts": "interface TreeNode { id: TreeNodeId; text: string; icon?: typeof import(\"svelte\").SvelteComponent; disabled?: boolean; expanded?: boolean; }"
         }
       ],
       "rest_props": { "type": "Element", "name": "ul" }
diff --git a/src/TreeView/TreeView.svelte b/src/TreeView/TreeView.svelte
index 7e36da2e..f1620ae7 100644
--- a/src/TreeView/TreeView.svelte
+++ b/src/TreeView/TreeView.svelte
@@ -1,7 +1,7 @@
 <script>
   /**
    * @typedef {string | number} TreeNodeId
-   * @typedef {{ id: TreeNodeId; text: string; icon?: typeof import("carbon-icons-svelte").CarbonIcon; disabled?: boolean; expanded?: boolean; }} TreeNode
+   * @typedef {{ id: TreeNodeId; text: string; icon?: typeof import("svelte").SvelteComponent; disabled?: boolean; expanded?: boolean; }} TreeNode
    * @event {TreeNode & { expanded: boolean; leaf: boolean; }} select
    * @event {TreeNode & { expanded: boolean; leaf: boolean; }} toggle
    * @event {TreeNode & { expanded: boolean; leaf: boolean; }} focus
diff --git a/src/UIShell/GlobalHeader/HeaderAction.svelte b/src/UIShell/GlobalHeader/HeaderAction.svelte
index 58f11911..385a0a98 100644
--- a/src/UIShell/GlobalHeader/HeaderAction.svelte
+++ b/src/UIShell/GlobalHeader/HeaderAction.svelte
@@ -14,7 +14,7 @@
 
   /**
    * Specify the close icon from `carbon-icons-svelte` to render
-   * @type {typeof import("carbon-icons-svelte").CarbonIcon}
+   * @type {typeof import("svelte").SvelteComponent}
    */
   export let closeIcon = Close20;
 
diff --git a/types/TreeView/TreeView.d.ts b/types/TreeView/TreeView.d.ts
index 29678a9a..3ad00bf5 100644
--- a/types/TreeView/TreeView.d.ts
+++ b/types/TreeView/TreeView.d.ts
@@ -6,7 +6,7 @@ export type TreeNodeId = string | number;
 export interface TreeNode {
   id: TreeNodeId;
   text: string;
-  icon?: typeof import("carbon-icons-svelte").CarbonIcon;
+  icon?: typeof import("svelte").SvelteComponent;
   disabled?: boolean;
   expanded?: boolean;
 }
diff --git a/types/UIShell/GlobalHeader/HeaderAction.d.ts b/types/UIShell/GlobalHeader/HeaderAction.d.ts
index 9509c132..41c9d6af 100644
--- a/types/UIShell/GlobalHeader/HeaderAction.d.ts
+++ b/types/UIShell/GlobalHeader/HeaderAction.d.ts
@@ -23,7 +23,7 @@ export interface HeaderActionProps
   /**
    * Specify the close icon from `carbon-icons-svelte` to render
    */
-  closeIcon?: typeof import("carbon-icons-svelte").CarbonIcon;
+  closeIcon?: typeof import("svelte").SvelteComponent;
 
   /**
    * Specify the text