diff --git a/src/SourceGit/Converters/StringConverters.cs b/src/SourceGit/Converters/StringConverters.cs
index 3b227316..ea1ddd42 100644
--- a/src/SourceGit/Converters/StringConverters.cs
+++ b/src/SourceGit/Converters/StringConverters.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 
 using Avalonia.Data.Converters;
+using Avalonia.Media;
 using Avalonia.Styling;
 
 namespace SourceGit.Converters
@@ -69,5 +70,29 @@ namespace SourceGit.Converters
 
         public static FuncValueConverter<string, string> ToShortSHA =
             new FuncValueConverter<string, string>(v => v.Length > 10 ? v.Substring(0, 10) : v);
+
+        public class ToFontFamilyConverter : IValueConverter
+        {
+            public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+            {
+                var name = value as string;
+                if (string.IsNullOrEmpty(name))
+                {
+                    return FontManager.Current.DefaultFontFamily;
+                }
+                else
+                {
+                    return new FontFamily(name);
+                }
+            }
+
+            public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+            {
+                var fontFamily = value as FontFamily;
+                return fontFamily == null ? string.Empty : fontFamily.ToString();
+            }
+        }
+
+        public static ToFontFamilyConverter ToFontFamily = new ToFontFamilyConverter();
     }
-}
\ No newline at end of file
+}
diff --git a/src/SourceGit/Resources/Locales.Designer.cs b/src/SourceGit/Resources/Locales.Designer.cs
index da001ddf..ca6b1087 100644
--- a/src/SourceGit/Resources/Locales.Designer.cs
+++ b/src/SourceGit/Resources/Locales.Designer.cs
@@ -2256,6 +2256,15 @@ namespace SourceGit.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Default FontFamily.
+        /// </summary>
+        public static string Text_Preference_General_DefaultFont {
+            get {
+                return ResourceManager.GetString("Text.Preference.General.DefaultFont", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Language.
         /// </summary>
@@ -2274,6 +2283,15 @@ namespace SourceGit.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Monospace FontFamily.
+        /// </summary>
+        public static string Text_Preference_General_MonospaceFont {
+            get {
+                return ResourceManager.GetString("Text.Preference.General.MonospaceFont", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Restore windows.
         /// </summary>
diff --git a/src/SourceGit/Resources/Locales.en.resx b/src/SourceGit/Resources/Locales.en.resx
index d1ddab22..3cf630ae 100644
--- a/src/SourceGit/Resources/Locales.en.resx
+++ b/src/SourceGit/Resources/Locales.en.resx
@@ -1290,4 +1290,10 @@
   <data name="Text.Diff.SyntaxHighlight" xml:space="preserve">
     <value>Syntax Highlighting</value>
   </data>
+  <data name="Text.Preference.General.DefaultFont" xml:space="preserve">
+    <value>Default FontFamily</value>
+  </data>
+  <data name="Text.Preference.General.MonospaceFont" xml:space="preserve">
+    <value>Monospace FontFamily</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/SourceGit/Resources/Locales.resx b/src/SourceGit/Resources/Locales.resx
index 3eaa6b39..bedb8136 100644
--- a/src/SourceGit/Resources/Locales.resx
+++ b/src/SourceGit/Resources/Locales.resx
@@ -1290,4 +1290,10 @@
   <data name="Text.Diff.SyntaxHighlight" xml:space="preserve">
     <value>Syntax Highlighting</value>
   </data>
+  <data name="Text.Preference.General.DefaultFont" xml:space="preserve">
+    <value>Default FontFamily</value>
+  </data>
+  <data name="Text.Preference.General.MonospaceFont" xml:space="preserve">
+    <value>Monospace FontFamily</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/SourceGit/Resources/Locales.zh.resx b/src/SourceGit/Resources/Locales.zh.resx
index 75cdd061..50ae5094 100644
--- a/src/SourceGit/Resources/Locales.zh.resx
+++ b/src/SourceGit/Resources/Locales.zh.resx
@@ -1290,4 +1290,10 @@
   <data name="Text.Diff.SyntaxHighlight" xml:space="preserve">
     <value>语法高亮</value>
   </data>
+  <data name="Text.Preference.General.DefaultFont" xml:space="preserve">
+    <value>缺省字体</value>
+  </data>
+  <data name="Text.Preference.General.MonospaceFont" xml:space="preserve">
+    <value>等宽字体</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/SourceGit/Resources/Styles.axaml b/src/SourceGit/Resources/Styles.axaml
index 9e6b3099..333fc136 100644
--- a/src/SourceGit/Resources/Styles.axaml
+++ b/src/SourceGit/Resources/Styles.axaml
@@ -1,5 +1,7 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="using:SourceGit.ViewModels"
+        xmlns:c="using:SourceGit.Converters"
         xmlns:ae="using:AvaloniaEdit"
         xmlns:aes="using:AvaloniaEdit.Search">
   <Design.PreviewWith>
@@ -13,6 +15,10 @@
     </Style.Resources>
   </Style>
 
+  <Style Selector="ContentPresenter">
+    <Setter Property="FontFamily" Value="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFont, Converter={x:Static c:StringConverters.ToFontFamily}}"/>
+  </Style>
+
   <Style Selector="Path">
     <Setter Property="Fill" Value="{DynamicResource Brush.FG1}"/>
     <Setter Property="Stretch" Value="Uniform"/>
@@ -64,7 +70,7 @@
     <Setter Property="FontStyle" Value="Italic"/>
   </Style>
   <Style Selector="TextBlock.monospace">
-    <Setter Property="FontFamily" Value="fonts:SourceGit#JetBrains Mono"/>
+    <Setter Property="FontFamily" Value="{Binding Source={x:Static vm:Preference.Instance}, Path=MonospaceFont, Converter={x:Static c:StringConverters.ToFontFamily}}"/>
   </Style>
   <Style Selector="TextBlock.group_header_label">
     <Setter Property="Foreground" Value="{DynamicResource Brush.FG2}"/>
diff --git a/src/SourceGit/ViewModels/Preference.cs b/src/SourceGit/ViewModels/Preference.cs
index 3b6fb7db..a069f9d0 100644
--- a/src/SourceGit/ViewModels/Preference.cs
+++ b/src/SourceGit/ViewModels/Preference.cs
@@ -71,6 +71,18 @@ namespace SourceGit.ViewModels
             }
         }
 
+        public string DefaultFont
+        {
+            get => _defaultFont;
+            set => SetProperty(ref _defaultFont, value);
+        }
+
+        public string MonospaceFont
+        {
+            get => _monospaceFont;
+            set => SetProperty(ref _monospaceFont, value);
+        }
+
         public string AvatarServer
         {
             get => Models.AvatarManager.SelectedServer;
@@ -352,6 +364,9 @@ namespace SourceGit.ViewModels
 
         private string _locale = "en_US";
         private string _theme = "Default";
+        private string _defaultFont = string.Empty;
+        private string _monospaceFont = "fonts:SourceGit#JetBrains Mono";
+
         private int _maxHistoryCommits = 20000;
         private bool _restoreTabs = false;
         private bool _useFixedTabWidth = true;
diff --git a/src/SourceGit/Views/Blame.axaml b/src/SourceGit/Views/Blame.axaml
index 0290cbf9..e21d8290 100644
--- a/src/SourceGit/Views/Blame.axaml
+++ b/src/SourceGit/Views/Blame.axaml
@@ -72,7 +72,7 @@
                          BorderThickness="1"
                          Background="{DynamicResource Brush.Contents}"
                          Foreground="{DynamicResource Brush.FG1}"
-                         FontFamily="fonts:SourceGit#JetBrains Mono"
+                         FontFamily="{Binding Source={x:Static vm:Preference.Instance}, Path=MonospaceFont, Converter={x:Static c:StringConverters.ToFontFamily}}"
                          FontSize="12"
                          BlameData="{Binding Data}"/>
       
diff --git a/src/SourceGit/Views/CommitBaseInfo.axaml b/src/SourceGit/Views/CommitBaseInfo.axaml
index 7bc298c8..3c4a6a4a 100644
--- a/src/SourceGit/Views/CommitBaseInfo.axaml
+++ b/src/SourceGit/Views/CommitBaseInfo.axaml
@@ -43,7 +43,7 @@
         <Grid RowDefinitions="24,Auto,Auto,Auto" ColumnDefinitions="96,*">
           <!-- SHA -->
           <TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.CommitDetail.Info.SHA}" />
-          <SelectableTextBlock Grid.Row="0" Grid.Column="1" Text="{Binding SHA}" Margin="12,0,0,0" FontSize="12" VerticalAlignment="Center" FontFamily="fonts:SourceGit#JetBrains Mono"/>
+          <SelectableTextBlock Grid.Row="0" Grid.Column="1" Text="{Binding SHA}" Margin="12,0,0,0" FontSize="12" VerticalAlignment="Center" FontFamily="{Binding Source={x:Static vm:Preference.Instance}, Path=MonospaceFont, Converter={x:Static c:StringConverters.ToFontFamily}}"/>
 
           <!-- PARENTS -->
           <TextBlock Grid.Row="1" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.CommitDetail.Info.Parents}" IsVisible="{Binding Parents.Count, Converter={x:Static c:IntConverters.IsGreaterThanZero}}"/>
@@ -95,7 +95,7 @@
           <!-- Messages -->
           <TextBlock Grid.Row="3" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.CommitDetail.Info.Message}" VerticalAlignment="Top" Margin="0,4,0,0" />
           <ScrollViewer Grid.Row="3" Grid.Column="1" Margin="12,5,0,0" MaxHeight="100" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-            <SelectableTextBlock Text="{Binding FullMessage}" FontSize="12" FontFamily="fonts:SourceGit#JetBrains Mono" TextWrapping="Wrap"/>
+            <SelectableTextBlock Text="{Binding FullMessage}" FontSize="12" FontFamily="{Binding Source={x:Static vm:Preference.Instance}, Path=MonospaceFont, Converter={x:Static c:StringConverters.ToFontFamily}}" TextWrapping="Wrap"/>
           </ScrollViewer>
         </Grid>
 
diff --git a/src/SourceGit/Views/Preference.axaml b/src/SourceGit/Views/Preference.axaml
index d2014570..6a301bf4 100644
--- a/src/SourceGit/Views/Preference.axaml
+++ b/src/SourceGit/Views/Preference.axaml
@@ -67,7 +67,7 @@
           <TabItem.Header>
             <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.General}"/>
           </TabItem.Header>
-          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32" ColumnDefinitions="Auto,*">
+          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32" ColumnDefinitions="Auto,*">
             <TextBlock Grid.Row="0" Grid.Column="0"
                        Text="{DynamicResource Text.Preference.General.Locale}"
                        HorizontalAlignment="Right"
@@ -113,10 +113,48 @@
             </ComboBox>
 
             <TextBlock Grid.Row="3" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.General.DefaultFont}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <ComboBox Grid.Row="3" Grid.Column="1"
+                      MinHeight="28"
+                      Padding="8,0"
+                      HorizontalAlignment="Stretch"
+                      ItemsSource="{Binding #me.InstalledFonts}"
+                      SelectedItem="{Binding DefaultFont, Converter={x:Static c:StringConverters.ToFontFamily}, Mode=TwoWay}">
+              <ComboBox.ItemTemplate>
+                <DataTemplate DataType="FontFamily">
+                  <Border Height="24">
+                    <TextBlock VerticalAlignment="Center" Text="{Binding Name}" FontFamily="{Binding}"/>
+                  </Border>
+                </DataTemplate>
+              </ComboBox.ItemTemplate>
+            </ComboBox>
+
+            <TextBlock Grid.Row="4" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.General.MonospaceFont}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <ComboBox Grid.Row="4" Grid.Column="1"
+                      MinHeight="28"
+                      Padding="8,0"
+                      HorizontalAlignment="Stretch"
+                      ItemsSource="{Binding #me.InstalledMonospaceFonts}"
+                      SelectedItem="{Binding MonospaceFont, Converter={x:Static c:StringConverters.ToFontFamily}, Mode=TwoWay}">
+              <ComboBox.ItemTemplate>
+                <DataTemplate DataType="FontFamily">
+                  <Border Height="24">
+                    <TextBlock VerticalAlignment="Center" Text="{Binding Name}" FontFamily="{Binding}"/>
+                  </Border>
+                </DataTemplate>
+              </ComboBox.ItemTemplate>
+            </ComboBox>
+
+            <TextBlock Grid.Row="5" Grid.Column="0"
                        Text="{DynamicResource Text.Preference.General.MaxHistoryCommits}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
-            <Grid Grid.Row="3" Grid.Column="1" ColumnDefinitions="*,64">
+            <Grid Grid.Row="5" Grid.Column="1" ColumnDefinitions="*,64">
               <Slider Grid.Column="0"
                       Minimum="20000" Maximum="100000"
                       TickPlacement="BottomRight" TickFrequency="5000"
@@ -140,11 +178,11 @@
                          Text="{Binding MaxHistoryCommits}"/>
             </Grid>
 
-            <CheckBox Grid.Row="4" Grid.Column="1"
+            <CheckBox Grid.Row="6" Grid.Column="1"
                       Content="{DynamicResource Text.Preference.General.RestoreTabs}"
                       IsChecked="{Binding RestoreTabs, Mode=TwoWay}"/>
 
-            <CheckBox Grid.Row="5" Grid.Column="1"
+            <CheckBox Grid.Row="7" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preference.General.UseFixedTabWidth}"
                       IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseFixedTabWidth, Mode=TwoWay}"/>
diff --git a/src/SourceGit/Views/Preference.axaml.cs b/src/SourceGit/Views/Preference.axaml.cs
index 799c1dc9..9dcd8c06 100644
--- a/src/SourceGit/Views/Preference.axaml.cs
+++ b/src/SourceGit/Views/Preference.axaml.cs
@@ -1,15 +1,30 @@
 using System;
+using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.Media;
 using Avalonia.Platform.Storage;
 
 namespace SourceGit.Views
 {
     public partial class Preference : Window
     {
+        public List<FontFamily> InstalledFonts
+        {
+            get;
+            private set;
+        }
+
+        public List<FontFamily> InstalledMonospaceFonts
+        {
+            get;
+            private set;
+        }
+
         public string DefaultUser
         {
             get;
@@ -51,6 +66,37 @@ namespace SourceGit.Views
             var pref = ViewModels.Preference.Instance;
             DataContext = pref;
 
+            InstalledFonts = new List<FontFamily>();
+            InstalledFonts.Add(new FontFamily("fonts:SourceGit#JetBrains Mono"));
+            InstalledFonts.AddRange(FontManager.Current.SystemFonts);
+            InstalledFonts.Remove(FontManager.Current.DefaultFontFamily);
+            InstalledFonts.Add(FontManager.Current.DefaultFontFamily);
+
+            InstalledMonospaceFonts = new List<FontFamily>();
+            InstalledMonospaceFonts.Add(new FontFamily("fonts:SourceGit#JetBrains Mono"));
+            foreach (var font in FontManager.Current.SystemFonts)
+            {
+                var typeface = new Typeface(font);
+                var testI = new FormattedText(
+                            "i",
+                            CultureInfo.CurrentCulture,
+                            FlowDirection.LeftToRight,
+                            typeface,
+                            12,
+                            Brushes.White);
+                var testW = new FormattedText(
+                            "W",
+                            CultureInfo.CurrentCulture,
+                            FlowDirection.LeftToRight,
+                            typeface,
+                            12,
+                            Brushes.White);
+                if (testI.Width == testW.Width)
+                {
+                    InstalledMonospaceFonts.Add(font);
+                }
+            }
+
             var ver = string.Empty;
             if (pref.IsGitConfigured)
             {
diff --git a/src/SourceGit/Views/RevisionFiles.axaml b/src/SourceGit/Views/RevisionFiles.axaml
index 17ed8876..fda309fe 100644
--- a/src/SourceGit/Views/RevisionFiles.axaml
+++ b/src/SourceGit/Views/RevisionFiles.axaml
@@ -89,7 +89,7 @@
             </DataTemplate>
 
             <DataTemplate DataType="m:RevisionTextFile">
-              <v:RevisionTextFileView FontFamily="fonts:SourceGit#JetBrains Mono" FontSize="12" Background="{DynamicResource Brush.Contents}"/>
+              <v:RevisionTextFileView FontFamily="{Binding Source={x:Static vm:Preference.Instance}, Path=MonospaceFont, Converter={x:Static c:StringConverters.ToFontFamily}}" FontSize="12" Background="{DynamicResource Brush.Contents}"/>
             </DataTemplate>
 
             <DataTemplate DataType="m:RevisionLFSObject">
diff --git a/src/SourceGit/Views/TextDiffView.axaml b/src/SourceGit/Views/TextDiffView.axaml
index d9ff5041..24f21030 100644
--- a/src/SourceGit/Views/TextDiffView.axaml
+++ b/src/SourceGit/Views/TextDiffView.axaml
@@ -17,7 +17,7 @@
                                    BorderThickness="0"
                                    Foreground="{DynamicResource Brush.FG1}"
                                    SecondaryFG="{DynamicResource Brush.FG2}"
-                                   FontFamily="fonts:SourceGit#JetBrains Mono"
+                                   FontFamily="{Binding Source={x:Static vm:Preference.Instance}, Path=MonospaceFont, Converter={x:Static c:StringConverters.ToFontFamily}}"
                                    FontSize="12"
                                    DiffData="{Binding}"
                                    SyncScrollOffset="{Binding $parent[v:DiffView].DataContext.(vm:DiffContext).SyncScrollOffset, Mode=TwoWay}"
@@ -36,7 +36,7 @@
                                        BorderThickness="0"
                                        Foreground="{DynamicResource Brush.FG1}"
                                        SecondaryFG="{DynamicResource Brush.FG2}"
-                                       FontFamily="fonts:SourceGit#JetBrains Mono"
+                                       FontFamily="{Binding Source={x:Static vm:Preference.Instance}, Path=MonospaceFont, Converter={x:Static c:StringConverters.ToFontFamily}}"
                                        FontSize="12"
                                        DiffData="{Binding}"/>
 
@@ -52,7 +52,7 @@
                                        BorderThickness="0"
                                        Foreground="{DynamicResource Brush.FG1}"
                                        SecondaryFG="{DynamicResource Brush.FG2}"
-                                       FontFamily="fonts:SourceGit#JetBrains Mono"
+                                       FontFamily="{Binding Source={x:Static vm:Preference.Instance}, Path=MonospaceFont, Converter={x:Static c:StringConverters.ToFontFamily}}"
                                        FontSize="12"
                                        DiffData="{Binding}"/>
       </Grid>
diff --git a/src/SourceGit/Views/TextDiffView.axaml.cs b/src/SourceGit/Views/TextDiffView.axaml.cs
index 654f41b0..9e32c5b2 100644
--- a/src/SourceGit/Views/TextDiffView.axaml.cs
+++ b/src/SourceGit/Views/TextDiffView.axaml.cs
@@ -160,7 +160,7 @@ namespace SourceGit.Views
             public LineStyleTransformer(CombinedTextDiffPresenter editor)
             {
                 _editor = editor;
-                _indicatorTypeface = new Typeface("fonts:SourceGit#JetBrains Mono", FontStyle.Italic);
+                _indicatorTypeface = new Typeface(editor.FontFamily, FontStyle.Italic);
             }
 
             protected override void ColorizeLine(DocumentLine line)
@@ -520,7 +520,7 @@ namespace SourceGit.Views
             public LineStyleTransformer(SingleSideTextDiffPresenter editor)
             {
                 _editor = editor;
-                _indicatorTypeface = new Typeface("fonts:SourceGit#JetBrains Mono", FontStyle.Italic);
+                _indicatorTypeface = new Typeface(editor.FontFamily, FontStyle.Italic);
             }
 
             protected override void ColorizeLine(DocumentLine line)