diff --git a/src/features/DisplayFont/ui/FontSampler/FontSampler.svelte b/src/features/DisplayFont/ui/FontSampler/FontSampler.svelte
index e7157cf..d1a41ed 100644
--- a/src/features/DisplayFont/ui/FontSampler/FontSampler.svelte
+++ b/src/features/DisplayFont/ui/FontSampler/FontSampler.svelte
@@ -84,8 +84,7 @@ const letterSpacing = $derived(controlManager.spacing);
     </div>
 
     <div class="p-4 sm:p-5 md:p-8 relative z-10">
-        <!-- TODO: Fix this ! -->
-        <FontApplicator id={font.id} name={font.name} url={font.styles.regular!}>
+        <FontApplicator {font} weight={fontWeight}>
             <ContentEditable
                 bind:text={text}
                 {...restProps}
diff --git a/src/widgets/ComparisonSlider/ui/ComparisonSlider/components/SelectComparedFonts.svelte b/src/widgets/ComparisonSlider/ui/ComparisonSlider/components/SelectComparedFonts.svelte
index 15ea996..379776b 100644
--- a/src/widgets/ComparisonSlider/ui/ComparisonSlider/components/SelectComparedFonts.svelte
+++ b/src/widgets/ComparisonSlider/ui/ComparisonSlider/components/SelectComparedFonts.svelte
@@ -70,7 +70,7 @@ function selectFontB(font: UnifiedFont) {
                 )}
             >
                 <div class="text-left flex-1 min-w-0">
-                    <FontApplicator name={font.name} id={font.id} {url}>
+                    <FontApplicator {font} weight={typography.weight}>
                         {font.name}
                     </FontApplicator>
                 </div>
@@ -95,9 +95,8 @@ function selectFontB(font: UnifiedFont) {
                                 onclick={handleClick}
                             >
                                 <FontApplicator
-                                    name={fontListItem.name}
-                                    id={fontListItem.id}
-                                    url={getFontUrl(fontListItem, typography.weight) ?? ''}
+                                    font={fontListItem}
+                                    weight={typography.weight}
                                 >
                                     {fontListItem.name}
                                 </FontApplicator>