diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
index 1b1f617..a192af6 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
@@ -40,6 +40,7 @@ public partial class QueryStoreGridControl : UserControl
     private bool _initialOrderByLoaded;
     private bool _suppressRangeChanged;
     private string? _waitHighlightCategory;
+    private const int AutoSelectTopN = 1; // number of rows auto-selected after each fetch
     private bool _waitStatsSupported;  // false until version + capture mode confirmed
     private bool _waitStatsEnabled = true;
     private bool _waitPercentMode;
@@ -64,7 +65,6 @@ public QueryStoreGridControl(ServerConnection serverConnection, ICredentialServi
         SetupColumnHeaders();
         PopulateDatabaseBox(databases, initialDatabase);
         TimeRangeSlicer.RangeChanged += OnTimeRangeChanged;
-        TimeRangeSlicer.IsExpanded = true;
 
         WaitStatsProfile.CategoryClicked += OnWaitCategoryClicked;
         WaitStatsProfile.CategoryDoubleClicked += OnWaitCategoryDoubleClicked;
@@ -211,7 +211,7 @@ private async System.Threading.Tasks.Task FetchPlansForRangeAsync()
 
             ApplyFilters();
             LoadButton.IsEnabled = true;
-            SelectToggleButton.Content = "Select None";
+            SelectToggleButton.Content = "Select All";
 
             // Fetch per-plan wait stats after grid is populated (needs plan IDs)
             if (_waitStatsSupported && _waitStatsEnabled && _slicerStartUtc.HasValue && _slicerEndUtc.HasValue)
@@ -496,6 +496,7 @@ private void OnWaitCategoryDoubleClicked(object? sender, string category)
         // Clear column sort indicators since we're using custom sort
         _sortedColumnTag = null;
         UpdateSortIndicators(null);
+        ReapplyTopNSelection();
         UpdateBarRatios();
     }
 
@@ -937,6 +938,13 @@ private static string GetColumnLabel(StackPanel header)
         return tb.Text?.TrimEnd(' ', '▲', '▼') ?? string.Empty;
     }
 
+    private void ReapplyTopNSelection()
+    {
+        if (_filteredRows.Count == 0) return;
+        foreach (var r in _rows) r.IsSelected = false;
+        foreach (var r in _filteredRows.Take(AutoSelectTopN)) r.IsSelected = true;
+    }
+
     private void ApplySortAndFilters()
     {
         IEnumerable<QueryStoreRow> source = _rows.Where(RowMatchesAllFilters);
@@ -952,6 +960,7 @@ private void ApplySortAndFilters()
         foreach (var row in source)
             _filteredRows.Add(row);
 
+        ReapplyTopNSelection();
         UpdateStatusText();
         UpdateBarRatios();
     }
@@ -1046,7 +1055,7 @@ private static IComparable GetSortKey(string columnTag, QueryStoreRow r) =>
 
 public class QueryStoreRow : INotifyPropertyChanged
 {
-    private bool _isSelected = true;
+    private bool _isSelected = false;
 
     // Bar ratios [0..1] per column
     private double _execsRatio;
diff --git a/src/PlanViewer.App/Controls/TimeRangeSlicerControl.axaml b/src/PlanViewer.App/Controls/TimeRangeSlicerControl.axaml
index ef28a01..068d20f 100644
--- a/src/PlanViewer.App/Controls/TimeRangeSlicerControl.axaml
+++ b/src/PlanViewer.App/Controls/TimeRangeSlicerControl.axaml
@@ -5,26 +5,88 @@
             BorderBrush="{DynamicResource SlicerBorderBrush}"
             BorderThickness="0,0,0,1">
         <Grid RowDefinitions="Auto,Auto">
-            <!-- Toggle header -->
-            <Button x:Name="ToggleButton" Grid.Row="0"
-                    Background="Transparent" BorderThickness="0"
-                    HorizontalAlignment="Stretch" HorizontalContentAlignment="Left"
-                    Padding="8,4" Cursor="Hand"
-                    Click="Toggle_Click">
-                <StackPanel Orientation="Horizontal" Spacing="6">
-                    <TextBlock x:Name="ToggleIcon" Text="▾" FontSize="12"
-                               Foreground="{DynamicResource SlicerToggleBrush}"
+            <!-- Header with range label button that opens date/time picker popup -->
+            <Panel Grid.Row="0">
+                <Grid ColumnDefinitions="Auto,Auto,*,Auto" Margin="8,4">
+                    <TextBlock Grid.Column="0" Text="📅" FontSize="12"
                                VerticalAlignment="Center"/>
-                    <TextBlock x:Name="ToggleLabel" Text="Time Range"
+                    <TextBlock Grid.Column="1" x:Name="ToggleLabel" Text="Time Range"
                                FontSize="11" FontWeight="SemiBold"
                                Foreground="{DynamicResource SlicerToggleBrush}"
-                               VerticalAlignment="Center"/>
-                    <TextBlock x:Name="RangeLabel" Text=""
-                               FontSize="11"
+                               VerticalAlignment="Center" Margin="6,0,0,0"/>
+                    <TextBlock Grid.Column="2" x:Name="RangeLabel" Text=""
+                               FontSize="11" FontFamily="Cascadia Mono,Consolas,monospace"
                                Foreground="{DynamicResource SlicerLabelBrush}"
-                               VerticalAlignment="Center" Margin="12,0,0,0"/>
-                </StackPanel>
-            </Button>
+                               VerticalAlignment="Center" Margin="12,0,0,0"
+                               TextTrimming="CharacterEllipsis"/>
+                    <StackPanel Grid.Column="3" x:Name="QuickFilterPanel" Orientation="Horizontal" Spacing="2" Margin="12,0,0,0" VerticalAlignment="Center">
+                        <Button x:Name="QF_3"      Content="3h"     Tag="3"   Click="QuickFilter_Click"   Height="20" MinWidth="32" Padding="6,0" FontSize="10" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="Transparent" BorderThickness="1" BorderBrush="{DynamicResource SlicerBorderBrush}" Foreground="{DynamicResource SlicerLabelBrush}" Cursor="Hand"/>
+                        <Button x:Name="QF_24"     Content="24h"    Tag="24"  Click="QuickFilter_Click"   Height="20" MinWidth="32" Padding="6,0" FontSize="10" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="Transparent" BorderThickness="1" BorderBrush="{DynamicResource SlicerBorderBrush}" Foreground="{DynamicResource SlicerLabelBrush}" Cursor="Hand"/>
+                        <Button x:Name="QF_48"     Content="48h"    Tag="48"  Click="QuickFilter_Click"   Height="20" MinWidth="32" Padding="6,0" FontSize="10" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="Transparent" BorderThickness="1" BorderBrush="{DynamicResource SlicerBorderBrush}" Foreground="{DynamicResource SlicerLabelBrush}" Cursor="Hand"/>
+                        <Button x:Name="QF_168"    Content="7d"     Tag="168" Click="QuickFilter_Click"   Height="20" MinWidth="32" Padding="6,0" FontSize="10" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="Transparent" BorderThickness="1" BorderBrush="{DynamicResource SlicerBorderBrush}" Foreground="{DynamicResource SlicerLabelBrush}" Cursor="Hand"/>
+                        <Button x:Name="QF_720"    Content="30d"    Tag="720" Click="QuickFilter_Click"   Height="20" MinWidth="32" Padding="6,0" FontSize="10" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="Transparent" BorderThickness="1" BorderBrush="{DynamicResource SlicerBorderBrush}" Foreground="{DynamicResource SlicerLabelBrush}" Cursor="Hand"/>
+                        <Button x:Name="QF_Custom" Content="Custom" Tag="0"   Click="CustomFilter_Click"  Height="20" MinWidth="42" Padding="6,0" FontSize="10" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="Transparent" BorderThickness="1" BorderBrush="{DynamicResource SlicerBorderBrush}" Foreground="{DynamicResource SlicerLabelBrush}" Cursor="Hand"/>
+                    </StackPanel>
+                </Grid>
+                <Popup x:Name="DateTimePopup"
+                       PlacementTarget="{Binding #QF_Custom}"
+                       Placement="BottomEdgeAlignedLeft"
+                       IsLightDismissEnabled="True"
+                       HorizontalOffset="0" VerticalOffset="2">
+                    <Border Background="{DynamicResource SlicerBackgroundBrush}"
+                            BorderBrush="{DynamicResource SlicerBorderBrush}"
+                            BorderThickness="1" CornerRadius="6"
+                            Padding="16" MinWidth="460">
+                        <StackPanel Spacing="12">
+                            <TextBlock Text="Custom Time Range"
+                                       FontSize="13" FontWeight="SemiBold"
+                                       Foreground="{DynamicResource ForegroundBrush}"/>
+                            <!-- Start date/time row -->
+                            <StackPanel Spacing="4">
+                                <TextBlock Text="Start" FontSize="11"
+                                           Foreground="{DynamicResource SlicerLabelBrush}"/>
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <CalendarDatePicker x:Name="StartDatePicker"
+                                                        Width="180" Height="30" FontSize="12"
+                                                        DisplayDateStart="{x:Null}"
+                                                        DisplayDateEnd="{x:Null}"
+                                                        CustomDateFormatString="yyyy-MM-dd"
+                                                        SelectedDateFormat="Custom"/>
+                                    <TimePicker x:Name="StartTimePicker"
+                                                Width="120" Height="30" FontSize="12"
+                                                ClockIdentifier="24HourClock"
+                                                MinuteIncrement="15"/>
+                                </StackPanel>
+                            </StackPanel>
+                            <!-- End date/time row -->
+                            <StackPanel Spacing="4">
+                                <TextBlock Text="End" FontSize="11"
+                                           Foreground="{DynamicResource SlicerLabelBrush}"/>
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <CalendarDatePicker x:Name="EndDatePicker"
+                                                        Width="180" Height="30" FontSize="12"
+                                                        DisplayDateStart="{x:Null}"
+                                                        DisplayDateEnd="{x:Null}"
+                                                        CustomDateFormatString="yyyy-MM-dd"
+                                                        SelectedDateFormat="Custom"/>
+                                    <TimePicker x:Name="EndTimePicker"
+                                                Width="120" Height="30" FontSize="12"
+                                                ClockIdentifier="24HourClock"
+                                                MinuteIncrement="15"/>
+                                </StackPanel>
+                            </StackPanel>
+                            <!-- Action buttons -->
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8"
+                                        Margin="0,4,0,0">
+                                <Button Content="Cancel" Width="70" Height="28"
+                                        Click="PopupCancel_Click"/>
+                                <Button Content="Apply" Width="70" Height="28"
+                                        Click="PopupApply_Click"/>
+                            </StackPanel>
+                        </StackPanel>
+                    </Border>
+                </Popup>
+            </Panel>
             <!-- Slicer canvas area -->
             <Border x:Name="SlicerBorder" Grid.Row="1" Height="120" Margin="8,0,8,6"
                     Background="{DynamicResource SlicerBackgroundBrush}"
diff --git a/src/PlanViewer.App/Controls/TimeRangeSlicerControl.axaml.cs b/src/PlanViewer.App/Controls/TimeRangeSlicerControl.axaml.cs
index 29bec9a..6d1ac56 100644
--- a/src/PlanViewer.App/Controls/TimeRangeSlicerControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/TimeRangeSlicerControl.axaml.cs
@@ -17,7 +17,6 @@ public partial class TimeRangeSlicerControl : UserControl
 {
     private List<QueryStoreTimeSlice> _data = new();
     private string _metric = "cpu";
-    private bool _isExpanded = true;
 
     // Range as normalised [0..1] positions within _data
     private double _rangeStart;
@@ -25,7 +24,6 @@ public partial class TimeRangeSlicerControl : UserControl
 
     private const double HandleWidthPx = 8;
     private const double HandleGripWidthPx = 20; // extended hit-test area for easier grabbing
-    private const double MinIntervalHours = 3;
     private const double ChartPaddingTop = 16;
     private const double ChartPaddingBottom = 20;
     private const double MoveBarHeight = 14; // height of the draggable move bar at the top of the selection
@@ -46,10 +44,6 @@ public partial class TimeRangeSlicerControl : UserControl
     private static readonly Cursor CursorSizeWE      = new(StandardCursorType.SizeWestEast);
     private static readonly FontFamily TooltipFont   = new("Cascadia Mono,Consolas,monospace");
 
-    // Line points computed in Redraw(), used for hover hit-testing
-    private Point[] _linePoints = Array.Empty<Point>();
-    private double  _stepX;
-
     private enum DragMode { None, MoveRange, DragStart, DragEnd, SelectRect }
     private DragMode _dragMode = DragMode.None;
     private double _dragOriginX;
@@ -58,7 +52,7 @@ private enum DragMode { None, MoveRange, DragStart, DragEnd, SelectRect }
     private double _selectRectOriginX;   // canvas-x where drag-select started
     private double _selectRectCurrentX;  // canvas-x of current pointer during drag-select
 
-    private int _hoveredIndex = -1;  // bucket index under the mouse (-1 = none)
+    private string _activeFilterTag = "24"; // tag of the currently active quick-filter button
     private DispatcherTimer? _rangeChangedDebounce;
 
     public event EventHandler<TimeRangeChangedEventArgs>? RangeChanged;
@@ -69,17 +63,7 @@ public TimeRangeSlicerControl()
         SlicerBorder.SizeChanged += (_, _) => Redraw();
         SlicerCanvas.Focusable = true;
         SlicerCanvas.KeyDown += Canvas_KeyDown;
-    }
-
-    public bool IsExpanded
-    {
-        get => _isExpanded;
-        set
-        {
-            _isExpanded = value;
-            SlicerBorder.IsVisible = _isExpanded;
-            ToggleIcon.Text = _isExpanded ? "▾" : "▸";
-        }
+        HighlightActiveFilter();
     }
 
     public void LoadData(List<QueryStoreTimeSlice> data, string metric,
@@ -98,6 +82,7 @@ public void LoadData(List<QueryStoreTimeSlice> data, string metric,
         {
             // Default selection: last 24 hours
             _rangeEnd = 1.0;
+            _activeFilterTag = "24";
             if (_data.Count >= 2)
             {
                 var last = _data[^1].IntervalStartUtc.AddHours(1);
@@ -108,6 +93,7 @@ public void LoadData(List<QueryStoreTimeSlice> data, string metric,
             {
                 _rangeStart = 0;
             }
+            HighlightActiveFilter();
         }
 
         UpdateRangeLabel();
@@ -165,14 +151,133 @@ private double MinNormInterval
         get
         {
             if (_data.Count == 0) return 0;
-            var n = _data.Count;
-            return Math.Min(MinIntervalHours / n, 1);
+            return 1.0 / _data.Count;
+        }
+    }
+
+    private void CustomFilter_Click(object? sender, RoutedEventArgs e)
+    {
+        PopulatePickersFromSelection();
+        DateTimePopup.IsOpen = true;
+    }
+
+    private void PopupApply_Click(object? sender, RoutedEventArgs e)
+    {
+        if (_data.Count < 2) { DateTimePopup.IsOpen = false; return; }
+
+        var startDate = StartDatePicker.SelectedDate;
+        var startTime = StartTimePicker.SelectedTime;
+        var endDate = EndDatePicker.SelectedDate;
+        var endTime = EndTimePicker.SelectedTime;
+
+        if (!startDate.HasValue || !endDate.HasValue) { DateTimePopup.IsOpen = false; return; }
+
+        var startDt = startDate.Value.Date + (startTime ?? TimeSpan.Zero);
+        var endDt = endDate.Value.Date + (endTime ?? TimeSpan.Zero);
+
+        // Convert display time back to UTC
+        var startUtc = ConvertFromDisplay(startDt);
+        var endUtc = ConvertFromDisplay(endDt);
+
+        if (endUtc <= startUtc) endUtc = startUtc.AddHours(1);
+
+        _rangeStart = GetNormFromDateTime(startUtc);
+        _rangeEnd = GetNormFromDateTime(endUtc);
+
+        // Enforce minimum interval
+        if (_rangeEnd - _rangeStart < MinNormInterval)
+            _rangeEnd = Math.Min(1, _rangeStart + MinNormInterval);
+
+        _activeFilterTag = "0";
+        HighlightActiveFilter();
+
+        DateTimePopup.IsOpen = false;
+        UpdateRangeLabel();
+        Redraw();
+        FireRangeChanged();
+    }
+
+    private void PopupCancel_Click(object? sender, RoutedEventArgs e)
+    {
+        DateTimePopup.IsOpen = false;
+    }
+
+    private void QuickFilter_Click(object? sender, RoutedEventArgs e)
+    {
+        if (sender is Button btn && btn.Tag is string hoursStr && int.TryParse(hoursStr, out var hours))
+        {
+            _activeFilterTag = hoursStr;
+            HighlightActiveFilter();
+            ApplyQuickFilter(hours);
+        }
+    }
+
+    private void ApplyQuickFilter(int hours)
+    {
+        if (_data.Count < 2) return;
+        var last = _data[^1].IntervalStartUtc.AddHours(1);
+        var start = last.AddHours(-hours);
+        _rangeStart = GetNormFromDateTime(start);
+        _rangeEnd = 1.0;
+        UpdateRangeLabel();
+        Redraw();
+        FireRangeChanged();
+    }
+
+    private void HighlightActiveFilter()
+    {
+        var accentBrush = TryFindBrush("AccentBrush", FallbackChartLineBrush);
+        var normalFg = TryFindBrush("SlicerLabelBrush", FallbackLabelBrush);
+        var normalBorder = TryFindBrush("SlicerBorderBrush", FallbackDayLineBrush);
+
+        foreach (var child in QuickFilterPanel.Children)
+        {
+            if (child is not Button btn) continue;
+            var tag = btn.Tag as string ?? "";
+            if (tag == _activeFilterTag)
+            {
+                btn.BorderBrush = accentBrush;
+                btn.Foreground = accentBrush;
+            }
+            else
+            {
+                btn.BorderBrush = normalBorder;
+                btn.Foreground = normalFg;
+            }
         }
     }
 
-    private void Toggle_Click(object? sender, RoutedEventArgs e)
+    private void PopulatePickersFromSelection()
+    {
+        if (_data.Count == 0) return;
+
+        var startDisplay = TimeDisplayHelper.ConvertForDisplay(GetDateTimeAtNorm(_rangeStart));
+        var endDisplay = TimeDisplayHelper.ConvertForDisplay(GetDateTimeAtNorm(_rangeEnd));
+
+        StartDatePicker.SelectedDate = startDisplay.Date;
+        StartTimePicker.SelectedTime = startDisplay.TimeOfDay;
+
+        EndDatePicker.SelectedDate = endDisplay.Date;
+        EndTimePicker.SelectedTime = endDisplay.TimeOfDay;
+
+        // Set display date range limits from data bounds
+        var firstDisplay = TimeDisplayHelper.ConvertForDisplay(_data[0].IntervalStartUtc);
+        var lastDisplay = TimeDisplayHelper.ConvertForDisplay(_data[^1].IntervalStartUtc.AddHours(1));
+        StartDatePicker.DisplayDateStart = firstDisplay.Date;
+        StartDatePicker.DisplayDateEnd = lastDisplay.Date;
+        EndDatePicker.DisplayDateStart = firstDisplay.Date;
+        EndDatePicker.DisplayDateEnd = lastDisplay.Date;
+    }
+
+    private static DateTime ConvertFromDisplay(DateTime displayTime)
     {
-        IsExpanded = !IsExpanded;
+        return TimeDisplayHelper.Current switch
+        {
+            TimeDisplayMode.Local => displayTime.ToUniversalTime(),
+            TimeDisplayMode.Utc => DateTime.SpecifyKind(displayTime, DateTimeKind.Utc),
+            TimeDisplayMode.Server => displayTime.AddMinutes(-TimeDisplayHelper.ServerUtcOffsetMinutes),
+            _ => displayTime.ToUniversalTime()
+        };
     }
 
     private double[] GetMetricValues()
@@ -249,10 +354,6 @@ public void Redraw()
             var y = chartBottom - (values[i] / max) * chartHeight;
             linePoints.Add(new Point(x, y));
         }
-        // Cache for Y-proximity hit-testing in pointer events
-        _linePoints = linePoints.ToArray();
-        _stepX      = stepX;
-
         // Area fill
         var fillBrush = TryFindBrush("SlicerChartFillBrush", FallbackChartFillBrush);
         var areaGeometry = new StreamGeometry();
@@ -513,13 +614,18 @@ public void Redraw()
             SlicerCanvas.Children.Add(hitRect);
         }
 
-        // ── Hover dot ──────────────────────────────────────────────────
-        var dotIdx = _hoveredIndex;
-        if (dotIdx >= 0 && dotIdx < n)
+        // ── Peak dot: fixed at the maximum-value bucket within the selection ──
+        var selStartIdx = (int)Math.Floor(_rangeStart * n);
+        var selEndIdx   = Math.Min(n - 1, (int)Math.Ceiling(_rangeEnd * n) - 1);
+        if (selStartIdx <= selEndIdx)
         {
+            var peakIdx = selStartIdx;
+            for (int pi = selStartIdx + 1; pi <= selEndIdx; pi++)
+                if (values[pi] > values[peakIdx]) peakIdx = pi;
+
             const double DotR = 7;
-            var dotX = dotIdx * stepX + stepX / 2;
-            var dotY = chartBottom - (values[dotIdx] / max) * chartHeight;
+            var dotX = peakIdx * stepX + stepX / 2;
+            var dotY = chartBottom - (values[peakIdx] / max) * chartHeight;
             var dot = new Ellipse
             {
                 Width           = DotR * 2,
@@ -595,28 +701,6 @@ private IBrush TryFindBrush(string key, IBrush fallback)
         return fallback;
     }
 
-    /// <summary>
-    /// Finds the bucket index whose line point is closest horizontally to <paramref name="pos"/>,
-    /// or -1 if none qualifies.
-    /// </summary>
-    private int FindNearestLineIndex(Point pos)
-    {
-        if (_linePoints.Length == 0) return -1;
-        var best = -1;
-        var bestDist = double.MaxValue;
-        for (int i = 0; i < _linePoints.Length; i++)
-        {
-            var lp = _linePoints[i];
-            var dx = Math.Abs(pos.X - lp.X);
-            if (dx <= _stepX / 2 + 2 && dx < bestDist)
-            {
-                bestDist = dx;
-                best = i;
-            }
-        }
-        return best;
-    }
-
     // ── Interaction ────────────────────────────────────────────────────────
 
     private void Canvas_PointerPressed(object? sender, PointerPressedEventArgs e)
@@ -707,13 +791,6 @@ private void Canvas_PointerMoved(object? sender, PointerEventArgs e)
                 SlicerCanvas.Cursor = Cursor.Default;
             }
 
-            // Y-proximity hover for dot
-            var newHover = FindNearestLineIndex(pos);
-            if (newHover != _hoveredIndex)
-            {
-                _hoveredIndex = newHover;
-                Redraw();
-            }
             return;
         }
 
@@ -785,6 +862,8 @@ private void Canvas_PointerReleased(object? sender, PointerReleasedEventArgs e)
 
         _dragMode = DragMode.None;
         e.Pointer.Capture(null);
+        _activeFilterTag = "0";
+        HighlightActiveFilter();
         UpdateRangeLabel();
         Redraw();
         FireRangeChanged();
@@ -820,6 +899,8 @@ private void Canvas_PointerWheelChanged(object? sender, PointerWheelEventArgs e)
         _rangeStart = Math.Max(0, newStart);
         _rangeEnd = Math.Min(1, newEnd);
 
+        _activeFilterTag = "0";
+        HighlightActiveFilter();
         UpdateRangeLabel();
         Redraw();
         FireRangeChanged();
@@ -878,7 +959,10 @@ private void UpdateRangeLabel()
         var start = TimeDisplayHelper.ConvertForDisplay(GetDateTimeAtNorm(_rangeStart));
         var end = TimeDisplayHelper.ConvertForDisplay(GetDateTimeAtNorm(_rangeEnd));
         var span = end - start;
-        RangeLabel.Text = $"{start:yyyy-MM-dd HH:mm} → {end:yyyy-MM-dd HH:mm}  ({span.TotalHours:F0}h)";
+        var spanText = span.TotalHours >= 48
+            ? $"{span.TotalDays:F1}d"
+            : $"{span.TotalHours:F0}h";
+        RangeLabel.Text = $"{start:yyyy-MM-dd HH:mm} → {end:yyyy-MM-dd HH:mm}  ({spanText})";
     }
 
     private void FireRangeChanged()