diff --git a/Source/GlobalAssemblyInfo.cs b/Source/GlobalAssemblyInfo.cs
index ce0c39e606..4e5fde9f3b 100644
--- a/Source/GlobalAssemblyInfo.cs
+++ b/Source/GlobalAssemblyInfo.cs
@@ -6,5 +6,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("2026.5.24.0")]
-[assembly: AssemblyFileVersion("2026.5.24.0")]
+[assembly: AssemblyVersion("2026.5.30.0")]
+[assembly: AssemblyFileVersion("2026.5.30.0")]
diff --git a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
index 0ff7f753ea..08463b220d 100644
--- a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
+++ b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
@@ -1552,7 +1552,16 @@ public static string CapsLockIsEnabled {
                 return ResourceManager.GetString("CapsLockIsEnabled", resourceCulture);
             }
         }
-        
+
+        /// <summary>
+        ///   Looks up a localized string similar to Chart time (seconds).
+        /// </summary>
+        public static string ChartTimeInSeconds {
+            get {
+                return ResourceManager.GetString("ChartTimeInSeconds", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to Capture.
         /// </summary>
@@ -6237,7 +6246,16 @@ public static string Lime {
                 return ResourceManager.GetString("Lime", resourceCulture);
             }
         }
-        
+
+        /// <summary>
+        ///   Looks up a localized string similar to Live.
+        /// </summary>
+        public static string Live {
+            get {
+                return ResourceManager.GetString("Live", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to Listeners.
         /// </summary>
diff --git a/Source/NETworkManager.Localization/Resources/Strings.resx b/Source/NETworkManager.Localization/Resources/Strings.resx
index 4cb9414464..886495042e 100644
--- a/Source/NETworkManager.Localization/Resources/Strings.resx
+++ b/Source/NETworkManager.Localization/Resources/Strings.resx
@@ -735,6 +735,9 @@
   <data name="CapsLockIsEnabled" xml:space="preserve">
     <value>Caps lock is enabled!</value>
   </data>
+  <data name="ChartTimeInSeconds" xml:space="preserve">
+    <value>Chart time (seconds)</value>
+  </data>
   <data name="CheckForUpdatesAtStartup" xml:space="preserve">
     <value>Check for updates at startup</value>
   </data>
@@ -1513,6 +1516,9 @@ Profile files are not affected!</value>
   <data name="Lime" xml:space="preserve">
     <value>Lime</value>
   </data>
+  <data name="Live" xml:space="preserve">
+    <value>Live</value>
+  </data>
   <data name="Magenta" xml:space="preserve">
     <value>Magenta</value>
   </data>
diff --git a/Source/NETworkManager.Settings/GlobalStaticConfiguration.cs b/Source/NETworkManager.Settings/GlobalStaticConfiguration.cs
index ef48d365e8..30df1a5117 100644
--- a/Source/NETworkManager.Settings/GlobalStaticConfiguration.cs
+++ b/Source/NETworkManager.Settings/GlobalStaticConfiguration.cs
@@ -143,6 +143,7 @@ public static class GlobalStaticConfiguration
     public static int PingMonitor_TTL => 64;
     public static int PingMonitor_WaitTime => 1000;
     public static bool PingMonitor_ExpandHostView => false;
+    public static int PingMonitor_ChartTime => 120;
     public static ExportFileType PingMonitor_ExportFileType => ExportFileType.Csv;
 
     // Application: Traceroute
diff --git a/Source/NETworkManager.Settings/SettingsInfo.cs b/Source/NETworkManager.Settings/SettingsInfo.cs
index 1040e8dd83..09a73eccb0 100644
--- a/Source/NETworkManager.Settings/SettingsInfo.cs
+++ b/Source/NETworkManager.Settings/SettingsInfo.cs
@@ -1508,6 +1508,19 @@ public bool PingMonitor_ExpandHostView
         }
     } = GlobalStaticConfiguration.PingMonitor_ExpandHostView;
 
+    public int PingMonitor_ChartTime
+    {
+        get;
+        set
+        {
+            if (value == field)
+                return;
+
+            field = value;
+            OnPropertyChanged();
+        }
+    } = GlobalStaticConfiguration.PingMonitor_ChartTime;
+
     public string PingMonitor_ExportFilePath
     {
         get;
diff --git a/Source/NETworkManager/Resources/ContextMenu/ContextMenu.xaml b/Source/NETworkManager/Resources/ContextMenu/ContextMenu.xaml
index 97a0728e5a..096157919f 100644
--- a/Source/NETworkManager/Resources/ContextMenu/ContextMenu.xaml
+++ b/Source/NETworkManager/Resources/ContextMenu/ContextMenu.xaml
@@ -88,7 +88,7 @@
                         </Style>
                     </Rectangle.Style>
                     <Rectangle.OpacityMask>
-                        <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                        <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                     </Rectangle.OpacityMask>
                 </Rectangle>
             </MenuItem.Icon>
diff --git a/Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml b/Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml
index 491389b5a4..5d9a6e02ae 100644
--- a/Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml
+++ b/Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml
@@ -75,6 +75,74 @@
                 Value="{DynamicResource ResourceKey=ExpanderDownHeader}" />
     </Style>
 
+    <!-- Header style for bordered expanders (e.g. the ping monitor host): adds a small
+         left margin so the chevron does not sit flush against the visible border. -->
+    <Style x:Key="PingMonitorExpanderDownHeader"
+           BasedOn="{StaticResource ResourceKey=MahApps.Styles.ToggleButton.ExpanderHeader.Down}"
+           TargetType="{x:Type TypeName=ToggleButton}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TypeName=ToggleButton}">
+                    <Border Padding="{TemplateBinding Property=Padding}"
+                            Background="{TemplateBinding Property=Background}"
+                            BorderBrush="{TemplateBinding Property=BorderBrush}"
+                            BorderThickness="{TemplateBinding Property=BorderThickness}">
+                        <Grid Background="Transparent" SnapsToDevicePixels="False">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Rectangle Grid.Column="0" Grid.Row="0"
+                                       x:Name="Chevron"
+                                       Width="16" Height="16"
+                                       Margin="10,0,0,0"
+                                       Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}"
+                                       VerticalAlignment="Center">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ChevronUp}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                            <mahAppsControls:ContentControlEx Grid.Column="1"
+                                                              Margin="10,0,0,0"
+                                                              HorizontalAlignment="Stretch"
+                                                              Padding="{TemplateBinding Property=Padding}"
+                                                              HorizontalContentAlignment="{TemplateBinding Property=HorizontalContentAlignment}"
+                                                              VerticalContentAlignment="{TemplateBinding Property=VerticalContentAlignment}"
+                                                              Content="{TemplateBinding Property=Content}"
+                                                              ContentCharacterCasing="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(mahAppsControls:ControlsHelper.ContentCharacterCasing)}"
+                                                              ContentStringFormat="{TemplateBinding Property=ContentStringFormat}"
+                                                              ContentTemplate="{TemplateBinding Property=ContentTemplate}"
+                                                              ContentTemplateSelector="{TemplateBinding Property=ContentTemplateSelector}"
+                                                              RecognizesAccessKey="True"
+                                                              SnapsToDevicePixels="{TemplateBinding Property=SnapsToDevicePixels}" />
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="Chevron" Property="OpacityMask">
+                                <Setter.Value>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ChevronDown}" />
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Chevron" Property="Fill"
+                                    Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray5}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Expander variant for the ping monitor host (bordered) using the indented header. -->
+    <Style x:Key="PingMonitorExpander"
+           TargetType="{x:Type TypeName=Expander}"
+           BasedOn="{StaticResource ResourceKey=DefaultExpander}">
+        <Setter Property="mahAppsControls:ExpanderHelper.HeaderDownStyle"
+                Value="{DynamicResource ResourceKey=PingMonitorExpanderDownHeader}" />
+    </Style>
+
     <Style x:Key="ProfileExpanderOpen"
            BasedOn="{StaticResource ResourceKey=MahApps.Styles.ToggleButton.ExpanderHeader.Down}"
            TargetType="{x:Type TypeName=ToggleButton}">
diff --git a/Source/NETworkManager/ViewModels/PingMonitorHostViewModel.cs b/Source/NETworkManager/ViewModels/PingMonitorHostViewModel.cs
index 70960638a0..1812017762 100644
--- a/Source/NETworkManager/ViewModels/PingMonitorHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PingMonitorHostViewModel.cs
@@ -144,22 +144,6 @@ public ObservableCollection<PingMonitorView> Hosts
     /// </summary>
     public ICollectionView HostsView { get; }
 
-    /// <summary>
-    ///     Gets or sets the selected host.
-    /// </summary>
-    public PingMonitorView SelectedHost
-    {
-        get;
-        set
-        {
-            if (value == field)
-                return;
-
-            field = value;
-            OnPropertyChanged();
-        }
-    }
-
     #region Profiles
 
     /// <summary>
@@ -461,16 +445,6 @@ private void CloseGroupAction(object group)
         RemoveGroup(group.ToString());
     }
 
-    /// <summary>
-    ///     Gets the command to export the selected host's data.
-    /// </summary>
-    public ICommand ExportCommand => new RelayCommand(_ => ExportAction());
-
-    private void ExportAction()
-    {
-        SelectedHost?.Export();
-    }
-
     /// <summary>
     ///     Gets the command to add a new profile.
     /// </summary>
@@ -698,6 +672,7 @@ private void RemoveGroup(string group)
                 continue;
 
             Hosts[i].Stop();
+            Hosts[i].Cleanup();
             Hosts.RemoveAt(i);
         }
     }
@@ -714,6 +689,7 @@ private void RemoveHostByGuid(Guid hostId)
             return;
 
         Hosts[i].Stop();
+        Hosts[i].Cleanup();
         Hosts.RemoveAt(i);
     }
 
diff --git a/Source/NETworkManager/ViewModels/PingMonitorSettingsViewModel.cs b/Source/NETworkManager/ViewModels/PingMonitorSettingsViewModel.cs
index 9e2d76f12c..462b907090 100644
--- a/Source/NETworkManager/ViewModels/PingMonitorSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PingMonitorSettingsViewModel.cs
@@ -125,6 +125,25 @@ public bool ExpandHostView
         }
     }
 
+    /// <summary>
+    /// Gets or sets the chart time window in seconds.
+    /// </summary>
+    public int ChartTime
+    {
+        get;
+        set
+        {
+            if (value == field)
+                return;
+
+            if (!_isLoading)
+                SettingsManager.Current.PingMonitor_ChartTime = value;
+
+            field = value;
+            OnPropertyChanged();
+        }
+    }
+
     #endregion
 
     #region Contructor, load settings
@@ -149,6 +168,7 @@ private void LoadSettings()
         DontFragment = SettingsManager.Current.PingMonitor_DontFragment;
         WaitTime = SettingsManager.Current.PingMonitor_WaitTime;
         ExpandHostView = SettingsManager.Current.PingMonitor_ExpandHostView;
+        ChartTime = SettingsManager.Current.PingMonitor_ChartTime;
     }
 
     #endregion
diff --git a/Source/NETworkManager/ViewModels/PingMonitorViewModel.cs b/Source/NETworkManager/ViewModels/PingMonitorViewModel.cs
index ada5083017..2558a171ea 100644
--- a/Source/NETworkManager/ViewModels/PingMonitorViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PingMonitorViewModel.cs
@@ -1,7 +1,6 @@
 using LiveChartsCore;
 using LiveChartsCore.Drawing;
 using LiveChartsCore.Kernel;
-using LiveChartsCore.Kernel.Sketches;
 using LiveChartsCore.SkiaSharpView;
 using LiveChartsCore.SkiaSharpView.Painting;
 using LiveChartsCore.SkiaSharpView.Painting.Effects;
@@ -58,6 +57,8 @@ public PingMonitorViewModel(Guid hostId, Action<Guid> removeHostByGuid,
         InitialTimeChart();
 
         ExpandHostView = SettingsManager.Current.PingMonitor_ExpandHostView;
+
+        SettingsManager.Current.PropertyChanged += SettingsManager_PropertyChanged;
     }
 
     #endregion
@@ -68,11 +69,12 @@ public PingMonitorViewModel(Guid hostId, Action<Guid> removeHostByGuid,
     private CancellationTokenSource _cancellationTokenSource;
     private int _maxPingValues;
     private int _sessionId;
+    private bool _updatingAxisFromCode;
 
     public readonly Guid HostId;
     private readonly Action<Guid> _removeHostByGuid;
 
-    private List<PingInfo> _pingInfoList;
+    private List<PingInfo> _pingInfoList = [];
 
     /// <summary>
     /// Gets the title of the monitor, typically "Hostname # IP".
@@ -293,7 +295,7 @@ private void InitialTimeChart()
                 Values = _pingValues,
                 Mapping = (info, _) => double.IsNaN(info.Value)
                     ? Coordinate.Empty
-                    : new(info.DateTime.Ticks / (double)TimeSpan.FromHours(1).Ticks, info.Value),
+                    : new((info.DateTime - _sessionStartTime).TotalSeconds, info.Value),
                 GeometrySize = 0,
                 LineSmoothness = 0.3,
                 DataPadding = new LvcPoint(0, 0),
@@ -306,9 +308,18 @@ private void InitialTimeChart()
         [
             new Axis
             {
-                LabelsPaint = null,
-                SeparatorsPaint = null,
-                Padding = new Padding(0)
+                Labeler = value => DateTimeHelper.DateTimeToTimeString(
+                    _sessionStartTime.AddSeconds(value)),
+                TextSize = 10,
+                Padding = new Padding(0, 4, 0, 0),
+                LabelsPaint = new SolidColorPaint(labelColor),
+                SeparatorsPaint = new SolidColorPaint(separatorColor)
+                {
+                    StrokeThickness = 1,
+                    PathEffect = new DashEffect([10f, 10f])
+                },
+                MinStep = SettingsManager.Current.PingMonitor_ChartTime / 4.0,
+                ForceStepToMin = true
             }
         ];
 
@@ -330,6 +341,25 @@ private void InitialTimeChart()
                 }
             }
         ];
+
+        PingXAxes[0].PropertyChanged += (_, args) =>
+        {
+            if (_updatingAxisFromCode)
+                return;
+
+            if (args.PropertyName is not (nameof(Axis.MinLimit) or nameof(Axis.MaxLimit)))
+                return;
+
+            IsLiveMode = false;
+
+            var axis = PingXAxes[0];
+            if (axis.MinLimit.HasValue && axis.MaxLimit.HasValue)
+            {
+                _updatingAxisFromCode = true;
+                axis.MinStep = (axis.MaxLimit.Value - axis.MinLimit.Value) / 4.0;
+                _updatingAxisFromCode = false;
+            }
+        };
     }
 
     /// <summary>
@@ -347,6 +377,22 @@ private void InitialTimeChart()
     /// </summary>
     public Axis[] PingYAxes { get; private set; }
 
+    /// <summary>
+    /// Gets or sets a value indicating whether the chart is in live (auto-scrolling) mode.
+    /// </summary>
+    public bool IsLiveMode
+    {
+        get;
+        private set
+        {
+            if (value == field)
+                return;
+
+            field = value;
+            OnPropertyChanged();
+        }
+    }
+
     /// <summary>
     /// Gets the error message if an error occurs.
     /// </summary>
@@ -425,6 +471,39 @@ private void CloseAction()
         _removeHostByGuid(HostId);
     }
 
+    /// <summary>
+    /// Gets the command to export the ping monitoring results of this host.
+    /// </summary>
+    public ICommand ExportCommand => new RelayCommand(_ => ExportAction());
+
+    private void ExportAction()
+    {
+        _ = Export();
+    }
+
+    /// <summary>
+    /// Gets the command to return the chart to live (auto-scrolling) mode.
+    /// </summary>
+    public ICommand GoLiveCommand => new RelayCommand(_ => GoLiveAction());
+
+    private void GoLiveAction()
+    {
+        IsLiveMode = true;
+
+        // Samples received while inspecting were not added to the chart, so rebuild the
+        // rolling buffer from the most recent history to resume at the current time.
+        var recent = _pingInfoList
+            .Skip(Math.Max(0, _pingInfoList.Count - _maxPingValues))
+            .Select(info => new LvlChartsDefaultInfo(
+                info.Timestamp, info.Status == IPStatus.Success ? info.Time : double.NaN));
+
+        _pingValues = new ObservableCollection<LvlChartsDefaultInfo>(recent);
+        ((LineSeries<LvlChartsDefaultInfo>)Series[0]).Values = _pingValues;
+
+        UpdateXAxisWindow(DateTime.Now);
+        UpdateYAxis();
+    }
+
     #endregion
 
     #region Methods
@@ -436,11 +515,14 @@ public void Start()
     {
         IsErrorMessageDisplayed = false;
         IsRunning = true;
+        IsLiveMode = true;
+
+        _sessionId++;
 
         // Reset history
         _pingInfoList = [];
 
-        // Reset the latest results            
+        // Reset the latest results
         StatusTime = DateTime.Now;
         Transmitted = 0;
         Received = 0;
@@ -448,14 +530,13 @@ public void Start()
         PacketLoss = 0;
 
         // Reset chart
-        _sessionId++;
+        _sessionStartTime = DateTime.Now;
         ResetTimeChart();
 
         _cancellationTokenSource?.Dispose();
         _cancellationTokenSource = new CancellationTokenSource();
 
-        // How many data points fit into the 60-second window at the configured interval.
-        _maxPingValues = (int)Math.Ceiling(60_000.0 / SettingsManager.Current.PingMonitor_WaitTime);
+        UpdateMaxPingValues();
 
         var ping = new Ping
         {
@@ -485,10 +566,7 @@ public void Stop()
         _cancellationTokenSource?.Cancel();
     }
 
-    /// <summary>
-    /// Resets the time chart with empty values.
-    /// </summary>
-    private static readonly double _hourTicks = (double)TimeSpan.FromHours(1).Ticks;
+    private DateTime _sessionStartTime;
 
     private void ResetTimeChart()
     {
@@ -501,9 +579,14 @@ private void ResetTimeChart()
 
     private void UpdateXAxisWindow(DateTime now)
     {
-        var axis = (Axis)PingXAxes[0];
-        axis.MinLimit = now.AddSeconds(-60).Ticks / _hourTicks;
-        axis.MaxLimit = now.Ticks / _hourTicks;
+        _updatingAxisFromCode = true;
+        var axis = PingXAxes[0];
+        var chartTime = SettingsManager.Current.PingMonitor_ChartTime;
+        var elapsed = (now - _sessionStartTime).TotalSeconds;
+        axis.MinStep = chartTime / 4.0;
+        axis.MinLimit = elapsed - chartTime;
+        axis.MaxLimit = elapsed;
+        _updatingAxisFromCode = false;
     }
 
     /// <summary>
@@ -599,10 +682,17 @@ private void Ping_PingReceived(object sender, PingReceivedArgs e)
         TimeMs = e.Args.Time;
 
         // Null exception may occur when the application is closing
-        var session = _sessionId;
+        var capturedSession = _sessionId;
         Application.Current?.Dispatcher.BeginInvoke(DispatcherPriority.Normal, () =>
         {
-            if (_sessionId != session) 
+            if (_sessionId != capturedSession)
+                return;
+
+            // While the user is inspecting the chart (zoomed/panned, i.e. not live), keep
+            // the chart frozen: ignore new samples here so the view does not move and the
+            // buffer does not grow. The sample is still recorded in the history below and
+            // becomes visible again when the user returns to live mode (see GoLiveAction).
+            if (!IsLiveMode)
                 return;
 
             _pingValues.Add(timeInfo);
@@ -610,17 +700,7 @@ private void Ping_PingReceived(object sender, PingReceivedArgs e)
                 _pingValues.RemoveAt(0);
 
             UpdateXAxisWindow(timeInfo.DateTime);
-
-            // Compute step from a 20% padded max, then set MaxLimit = step * 3 so the
-            // 4th label lands exactly on MaxLimit and is never cut off by rounding.
-            var maxVal = _pingValues.Where(p => !double.IsNaN(p.Value)).Select(p => p.Value).DefaultIfEmpty(0).Max();
-            if (maxVal > 0)
-            {
-                var yAxis = (Axis)PingYAxes[0];
-                var step = Math.Ceiling(maxVal * 1.2 / 3.0);
-                yAxis.MinStep = step;
-                yAxis.MaxLimit = step * 3;
-            }
+            UpdateYAxis();
         });
 
         // Add to history
@@ -664,5 +744,60 @@ private void Ping_PingException(object sender, PingExceptionArgs e)
         IsErrorMessageDisplayed = true;
     }
 
+    /// <summary>
+    /// Unsubscribes from global settings changes. Must be called when the host is removed,
+    /// so this transient view model is not kept alive by the long-lived settings singleton.
+    /// </summary>
+    public void Cleanup()
+    {
+        SettingsManager.Current.PropertyChanged -= SettingsManager_PropertyChanged;
+    }
+
+    private void SettingsManager_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+    {
+        switch (e.PropertyName)
+        {
+            case nameof(SettingsInfo.PingMonitor_ChartTime):
+                UpdateMaxPingValues();
+                if (IsRunning && IsLiveMode)
+                    UpdateXAxisWindow(DateTime.Now);
+                break;
+            case nameof(SettingsInfo.PingMonitor_WaitTime):
+                UpdateMaxPingValues();
+                break;
+        }
+    }
+
+    /// <summary>
+    /// Extra share of samples kept beyond the visible window so the chart has a little
+    /// off-screen history (smoother left edge while live + minor pan-back headroom).
+    /// </summary>
+    private const double PingValuesHeadroom = 1.1;
+
+    private void UpdateMaxPingValues()
+    {
+        var visibleValues = (double)SettingsManager.Current.PingMonitor_ChartTime * 1000 /
+                            SettingsManager.Current.PingMonitor_WaitTime;
+
+        _maxPingValues = (int)Math.Ceiling(visibleValues * PingValuesHeadroom);
+    }
+
+    /// <summary>
+    /// Rescales the Y axis to the current values. The step is derived from a 20% padded
+    /// max and MaxLimit is set to step * 3, so the 4th label lands exactly on MaxLimit and
+    /// is never cut off by rounding.
+    /// </summary>
+    private void UpdateYAxis()
+    {
+        var maxVal = _pingValues.Where(p => !double.IsNaN(p.Value)).Select(p => p.Value).DefaultIfEmpty(0).Max();
+        if (!(maxVal > 0))
+            return;
+
+        var yAxis = PingYAxes[0];
+        var step = Math.Ceiling(maxVal * 1.2 / 3.0);
+        yAxis.MinStep = step;
+        yAxis.MaxLimit = step * 3;
+    }
+
     #endregion
 }
diff --git a/Source/NETworkManager/Views/BitCalculatorView.xaml b/Source/NETworkManager/Views/BitCalculatorView.xaml
index 64b8dd501b..dec4c9bf93 100644
--- a/Source/NETworkManager/Views/BitCalculatorView.xaml
+++ b/Source/NETworkManager/Views/BitCalculatorView.xaml
@@ -204,7 +204,7 @@
                                 <Rectangle Grid.Column="0" Grid.Row="0"
                                            Style="{StaticResource ResourceKey=ButtonWithImageRectangle}">
                                     <Rectangle.OpacityMask>
-                                        <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                        <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                     </Rectangle.OpacityMask>
                                 </Rectangle>
                                 <TextBlock Grid.Column="1" Grid.Row="0"
diff --git a/Source/NETworkManager/Views/ConnectionsView.xaml b/Source/NETworkManager/Views/ConnectionsView.xaml
index 4a4dae26a8..016c459a7e 100644
--- a/Source/NETworkManager/Views/ConnectionsView.xaml
+++ b/Source/NETworkManager/Views/ConnectionsView.xaml
@@ -153,7 +153,7 @@
                                 <MenuItem.Icon>
                                     <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                         <Rectangle.OpacityMask>
-                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                         </Rectangle.OpacityMask>
                                     </Rectangle>
                                 </MenuItem.Icon>
@@ -165,7 +165,7 @@
                                 <MenuItem.Icon>
                                     <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                         <Rectangle.OpacityMask>
-                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                         </Rectangle.OpacityMask>
                                     </Rectangle>
                                 </MenuItem.Icon>
diff --git a/Source/NETworkManager/Views/DNSLookupView.xaml b/Source/NETworkManager/Views/DNSLookupView.xaml
index 450f7e4375..dc2ccd9028 100644
--- a/Source/NETworkManager/Views/DNSLookupView.xaml
+++ b/Source/NETworkManager/Views/DNSLookupView.xaml
@@ -183,7 +183,7 @@
                         <MenuItem.Icon>
                             <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
@@ -194,7 +194,7 @@
                         <MenuItem.Icon>
                             <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
diff --git a/Source/NETworkManager/Views/DiscoveryProtocolView.xaml b/Source/NETworkManager/Views/DiscoveryProtocolView.xaml
index ffe9eb0929..a2ba0928f2 100644
--- a/Source/NETworkManager/Views/DiscoveryProtocolView.xaml
+++ b/Source/NETworkManager/Views/DiscoveryProtocolView.xaml
@@ -217,7 +217,7 @@
                                                    Style="{StaticResource ResourceKey=ButtonWithImageRectangle}">
                                             <Rectangle.OpacityMask>
                                                 <VisualBrush Stretch="Uniform"
-                                                             Visual="{iconPacks:Material Kind=Export}" />
+                                                             Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                             </Rectangle.OpacityMask>
                                         </Rectangle>
                                         <TextBlock Grid.Column="1" Grid.Row="0"
diff --git a/Source/NETworkManager/Views/FirewallView.xaml b/Source/NETworkManager/Views/FirewallView.xaml
index 73b3bf6ce8..ef24b54ef4 100644
--- a/Source/NETworkManager/Views/FirewallView.xaml
+++ b/Source/NETworkManager/Views/FirewallView.xaml
@@ -200,7 +200,7 @@
                                     <MenuItem.Icon>
                                         <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                             <Rectangle.OpacityMask>
-                                                <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                                <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                             </Rectangle.OpacityMask>
                                         </Rectangle>
                                     </MenuItem.Icon>
@@ -212,7 +212,7 @@
                                     <MenuItem.Icon>
                                         <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                             <Rectangle.OpacityMask>
-                                                <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                                <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                             </Rectangle.OpacityMask>
                                         </Rectangle>
                                     </MenuItem.Icon>
diff --git a/Source/NETworkManager/Views/HostsFileEditorView.xaml b/Source/NETworkManager/Views/HostsFileEditorView.xaml
index dc12172802..d2adbbf654 100644
--- a/Source/NETworkManager/Views/HostsFileEditorView.xaml
+++ b/Source/NETworkManager/Views/HostsFileEditorView.xaml
@@ -161,7 +161,7 @@
                                     <Rectangle Width="16" Height="16"
                                                Fill="{DynamicResource ResourceKey= MahApps.Brushes.Gray3}">
                                         <Rectangle.OpacityMask>
-                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                         </Rectangle.OpacityMask>
                                     </Rectangle>
                                 </MenuItem.Icon>
@@ -173,7 +173,7 @@
                                 <MenuItem.Icon>
                                     <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                         <Rectangle.OpacityMask>
-                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                         </Rectangle.OpacityMask>
                                     </Rectangle>
                                 </MenuItem.Icon>
diff --git a/Source/NETworkManager/Views/IPGeolocationView.xaml b/Source/NETworkManager/Views/IPGeolocationView.xaml
index ea0f44c027..084305da81 100644
--- a/Source/NETworkManager/Views/IPGeolocationView.xaml
+++ b/Source/NETworkManager/Views/IPGeolocationView.xaml
@@ -299,7 +299,7 @@
                             <Rectangle Grid.Column="0" Grid.Row="0"
                                        Style="{StaticResource ResourceKey=ButtonWithImageRectangle}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                             <TextBlock Grid.Column="1" Grid.Row="0"
diff --git a/Source/NETworkManager/Views/IPScannerView.xaml b/Source/NETworkManager/Views/IPScannerView.xaml
index 0d7301ded9..c60cf86ed4 100644
--- a/Source/NETworkManager/Views/IPScannerView.xaml
+++ b/Source/NETworkManager/Views/IPScannerView.xaml
@@ -440,7 +440,7 @@
                         <MenuItem.Icon>
                             <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
@@ -451,7 +451,7 @@
                         <MenuItem.Icon>
                             <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
diff --git a/Source/NETworkManager/Views/ListenersView.xaml b/Source/NETworkManager/Views/ListenersView.xaml
index d23d72d268..558afb85af 100644
--- a/Source/NETworkManager/Views/ListenersView.xaml
+++ b/Source/NETworkManager/Views/ListenersView.xaml
@@ -124,7 +124,7 @@
                                 <MenuItem.Icon>
                                     <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                         <Rectangle.OpacityMask>
-                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                         </Rectangle.OpacityMask>
                                     </Rectangle>
                                 </MenuItem.Icon>
@@ -136,7 +136,7 @@
                                 <MenuItem.Icon>
                                     <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                         <Rectangle.OpacityMask>
-                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                         </Rectangle.OpacityMask>
                                     </Rectangle>
                                 </MenuItem.Icon>
diff --git a/Source/NETworkManager/Views/LookupOUILookupView.xaml b/Source/NETworkManager/Views/LookupOUILookupView.xaml
index 58684519fd..62f18f2d57 100644
--- a/Source/NETworkManager/Views/LookupOUILookupView.xaml
+++ b/Source/NETworkManager/Views/LookupOUILookupView.xaml
@@ -126,7 +126,7 @@
                         <MenuItem.Icon>
                             <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
@@ -137,7 +137,7 @@
                         <MenuItem.Icon>
                             <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
diff --git a/Source/NETworkManager/Views/LookupPortLookupView.xaml b/Source/NETworkManager/Views/LookupPortLookupView.xaml
index 229f4f6946..0f6ae97cb7 100644
--- a/Source/NETworkManager/Views/LookupPortLookupView.xaml
+++ b/Source/NETworkManager/Views/LookupPortLookupView.xaml
@@ -133,7 +133,7 @@
                         <MenuItem.Icon>
                             <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
@@ -144,7 +144,7 @@
                         <MenuItem.Icon>
                             <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
diff --git a/Source/NETworkManager/Views/NeighborTableView.xaml b/Source/NETworkManager/Views/NeighborTableView.xaml
index 9ddb014fee..d1abab3bbf 100644
--- a/Source/NETworkManager/Views/NeighborTableView.xaml
+++ b/Source/NETworkManager/Views/NeighborTableView.xaml
@@ -154,7 +154,7 @@
                                     <Rectangle Width="16" Height="16"
                                                Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}">
                                         <Rectangle.OpacityMask>
-                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                         </Rectangle.OpacityMask>
                                     </Rectangle>
                                 </MenuItem.Icon>
@@ -166,7 +166,7 @@
                                 <MenuItem.Icon>
                                     <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                         <Rectangle.OpacityMask>
-                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                         </Rectangle.OpacityMask>
                                     </Rectangle>
                                 </MenuItem.Icon>
diff --git a/Source/NETworkManager/Views/NetworkInterfaceView.xaml b/Source/NETworkManager/Views/NetworkInterfaceView.xaml
index dac367acaa..ffbddcdcc1 100644
--- a/Source/NETworkManager/Views/NetworkInterfaceView.xaml
+++ b/Source/NETworkManager/Views/NetworkInterfaceView.xaml
@@ -687,7 +687,7 @@
                                                    Style="{StaticResource ResourceKey=ButtonWithImageRectangle}">
                                             <Rectangle.OpacityMask>
                                                 <VisualBrush Stretch="Uniform"
-                                                             Visual="{iconPacks:Material Kind=Export}" />
+                                                             Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                             </Rectangle.OpacityMask>
                                         </Rectangle>
                                         <TextBlock Grid.Column="1" Grid.Row="0"
diff --git a/Source/NETworkManager/Views/PingMonitorHostView.xaml b/Source/NETworkManager/Views/PingMonitorHostView.xaml
index d56270c4bd..c850e14cd1 100644
--- a/Source/NETworkManager/Views/PingMonitorHostView.xaml
+++ b/Source/NETworkManager/Views/PingMonitorHostView.xaml
@@ -163,29 +163,10 @@
                     </Grid>
                     <ScrollViewer Grid.Column="0" Grid.Row="2"
                                   HorizontalScrollBarVisibility="Auto">
-                        <ListView ItemsSource="{Binding Path=HostsView}"
-                                  SelectedItem="{Binding Path=SelectedHost}"
+                        <ItemsControl ItemsSource="{Binding Path=HostsView}"
                                   Visibility="{Binding Path=Hosts.Count, Converter={StaticResource ResourceKey=IntNotZeroToVisibilityCollapsedConverter}}"
-                                  Background="Transparent"
-                                  BorderThickness="0"
-                                  SelectionMode="Single">
-                            <ListView.ContextMenu>
-                                <ContextMenu Opened="ContextMenu_Opened" MinWidth="150">
-                                    <MenuItem Header="{x:Static Member=localization:Strings.ExportDots}"
-                                              Command="{Binding Path=ExportCommand}">
-                                        <MenuItem.Icon>
-                                            <Rectangle Width="16" Height="16"
-                                                       Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}">
-                                                <Rectangle.OpacityMask>
-                                                    <VisualBrush Stretch="Uniform"
-                                                                 Visual="{iconPacks:Material Kind=Export}" />
-                                                </Rectangle.OpacityMask>
-                                            </Rectangle>
-                                        </MenuItem.Icon>
-                                    </MenuItem>
-                                </ContextMenu>
-                            </ListView.ContextMenu>
-                            <ListBox.GroupStyle>
+                                  Background="Transparent">
+                            <ItemsControl.GroupStyle>
                                 <GroupStyle>
                                     <GroupStyle.ContainerStyle>
                                         <Style TargetType="{x:Type TypeName=GroupItem}">
@@ -206,7 +187,7 @@
                                                                                Style="{DynamicResource ResourceKey=HeaderTextBlock}" />
                                                                     <Button Grid.Column="2" Grid.Row="0"
                                                                             HorizontalAlignment="Right"
-                                                                            Command="{Binding Path=DataContext.CloseGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TypeName=ListView}}}"
+                                                                            Command="{Binding Path=DataContext.CloseGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TypeName=ItemsControl}}}"
                                                                             CommandParameter="{Binding Path=(CollectionViewGroup.Name)}"
                                                                             Style="{StaticResource ResourceKey=CleanButton}"
                                                                             ToolTip="{x:Static Member=localization:Strings.CloseGroup}">
@@ -239,31 +220,13 @@
                                         </Style>
                                     </GroupStyle.ContainerStyle>
                                 </GroupStyle>
-                            </ListBox.GroupStyle>
-                            <ListView.ItemContainerStyle>
-                                <Style TargetType="{x:Type TypeName=ListViewItem}"
-                                       BasedOn="{StaticResource ResourceKey=MahApps.Styles.ListViewItem}">
-                                    <Setter Property="Margin" Value="0,0,0,10" />
-                                    <Setter Property="mah:ItemHelper.HoverBackgroundBrush" Value="Transparent" />
-                                    <Setter Property="mah:ItemHelper.HoverSelectedBackgroundBrush" Value="Transparent" />
-                                    <Setter Property="mah:ItemHelper.SelectedBackgroundBrush" Value="Transparent" />
-                                    <Setter Property="mah:ItemHelper.ActiveSelectionBackgroundBrush"
-                                            Value="Transparent" />
-                                </Style>
-                            </ListView.ItemContainerStyle>
-                            <!-- BUGFIX This has to be set, to enable mouse wheel scrolling -->
-                            <ListView.Template>
-                                <ControlTemplate>
-                                    <ItemsPresenter />
-                                </ControlTemplate>
-                            </ListView.Template>
-                            <ListView.ItemsPanel>
+                            </ItemsControl.GroupStyle>
+                            <ItemsControl.ItemsPanel>
                                 <ItemsPanelTemplate>
-                                    <VirtualizingStackPanel />
+                                    <StackPanel />
                                 </ItemsPanelTemplate>
-                            </ListView.ItemsPanel>
-                            <!-- /BUGFIX-->
-                        </ListView>
+                            </ItemsControl.ItemsPanel>
+                        </ItemsControl>
                     </ScrollViewer>
                     <TextBlock Grid.Column="0" Grid.Row="2"
                                Foreground="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}"
diff --git a/Source/NETworkManager/Views/PingMonitorSettingsView.xaml b/Source/NETworkManager/Views/PingMonitorSettingsView.xaml
index c1b16bbbf0..f14a3e4584 100644
--- a/Source/NETworkManager/Views/PingMonitorSettingsView.xaml
+++ b/Source/NETworkManager/Views/PingMonitorSettingsView.xaml
@@ -24,6 +24,9 @@
                    Style="{StaticResource CenterTextBlock}" Margin="0,0,0,10" />
         <mah:NumericUpDown Value="{Binding WaitTime}" Minimum="100" Maximum="15000" Interval="100" Margin="0,0,0,20" />
         <TextBlock Text="{x:Static localization:Strings.Appearance}" Style="{StaticResource HeaderTextBlock}" />
+        <TextBlock Text="{x:Static localization:Strings.ChartTimeInSeconds}" Style="{StaticResource CenterTextBlock}"
+                   Margin="0,0,0,10" />
+        <mah:NumericUpDown Value="{Binding ChartTime}" Minimum="30" Maximum="3600" Interval="30" Margin="0,0,0,10" />
         <mah:ToggleSwitch IsOn="{Binding ExpandHostView}" Header="{x:Static localization:Strings.ExpandHostView}" />
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/PingMonitorView.xaml b/Source/NETworkManager/Views/PingMonitorView.xaml
index c2e6e2686d..6639822c1a 100644
--- a/Source/NETworkManager/Views/PingMonitorView.xaml
+++ b/Source/NETworkManager/Views/PingMonitorView.xaml
@@ -14,10 +14,26 @@
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
         <converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
     </UserControl.Resources>
-    <Expander Style="{StaticResource DefaultExpander}"
+    <Expander Style="{StaticResource PingMonitorExpander}"
               IsExpanded="{Binding ExpandHostView}"
               BorderThickness="1,1,1,1"
-              BorderBrush="{DynamicResource MahApps.Brushes.Gray8}">
+              BorderBrush="{DynamicResource MahApps.Brushes.Gray8}"
+              Margin="0,0,0,10">
+        <Expander.ContextMenu>
+            <ContextMenu Style="{StaticResource DefaultContextMenu}" MinWidth="150">
+                <MenuItem Header="{x:Static localization:Strings.ExportDots}"
+                          Command="{Binding ExportCommand}">
+                    <MenuItem.Icon>
+                        <Rectangle Width="16" Height="16"
+                                   Fill="{DynamicResource MahApps.Brushes.Gray3}">
+                            <Rectangle.OpacityMask>
+                                <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
+                            </Rectangle.OpacityMask>
+                        </Rectangle>
+                    </MenuItem.Icon>
+                </MenuItem>
+            </ContextMenu>
+        </Expander.ContextMenu>
         <Expander.Header>
             <Grid Margin="0,0,10,0">
                 <Grid.ColumnDefinitions>
@@ -228,11 +244,53 @@
                                     YAxes="{Binding PingYAxes}"
                                     DrawMarginFrame="{x:Null}"
                                     EasingFunction="{x:Null}"
+                                    ZoomMode="PanX, ZoomX, NoFit"
+                                    ContextMenuOpening="Chart_ContextMenuOpening"
                                     RenderOptions.BitmapScalingMode="NearestNeighbor">
                     <lvc:CartesianChart.Tooltip>
                         <controls:LiveChartsPingTimeTooltip />
                     </lvc:CartesianChart.Tooltip>
                 </lvc:CartesianChart>
+                <Button HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        Margin="0,5,5,0"
+                        Command="{Binding GoLiveCommand}"
+                        Style="{StaticResource CleanButton}"
+                        Visibility="{Binding IsLiveMode, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
+                    <StackPanel Orientation="Horizontal">
+                        <Rectangle Width="16" Height="16"
+                                   VerticalAlignment="Center">
+                            <Rectangle.OpacityMask>
+                                <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=AccessPoint}" />
+                            </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>
+                        <TextBlock Margin="4,0,0,0"
+                                   Text="{x:Static localization:Strings.Live}"
+                                   FontSize="11"
+                                   VerticalAlignment="Center">
+                            <TextBlock.Style>
+                                <Style TargetType="{x:Type TextBlock}">
+                                    <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </TextBlock.Style>
+                        </TextBlock>
+                    </StackPanel>
+                </Button>
             </Grid>
         </Grid>
     </Expander>
diff --git a/Source/NETworkManager/Views/PingMonitorView.xaml.cs b/Source/NETworkManager/Views/PingMonitorView.xaml.cs
index 97e6720162..004d4e1749 100644
--- a/Source/NETworkManager/Views/PingMonitorView.xaml.cs
+++ b/Source/NETworkManager/Views/PingMonitorView.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Net;
+using System.Windows.Controls;
 using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views;
@@ -34,13 +35,29 @@ public void Stop()
         _viewModel.Stop();
     }
 
-    public void Export()
+    /// <summary>
+    /// Releases resources held by the view model. Must be called when the host is removed.
+    /// </summary>
+    public void Cleanup()
     {
-        _ = _viewModel.Export();
+        // Release the app-lifetime subscription so this transient per-host view (and its
+        // view model) is not kept alive until the application shuts down.
+        Dispatcher.ShutdownStarted -= Dispatcher_ShutdownStarted;
+
+        _viewModel.Cleanup();
     }
 
     private void Dispatcher_ShutdownStarted(object sender, EventArgs e)
     {
         Stop();
     }
+
+    /// <summary>
+    /// Suppresses the host context menu while the pointer is over the chart, so a
+    /// right-click drag can be used to zoom into a section instead of opening the menu.
+    /// </summary>
+    private void Chart_ContextMenuOpening(object sender, ContextMenuEventArgs e)
+    {
+        e.Handled = true;
+    }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/PortScannerView.xaml b/Source/NETworkManager/Views/PortScannerView.xaml
index 45fed20bdd..54bb2151fa 100644
--- a/Source/NETworkManager/Views/PortScannerView.xaml
+++ b/Source/NETworkManager/Views/PortScannerView.xaml
@@ -274,7 +274,7 @@
                         <MenuItem.Icon>
                             <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
@@ -285,7 +285,7 @@
                         <MenuItem.Icon>
                             <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
diff --git a/Source/NETworkManager/Views/SNMPView.xaml b/Source/NETworkManager/Views/SNMPView.xaml
index 283800b3c5..cd62d56e7a 100644
--- a/Source/NETworkManager/Views/SNMPView.xaml
+++ b/Source/NETworkManager/Views/SNMPView.xaml
@@ -641,7 +641,7 @@
                         <MenuItem.Icon>
                             <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
@@ -652,7 +652,7 @@
                         <MenuItem.Icon>
                             <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
diff --git a/Source/NETworkManager/Views/SNTPLookupView.xaml b/Source/NETworkManager/Views/SNTPLookupView.xaml
index b1808aa5b8..47688067a6 100644
--- a/Source/NETworkManager/Views/SNTPLookupView.xaml
+++ b/Source/NETworkManager/Views/SNTPLookupView.xaml
@@ -160,7 +160,7 @@
                             <Rectangle Width="16" Height="16"
                                        Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
@@ -173,7 +173,7 @@
                             <Rectangle Width="16" Height="16"
                                        Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
diff --git a/Source/NETworkManager/Views/SpeedTestWidgetView.xaml b/Source/NETworkManager/Views/SpeedTestWidgetView.xaml
index 0760fc8ebc..c26830cb4b 100644
--- a/Source/NETworkManager/Views/SpeedTestWidgetView.xaml
+++ b/Source/NETworkManager/Views/SpeedTestWidgetView.xaml
@@ -84,15 +84,15 @@
                         </Button.ToolTip>
                         <Rectangle Width="20" Height="20">
                             <Rectangle.Resources>
-                                <VisualBrush x:Key="VisualPlay" Stretch="Uniform"
-                                             Visual="{iconPacks:Material Kind=Play}" />
+                                <VisualBrush x:Key="VisualRefresh" Stretch="Uniform"
+                                             Visual="{iconPacks:Material Kind=Refresh}" />
                                 <VisualBrush x:Key="VisualClose" Stretch="Uniform"
                                              Visual="{iconPacks:Material Kind=Close}" />
                             </Rectangle.Resources>
                             <Rectangle.Style>
                                 <Style TargetType="{x:Type Rectangle}">
                                     <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
-                                    <Setter Property="OpacityMask" Value="{StaticResource VisualPlay}" />
+                                    <Setter Property="OpacityMask" Value="{StaticResource VisualRefresh}" />
                                     <Style.Triggers>
                                         <DataTrigger Binding="{Binding IsRunning}" Value="True">
                                             <Setter Property="OpacityMask" Value="{StaticResource VisualClose}" />
diff --git a/Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml b/Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml
index 857e1b4302..e0d34d316d 100644
--- a/Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml
+++ b/Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml
@@ -187,7 +187,7 @@
                         <MenuItem.Icon>
                             <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
@@ -198,7 +198,7 @@
                         <MenuItem.Icon>
                             <Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
diff --git a/Source/NETworkManager/Views/TracerouteView.xaml b/Source/NETworkManager/Views/TracerouteView.xaml
index 3aae2b0791..6d5bfa6183 100644
--- a/Source/NETworkManager/Views/TracerouteView.xaml
+++ b/Source/NETworkManager/Views/TracerouteView.xaml
@@ -376,7 +376,7 @@
                             <Rectangle Width="16" Height="16"
                                        Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
@@ -388,7 +388,7 @@
                             <Rectangle Width="16" Height="16"
                                        Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}">
                                 <Rectangle.OpacityMask>
-                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
                         </MenuItem.Icon>
diff --git a/Source/NETworkManager/Views/WiFiView.xaml b/Source/NETworkManager/Views/WiFiView.xaml
index 2dc53728aa..030faf1ecc 100644
--- a/Source/NETworkManager/Views/WiFiView.xaml
+++ b/Source/NETworkManager/Views/WiFiView.xaml
@@ -390,7 +390,7 @@
                                                                    Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                                             <Rectangle.OpacityMask>
                                                                 <VisualBrush Stretch="Uniform"
-                                                                             Visual="{iconPacks:Material Kind=Export}" />
+                                                                             Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                                             </Rectangle.OpacityMask>
                                                         </Rectangle>
                                                     </MenuItem.Icon>
@@ -405,7 +405,7 @@
                                                                    Fill="{DynamicResource MahApps.Brushes.Gray3}">
                                                             <Rectangle.OpacityMask>
                                                                 <VisualBrush Stretch="Uniform"
-                                                                             Visual="{iconPacks:Material Kind=Export}" />
+                                                                             Visual="{iconPacks:Material Kind=FileMoveOutline}" />
                                                             </Rectangle.OpacityMask>
                                                         </Rectangle>
                                                     </MenuItem.Icon>
diff --git a/Website/docs/application/ping-monitor.md b/Website/docs/application/ping-monitor.md
index b79eacfacc..d76aff93a4 100644
--- a/Website/docs/application/ping-monitor.md
+++ b/Website/docs/application/ping-monitor.md
@@ -37,12 +37,29 @@ Example: `10.0.0.0/24; 10.0.[10-20]1`
 
 :::
 
+### Chart
+
+Each monitored host shows a latency chart over time. By default the chart displays the last 2 minutes (see [Chart time (seconds)](#chart-time-seconds)) and scrolls automatically as new results arrive (**live mode**).
+
+You can interact with the chart to inspect past results:
+
+| Action | Description |
+|--------|-------------|
+| **Mouse wheel** | Zoom in and out on the time axis |
+| **Left mouse button + drag** | Pan the chart left and right |
+| **Right mouse button + drag** | Zoom into the selected section |
+
+When you zoom or pan, the chart leaves live mode and stops scrolling. A **Live** button then appears in the top-right corner of the chart — click it to return to live mode and resume auto-scrolling.
+
 ### Context menu
 
+Right-click a monitored host (anywhere except the chart) to open the context menu:
+
 | Action | Description |
 |--------|-------------|
-| **Copy** | Copies the selected information to the clipboard |
-| **Export...** | Exports the selected or all results to a file |
+| **Export...** | Exports the results of the host to a file |
+
+Right-clicking an individual field (hostname, IP address, ...) instead lets you **Copy** its value to the clipboard.
 
 ## Profile
 
@@ -115,6 +132,14 @@ Time in milliseconds to wait between each ping.
 
 **Default:** `1000`
 
+### Chart time (seconds)
+
+Time range in seconds displayed in the latency chart.
+
+**Type:** `Integer` [Min `30`, Max `3600`]
+
+**Default:** `120`
+
 ### Expand host view
 
 Expand the host view to show more information when the host is added.
diff --git a/Website/docs/changelog/next-release.md b/Website/docs/changelog/next-release.md
index 56d72f43c2..5c5cbec27f 100644
--- a/Website/docs/changelog/next-release.md
+++ b/Website/docs/changelog/next-release.md
@@ -78,6 +78,8 @@ Release date: **xx.xx.2025**
 **Ping Monitor**
 
 - Migrated charts from LiveCharts to LiveCharts2. Added a tooltip showing the ping time on hover. [#3449](https://github.com/BornToBeRoot/NETworkManager/pull/3449)
+- The latency chart is now interactive: zoom with the mouse wheel, pan by dragging with the left mouse button, and zoom into a section by dragging with the right mouse button. While inspecting, the chart pauses auto-scrolling and a **Live** button returns it to live mode. The visible time window is now configurable via the new **Chart time** setting (default 2 minutes). [#3453](https://github.com/BornToBeRoot/NETworkManager/pull/3453)
+- Export is now triggered by right-clicking a host directly (instead of the list context menu), so right-clicking the chart can be used to zoom into a section. [#3453](https://github.com/BornToBeRoot/NETworkManager/pull/3453)
 
 **Discovery Protocol**
 
diff --git a/Website/docs/img/ping-monitor.png b/Website/docs/img/ping-monitor.png
index f2e6e63c0b..42548bf9b1 100644
Binary files a/Website/docs/img/ping-monitor.png and b/Website/docs/img/ping-monitor.png differ