diff --git a/src/Notification/NotificationButton.svelte b/src/Notification/NotificationButton.svelte
index 3a8f5c2e..9c5983b6 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";
+  import Close20 from "carbon-icons-svelte/lib/Close20/Close20.svelte";
 </script>
 
 <button
@@ -38,7 +38,6 @@
   <svelte:component
     this="{renderIcon}"
     title="{title}"
-    class="{notificationType === 'toast' && 'bx--toast-notification__close-icon'}
-      {notificationType === 'inline' && 'bx--inline-notification__close-icon'}"
+    class="bx--{notificationType}-notification__close-icon"
   />
 </button>
diff --git a/src/Notification/NotificationIcon.svelte b/src/Notification/NotificationIcon.svelte
index b2fa10dc..5b49cb68 100644
--- a/src/Notification/NotificationIcon.svelte
+++ b/src/Notification/NotificationIcon.svelte
@@ -14,12 +14,12 @@
   /** Specify the ARIA label for the icon */
   export let iconDescription = "Closes notification";
 
-  import CheckmarkFilled20 from "carbon-icons-svelte/lib/CheckmarkFilled20";
-  import ErrorFilled20 from "carbon-icons-svelte/lib/ErrorFilled20";
-  import InformationFilled20 from "carbon-icons-svelte/lib/InformationFilled20";
-  import InformationSquareFilled20 from "carbon-icons-svelte/lib/InformationSquareFilled20";
-  import WarningFilled20 from "carbon-icons-svelte/lib/WarningFilled20";
-  import WarningAltFilled20 from "carbon-icons-svelte/lib/WarningAltFilled20";
+  import CheckmarkFilled20 from "carbon-icons-svelte/lib/CheckmarkFilled20/CheckmarkFilled20.svelte";
+  import ErrorFilled20 from "carbon-icons-svelte/lib/ErrorFilled20/ErrorFilled20.svelte";
+  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";
 
   const icons = {
     error: ErrorFilled20,