diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index d3eda4e1..8ef8a265 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -26,6 +26,11 @@
     <Setter Property="ExtendClientAreaToDecorationsHint" Value="True"/>
     <Setter Property="SystemDecorations" Value="Full"/>
     <Setter Property="Padding" Value="0"/>
+
+    <Style.Resources>
+      <SolidColorBrush x:Key="SystemControlErrorTextForegroundBrush" Color="Red"/>
+      <SolidColorBrush x:Key="SystemErrorTextColor" Color="Red"/>
+    </Style.Resources>
   </Style>
 
   <Style Selector="Window[WindowState=Maximized]">
@@ -1294,4 +1299,22 @@
   <Style Selector="TreeDataGridExpanderCell[IsExpanded=False] Path.folder_icon">
     <Setter Property="Data" Value="{StaticResource Icons.Folder.Fill}"/>
   </Style>
+
+  <Style Selector="NumericUpDown">
+    <Style Selector="^ /template/ ButtonSpinner#PART_Spinner">
+      <Setter Property="MinHeight" Value="0"/>
+      <Setter Property="Height" Value="28"/>
+    </Style>
+    <Style Selector="^ /template/ TextBox#PART_TextBox">
+      <Setter Property="MinHeight" Value="0"/>
+      <Setter Property="Height" Value="28"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+    </Style>
+    <Style Selector="^:focus-within /template/ ButtonSpinner#PART_Spinner">
+      <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}"/>
+    </Style>
+    <Style Selector="^ /template/ TextBox#PART_TextBox /template/ Border#PART_BorderElement">
+      <Setter Property="IsVisible" Value="False"/>
+    </Style>
+  </Style>
 </Styles>
diff --git a/src/Views/Preference.axaml b/src/Views/Preference.axaml
index d86b0b95..037b6353 100644
--- a/src/Views/Preference.axaml
+++ b/src/Views/Preference.axaml
@@ -200,20 +200,7 @@
                            Padding="4"
                            BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
                            CornerRadius="3"
-                           Value="{Binding DefaultFontSize, Mode=TwoWay}">
-              <NumericUpDown.Styles>
-                <Style Selector="NumericUpDown /template/ ButtonSpinner#PART_Spinner">
-                  <Setter Property="MinHeight" Value="0"/>
-                  <Setter Property="Height" Value="28"/>
-                </Style>
-                <Style Selector="NumericUpDown /template/ TextBox#PART_TextBox">
-                  <Setter Property="MinHeight" Value="0"/>
-                  <Setter Property="Height" Value="28"/>
-                  <Setter Property="VerticalContentAlignment" Value="Center"/>
-                  <Setter Property="CornerRadius" Value="3,0,0,3"/>
-                </Style>
-              </NumericUpDown.Styles>
-            </NumericUpDown>
+                           Value="{Binding DefaultFontSize, Mode=TwoWay}"/>
 
             <TextBlock Grid.Row="4" Grid.Column="0"
                        Text="{DynamicResource Text.Preference.Appearance.ColorOverrides}"
@@ -382,20 +369,7 @@
                              CornerRadius="3"
                              ParsingNumberStyle="Integer"
                              FormatString="0"
-                             Value="{Binding GitAutoFetchInterval, Mode=TwoWay, FallbackValue=10}">
-                <NumericUpDown.Styles>
-                  <Style Selector="NumericUpDown /template/ ButtonSpinner#PART_Spinner">
-                    <Setter Property="MinHeight" Value="0"/>
-                    <Setter Property="Height" Value="28"/>
-                  </Style>
-                  <Style Selector="NumericUpDown /template/ TextBox#PART_TextBox">
-                    <Setter Property="MinHeight" Value="0"/>
-                    <Setter Property="Height" Value="28"/>
-                    <Setter Property="VerticalContentAlignment" Value="Center"/>
-                    <Setter Property="CornerRadius" Value="3,0,0,3"/>
-                  </Style>
-                </NumericUpDown.Styles>
-              </NumericUpDown>
+                             Value="{Binding GitAutoFetchInterval, Mode=TwoWay, FallbackValue=10}"/>
               
               <TextBlock Grid.Column="1"
                          VerticalAlignment="Center"