diff --git a/docs/src/COMPONENT_API.json b/docs/src/COMPONENT_API.json
index 26b3b972..f5b856c4 100644
--- a/docs/src/COMPONENT_API.json
+++ b/docs/src/COMPONENT_API.json
@@ -4608,7 +4608,8 @@
         { "type": "dispatched", "name": "focusInputSearch" },
         { "type": "dispatched", "name": "focusOutInputSearch" }
       ],
-      "typedefs": []
+      "typedefs": [],
+      "componentComment": "\n@deprecated\nThis component is deprecated. Use `HeaderSearch` instead."
     },
     {
       "moduleName": "HeaderGlobalAction",
@@ -4991,7 +4992,8 @@
       "extends": {
         "interface": "IconSkeletonProps",
         "import": "\"./IconSkeleton.svelte\""
-      }
+      },
+      "componentComment": "\n@deprecated This component is deprecated.\nUse icons from \"carbon-icons-svelte\" instead."
     },
     {
       "moduleName": "IconSkeleton",
@@ -5017,7 +5019,8 @@
         { "type": "forwarded", "name": "mouseleave", "element": "div" }
       ],
       "typedefs": [],
-      "rest_props": { "type": "Element", "name": "div" }
+      "rest_props": { "type": "Element", "name": "div" },
+      "componentComment": "\n@deprecated This component is deprecated."
     },
     {
       "moduleName": "ImageLoader",
@@ -6985,7 +6988,8 @@
       ],
       "slots": [{ "name": "__default__", "default": true, "slot_props": "{}" }],
       "events": [],
-      "typedefs": []
+      "typedefs": [],
+      "componentComment": "\n@deprecated This component is deprecated."
     },
     {
       "moduleName": "NumberInput",
@@ -12716,7 +12720,8 @@
         { "type": "forwarded", "name": "blur", "element": "input" }
       ],
       "typedefs": [],
-      "rest_props": { "type": "Element", "name": "div" }
+      "rest_props": { "type": "Element", "name": "div" },
+      "componentComment": "\n@deprecated This component is deprecated.\nUse`<Toggle size=\"sm\" />` instead."
     },
     {
       "moduleName": "ToggleSmallSkeleton",
@@ -12753,7 +12758,8 @@
         { "type": "forwarded", "name": "mouseleave", "element": "div" }
       ],
       "typedefs": [],
-      "rest_props": { "type": "Element", "name": "div" }
+      "rest_props": { "type": "Element", "name": "div" },
+      "componentComment": "\n@deprecated This component is deprecated.\nUse`<ToggleSkeleton size=\"sm\" />` instead."
     },
     {
       "moduleName": "Toolbar",
diff --git a/src/Icon/Icon.svelte b/src/Icon/Icon.svelte
index 7159b029..0726a79a 100644
--- a/src/Icon/Icon.svelte
+++ b/src/Icon/Icon.svelte
@@ -1,10 +1,4 @@
 <script>
-  /**
-   * @deprecated
-   * This component will be removed in version 1.0.0.
-   * Use icons from "carbon-icons-svelte" instead
-   */
-
   /**
    * @extends {"./IconSkeleton.svelte"} IconSkeletonProps
    * @restProps {svg}
@@ -22,6 +16,11 @@
   import IconSkeleton from "./IconSkeleton.svelte";
 </script>
 
+<!-- @component
+@deprecated This component is deprecated.
+Use icons from "carbon-icons-svelte" instead.
+-->
+
 {#if skeleton}
   <IconSkeleton
     {...$$restProps}
diff --git a/src/Icon/IconSkeleton.svelte b/src/Icon/IconSkeleton.svelte
index 5dd7bbca..bb65630a 100644
--- a/src/Icon/IconSkeleton.svelte
+++ b/src/Icon/IconSkeleton.svelte
@@ -1,13 +1,12 @@
 <script>
-  /**
-   * @deprecated
-   * This component will be removed in version 1.0.0.
-   */
-
   /** Set the size of the icon */
   export let size = 16;
 </script>
 
+<!-- @component
+@deprecated This component is deprecated.
+-->
+
 <!-- svelte-ignore a11y-mouse-events-have-key-events -->
 <div
   class:bx--icon--skeleton="{true}"
diff --git a/src/Notification/NotificationTextDetails.svelte b/src/Notification/NotificationTextDetails.svelte
index c3fd8fe7..a2d96980 100644
--- a/src/Notification/NotificationTextDetails.svelte
+++ b/src/Notification/NotificationTextDetails.svelte
@@ -1,9 +1,4 @@
 <script>
-  /**
-   * @deprecated
-   * This component will be removed in version 1.0.0.
-   */
-
   /**
    * Set the type of notification
    * @type {"toast" | "inline"}
@@ -20,6 +15,10 @@
   export let caption = "Caption";
 </script>
 
+<!-- @component
+@deprecated This component is deprecated.
+-->
+
 {#if notificationType === "toast"}
   <div class:bx--toast-notification__details="{true}">
     <h3 class:bx--toast-notification__title="{true}">{title}</h3>
diff --git a/src/ToggleSmall/ToggleSmall.svelte b/src/ToggleSmall/ToggleSmall.svelte
index 7fcb64c5..29652e0e 100644
--- a/src/ToggleSmall/ToggleSmall.svelte
+++ b/src/ToggleSmall/ToggleSmall.svelte
@@ -1,10 +1,4 @@
 <script>
-  /**
-   * @deprecated
-   * This component will be removed in version 1.0.0.
-   * Use `<Toggle size="sm" />` instead
-   */
-
   /** Set to `true` to toggle the checkbox input */
   export let toggled = false;
 
@@ -30,6 +24,11 @@
   export let name = undefined;
 </script>
 
+<!-- @component
+@deprecated This component is deprecated.
+Use`<Toggle size="sm" />` instead.
+-->
+
 <!-- svelte-ignore a11y-mouse-events-have-key-events -->
 <div
   class:bx--form-item="{true}"
diff --git a/src/ToggleSmall/ToggleSmallSkeleton.svelte b/src/ToggleSmall/ToggleSmallSkeleton.svelte
index f4d73749..569b3deb 100644
--- a/src/ToggleSmall/ToggleSmallSkeleton.svelte
+++ b/src/ToggleSmall/ToggleSmallSkeleton.svelte
@@ -1,10 +1,4 @@
 <script>
-  /**
-   * @deprecated
-   * This component will be removed in version 1.0.0.
-   * Use `<ToggleSkeleton size="sm" />` instead
-   */
-
   /** Specify the label text */
   export let labelText = "";
 
@@ -12,6 +6,11 @@
   export let id = "ccs-" + Math.random().toString(36);
 </script>
 
+<!-- @component
+@deprecated This component is deprecated.
+Use`<ToggleSkeleton size="sm" />` instead.
+-->
+
 <!-- svelte-ignore a11y-mouse-events-have-key-events -->
 <div
   class:bx--form-item="{true}"
diff --git a/src/UIShell/GlobalHeader/HeaderActionSearch.svelte b/src/UIShell/GlobalHeader/HeaderActionSearch.svelte
index 5b40bd65..17e59f90 100644
--- a/src/UIShell/GlobalHeader/HeaderActionSearch.svelte
+++ b/src/UIShell/GlobalHeader/HeaderActionSearch.svelte
@@ -1,10 +1,4 @@
 <script>
-  /**
-   * @deprecated
-   * This component will be removed in version 1.0.0.
-   * Use `HeaderSearch` instead
-   */
-
   /**
    * @event {{ action: "search"; textInput: string; }} inputSearch
    */
@@ -64,6 +58,10 @@
   }}"
 />
 
+<!-- @component
+@deprecated
+This component is deprecated. Use `HeaderSearch` instead.
+-->
 <div
   bind:this="{elTypeSearch}"
   role="search"
diff --git a/types/Icon/Icon.svelte.d.ts b/types/Icon/Icon.svelte.d.ts
index 8e59b72a..68e6ae06 100644
--- a/types/Icon/Icon.svelte.d.ts
+++ b/types/Icon/Icon.svelte.d.ts
@@ -18,6 +18,10 @@ export interface IconProps
   skeleton?: boolean;
 }
 
+/**
+ * @deprecated This component is deprecated.
+ * Use icons from "carbon-icons-svelte" instead.
+ */
 export default class Icon extends SvelteComponentTyped<
   IconProps,
   {
diff --git a/types/Icon/IconSkeleton.svelte.d.ts b/types/Icon/IconSkeleton.svelte.d.ts
index 97e696ff..2755a2dc 100644
--- a/types/Icon/IconSkeleton.svelte.d.ts
+++ b/types/Icon/IconSkeleton.svelte.d.ts
@@ -10,6 +10,9 @@ export interface IconSkeletonProps
   size?: number;
 }
 
+/**
+ * @deprecated This component is deprecated.
+ */
 export default class IconSkeleton extends SvelteComponentTyped<
   IconSkeletonProps,
   {
diff --git a/types/Notification/NotificationTextDetails.svelte.d.ts b/types/Notification/NotificationTextDetails.svelte.d.ts
index b3db36ba..409a786a 100644
--- a/types/Notification/NotificationTextDetails.svelte.d.ts
+++ b/types/Notification/NotificationTextDetails.svelte.d.ts
@@ -27,6 +27,9 @@ export interface NotificationTextDetailsProps {
   caption?: string;
 }
 
+/**
+ * @deprecated This component is deprecated.
+ */
 export default class NotificationTextDetails extends SvelteComponentTyped<
   NotificationTextDetailsProps,
   {},
diff --git a/types/ToggleSmall/ToggleSmall.svelte.d.ts b/types/ToggleSmall/ToggleSmall.svelte.d.ts
index 00de1e1b..79216453 100644
--- a/types/ToggleSmall/ToggleSmall.svelte.d.ts
+++ b/types/ToggleSmall/ToggleSmall.svelte.d.ts
@@ -46,6 +46,10 @@ export interface ToggleSmallProps
   name?: string;
 }
 
+/**
+ * @deprecated This component is deprecated.
+ * Use`<Toggle size="sm" />` instead.
+ */
 export default class ToggleSmall extends SvelteComponentTyped<
   ToggleSmallProps,
   {
diff --git a/types/ToggleSmall/ToggleSmallSkeleton.svelte.d.ts b/types/ToggleSmall/ToggleSmallSkeleton.svelte.d.ts
index 219d1115..7f1cbe21 100644
--- a/types/ToggleSmall/ToggleSmallSkeleton.svelte.d.ts
+++ b/types/ToggleSmall/ToggleSmallSkeleton.svelte.d.ts
@@ -16,6 +16,10 @@ export interface ToggleSmallSkeletonProps
   id?: string;
 }
 
+/**
+ * @deprecated This component is deprecated.
+ * Use`<ToggleSkeleton size="sm" />` instead.
+ */
 export default class ToggleSmallSkeleton extends SvelteComponentTyped<
   ToggleSmallSkeletonProps,
   {
diff --git a/types/UIShell/GlobalHeader/HeaderActionSearch.svelte.d.ts b/types/UIShell/GlobalHeader/HeaderActionSearch.svelte.d.ts
index 38d07d45..2a485ba9 100644
--- a/types/UIShell/GlobalHeader/HeaderActionSearch.svelte.d.ts
+++ b/types/UIShell/GlobalHeader/HeaderActionSearch.svelte.d.ts
@@ -9,6 +9,10 @@ export interface HeaderActionSearchProps {
   searchIsActive?: boolean;
 }
 
+/**
+ * @deprecated
+ * This component is deprecated. Use `HeaderSearch` instead.
+ */
 export default class HeaderActionSearch extends SvelteComponentTyped<
   HeaderActionSearchProps,
   {