diff --git a/src/routes/router.ts b/src/routes/router.ts
index 49e21cd..4c3ce68 100644
--- a/src/routes/router.ts
+++ b/src/routes/router.ts
@@ -1,6 +1,5 @@
 import { createRouter } from 'sv-router';
 import Home from './Home.svelte';
-import Redirect from './Redirect.svelte';
 
 /**
  * Single-page router for glyphdiff.
@@ -18,6 +17,8 @@ export const {
     '/': Home,
     /**
      * Any unmatched path redirects to home until additional routes exist.
+     * Lazy-loaded so `router` doesn't statically import `Redirect`, which
+     * imports `navigate` from here — breaks the import cycle.
      */
-    '*notfound': Redirect,
+    '*notfound': () => import('./Redirect.svelte'),
 });
diff --git a/src/shared/lib/utils/roundToStepPrecision/roundToStepPrecision.ts b/src/shared/lib/utils/roundToStepPrecision/roundToStepPrecision.ts
index f3eb854..7ef6777 100644
--- a/src/shared/lib/utils/roundToStepPrecision/roundToStepPrecision.ts
+++ b/src/shared/lib/utils/roundToStepPrecision/roundToStepPrecision.ts
@@ -1,4 +1,4 @@
-import { getDecimalPlaces } from '$shared/lib/utils';
+import { getDecimalPlaces } from '../getDecimalPlaces/getDecimalPlaces';
 
 /**
  * Rounds a value to match the precision of a given step
diff --git a/src/shared/ui/ComboControl/ComboControl.svelte b/src/shared/ui/ComboControl/ComboControl.svelte
index ac72f66..99eae67 100644
--- a/src/shared/ui/ComboControl/ComboControl.svelte
+++ b/src/shared/ui/ComboControl/ComboControl.svelte
@@ -5,13 +5,11 @@
 -->
 <script lang="ts">
 import { cn } from '$shared/lib';
-import {
-    Popover,
-    Slider,
-} from '$shared/ui';
-import { Button } from '$shared/ui/Button';
 import MinusIcon from '@lucide/svelte/icons/minus';
 import PlusIcon from '@lucide/svelte/icons/plus';
+import { Button } from '../Button';
+import Popover from '../Popover/Popover.svelte';
+import Slider from '../Slider/Slider.svelte';
 import TechText from '../TechText/TechText.svelte';
 import type {
     ControlLabels,
diff --git a/src/shared/ui/FilterGroup/FilterGroup.svelte b/src/shared/ui/FilterGroup/FilterGroup.svelte
index acc9a41..eb924bc 100644
--- a/src/shared/ui/FilterGroup/FilterGroup.svelte
+++ b/src/shared/ui/FilterGroup/FilterGroup.svelte
@@ -5,8 +5,6 @@
 <script lang="ts">
 import type { Filter } from '$shared/lib';
 import { cn } from '$shared/lib';
-import { Button } from '$shared/ui';
-import { Label } from '$shared/ui';
 import ChevronUpIcon from '@lucide/svelte/icons/chevron-up';
 import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
 import { cubicOut } from 'svelte/easing';
@@ -14,6 +12,8 @@ import {
     draw,
     fly,
 } from 'svelte/transition';
+import { Button } from '../Button';
+import Label from '../Label/Label.svelte';
 
 interface Props {
     /**
diff --git a/src/shared/ui/Logo/Logo.svelte b/src/shared/ui/Logo/Logo.svelte
index 7edb647..208e3d5 100644
--- a/src/shared/ui/Logo/Logo.svelte
+++ b/src/shared/ui/Logo/Logo.svelte
@@ -4,7 +4,7 @@
 -->
 <script lang="ts">
 import { cn } from '$shared/lib';
-import { Badge } from '$shared/ui';
+import Badge from '../Badge/Badge.svelte';
 
 interface Props {
     /**
diff --git a/src/shared/ui/Section/SectionHeader/SectionHeader.svelte b/src/shared/ui/Section/SectionHeader/SectionHeader.svelte
index c7e285d..0617338 100644
--- a/src/shared/ui/Section/SectionHeader/SectionHeader.svelte
+++ b/src/shared/ui/Section/SectionHeader/SectionHeader.svelte
@@ -4,7 +4,7 @@
 -->
 <script lang="ts">
 import { cn } from '$shared/lib';
-import { Label } from '$shared/ui';
+import Label from '../../Label/Label.svelte';
 
 interface Props {
     /**
diff --git a/src/shared/ui/Stat/Stat.svelte b/src/shared/ui/Stat/Stat.svelte
index a4bbc2e..9866d9c 100644
--- a/src/shared/ui/Stat/Stat.svelte
+++ b/src/shared/ui/Stat/Stat.svelte
@@ -4,8 +4,8 @@
 -->
 <script lang="ts">
 import { cn } from '$shared/lib';
-import { Label } from '$shared/ui';
 import type { ComponentProps } from 'svelte';
+import Label from '../Label/Label.svelte';
 
 interface Props extends Pick<ComponentProps<typeof Label>, 'variant'> {
     /**
diff --git a/src/shared/ui/Stat/StatGroup.svelte b/src/shared/ui/Stat/StatGroup.svelte
index f80c91d..cdb8bdb 100644
--- a/src/shared/ui/Stat/StatGroup.svelte
+++ b/src/shared/ui/Stat/StatGroup.svelte
@@ -4,8 +4,8 @@
 -->
 <script lang="ts">
 import { cn } from '$shared/lib';
-import { Stat } from '$shared/ui';
 import type { ComponentProps } from 'svelte';
+import Stat from './Stat.svelte';
 
 interface StatItem extends Partial<Pick<ComponentProps<typeof Stat>, 'variant'>> {
     label: string;