diff --git a/src/UIShell/SideNav/SideNavLink.svelte b/src/UIShell/SideNav/SideNavLink.svelte
index 09a3ecef..9825ca10 100644
--- a/src/UIShell/SideNav/SideNavLink.svelte
+++ b/src/UIShell/SideNav/SideNavLink.svelte
@@ -15,11 +15,13 @@
     class:bx--side-nav__link--current={isSelected}
     {...$$restProps}
     on:click>
-    <div class:bx--side-nav__icon={true} class:bx--side-nav__icon--small={true}>
-      {#if icon}
+    {#if icon}
+      <div
+        class:bx--side-nav__icon={true}
+        class:bx--side-nav__icon--small={true}>
         <Icon {...icon} />
-      {/if}
-    </div>
+      </div>
+    {/if}
     <span class:bx--side-nav__link-text={true}>{text}</span>
   </a>
 </li>
diff --git a/src/UIShell/SideNav/SideNavMenu.svelte b/src/UIShell/SideNav/SideNavMenu.svelte
index e50281eb..5b818344 100644
--- a/src/UIShell/SideNav/SideNavMenu.svelte
+++ b/src/UIShell/SideNav/SideNavMenu.svelte
@@ -7,7 +7,7 @@
   import { Icon } from "../../Icon";
 </script>
 
-<li class:bx--side-nav__item={true} class:bx--side-nav__item--icon={true}>
+<li class:bx--side-nav__item={true} class:bx--side-nav__item--icon={icon}>
   <button
     type="button"
     aria-haspopup="true"
@@ -18,11 +18,11 @@
     on:click={() => {
       expanded = !expanded;
     }}>
-    <div class:bx--side-nav__icon={true}>
-      {#if icon}
+    {#if icon}
+      <div class:bx--side-nav__icon={true}>
         <Icon {...icon} />
-      {/if}
-    </div>
+      </div>
+    {/if}
     <span class:bx--side-nav__submenu-title={true}>{text}</span>
     <div
       class:bx--side-nav__icon={true}