From feab1467a7dce847c2be495769d8b331e26d39c7 Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Mon, 25 May 2026 17:20:32 +0200
Subject: [PATCH 1/4] Feature: Refresh button

---
 Source/NETworkManager/StatusWindow.xaml       | 16 +-----
 Source/NETworkManager/StatusWindow.xaml.cs    |  7 ---
 .../IPApiDNSResolverWidgetViewModel.cs        | 16 +-----
 .../IPApiIPGeolocationWidgetViewModel.cs      | 16 +-----
 .../NetworkConnectionWidgetViewModel.cs       | 32 ++++++++----
 .../Views/DashboardView.xaml.cs               | 20 +++----
 .../Views/IPApiDNSResolverWidgetView.xaml     | 48 +++++++++++++----
 .../Views/IPApiIPGeolocationWidgetView.xaml   | 48 +++++++++++++----
 .../Views/NetworkConnectionWidgetView.xaml    | 52 ++++++++++++++-----
 9 files changed, 149 insertions(+), 106 deletions(-)

diff --git a/Source/NETworkManager/StatusWindow.xaml b/Source/NETworkManager/StatusWindow.xaml
index 743ccd9187..eae2a831c0 100644
--- a/Source/NETworkManager/StatusWindow.xaml
+++ b/Source/NETworkManager/StatusWindow.xaml
@@ -60,21 +60,7 @@
         </mah:WindowCommands>
     </mah:MetroWindow.LeftWindowCommands>
     <mah:MetroWindow.RightWindowCommands>
-        <mah:WindowCommands ShowSeparators="False">            
-            <Button Command="{Binding Path=ReloadCommand}"
-                    ToolTip="{x:Static Member=localization:Strings.Reload}"
-                    Cursor="Hand"
-                    Focusable="False"
-                    Margin="0,0,5,0">
-                <StackPanel Orientation="Horizontal">
-                    <Rectangle Width="16" Height="16"
-                               Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">
-                        <Rectangle.OpacityMask>
-                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Refresh}" />
-                        </Rectangle.OpacityMask>
-                    </Rectangle>
-                </StackPanel>
-            </Button>
+        <mah:WindowCommands ShowSeparators="False">
             <Button Command="{Binding Path=ShowMainWindowCommand}"                    
                     ToolTip="{x:Static Member=localization:Strings.Show}"
                     Cursor="Hand"
diff --git a/Source/NETworkManager/StatusWindow.xaml.cs b/Source/NETworkManager/StatusWindow.xaml.cs
index ab28a2f1ad..ade8b9b17c 100644
--- a/Source/NETworkManager/StatusWindow.xaml.cs
+++ b/Source/NETworkManager/StatusWindow.xaml.cs
@@ -96,13 +96,6 @@ public double Time
 
     #region ICommands & Actions
 
-    public ICommand ReloadCommand => new RelayCommand(_ => ReloadAction());
-
-    private void ReloadAction()
-    {
-        Check();
-    }
-
     public ICommand ShowMainWindowCommand => new RelayCommand(_ => ShowMainWindowAction());
 
     private void ShowMainWindowAction()
diff --git a/Source/NETworkManager/ViewModels/IPApiDNSResolverWidgetViewModel.cs b/Source/NETworkManager/ViewModels/IPApiDNSResolverWidgetViewModel.cs
index fe77d67311..d37881d367 100644
--- a/Source/NETworkManager/ViewModels/IPApiDNSResolverWidgetViewModel.cs
+++ b/Source/NETworkManager/ViewModels/IPApiDNSResolverWidgetViewModel.cs
@@ -70,17 +70,9 @@ private void LoadSettings()
     #region ICommands & Actions
 
     /// <summary>
-    /// Gets the command to check via hotkey.
+    /// Gets the command to check the DNS resolver.
     /// </summary>
-    public ICommand CheckViaHotkeyCommand => new RelayCommand(_ => CheckViaHotkeyAction());
-
-    /// <summary>
-    /// Action to check via hotkey.
-    /// </summary>
-    private void CheckViaHotkeyAction()
-    {
-        Check();
-    }
+    public ICommand CheckCommand => new RelayCommand(_ => Check(), _ => !IsRunning);
 
     #endregion
 
@@ -103,10 +95,6 @@ private async Task CheckAsync()
         if (!SettingsManager.Current.Dashboard_CheckIPApiDNSResolver)
             return;
 
-        // Don't check multiple times if already running
-        if (IsRunning)
-            return;
-
         IsRunning = true;
         Result = null;
 
diff --git a/Source/NETworkManager/ViewModels/IPApiIPGeolocationWidgetViewModel.cs b/Source/NETworkManager/ViewModels/IPApiIPGeolocationWidgetViewModel.cs
index 5074cc6968..5fba710d19 100644
--- a/Source/NETworkManager/ViewModels/IPApiIPGeolocationWidgetViewModel.cs
+++ b/Source/NETworkManager/ViewModels/IPApiIPGeolocationWidgetViewModel.cs
@@ -72,17 +72,9 @@ private void LoadSettings()
     #region ICommands & Actions
 
     /// <summary>
-    /// Gets the command to check via hotkey.
+    /// Gets the command to check the IP geolocation.
     /// </summary>
-    public ICommand CheckViaHotkeyCommand => new RelayCommand(_ => CheckViaHotkeyAction());
-
-    /// <summary>
-    /// Action to check via hotkey.
-    /// </summary>
-    private void CheckViaHotkeyAction()
-    {
-        Check();
-    }
+    public ICommand CheckCommand => new RelayCommand(_ => Check(), _ => !IsRunning);
 
     #endregion
 
@@ -105,10 +97,6 @@ private async Task CheckAsync()
         if (!SettingsManager.Current.Dashboard_CheckIPApiIPGeolocation)
             return;
 
-        // Don't check multiple times if already running
-        if (IsRunning)
-            return;
-
         IsRunning = true;
         Result = null;
 
diff --git a/Source/NETworkManager/ViewModels/NetworkConnectionWidgetViewModel.cs b/Source/NETworkManager/ViewModels/NetworkConnectionWidgetViewModel.cs
index ff121d3691..155d2f7432 100644
--- a/Source/NETworkManager/ViewModels/NetworkConnectionWidgetViewModel.cs
+++ b/Source/NETworkManager/ViewModels/NetworkConnectionWidgetViewModel.cs
@@ -476,6 +476,22 @@ private set
     /// </summary>
     public bool CheckPublicIPAddressEnabled => SettingsManager.Current.Dashboard_CheckPublicIPAddress;
 
+    /// <summary>
+    /// Gets or sets a value indicating whether a check is currently running.
+    /// </summary>
+    public bool IsChecking
+    {
+        get;
+        private set
+        {
+            if (value == field)
+                return;
+
+            field = value;
+            OnPropertyChanged();
+        }
+    }
+
     #endregion
 
     #region Constructor, load settings
@@ -500,17 +516,9 @@ private void LoadSettings()
     #region ICommands & Actions
 
     /// <summary>
-    /// Gets the command to check connections via hotkey.
-    /// </summary>
-    public ICommand CheckViaHotkeyCommand => new RelayCommand(_ => CheckViaHotkeyAction());
-
-    /// <summary>
-    /// Executes the check via hotkey action.
+    /// Gets the command to check connections.
     /// </summary>
-    private void CheckViaHotkeyAction()
-    {
-        Check();
-    }
+    public ICommand CheckCommand => new RelayCommand(_ => Check());
 
     #endregion
 
@@ -564,6 +572,8 @@ private async Task CheckAsync()
         _cancellationTokenSource = new CancellationTokenSource();
         var wasCanceled = false;
 
+        IsChecking = true;
+
         try
         {
             _checkTask = RunTask(_cancellationTokenSource.Token);
@@ -576,6 +586,8 @@ private async Task CheckAsync()
         }
         finally
         {
+            IsChecking = false;
+
             if (!wasCanceled)
                 Log.Info("Network connection check completed.");
         }
diff --git a/Source/NETworkManager/Views/DashboardView.xaml.cs b/Source/NETworkManager/Views/DashboardView.xaml.cs
index e36726f392..3837ea111d 100644
--- a/Source/NETworkManager/Views/DashboardView.xaml.cs
+++ b/Source/NETworkManager/Views/DashboardView.xaml.cs
@@ -24,29 +24,21 @@ public DashboardView()
         ContentControlSpeedTest.Content = _speedTestWidgetView;
 
         // Check all widgets
-        Check();
+        _networkConnectionWidgetView.Check();
+        _ipApiIPGeolocationWidgetView.Check();
+        _ipApiDNSResolverWidgetView.Check();
     }
 
     public void OnViewVisible()
     {
         _viewModel.OnViewVisible();
 
-        // Check all widgets
-        Check();
+        // Check network connection
+        _networkConnectionWidgetView.Check();
     }
 
     public void OnViewHide()
     {
         _viewModel.OnViewHide();
     }
-
-    /// <summary>
-    /// Check all widgets
-    /// </summary>
-    private void Check()
-    {
-        _networkConnectionWidgetView.Check();
-        _ipApiIPGeolocationWidgetView.Check();
-        _ipApiDNSResolverWidgetView.Check();
-    }
-}
\ No newline at end of file
+}
diff --git a/Source/NETworkManager/Views/IPApiDNSResolverWidgetView.xaml b/Source/NETworkManager/Views/IPApiDNSResolverWidgetView.xaml
index 7c832ac7e3..5351ec8ae8 100644
--- a/Source/NETworkManager/Views/IPApiDNSResolverWidgetView.xaml
+++ b/Source/NETworkManager/Views/IPApiDNSResolverWidgetView.xaml
@@ -10,10 +10,11 @@
              xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
              xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
              xmlns:system="clr-namespace:System;assembly=mscorlib"
+             xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              mc:Ignorable="d" MinHeight="200"
              d:DataContext="{d:DesignInstance viewModels:IPApiDNSResolverWidgetViewModel}">
     <UserControl.InputBindings>
-        <KeyBinding Key="F5" Command="{Binding CheckViaHotkeyCommand}" />
+        <KeyBinding Key="F5" Command="{Binding CheckCommand}" />
     </UserControl.InputBindings>
     <UserControl.Resources>
         <converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
@@ -37,15 +38,42 @@
                     <RowDefinition Height="Auto" />                    
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-                <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10">
-                    <Rectangle Width="32" Height="32" Fill="{DynamicResource MahApps.Brushes.Gray3}">
-                        <Rectangle.OpacityMask>
-                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=SearchWeb}" />
-                        </Rectangle.OpacityMask>
-                    </Rectangle>
-                    <TextBlock Text="{x:Static localization:Strings.DNSResolver}"
-                               Style="{StaticResource MessageTextBlock}" Margin="10,0,0,0" />
-                </StackPanel>
+                <Grid Grid.Row="0" Margin="10">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
+                        <Rectangle Width="32" Height="32" Fill="{DynamicResource MahApps.Brushes.Gray3}">
+                            <Rectangle.OpacityMask>
+                                <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=SearchWeb}" />
+                            </Rectangle.OpacityMask>
+                        </Rectangle>
+                        <TextBlock Text="{x:Static localization:Strings.DNSResolver}"
+                                   Style="{StaticResource MessageTextBlock}" Margin="10,0,0,0" />
+                    </StackPanel>
+                    <Button Grid.Column="2" Command="{Binding CheckCommand}"
+                            Style="{StaticResource CleanButton}"
+                            VerticalAlignment="Center">
+                        <Rectangle Width="20" Height="20"
+                                   wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsRunning}">
+                            <Rectangle.OpacityMask>
+                                <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Refresh}" />
+                            </Rectangle.OpacityMask>
+                            <Rectangle.Style>
+                                <Style TargetType="{x:Type Rectangle}">
+                                    <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                            <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Rectangle.Style>
+                        </Rectangle>
+                    </Button>
+                </Grid>
                 <Grid Grid.Column="0" Grid.Row="2" Margin="10"
                       Visibility="{Binding Source={x:Static Member=settings:SettingsManager.Current}, Path=Dashboard_CheckIPApiDNSResolver, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}">
                     <!-- Result-->
diff --git a/Source/NETworkManager/Views/IPApiIPGeolocationWidgetView.xaml b/Source/NETworkManager/Views/IPApiIPGeolocationWidgetView.xaml
index 86173f75d7..9d908ad2e3 100644
--- a/Source/NETworkManager/Views/IPApiIPGeolocationWidgetView.xaml
+++ b/Source/NETworkManager/Views/IPApiIPGeolocationWidgetView.xaml
@@ -10,10 +10,11 @@
              xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
              xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
              xmlns:system="clr-namespace:System;assembly=mscorlib"
+             xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              mc:Ignorable="d" MinHeight="200"
              d:DataContext="{d:DesignInstance viewModels:IPApiIPGeolocationWidgetViewModel}">
     <UserControl.InputBindings>
-        <KeyBinding Key="F5" Command="{Binding CheckViaHotkeyCommand}" />
+        <KeyBinding Key="F5" Command="{Binding CheckCommand}" />
     </UserControl.InputBindings>
     <UserControl.Resources>
         <converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
@@ -40,15 +41,42 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-                <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10">
-                    <Rectangle Width="32" Height="32" Fill="{DynamicResource MahApps.Brushes.Gray3}">
-                        <Rectangle.OpacityMask>
-                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=MapMarkerOutline}" />
-                        </Rectangle.OpacityMask>
-                    </Rectangle>
-                    <TextBlock Text="{x:Static localization:Strings.IPGeolocation}"
-                               Style="{StaticResource MessageTextBlock}" Margin="10,0,0,0" />
-                </StackPanel>
+                <Grid Grid.Row="0" Margin="10">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
+                        <Rectangle Width="32" Height="32" Fill="{DynamicResource MahApps.Brushes.Gray3}">
+                            <Rectangle.OpacityMask>
+                                <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=MapMarkerOutline}" />
+                            </Rectangle.OpacityMask>
+                        </Rectangle>
+                        <TextBlock Text="{x:Static localization:Strings.IPGeolocation}"
+                                   Style="{StaticResource MessageTextBlock}" Margin="10,0,0,0" />
+                    </StackPanel>
+                    <Button Grid.Column="2" Command="{Binding CheckCommand}"
+                            Style="{StaticResource CleanButton}"
+                            VerticalAlignment="Center">
+                        <Rectangle Width="20" Height="20"
+                                   wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsRunning}">
+                            <Rectangle.OpacityMask>
+                                <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Refresh}" />
+                            </Rectangle.OpacityMask>
+                            <Rectangle.Style>
+                                <Style TargetType="{x:Type Rectangle}">
+                                    <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                            <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Rectangle.Style>
+                        </Rectangle>
+                    </Button>
+                </Grid>
                 <Grid Grid.Column="0" Grid.Row="2" Margin="10"
                       Visibility="{Binding Source={x:Static Member=settings:SettingsManager.Current}, Path=Dashboard_CheckIPApiIPGeolocation, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}">
                     <!-- Result -->
diff --git a/Source/NETworkManager/Views/NetworkConnectionWidgetView.xaml b/Source/NETworkManager/Views/NetworkConnectionWidgetView.xaml
index 0838b5e8a3..78d87bf98b 100644
--- a/Source/NETworkManager/Views/NetworkConnectionWidgetView.xaml
+++ b/Source/NETworkManager/Views/NetworkConnectionWidgetView.xaml
@@ -8,10 +8,11 @@
              xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
+             xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              mc:Ignorable="d"
              d:DataContext="{d:DesignInstance viewModels:NetworkConnectionWidgetViewModel}">
     <UserControl.InputBindings>
-        <KeyBinding Key="F5" Command="{Binding CheckViaHotkeyCommand}" />
+        <KeyBinding Key="F5" Command="{Binding CheckCommand}" />
     </UserControl.InputBindings>
     <UserControl.Resources>
         <converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
@@ -20,8 +21,8 @@
     </UserControl.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*" />            
-            <ColumnDefinition Width="1*" />            
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="1*" />
             <ColumnDefinition Width="1*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
@@ -167,15 +168,42 @@
                         <RowDefinition Height="Auto" />                        
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
-                    <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10">
-                        <Rectangle Width="32" Height="32" Fill="{DynamicResource MahApps.Brushes.Gray3}">
-                            <Rectangle.OpacityMask>
-                                <VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Globe}" />
-                            </Rectangle.OpacityMask>
-                        </Rectangle>
-                        <TextBlock Text="{x:Static localization:Strings.Internet}"
-                                   Style="{StaticResource MessageTextBlock}" Margin="10,0,0,0" />
-                    </StackPanel>
+                    <Grid Grid.Row="0" Margin="10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
+                            <Rectangle Width="32" Height="32" Fill="{DynamicResource MahApps.Brushes.Gray3}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Globe}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                            <TextBlock Text="{x:Static localization:Strings.Internet}"
+                                       Style="{StaticResource MessageTextBlock}" Margin="10,0,0,0" />
+                        </StackPanel>
+                        <Button Grid.Column="2" Command="{Binding CheckCommand}"
+                                Style="{StaticResource CleanButton}"
+                                VerticalAlignment="Center">
+                            <Rectangle Width="20" Height="20"
+                                       wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsChecking}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Refresh}" />
+                                </Rectangle.OpacityMask>
+                                <Rectangle.Style>
+                                    <Style TargetType="{x:Type Rectangle}">
+                                        <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                                <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray5}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Rectangle.Style>
+                            </Rectangle>
+                        </Button>
+                    </Grid>
                     <Grid Grid.Row="1" HorizontalAlignment="Left" Margin="10"
                           Visibility="{Binding CheckPublicIPAddressEnabled, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                         <Grid.ColumnDefinitions>

From 4c24bdb32dfbf439f5ac80bd1887694c24da0416 Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Mon, 25 May 2026 17:50:11 +0200
Subject: [PATCH 2/4] Chore: Copilot feedback

---
 .../ViewModels/IPApiDNSResolverWidgetViewModel.cs          | 7 ++++---
 .../ViewModels/IPApiIPGeolocationWidgetViewModel.cs        | 3 ++-
 .../ViewModels/NetworkConnectionWidgetViewModel.cs         | 2 ++
 Source/NETworkManager/Views/DashboardView.xaml.cs          | 5 -----
 .../Views/IPApiDNSResolverWidgetView.xaml.cs               | 5 +----
 .../Views/IPApiIPGeolocationWidgetView.xaml.cs             | 4 ----
 Website/docs/changelog/next-release.md                     | 1 +
 7 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Source/NETworkManager/ViewModels/IPApiDNSResolverWidgetViewModel.cs b/Source/NETworkManager/ViewModels/IPApiDNSResolverWidgetViewModel.cs
index d37881d367..e04b17a819 100644
--- a/Source/NETworkManager/ViewModels/IPApiDNSResolverWidgetViewModel.cs
+++ b/Source/NETworkManager/ViewModels/IPApiDNSResolverWidgetViewModel.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using System.Windows.Input;
 using NETworkManager.Models.IPApi;
 using NETworkManager.Settings;
@@ -55,6 +55,7 @@ private set
     public IPApiDNSResolverWidgetViewModel()
     {
         LoadSettings();
+        Check();
     }
 
     /// <summary>
@@ -81,7 +82,7 @@ private void LoadSettings()
     /// <summary>
     /// Checks the DNS resolver.
     /// </summary>
-    public void Check()
+    private void Check()
     {
         _ = CheckAsync();
     }
@@ -98,7 +99,7 @@ private async Task CheckAsync()
         IsRunning = true;
         Result = null;
 
-        // Make the user happy, let him see a reload animation (and he cannot spam the reload command)        
+        // Make the user happy, let him see a reload animation (and he cannot spam the reload command)
         await Task.Delay(GlobalStaticConfiguration.ApplicationUIRefreshInterval);
 
         Result = await DNSResolverService.GetInstance().GetDNSResolverAsync();
diff --git a/Source/NETworkManager/ViewModels/IPApiIPGeolocationWidgetViewModel.cs b/Source/NETworkManager/ViewModels/IPApiIPGeolocationWidgetViewModel.cs
index 5fba710d19..201395dded 100644
--- a/Source/NETworkManager/ViewModels/IPApiIPGeolocationWidgetViewModel.cs
+++ b/Source/NETworkManager/ViewModels/IPApiIPGeolocationWidgetViewModel.cs
@@ -58,6 +58,7 @@ private set
     public IPApiIPGeolocationWidgetViewModel()
     {
         LoadSettings();
+        Check();
     }
 
     /// <summary>
@@ -83,7 +84,7 @@ private void LoadSettings()
     /// <summary>
     /// Checks the IP geolocation.
     /// </summary>
-    public void Check()
+    private void Check()
     {
         _ = CheckAsync();
     }
diff --git a/Source/NETworkManager/ViewModels/NetworkConnectionWidgetViewModel.cs b/Source/NETworkManager/ViewModels/NetworkConnectionWidgetViewModel.cs
index 155d2f7432..db05c7d8e1 100644
--- a/Source/NETworkManager/ViewModels/NetworkConnectionWidgetViewModel.cs
+++ b/Source/NETworkManager/ViewModels/NetworkConnectionWidgetViewModel.cs
@@ -502,6 +502,7 @@ private set
     public NetworkConnectionWidgetViewModel()
     {
         LoadSettings();
+        Check();
     }
 
     /// <summary>
@@ -587,6 +588,7 @@ private async Task CheckAsync()
         finally
         {
             IsChecking = false;
+            _cancellationTokenSource.Dispose();
 
             if (!wasCanceled)
                 Log.Info("Network connection check completed.");
diff --git a/Source/NETworkManager/Views/DashboardView.xaml.cs b/Source/NETworkManager/Views/DashboardView.xaml.cs
index 3837ea111d..0fb44cf056 100644
--- a/Source/NETworkManager/Views/DashboardView.xaml.cs
+++ b/Source/NETworkManager/Views/DashboardView.xaml.cs
@@ -22,11 +22,6 @@ public DashboardView()
         ContentControlIPApiIPGeolocation.Content = _ipApiIPGeolocationWidgetView;
         ContentControlIPApiDNSResolver.Content = _ipApiDNSResolverWidgetView;
         ContentControlSpeedTest.Content = _speedTestWidgetView;
-
-        // Check all widgets
-        _networkConnectionWidgetView.Check();
-        _ipApiIPGeolocationWidgetView.Check();
-        _ipApiDNSResolverWidgetView.Check();
     }
 
     public void OnViewVisible()
diff --git a/Source/NETworkManager/Views/IPApiDNSResolverWidgetView.xaml.cs b/Source/NETworkManager/Views/IPApiDNSResolverWidgetView.xaml.cs
index 3f6965507d..ed93bf424d 100644
--- a/Source/NETworkManager/Views/IPApiDNSResolverWidgetView.xaml.cs
+++ b/Source/NETworkManager/Views/IPApiDNSResolverWidgetView.xaml.cs
@@ -1,3 +1,4 @@
+
 using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views;
@@ -12,8 +13,4 @@ public IPApiDNSResolverWidgetView()
         DataContext = _viewModel;
     }
 
-    public void Check()
-    {
-        _viewModel.Check();
-    }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/IPApiIPGeolocationWidgetView.xaml.cs b/Source/NETworkManager/Views/IPApiIPGeolocationWidgetView.xaml.cs
index 54e004404a..2e6224f830 100644
--- a/Source/NETworkManager/Views/IPApiIPGeolocationWidgetView.xaml.cs
+++ b/Source/NETworkManager/Views/IPApiIPGeolocationWidgetView.xaml.cs
@@ -12,8 +12,4 @@ public IPApiIPGeolocationWidgetView()
         DataContext = _viewModel;
     }
 
-    public void Check()
-    {
-        _viewModel.Check();
-    }
 }
\ No newline at end of file
diff --git a/Website/docs/changelog/next-release.md b/Website/docs/changelog/next-release.md
index 480ee60f48..ace0c46d11 100644
--- a/Website/docs/changelog/next-release.md
+++ b/Website/docs/changelog/next-release.md
@@ -67,6 +67,7 @@ Release date: **xx.xx.2025**
 
 **Dashboard**
 
+- Added a **Refresh** button (with animated feedback) to the **Network Connection**, **IP Geolocation**, and **DNS Resolver** widgets. The global reload button in the Status Window has been removed, as each widget now has its own. [#3447](https://github.com/BornToBeRoot/NETworkManager/pull/3447)
 - Redesign Status Window to make it more compact. [#3359](https://github.com/BornToBeRoot/NETworkManager/pull/3359)
 
 **Network Interface**

From 9e3069e52db9328be641b53339859a5b26cf955b Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Mon, 25 May 2026 18:06:00 +0200
Subject: [PATCH 3/4] Chore: Add tooltip

---
 Source/NETworkManager/Views/IPApiDNSResolverWidgetView.xaml   | 1 +
 Source/NETworkManager/Views/IPApiIPGeolocationWidgetView.xaml | 1 +
 Source/NETworkManager/Views/NetworkConnectionWidgetView.xaml  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/Source/NETworkManager/Views/IPApiDNSResolverWidgetView.xaml b/Source/NETworkManager/Views/IPApiDNSResolverWidgetView.xaml
index 5351ec8ae8..4f1b3d7b1c 100644
--- a/Source/NETworkManager/Views/IPApiDNSResolverWidgetView.xaml
+++ b/Source/NETworkManager/Views/IPApiDNSResolverWidgetView.xaml
@@ -55,6 +55,7 @@
                     </StackPanel>
                     <Button Grid.Column="2" Command="{Binding CheckCommand}"
                             Style="{StaticResource CleanButton}"
+                            ToolTip="{x:Static localization:Strings.Refresh}"
                             VerticalAlignment="Center">
                         <Rectangle Width="20" Height="20"
                                    wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsRunning}">
diff --git a/Source/NETworkManager/Views/IPApiIPGeolocationWidgetView.xaml b/Source/NETworkManager/Views/IPApiIPGeolocationWidgetView.xaml
index 9d908ad2e3..342b6370a9 100644
--- a/Source/NETworkManager/Views/IPApiIPGeolocationWidgetView.xaml
+++ b/Source/NETworkManager/Views/IPApiIPGeolocationWidgetView.xaml
@@ -58,6 +58,7 @@
                     </StackPanel>
                     <Button Grid.Column="2" Command="{Binding CheckCommand}"
                             Style="{StaticResource CleanButton}"
+                            ToolTip="{x:Static localization:Strings.Refresh}"
                             VerticalAlignment="Center">
                         <Rectangle Width="20" Height="20"
                                    wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsRunning}">
diff --git a/Source/NETworkManager/Views/NetworkConnectionWidgetView.xaml b/Source/NETworkManager/Views/NetworkConnectionWidgetView.xaml
index 78d87bf98b..3e3764e1a6 100644
--- a/Source/NETworkManager/Views/NetworkConnectionWidgetView.xaml
+++ b/Source/NETworkManager/Views/NetworkConnectionWidgetView.xaml
@@ -185,6 +185,7 @@
                         </StackPanel>
                         <Button Grid.Column="2" Command="{Binding CheckCommand}"
                                 Style="{StaticResource CleanButton}"
+                                ToolTip="{x:Static localization:Strings.Refresh}"
                                 VerticalAlignment="Center">
                             <Rectangle Width="20" Height="20"
                                        wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsChecking}">

From 527370fca2401d520e386be664d585ac32860038 Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Mon, 25 May 2026 18:13:05 +0200
Subject: [PATCH 4/4] Chore: Add tooltips

---
 Source/NETworkManager/Views/ConnectionsView.xaml      | 1 +
 Source/NETworkManager/Views/FirewallView.xaml         | 1 +
 Source/NETworkManager/Views/HostsFileEditorView.xaml  | 1 +
 Source/NETworkManager/Views/ListenersView.xaml        | 1 +
 Source/NETworkManager/Views/NeighborTableView.xaml    | 1 +
 Source/NETworkManager/Views/NetworkInterfaceView.xaml | 3 +++
 Source/NETworkManager/Views/WiFiView.xaml             | 4 +++-
 7 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Source/NETworkManager/Views/ConnectionsView.xaml b/Source/NETworkManager/Views/ConnectionsView.xaml
index 3374a8925e..4a4dae26a8 100644
--- a/Source/NETworkManager/Views/ConnectionsView.xaml
+++ b/Source/NETworkManager/Views/ConnectionsView.xaml
@@ -67,6 +67,7 @@
                         </ComboBox>
                         <Button Command="{Binding Path=RefreshCommand}"
                                 Style="{StaticResource CleanButton}"
+                                ToolTip="{x:Static localization:Strings.Refresh}"
                                 Margin="0,0,10,0">
                             <Rectangle Width="16" Height="16"
                                        wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
diff --git a/Source/NETworkManager/Views/FirewallView.xaml b/Source/NETworkManager/Views/FirewallView.xaml
index b708076dcf..73b3bf6ce8 100644
--- a/Source/NETworkManager/Views/FirewallView.xaml
+++ b/Source/NETworkManager/Views/FirewallView.xaml
@@ -57,6 +57,7 @@
                                     HorizontalAlignment="Right">
                             <Button Command="{Binding Path=RefreshCommand}"
                                     Style="{StaticResource CleanButton}"
+                                    ToolTip="{x:Static localization:Strings.Refresh}"
                                     Margin="0,0,10,0">
                                 <Rectangle Width="16" Height="16"
                                            wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
diff --git a/Source/NETworkManager/Views/HostsFileEditorView.xaml b/Source/NETworkManager/Views/HostsFileEditorView.xaml
index d4e176e76d..dc12172802 100644
--- a/Source/NETworkManager/Views/HostsFileEditorView.xaml
+++ b/Source/NETworkManager/Views/HostsFileEditorView.xaml
@@ -51,6 +51,7 @@
                                 HorizontalAlignment="Right">
                         <Button Command="{Binding Path=RefreshCommand}"
                                 Style="{StaticResource CleanButton}"
+                                ToolTip="{x:Static localization:Strings.Refresh}"
                                 Margin="0,0,10,0">
                             <Rectangle Width="16" Height="16"
                                        wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
diff --git a/Source/NETworkManager/Views/ListenersView.xaml b/Source/NETworkManager/Views/ListenersView.xaml
index e78ab668e2..d23d72d268 100644
--- a/Source/NETworkManager/Views/ListenersView.xaml
+++ b/Source/NETworkManager/Views/ListenersView.xaml
@@ -66,6 +66,7 @@
                         </ComboBox>
                         <Button Command="{Binding Path=RefreshCommand}"
                                 Style="{StaticResource CleanButton}"
+                                ToolTip="{x:Static localization:Strings.Refresh}"
                                 Margin="0,0,10,0">
                             <Rectangle Width="16" Height="16"
                                        wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
diff --git a/Source/NETworkManager/Views/NeighborTableView.xaml b/Source/NETworkManager/Views/NeighborTableView.xaml
index df4217cc7d..9ddb014fee 100644
--- a/Source/NETworkManager/Views/NeighborTableView.xaml
+++ b/Source/NETworkManager/Views/NeighborTableView.xaml
@@ -76,6 +76,7 @@
                         </ComboBox>
                         <Button Command="{Binding Path=RefreshCommand}"
                                 Style="{StaticResource CleanButton}"
+                                ToolTip="{x:Static localization:Strings.Refresh}"
                                 Margin="0,0,10,0">
                             <Rectangle Width="16" Height="16"
                                        wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
diff --git a/Source/NETworkManager/Views/NetworkInterfaceView.xaml b/Source/NETworkManager/Views/NetworkInterfaceView.xaml
index 2230bcfebb..dac367acaa 100644
--- a/Source/NETworkManager/Views/NetworkInterfaceView.xaml
+++ b/Source/NETworkManager/Views/NetworkInterfaceView.xaml
@@ -161,6 +161,7 @@
                                         Height="{Binding ElementName=ComboBoxNetworkInterfaceProfiles, Path=ActualHeight}"
                                         Command="{Binding ReloadNetworkInterfacesCommand}"
                                         Style="{StaticResource CleanButton}"
+                                        ToolTip="{x:Static localization:Strings.Refresh}"
                                         IsEnabled="{Binding IsNetworkInterfaceLoading, Converter={StaticResource BooleanReverseConverter}}"
                                         Margin="10,0,0,0">
                                     <Rectangle Width="24" Height="24"
@@ -803,6 +804,7 @@
                                         Height="{Binding ElementName=ComboBoxNetworkInterfaceProfiles, Path=ActualHeight}"
                                         Command="{Binding ReloadNetworkInterfacesCommand}"
                                         Style="{StaticResource CleanButton}"
+                                        ToolTip="{x:Static localization:Strings.Refresh}"
                                         IsEnabled="{Binding IsNetworkInterfaceLoading, Converter={StaticResource BooleanReverseConverter}}"
                                         Margin="10,0,0,0">
                                     <Rectangle Width="24" Height="24"
@@ -1042,6 +1044,7 @@
                                             Height="{Binding ElementName=ComboBoxNetworkInterfaceProfiles, Path=ActualHeight}"
                                             Command="{Binding ReloadNetworkInterfacesCommand}"
                                             Style="{StaticResource CleanButton}"
+                                            ToolTip="{x:Static localization:Strings.Refresh}"
                                             IsEnabled="{Binding IsNetworkInterfaceLoading, Converter={StaticResource BooleanReverseConverter}}"
                                             Margin="10,0,0,0">
                                         <Rectangle Width="24" Height="24"
diff --git a/Source/NETworkManager/Views/WiFiView.xaml b/Source/NETworkManager/Views/WiFiView.xaml
index 12aa93c6de..2dc53728aa 100644
--- a/Source/NETworkManager/Views/WiFiView.xaml
+++ b/Source/NETworkManager/Views/WiFiView.xaml
@@ -169,6 +169,7 @@
                                                 Height="{Binding ElementName=ComboBoxAdapters, Path=ActualHeight}"
                                                 Command="{Binding Path=ReloadAdaptersCommand}"
                                                 Style="{StaticResource CleanButton}"
+                                                ToolTip="{x:Static localization:Strings.Refresh}"
                                                 Margin="10,0,0,0">
                                             <Rectangle Width="24" Height="24"
                                                        wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsAdaptersLoading}">
@@ -241,8 +242,9 @@
                                             </ComboBox>
                                             <Button Command="{Binding Path=ScanNetworksCommand}"
                                                     Style="{StaticResource CleanButton}"
+                                                    ToolTip="{x:Static localization:Strings.Refresh}"
                                                     Margin="0,0,10,0">
-                                                <Rectangle Width="24" Height="24"
+                                                <Rectangle Width="16" Height="16"
                                                            wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding Path=IsBackgroundSearchRunning}">
                                                     <Rectangle.OpacityMask>
                                                         <VisualBrush Stretch="Uniform"