diff --git a/README.md b/README.md
index 6b4b37e9..2a77731c 100644
--- a/README.md
+++ b/README.md
@@ -207,6 +207,6 @@ More information can be found [here](docs/Debugger.md).
 - [FFmpeg wrapper](https://github.com/rosenbjerg/FFMpegCore)
 - [SkiaSharp](https://github.com/mono/SkiaSharp)
 - [Material Icons](https://github.com/SKProCH/Material.Icons)
-- [ZX Spectrum Font](https://github.com/comptic/zx-spectrum-font)
+- [ZX Spectrum Font by Patrick H. Lauke](https://fontstruct.com/fontstructions/show/1398596)
 - [Hack Font](https://sourcefoundry.org/hack/)
 - [VT220 Font](https://github.com/svofski/glasstty/blob/master/Glass_TTY_VT220.ttf)
\ No newline at end of file
diff --git a/src/Spectron.Debugger/Controls/CodeList.axaml b/src/Spectron.Debugger/Controls/CodeList.axaml
index e66f3afc..07f954e8 100644
--- a/src/Spectron.Debugger/Controls/CodeList.axaml
+++ b/src/Spectron.Debugger/Controls/CodeList.axaml
@@ -14,8 +14,8 @@
                 Text="Code"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                FontFamily="{StaticResource SpectrumStrictFont}"
-                FontSize="20"/>
+                FontFamily="{StaticResource SpectrumFont}"
+                FontSize="9"/>
         </Border>
 
         <ListBox Grid.Row="1" ItemsSource="{Binding CodeLines}" Name="ListBox" DoubleTapped="ListBox_OnDoubleTapped">
diff --git a/src/Spectron.Debugger/Controls/Cpu.axaml b/src/Spectron.Debugger/Controls/Cpu.axaml
index 5f4c157d..d3395ea2 100644
--- a/src/Spectron.Debugger/Controls/Cpu.axaml
+++ b/src/Spectron.Debugger/Controls/Cpu.axaml
@@ -19,8 +19,8 @@
                 Text="CPU"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                FontFamily="{StaticResource SpectrumStrictFont}"
-                FontSize="20"/>
+                FontFamily="{StaticResource SpectrumFont}"
+                FontSize="9"/>
         </Border>
 
         <Border Grid.Row="1" Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}">
diff --git a/src/Spectron.Debugger/Controls/HexViewer.axaml b/src/Spectron.Debugger/Controls/HexViewer.axaml
index f0fe6915..036a04e2 100644
--- a/src/Spectron.Debugger/Controls/HexViewer.axaml
+++ b/src/Spectron.Debugger/Controls/HexViewer.axaml
@@ -90,8 +90,8 @@
                                                     <Grid x:DataType="controls:HexViewerCell" Height="{TemplateBinding CellHeight}">
                                                         <TextBlock Name="AsciiCell"
                                                             Text="{Binding Value, Converter={StaticResource AsciiConverter}}"
-                                                            FontFamily="{StaticResource SpectrumStrictFont}"
-                                                            FontSize="15"
+                                                            FontFamily="{StaticResource SpectrumFont}"
+                                                            FontSize="7"
                                                             VerticalAlignment="Center"
                                                             TextAlignment="Center"
                                                             Width="14"/>
diff --git a/src/Spectron.Debugger/Controls/Memory.axaml b/src/Spectron.Debugger/Controls/Memory.axaml
index b62d76ff..b85f94a1 100644
--- a/src/Spectron.Debugger/Controls/Memory.axaml
+++ b/src/Spectron.Debugger/Controls/Memory.axaml
@@ -14,8 +14,8 @@
                 Text="Memory"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                FontFamily="{StaticResource SpectrumStrictFont}"
-                FontSize="20"/>
+                FontFamily="{StaticResource SpectrumFont}"
+                FontSize="9"/>
         </Border>
 
         <Border Grid.Row="1" Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}">
diff --git a/src/Spectron.Debugger/Controls/Register.axaml b/src/Spectron.Debugger/Controls/Register.axaml
index d6af7512..097b4241 100644
--- a/src/Spectron.Debugger/Controls/Register.axaml
+++ b/src/Spectron.Debugger/Controls/Register.axaml
@@ -17,16 +17,16 @@
 
     <UserControl.Styles>
         <Style Selector="TextBox.Register">
-            <Setter Property="FontFamily" Value="{StaticResource SpectrumStrictFont}"/>
+            <Setter Property="FontFamily" Value="{StaticResource SpectrumFont}"/>
             <Setter Property="VerticalContentAlignment" Value="Center"/>
-            <Setter Property="FontSize" Value="20"/>
+            <Setter Property="FontSize" Value="9"/>
             <Setter Property="Padding" Value="8 0 8 0"/>
             <Setter Property="Height" Value="30"/>
         </Style>
         <Style Selector="TextBlock.Register">
-            <Setter Property="FontFamily" Value="{StaticResource SpectrumStrictFont}"/>
+            <Setter Property="FontFamily" Value="{StaticResource SpectrumFont}"/>
             <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="FontSize" Value="20"/>
+            <Setter Property="FontSize" Value="9"/>
         </Style>
     </UserControl.Styles>
 
diff --git a/src/Spectron.Debugger/Controls/Stack.axaml b/src/Spectron.Debugger/Controls/Stack.axaml
index df8ac9f2..e5aac93b 100644
--- a/src/Spectron.Debugger/Controls/Stack.axaml
+++ b/src/Spectron.Debugger/Controls/Stack.axaml
@@ -17,8 +17,8 @@
                 Text="Stack"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                FontFamily="{StaticResource SpectrumStrictFont}"
-                FontSize="20"/>
+                FontFamily="{StaticResource SpectrumFont}"
+                FontSize="9"/>
         </Border>
 
         <ListBox Grid.Row="1" ItemsSource="{Binding Items}">
@@ -50,17 +50,19 @@
 
                         <TextBlock
                             Grid.Column="1"
-                            FontFamily="{StaticResource SpectrumStrictFont}"
+                            FontFamily="{StaticResource SpectrumFont}"
+                            VerticalAlignment="Center"
                             TextAlignment="Left"
-                            FontSize="20"
-                            Margin="0 -4 0 0"
+                            FontSize="9"
+                            Margin="0 0 0 0"
                             Text="{Binding Address}"/>
                         <TextBlock
                             Grid.Column="2"
-                            FontFamily="{StaticResource SpectrumStrictFont}"
+                            FontFamily="{StaticResource SpectrumFont}"
+                            VerticalAlignment="Center"
                             TextAlignment="Right"
-                            FontSize="20"
-                            Margin="0 -4 8 0"
+                            FontSize="9"
+                            Margin="0 0 8 0"
                             Text="{Binding Value}"/>
                     </Grid>
                 </DataTemplate>
diff --git a/src/Spectron/App.axaml b/src/Spectron/App.axaml
index fb8157ba..7d342dbf 100644
--- a/src/Spectron/App.axaml
+++ b/src/Spectron/App.axaml
@@ -35,8 +35,7 @@
 
     <Application.Resources>
         <!-- Spectrum fonts -->
-        <FontFamily x:Key="SpectrumStrictFont">/Assets/Fonts/zxSpectrumStrict.ttf#zxSpectrumStrict</FontFamily>
-        <FontFamily x:Key="SpectrumExpandedFont">/Assets/Fonts/zxSpectrumExpanded.ttf#zxSpectrumExpand</FontFamily>
+        <FontFamily x:Key="SpectrumFont">/Assets/Fonts/zx-spectrum.ttf#ZX Spectrum Regular</FontFamily>
         <FontFamily x:Key="HackRegular">/Assets/Fonts/Hack-Regular.ttf#Hack</FontFamily>
         <FontFamily x:Key="VT220">/Assets/Fonts/Glass_TTY_VT220.ttf#Glass TTY VT220</FontFamily>
 
diff --git a/src/Spectron/Assets/Fonts/zx-spectrum.ttf b/src/Spectron/Assets/Fonts/zx-spectrum.ttf
new file mode 100644
index 00000000..d555f99e
Binary files /dev/null and b/src/Spectron/Assets/Fonts/zx-spectrum.ttf differ
diff --git a/src/Spectron/Assets/Fonts/zxSpectrumExpanded.ttf b/src/Spectron/Assets/Fonts/zxSpectrumExpanded.ttf
deleted file mode 100644
index 5c9e5c0f..00000000
Binary files a/src/Spectron/Assets/Fonts/zxSpectrumExpanded.ttf and /dev/null differ
diff --git a/src/Spectron/Assets/Fonts/zxSpectrumStrict.ttf b/src/Spectron/Assets/Fonts/zxSpectrumStrict.ttf
deleted file mode 100644
index d5cd19bc..00000000
Binary files a/src/Spectron/Assets/Fonts/zxSpectrumStrict.ttf and /dev/null differ
diff --git a/src/Spectron/Controls/PauseOverlay.axaml b/src/Spectron/Controls/PauseOverlay.axaml
index c6675be3..c85f7c82 100644
--- a/src/Spectron/Controls/PauseOverlay.axaml
+++ b/src/Spectron/Controls/PauseOverlay.axaml
@@ -3,7 +3,7 @@
         xmlns:controls="clr-namespace:OldBit.Spectron.Controls">
 
     <Design.PreviewWith>
-        <controls:PauseOverlay FontSize="60" />
+        <controls:PauseOverlay FontSize="27" />
     </Design.PreviewWith>
 
     <Style Selector="controls|PauseOverlay">
@@ -12,32 +12,32 @@
                 <StackPanel Orientation="Horizontal" Opacity="{Binding Opacity, RelativeSource={RelativeSource AncestorType={x:Type controls:PauseOverlay}}}" >
                     <TextBlock Text="P" x:Name="PART_LetterP" Opacity="1"
                                FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type controls:PauseOverlay}}}"
-                               FontFamily="{StaticResource SpectrumStrictFont}"
+                               FontFamily="{StaticResource SpectrumFont}"
                                Foreground="{StaticResource SpectrumBlack}"
                     />
                     <TextBlock Text="A" x:Name="PART_LetterA" Opacity="1"
                                FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type controls:PauseOverlay}}}"
-                               FontFamily="{StaticResource SpectrumStrictFont}"
+                               FontFamily="{StaticResource SpectrumFont}"
                                Foreground="{StaticResource SpectrumBrightRed}"
                     />
                     <TextBlock Text="U" x:Name="PART_LetterU" Opacity="1"
                                FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type controls:PauseOverlay}}}"
-                               FontFamily="{StaticResource SpectrumStrictFont}"
+                               FontFamily="{StaticResource SpectrumFont}"
                                Foreground="{StaticResource SpectrumBrightGreen}"
                     />
                     <TextBlock Text="S" x:Name="PART_LetterS" Opacity="1"
                                FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type controls:PauseOverlay}}}"
-                               FontFamily="{StaticResource SpectrumStrictFont}"
+                               FontFamily="{StaticResource SpectrumFont}"
                                Foreground="{StaticResource SpectrumBrightYellow}"
                     />
                     <TextBlock Text="E" x:Name="PART_LetterE" Opacity="1"
                                FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type controls:PauseOverlay}}}"
-                               FontFamily="{StaticResource SpectrumStrictFont}"
+                               FontFamily="{StaticResource SpectrumFont}"
                                Foreground="{StaticResource SpectrumBrightMagenta}"
                     />
                     <TextBlock Text="D" x:Name="PART_LetterD" Opacity="1"
                                FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type controls:PauseOverlay}}}"
-                               FontFamily="{StaticResource SpectrumStrictFont}"
+                               FontFamily="{StaticResource SpectrumFont}"
                                Foreground="{StaticResource SpectrumBrightBlue}"
                     />
                 </StackPanel>
diff --git a/src/Spectron/Controls/TimeMachineTimer.axaml b/src/Spectron/Controls/TimeMachineTimer.axaml
index b49bd54e..74afae98 100644
--- a/src/Spectron/Controls/TimeMachineTimer.axaml
+++ b/src/Spectron/Controls/TimeMachineTimer.axaml
@@ -6,8 +6,8 @@
              x:Class="OldBit.Spectron.Controls.TimeMachineTimer">
     <TextBlock
         Name="Countdown"
-        FontFamily="{StaticResource SpectrumExpandedFont}"
-        FontSize="512"
+        FontFamily="{StaticResource SpectrumFont}"
+        FontSize="230"
         Opacity=".8"
         Foreground="{StaticResource SpectrumBrightMagenta}"
         HorizontalAlignment="Center"
diff --git a/src/Spectron/Views/AboutView.axaml b/src/Spectron/Views/AboutView.axaml
index b5f2e81e..b63529a1 100644
--- a/src/Spectron/Views/AboutView.axaml
+++ b/src/Spectron/Views/AboutView.axaml
@@ -48,10 +48,10 @@
     <Grid RowDefinitions="96,*" Margin="10">
         <Image Grid.Row="0" Source="../Assets/Logo.png" Height="128" Width="96"/>
         <StackPanel Grid.Row="1">
-            <TextBlock Text="Spectron" FontFamily="{StaticResource SpectrumStrictFont}" FontSize="64" HorizontalAlignment="Center" Classes="Spectron"/>
-            <TextBlock Text="Version 1.0.0" FontFamily="{StaticResource SpectrumStrictFont}" FontSize="24" HorizontalAlignment="Center" Padding="8" Foreground="{StaticResource SpectrumBrightGreen}"/>
-            <TextBlock Text="© 2025-2026 Wojciech Sobieszek" FontFamily="{StaticResource SpectrumStrictFont}" FontSize="20" HorizontalAlignment="Center" Padding="0,20,0,3" Foreground="{StaticResource SpectrumBrightCyan}"/>
-            <TextBlock Text="OldBit Ltd" FontFamily="{StaticResource SpectrumStrictFont}" FontSize="20" HorizontalAlignment="Center" Foreground="{StaticResource SpectrumBrightCyan}"/>
+            <TextBlock Text="Spectron" FontFamily="{StaticResource SpectrumFont}" FontSize="29" HorizontalAlignment="Center" Classes="Spectron"/>
+            <TextBlock Text="Version 1.0.0" FontFamily="{StaticResource SpectrumFont}" FontSize="11" HorizontalAlignment="Center" Padding="30" Foreground="{StaticResource SpectrumBrightGreen}"/>
+            <TextBlock Text="© 2025-2026 Wojciech Sobieszek" FontFamily="{StaticResource SpectrumFont}" FontSize="9" HorizontalAlignment="Center" Padding="0,35,0,3" Foreground="{StaticResource SpectrumBrightCyan}"/>
+            <TextBlock Text="OldBit Ltd" FontFamily="{StaticResource SpectrumFont}" FontSize="9" HorizontalAlignment="Center" Foreground="{StaticResource SpectrumBrightCyan}"/>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/src/Spectron/Views/DiskView.axaml b/src/Spectron/Views/DiskView.axaml
index 721d1221..77c398a9 100644
--- a/src/Spectron/Views/DiskView.axaml
+++ b/src/Spectron/Views/DiskView.axaml
@@ -12,8 +12,8 @@
 
     <Window.Styles>
         <Style Selector="TextBlock.ZX">
-            <Setter Property="FontFamily" Value="{StaticResource SpectrumStrictFont}"/>
-            <Setter Property="FontSize" Value="24"/>
+            <Setter Property="FontFamily" Value="{StaticResource SpectrumFont}"/>
+            <Setter Property="FontSize" Value="11"/>
             <Setter Property="VerticalAlignment" Value="Center"/>
         </Style>
     </Window.Styles>
diff --git a/src/Spectron/Views/KeyboardView.axaml b/src/Spectron/Views/KeyboardView.axaml
index f81b3c7b..567c436d 100644
--- a/src/Spectron/Views/KeyboardView.axaml
+++ b/src/Spectron/Views/KeyboardView.axaml
@@ -19,12 +19,12 @@
         <Image Source="../Assets/Keyboard.png"/>
         <TextBlock
             Text="Spectron Emulator"
-            FontFamily="{StaticResource SpectrumStrictFont}"
+            FontFamily="{StaticResource SpectrumFont}"
             VerticalAlignment="Bottom"
             HorizontalAlignment="Left"
             Opacity=".7"
             Margin="30,0,0,5"
-            FontSize="20"
+            FontSize="9"
             Foreground="{StaticResource SpectrumBrightCyan}"
             Background="Transparent"/>
     </Grid>
diff --git a/src/Spectron/Views/PreferencesView.axaml b/src/Spectron/Views/PreferencesView.axaml
index 3f2376a1..9830b41e 100644
--- a/src/Spectron/Views/PreferencesView.axaml
+++ b/src/Spectron/Views/PreferencesView.axaml
@@ -603,8 +603,8 @@
                                 VerticalAlignment="Center"/>
                             <ComboBox
                                 Grid.Column="1"
-                                FontFamily="{StaticResource SpectrumStrictFont}"
-                                FontSize="22"
+                                FontFamily="{StaticResource SpectrumFont}"
+                                FontSize="10"
                                 Width="130"
                                 ItemsSource="{Binding HexNumberFormats}"
                                 SelectedValue="{Binding DebuggerNumberFormat}"
diff --git a/src/Spectron/Views/TimeMachineView.axaml b/src/Spectron/Views/TimeMachineView.axaml
index 4dd50155..17464d7e 100644
--- a/src/Spectron/Views/TimeMachineView.axaml
+++ b/src/Spectron/Views/TimeMachineView.axaml
@@ -14,7 +14,7 @@
 
     <Window.Styles>
         <Style Selector="TextBlock.ZX">
-            <Setter Property="FontFamily" Value="{StaticResource SpectrumStrictFont}"/>
+            <Setter Property="FontFamily" Value="{StaticResource SpectrumFont}"/>
         </Style>
     </Window.Styles>
 
@@ -29,11 +29,11 @@
             <Slider Name="Slider" TickPlacement="None" FocusAdorner="{x:Null}" Height="35" Padding="20 0 20 0" Minimum="0" Maximum="{Binding EntriesCount}" Value="{Binding CurrentEntryIndex}" TickFrequency="1" IsSnapToTickEnabled="True"/>
 
             <Grid ColumnDefinitions="*,*" Margin="20 0 20 0">
-                <TextBlock Grid.Column="0" Text="past" Classes="ZX" FontSize="15" Foreground="{StaticResource SpectrumWhite}"/>
-                <TextBlock Grid.Column="1" Text="now" TextAlignment="Right" Classes="ZX" FontSize="15" Foreground="{StaticResource SpectrumWhite}"/>
+                <TextBlock Grid.Column="0" Text="past" Classes="ZX" FontSize="8" Foreground="{StaticResource SpectrumWhite}"/>
+                <TextBlock Grid.Column="1" Text="now" TextAlignment="Right" Classes="ZX" FontSize="8" Foreground="{StaticResource SpectrumWhite}"/>
             </Grid>
 
-            <Button HotKey="Enter" HorizontalAlignment="Center" Content="Time Travel" Command="{Binding TimeTravelCommand}" FontFamily="{StaticResource SpectrumStrictFont}" FontSize="20" CornerRadius="10"/>
+            <Button HotKey="Enter" HorizontalAlignment="Center" Content="Time Travel" Command="{Binding TimeTravelCommand}" FontFamily="{StaticResource SpectrumFont}" FontSize="9" CornerRadius="10"/>
         </StackPanel>
     </Grid>
 </Window>