diff --git a/src/Resources/Styles/ListView.xaml b/src/Resources/Styles/ListView.xaml
index 75a47dc7..7eb6427d 100644
--- a/src/Resources/Styles/ListView.xaml
+++ b/src/Resources/Styles/ListView.xaml
@@ -1,10 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:models="clr-namespace:SourceGit.Models">
     <Style TargetType="{x:Type ListViewItem}">
         <Setter Property="Padding" Value="0"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="SnapsToDevicePixels" Value="true"/>
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
+        <Setter Property="TextElement.FontFamily" Value="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyContent, Mode=OneWay}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListViewItem}">
diff --git a/src/Resources/Styles/TabControl.xaml b/src/Resources/Styles/TabControl.xaml
index f37e7c99..87afce73 100644
--- a/src/Resources/Styles/TabControl.xaml
+++ b/src/Resources/Styles/TabControl.xaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:models="clr-namespace:SourceGit.Models">
     <Style TargetType="{x:Type TabControl}">
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -51,6 +52,7 @@
                                     <Setter Property="FontWeight" Value="DemiBold"/>
                                     <Setter Property="FontSize" Value="9pt"/>
                                     <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
+                                    <Setter Property="TextElement.FontFamily" Value="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyWindow, Mode=OneWay}"/>
                                     <Style.Triggers>
                                         <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type TabItem}}, Path=IsSelected}" Value="True">
                                             <Setter Property="Foreground" Value="{DynamicResource Brush.Accent1}"/>
diff --git a/src/Resources/Styles/TextBlock.xaml b/src/Resources/Styles/TextBlock.xaml
index 7634cf3f..ca6948fd 100644
--- a/src/Resources/Styles/TextBlock.xaml
+++ b/src/Resources/Styles/TextBlock.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="clr-namespace:SourceGit.Views.Controls">
+                    xmlns:controls="clr-namespace:SourceGit.Views.Controls"
+                    xmlns:models="clr-namespace:SourceGit.Models">
     <Style x:Key="Style.TextBlock.Base" TargetType="{x:Type TextBlock}">
         <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="FontSize" Value="9pt"/>
@@ -18,6 +19,7 @@
     <Style x:Key="Style.TextBlock.Group" TargetType="{x:Type TextBlock}" BasedOn="{x:Null}">
         <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="FontFamily" Value="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyWindow, Mode=OneWay}"/>
         <Setter Property="Foreground" Value="{DynamicResource Brush.FG2}"/>
         <Setter Property="FontWeight" Value="ExtraBold"/>
         <Setter Property="FontSize" Value="9pt"/>
diff --git a/src/Views/Widgets/RevisionFiles.xaml.cs b/src/Views/Widgets/RevisionFiles.xaml.cs
index 5e54273c..89b9b382 100644
--- a/src/Views/Widgets/RevisionFiles.xaml.cs
+++ b/src/Views/Widgets/RevisionFiles.xaml.cs
@@ -138,14 +138,12 @@ namespace SourceGit.Views.Widgets {
 
         #region EVENTS
         private void LayoutTextPreview(List<Models.TextLine> lines) {
-            var font = new FontFamily(Models.Preference.Instance.General.FontFamilyWindow);
-
             var maxLineNumber = $"{lines.Count + 1}";
             var formatted = new FormattedText(
                 maxLineNumber,
                 CultureInfo.CurrentCulture,
                 FlowDirection.LeftToRight,
-                new Typeface(font, FontStyles.Normal, FontWeights.Normal, FontStretches.Normal),
+                new Typeface(txtPreviewData.FontFamily, FontStyles.Normal, FontWeights.Normal, FontStretches.Normal),
                 12.0,
                 Brushes.Black,
                 VisualTreeHelper.GetDpi(this).PixelsPerDip);
diff --git a/src/Views/Widgets/WorkingCopy.xaml b/src/Views/Widgets/WorkingCopy.xaml
index e8d23b6d..fa10b3c5 100644
--- a/src/Views/Widgets/WorkingCopy.xaml
+++ b/src/Views/Widgets/WorkingCopy.xaml
@@ -10,8 +10,7 @@
              xmlns:widgets="clr-namespace:SourceGit.Views.Widgets"
              xmlns:validations="clr-namespace:SourceGit.Views.Validations"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800"
-             FontFamily="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyContent, Mode=OneWay}">
+             d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
         <converter:BoolToCollapsed x:Key="BoolToCollapsed"/>
     </UserControl.Resources>