diff --git a/src/Models/AvatarServer.cs b/src/Models/AvatarServer.cs
deleted file mode 100644
index a96344ec..00000000
--- a/src/Models/AvatarServer.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-
-namespace SourceGit.Models {
-
-    /// <summary>
-    ///     支持的头像服务器
-    /// </summary>
-    public class AvatarServer {
-        public string Name { get; set; }
-        public string Url { get; set; }
-
-        public static List<AvatarServer> Supported = new List<AvatarServer>() {
-            new AvatarServer("Gravatar", "https://www.gravatar.com/avatar/"),
-            new AvatarServer("Gravatar - 极客族", "https://sdn.geekzu.org/avatar/"),
-        };
-
-        public AvatarServer(string name, string url) {
-            Name = name;
-            Url = url;
-        }
-    }
-}
diff --git a/src/Models/Preference.cs b/src/Models/Preference.cs
index 04b7d70d..7e4141b6 100644
--- a/src/Models/Preference.cs
+++ b/src/Models/Preference.cs
@@ -58,11 +58,6 @@ namespace SourceGit.Models {
                 set => FontFamilyContentSetting = value;
             }
 
-            /// <summary>
-            ///     头像服务器
-            /// </summary>
-            public string AvatarServer { get; set; } = "https://www.gravatar.com/avatar/";
-
             /// <summary>
             ///     是否启用深色主题
             /// </summary>
diff --git a/src/Views/Controls/Avatar.cs b/src/Views/Controls/Avatar.cs
index 128033fe..219f2ee7 100644
--- a/src/Views/Controls/Avatar.cs
+++ b/src/Views/Controls/Avatar.cs
@@ -193,7 +193,7 @@ namespace SourceGit.Views.Controls {
                 if (!requesting.ContainsKey(email)) return;
 
                 try {
-                    var req = new HttpClient().GetAsync(Models.Preference.Instance.General.AvatarServer + md5 + "?d=404");
+                    var req = new HttpClient().GetAsync($"https://www.gravatar.com/avatar/{md5}?d=404");
                     req.Wait();
 
                     var rsp = req.Result;
diff --git a/src/Views/Preference.xaml b/src/Views/Preference.xaml
index e61f1e68..6f905dda 100644
--- a/src/Views/Preference.xaml
+++ b/src/Views/Preference.xaml
@@ -57,7 +57,7 @@
         <TabControl Grid.Row="2" Margin="0,4">
             <!-- General Setting -->
             <TabItem Header="{DynamicResource Text.Preference.General}">
-                <Grid Margin="0,8">
+                <Grid Margin="8">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="28"/>
                         <RowDefinition Height="28"/>
@@ -66,7 +66,6 @@
                         <RowDefinition Height="28"/>
                         <RowDefinition Height="28"/>
                         <RowDefinition Height="28"/>
-                        <RowDefinition Height="28"/>
                     </Grid.RowDefinitions>
 
                     <Grid.ColumnDefinitions>
@@ -133,36 +132,22 @@
                         </ComboBox.Resources>
                     </ComboBox>
 
-                    <!-- Avatar -->
-                    <TextBlock
-                        Grid.Row="3" Grid.Column="0"
-                        Text="{DynamicResource Text.Preference.AvatarServer}"
-                        HorizontalAlignment="Right"
-                        Margin="0,0,8,0"/>
-                    <ComboBox
-                        Grid.Row="3" Grid.Column="1"
-                        Height="24"
-                        ItemsSource="{Binding Source={x:Static models:AvatarServer.Supported}}"
-                        DisplayMemberPath="Name"
-                        SelectedValuePath="Url"
-                        SelectedValue="{Binding Source={x:Static models:Preference.Instance}, Path=General.AvatarServer, Mode=TwoWay}"/>
-
                     <!-- Enable Check For Update -->
                     <CheckBox
-                        Grid.Row="4" Grid.Column="1"
+                        Grid.Row="3" Grid.Column="1"
                         Content="{DynamicResource Text.Preference.CheckUpdate}"
                         IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=General.CheckForUpdate, Mode=TwoWay}"/>
 
                     <!-- Enable Dark Theme -->
                     <CheckBox
-                        Grid.Row="5" Grid.Column="1"
+                        Grid.Row="4" Grid.Column="1"
                         Content="{DynamicResource Text.Preference.UseDarkTheme}"
                         IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=General.UseDarkTheme, Mode=TwoWay}"
                         Checked="ChangeTheme" Unchecked="ChangeTheme"/>
 
                     <!-- Restore Windows -->
                     <CheckBox
-                        Grid.Row="6" Grid.Column="1"
+                        Grid.Row="5" Grid.Column="1"
                         Content="{DynamicResource Text.Preference.RestoreTabs}"
                         IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=Restore.IsEnabled, Mode=TwoWay}"/>
                 </Grid>
@@ -170,7 +155,7 @@
 
             <!-- Git Setting -->
             <TabItem Header="{DynamicResource Text.Preference.Git}">
-                <Grid Margin="0,8">
+                <Grid Margin="8">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="28"/>
                         <RowDefinition Height="28"/>
@@ -310,7 +295,7 @@
             </TabItem>
 
             <TabItem Header="{DynamicResource Text.Preference.Merger}">
-                <Grid Margin="0,8">
+                <Grid Margin="8">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="28"/>
                         <RowDefinition Height="28"/>