diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml
index 35cdf639c..e03078edc 100644
--- a/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml
+++ b/src/Wpf.Ui.Gallery/Views/Pages/Collections/ListViewPage.xaml
@@ -121,31 +121,34 @@
             <controls:ControlExample.XamlCode>
                 &lt;ListView ItemsSource=&quot;{Binding ViewModel.BasicListViewItems}&quot;&gt;\n
                 \t&lt;ListView.View&gt;\n
-                \t\t&lt;GridView&gt;\n
-                \t\t\t&lt;GridViewColumn DisplayMemberBinding=&quot;{Binding FirstName}&quot; Header=&quot;First Name&quot;/&gt;\n
+                \t\t&lt;ui:GridView&gt;\n
+                \t\t\t&lt;GridViewColumn DisplayMemberBinding=&quot;{Binding FirstName}&quot; Header=&quot;First Name&quot; MinWidth=&amp;quot;100&amp;quot; MaxWidth=&amp;quot;200&amp;quot;/&gt;\n
                 \t\t\t&lt;GridViewColumn DisplayMemberBinding=&quot;{Binding LastName}&quot; Header=&quot;Last Name&quot;/&gt;\n
                 \t\t\t&lt;GridViewColumn DisplayMemberBinding=&quot;{Binding Company}&quot; Header=&quot;Company&quot;/&gt;\n
-                \t\t&lt;/GridView&gt;\n
+                \t\t&lt;/ui:GridView&gt;\n
                 \t&lt;/ListView.View&gt;\n
                 &lt;/ListView&gt;
             </controls:ControlExample.XamlCode>
             <ui:ListView
                 MaxHeight="200"
-                d:ItemsSource="{d:SampleData ItemCount=3}"
+                d:ItemsSource="{d:SampleData ItemCount=2}"
                 BorderThickness="0"
                 ItemsSource="{Binding ViewModel.BasicListViewItems, Mode=TwoWay}">
                 <ui:ListView.View>
-                    <GridView>
-                        <GridViewColumn
-                            Width="100"
+                    <ui:GridView>
+                        <ui:GridViewColumn
+                            MinWidth="100"
                             DisplayMemberBinding="{Binding FirstName}"
                             Header="First Name" />
-                        <GridViewColumn
-                            Width="100"
+                        <ui:GridViewColumn
+                            MinWidth="100"
                             DisplayMemberBinding="{Binding LastName}"
                             Header="Last Name" />
-                        <GridViewColumn DisplayMemberBinding="{Binding Company}" Header="Company" />
-                    </GridView>
+                        <ui:GridViewColumn
+                            MinWidth="100"
+                            DisplayMemberBinding="{Binding Company}"
+                            Header="Company" />
+                    </ui:GridView>
                 </ui:ListView.View>
             </ui:ListView>
         </controls:ControlExample>
diff --git a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml
index 389daa086..5465b4a70 100644
--- a/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml
+++ b/src/Wpf.Ui/Controls/AutoSuggestBox/AutoSuggestBox.xaml
@@ -13,7 +13,7 @@
     <system:Double x:Key="AutoSuggestBoxClearButtonHeight">24</system:Double>
     <system:Double x:Key="AutoSuggestBoxClearButtonIconSize">14</system:Double>
 
-    <Style x:Key="DefaultAutoSuggestBoxItemContainerStyle" TargetType="{x:Type ListViewItem}">
+    <Style x:Key="DefaultAutoSuggestBoxItemContainerStyle" TargetType="{x:Type controls:ListViewItem}">
         <Setter Property="Foreground" Value="{DynamicResource ListViewItemForeground}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
diff --git a/src/Wpf.Ui/Controls/GridView/GridView.cs b/src/Wpf.Ui/Controls/GridView/GridView.cs
new file mode 100644
index 000000000..70cf99c91
--- /dev/null
+++ b/src/Wpf.Ui/Controls/GridView/GridView.cs
@@ -0,0 +1,37 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+namespace Wpf.Ui.Controls;
+
+/// <summary>
+/// Extends <see cref="System.Windows.Controls.GridView"/> to use Wpf.Ui custom styles
+/// </summary>
+/// <example>
+/// To use this enhanced GridView in a ListView:
+/// <code lang="xml">
+/// &lt;ListView&gt;
+///     &lt;ListView.View&gt;
+///         &lt;local:GridView&gt;
+///             &lt;GridViewColumn Header="First Name" DisplayMemberBinding="{Binding FirstName}"/&gt;
+///             &lt;GridViewColumn Header="Last Name" DisplayMemberBinding="{Binding LastName}"/&gt;
+///         &lt;/local:GridView&gt;
+///     &lt;/ListView.View&gt;
+/// &lt;/ListView&gt;
+/// </code>
+/// </example>
+public class GridView : System.Windows.Controls.GridView
+{
+    static GridView()
+    {
+        ResourceDictionary resourceDict = new()
+        {
+            Source = new Uri("pack://application:,,,/Wpf.Ui;component/Controls/GridView/GridViewColumnHeader.xaml")
+        };
+
+        Style defaultStyle = (Style)resourceDict["UiGridViewColumnHeaderStyle"];
+
+        ColumnHeaderContainerStyleProperty.OverrideMetadata(typeof(GridView), new FrameworkPropertyMetadata(defaultStyle));
+    }
+}
diff --git a/src/Wpf.Ui/Controls/GridView/GridViewColumn.cs b/src/Wpf.Ui/Controls/GridView/GridViewColumn.cs
new file mode 100644
index 000000000..e34049630
--- /dev/null
+++ b/src/Wpf.Ui/Controls/GridView/GridViewColumn.cs
@@ -0,0 +1,118 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+using System.Reflection;
+
+namespace Wpf.Ui.Controls;
+
+/// <summary>
+/// Extends <see cref="System.Windows.Controls.GridViewColumn"/> with MinWidth and MaxWidth properties.
+/// It can be used with <see cref="ListView"/> when in GridView mode.
+/// </summary>
+/// <example>
+/// <code lang="xml">
+/// &lt;ui:ListView&gt;
+///     &lt;ui:ListView.View&gt;
+///         &lt;ui:GridView&gt;
+///             &lt;ui:GridViewColumn
+///                 MinWidth="100"
+///                 MaxWidth="200"
+///                 DisplayMemberBinding="{Binding FirstName}"
+///                 Header="First Name" /&gt;
+///         &lt;/ui:GridView&gt;
+///     &lt;/ui:ListView.View&gt;
+/// &lt;/ui:ListView&gt;
+/// </code>
+/// </example>
+public class GridViewColumn : System.Windows.Controls.GridViewColumn
+{
+    // use reflection to get the `_desiredWidth` private field.
+    private static readonly Lazy<FieldInfo> _desiredWidthField = new(() =>
+        typeof(System.Windows.Controls.GridViewColumn).GetField("_desiredWidth", BindingFlags.NonPublic | BindingFlags.Instance)
+        ?? throw new InvalidOperationException("The `_desiredWidth` field was not found."));
+
+    private static FieldInfo DesiredWidthField => _desiredWidthField.Value;
+
+    // use reflection to get the `UpdateActualWidth` private method.
+    private static readonly Lazy<MethodInfo> _updateActualWidthMethod = new(() =>
+    {
+        MethodInfo methodInfo = typeof(System.Windows.Controls.GridViewColumn).GetMethod("UpdateActualWidth", BindingFlags.NonPublic | BindingFlags.Instance)
+            ?? throw new InvalidOperationException("The `UpdateActualWidth` method was not found.");
+        return methodInfo;
+    });
+
+    private static MethodInfo UpdateActualWidthMethod => _updateActualWidthMethod.Value;
+
+    /// <summary>
+    /// Updates the desired width of the column to be clamped between MinWidth and MaxWidth).
+    /// </summary>
+    /// <remarks>
+    /// Uses reflection to directly set the private `_desiredWidth` field on the `System.Windows.Controls.GridViewColumn`.
+    /// </remarks>
+    /// <exception cref="InvalidOperationException">
+    /// Thrown if reflection fails to access the `_desiredWidth` field
+    /// </exception>
+    internal void UpdateDesiredWidth()
+    {
+        double currentWidth = (double)(DesiredWidthField.GetValue(this) ?? throw new InvalidOperationException("Failed to get the current `_desiredWidth`."));
+        double clampedWidth = Math.Max(MinWidth, Math.Min(currentWidth, MaxWidth));
+        DesiredWidthField.SetValue(this, clampedWidth);
+        _ = UpdateActualWidthMethod.Invoke(this, null);
+    }
+
+    /// <summary>
+    /// Gets or sets the minimum width of the column.
+    /// </summary>
+    public double MinWidth
+    {
+        get => (double)GetValue(MinWidthProperty);
+        set => SetValue(MinWidthProperty, value);
+    }
+
+    /// <summary>Identifies the <see cref="MinWidth"/> dependency property.</summary>
+    public static readonly DependencyProperty MinWidthProperty = DependencyProperty.Register(nameof(MinWidth), typeof(double), typeof(GridViewColumn), new FrameworkPropertyMetadata(0.0, OnMinWidthChanged));
+
+    private static void OnMinWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not GridViewColumn self)
+        {
+            return;
+        }
+
+        self.OnMinWidthChanged(e);
+    }
+
+    protected virtual void OnMinWidthChanged(DependencyPropertyChangedEventArgs e)
+    {
+        // Hook for derived classes to react to MinWidth property changes
+    }
+
+    /// <summary>
+    /// gets or sets the maximum width of the column.
+    /// </summary>
+    public double MaxWidth
+    {
+        get => (double)GetValue(MaxWidthProperty);
+        set => SetValue(MaxWidthProperty, value);
+    }
+
+    /// <summary>Identifies the <see cref="MaxWidth"/> dependency property.</summary>
+    public static readonly DependencyProperty MaxWidthProperty = DependencyProperty.Register(nameof(MaxWidth), typeof(double), typeof(GridViewColumn), new FrameworkPropertyMetadata(double.PositiveInfinity, OnMaxWidthChanged));
+
+    private static void OnMaxWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not GridViewColumn self)
+        {
+            return;
+        }
+
+        self.OnMaxWidthChanged(e);
+    }
+
+    protected virtual void OnMaxWidthChanged(DependencyPropertyChangedEventArgs e)
+    {
+        // Hook for derived classes to react to MaxWidth property changes
+    }
+}
diff --git a/src/Wpf.Ui/Controls/GridView/GridViewColumnHeader.xaml b/src/Wpf.Ui/Controls/GridView/GridViewColumnHeader.xaml
new file mode 100644
index 000000000..8881c5acf
--- /dev/null
+++ b/src/Wpf.Ui/Controls/GridView/GridViewColumnHeader.xaml
@@ -0,0 +1,120 @@
+<!--
+    This Source Code Form is subject to the terms of the MIT License.
+    If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+    Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+    All Rights Reserved.
+-->
+
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+
+    <Style x:Key="UiGridViewColumnHeaderStyle" TargetType="GridViewColumnHeader">
+        <Style.Triggers>
+            <Trigger Property="GridViewColumnHeader.Role" Value="Floating">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="GridViewColumnHeader">
+                            <Canvas Name="PART_FloatingHeaderCanvas">
+                                <Rectangle
+                                    Width="{TemplateBinding ActualWidth}"
+                                    Height="{TemplateBinding ActualHeight}"
+                                    Fill="#FF000000"
+                                    Opacity="0.5" />
+                            </Canvas>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+            <Trigger Property="GridViewColumnHeader.Role" Value="Padding">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="GridViewColumnHeader">
+                            <Border
+                                Name="HeaderBorder"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding Border.BorderBrush}"
+                                BorderThickness="0,0,0,0" />
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0,0,0,0" />
+        <Setter Property="Margin" Value="0,0,0,0" />
+        <Setter Property="Padding" Value="0,2" />
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="GridViewColumnHeader">
+                    <Grid>
+                        <Border
+                            Name="HeaderBorder"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="0,0,0,0"
+                            CornerRadius="{DynamicResource ControlCornerRadius}">
+                            <Border Margin="6,0,0,0" Padding="{TemplateBinding Padding}">
+                                <ContentPresenter
+                                    Name="HeaderContent"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Content="{TemplateBinding Content}"
+                                    ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                                    RecognizesAccessKey="True"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                <!--<TextBlock Text="{TemplateBinding Content}" />-->
+                            </Border>
+                        </Border>
+                        <Canvas>
+                            <Thumb Name="PART_HeaderGripper">
+                                <Thumb.Style>
+                                    <Style TargetType="Thumb">
+                                        <Setter Property="Canvas.Right" Value="-9" />
+                                        <Setter Property="Width" Value="18" />
+                                        <Setter Property="Height" Value="{Binding Path=ActualHeight, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
+                                        <Setter Property="Padding" Value="0,0,0,0" />
+                                        <Setter Property="Background" Value="Transparent" />
+                                        <Setter Property="Template">
+                                            <Setter.Value>
+                                                <ControlTemplate TargetType="Thumb">
+                                                    <Border Padding="{TemplateBinding Padding}" Background="#00FFFFFF">
+                                                        <Rectangle
+                                                            Width="1"
+                                                            HorizontalAlignment="Center"
+                                                            Fill="{TemplateBinding Background}" />
+                                                    </Border>
+                                                </ControlTemplate>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                </Thumb.Style>
+                            </Thumb>
+                        </Canvas>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="HeaderBorder" Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}" />
+                            <Setter TargetName="PART_HeaderGripper" Property="Background" Value="Transparent" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="HeaderBorder" Property="Background" Value="Transparent" />
+                            <Setter TargetName="PART_HeaderGripper" Property="Visibility" Value="Hidden" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Controls/GridView/GridViewHeaderRowIndicator.xaml b/src/Wpf.Ui/Controls/GridView/GridViewHeaderRowIndicator.xaml
new file mode 100644
index 000000000..77537437e
--- /dev/null
+++ b/src/Wpf.Ui/Controls/GridView/GridViewHeaderRowIndicator.xaml
@@ -0,0 +1,26 @@
+<!--
+    This Source Code Form is subject to the terms of the MIT License.
+    If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+    Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+    All Rights Reserved.
+-->
+
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
+
+    <ControlTemplate x:Key="GridViewHeaderRowIndicatorTemplate" TargetType="Separator">
+        <Border>
+            <Rectangle
+                Width="3"
+                Height="18"
+                Margin="0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Fill="{DynamicResource ListViewItemPillFillBrush}"
+                RadiusX="2"
+                RadiusY="2" />
+        </Border>
+    </ControlTemplate>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Wpf.Ui/Controls/GridView/GridViewHeaderRowPresenter.cs b/src/Wpf.Ui/Controls/GridView/GridViewHeaderRowPresenter.cs
new file mode 100644
index 000000000..d16d22226
--- /dev/null
+++ b/src/Wpf.Ui/Controls/GridView/GridViewHeaderRowPresenter.cs
@@ -0,0 +1,84 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+using System.Diagnostics;
+using System.Reflection;
+using System.Windows.Controls;
+
+namespace Wpf.Ui.Controls;
+
+/// <summary>
+/// Extends <see cref="System.Windows.Controls.GridViewHeaderRowPresenter"/>, and adds layout support for <see cref="GridViewColumn"/>, which can have <see cref="GridViewColumn.MinWidth"/> and <see cref="GridViewColumn.MaxWidth"/>.
+/// </summary>
+public class GridViewHeaderRowPresenter : System.Windows.Controls.GridViewHeaderRowPresenter
+{
+    public GridViewHeaderRowPresenter()
+    {
+        Loaded += OnLoaded;
+    }
+
+    protected override Size ArrangeOverride(Size arrangeSize)
+    {
+        // update the desired width of each column (clamps desiredwidth to MinWidth and MaxWidth)
+        if (Columns != null)
+        {
+            foreach (GridViewColumn column in Columns.OfType<GridViewColumn>())
+            {
+                column.UpdateDesiredWidth();
+            }
+        }
+
+        return base.ArrangeOverride(arrangeSize);
+    }
+
+    protected override Size MeasureOverride(Size constraint)
+    {
+        if (Columns != null)
+        {
+            foreach (GridViewColumn column in Columns.OfType<GridViewColumn>())
+            {
+                column.UpdateDesiredWidth();
+            }
+        }
+
+        return base.MeasureOverride(constraint);
+    }
+
+    private void OnLoaded(object sender, RoutedEventArgs e)
+    {
+        UpdateIndicatorStyle();
+    }
+
+    private void UpdateIndicatorStyle()
+    {
+        FieldInfo? indicatorField = typeof(System.Windows.Controls.GridViewHeaderRowPresenter).GetField("_indicator", BindingFlags.NonPublic | BindingFlags.Instance);
+
+        if (indicatorField == null)
+        {
+            Debug.WriteLine("Failed to get the _indicator field");
+            return;
+        }
+
+        if (indicatorField.GetValue(this) is Separator indicator)
+        {
+            indicator.Margin = new Thickness(0);
+            indicator.Width = 3.0;
+
+            ResourceDictionary resourceDictionary = new()
+            {
+                Source = new Uri("pack://application:,,,/Wpf.Ui;component/Controls/GridView/GridViewHeaderRowIndicator.xaml", UriKind.Absolute)
+            };
+
+            if (resourceDictionary["GridViewHeaderRowIndicatorTemplate"] is ControlTemplate template)
+            {
+                indicator.Template = template;
+            }
+            else
+            {
+                Debug.WriteLine("Failed to get the GridViewHeaderRowIndicatorTemplate");
+            }
+        }
+    }
+}
diff --git a/src/Wpf.Ui/Controls/GridView/GridViewRowPresenter.cs b/src/Wpf.Ui/Controls/GridView/GridViewRowPresenter.cs
new file mode 100644
index 000000000..0ba3e9334
--- /dev/null
+++ b/src/Wpf.Ui/Controls/GridView/GridViewRowPresenter.cs
@@ -0,0 +1,37 @@
+using System.Reflection;
+using System.Windows.Controls;
+
+namespace Wpf.Ui.Controls;
+
+/// <summary>
+/// Extends <see cref="System.Windows.Controls.GridViewRowPresenter"/>, and adds header row layout support for <see cref="GridViewColumn"/>, which can have <see cref="GridViewColumn.MinWidth"/> and <see cref="GridViewColumn.MaxWidth"/>.
+/// </summary>
+public class GridViewRowPresenter : System.Windows.Controls.GridViewRowPresenter
+{
+    protected override Size ArrangeOverride(Size arrangeSize)
+    {
+        // update the desired width of each column (clamps desiredwidth to MinWidth and MaxWidth)
+        if (Columns != null)
+        {
+            foreach (GridViewColumn column in Columns.OfType<GridViewColumn>())
+            {
+                column.UpdateDesiredWidth();
+            }
+        }
+
+        return base.ArrangeOverride(arrangeSize);
+    }
+
+    protected override Size MeasureOverride(Size constraint)
+    {
+        if (Columns != null)
+        {
+            foreach (GridViewColumn column in Columns.OfType<GridViewColumn>())
+            {
+                column.UpdateDesiredWidth();
+            }
+        }
+
+        return base.MeasureOverride(constraint);
+    }
+}
diff --git a/src/Wpf.Ui/Controls/ListView/ListView.cs b/src/Wpf.Ui/Controls/ListView/ListView.cs
index 4398631be..31e0237be 100644
--- a/src/Wpf.Ui/Controls/ListView/ListView.cs
+++ b/src/Wpf.Ui/Controls/ListView/ListView.cs
@@ -7,14 +7,14 @@ namespace Wpf.Ui.Controls;
 /// <code lang="xml">
 /// &lt;ui:ListView ItemsSource="{Binding ...}" &gt;
 ///     &lt;ui:ListView.View&gt;
-///         &lt;GridView&gt;
+///         &lt;ui:GridView&gt;
 ///             &lt;GridViewColumn
 ///                 DisplayMemberBinding="{Binding FirstName}"
 ///                 Header="First Name" /&gt;
 ///             &lt;GridViewColumn
 ///                 DisplayMemberBinding="{Binding LastName}"
 ///                 Header="Last Name" /&gt;
-///         &lt;/GridView&gt;
+///         &lt;/ui:GridView&gt;
 ///     &lt;/ui:ListView.View&gt;
 /// &lt;/ui:ListView&gt;
 /// </code>
@@ -96,4 +96,14 @@ static ListView()
             new FrameworkPropertyMetadata(typeof(ListView))
         );
     }
+
+    protected override DependencyObject GetContainerForItemOverride()
+    {
+        return new ListViewItem();
+    }
+
+    protected override bool IsItemItsOwnContainerOverride(object item)
+    {
+        return item is ListViewItem;
+    }
 }
diff --git a/src/Wpf.Ui/Controls/ListView/ListView.xaml b/src/Wpf.Ui/Controls/ListView/ListView.xaml
index 1af21cff0..6e6eb9711 100644
--- a/src/Wpf.Ui/Controls/ListView/ListView.xaml
+++ b/src/Wpf.Ui/Controls/ListView/ListView.xaml
@@ -59,8 +59,9 @@
                     Focusable="False"
                     HorizontalScrollBarVisibility="Hidden"
                     VerticalScrollBarVisibility="Hidden">
-                    <GridViewHeaderRowPresenter
-                        Margin="0"
+                    <!--  margin-left matched to listviewitem.padding  -->
+                    <controls:GridViewHeaderRowPresenter
+                        Margin="4"
                         AllowsColumnReorder="{Binding Path=View.AllowsColumnReorder, RelativeSource={RelativeSource AncestorType=ListView}}"
                         ColumnHeaderContainerStyle="{Binding Path=View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource AncestorType=ListView}}"
                         ColumnHeaderContextMenu="{Binding Path=View.ColumnHeaderContextMenu, RelativeSource={RelativeSource AncestorType=ListView}}"
@@ -115,25 +116,6 @@
         </Grid>
     </ControlTemplate>
 
-    <!--  replaces framework styling for GridView column headers  -->
-    <Style TargetType="GridViewColumnHeader">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Padding" Value="4" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="GridViewColumnHeader">
-                    <!--  margins and padding need some help  -->
-                    <TextBlock
-                        Margin="6,2,0,6"
-                        Padding="4"
-                        FontWeight="Bold"
-                        Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                        Text="{TemplateBinding Content}" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
     <ControlTemplate x:Key="GridViewTemplate" TargetType="{x:Type controls:ListView}">
         <Border
             Name="Bd"
diff --git a/src/Wpf.Ui/Controls/ListView/ListViewItem.cs b/src/Wpf.Ui/Controls/ListView/ListViewItem.cs
new file mode 100644
index 000000000..5c5b7f622
--- /dev/null
+++ b/src/Wpf.Ui/Controls/ListView/ListViewItem.cs
@@ -0,0 +1,10 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+namespace Wpf.Ui.Controls;
+
+public class ListViewItem : System.Windows.Controls.ListViewItem
+{
+}
diff --git a/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml b/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
index 8b0e66ef9..1a4947958 100644
--- a/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
+++ b/src/Wpf.Ui/Controls/ListView/ListViewItem.xaml
@@ -5,9 +5,12 @@
     All Rights Reserved.
 -->
 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Wpf.Ui.Controls">
 
-    <ControlTemplate x:Key="NullViewItemTemplate" TargetType="{x:Type ListViewItem}">
+    <ControlTemplate x:Key="NullViewItemTemplate" TargetType="{x:Type controls:ListViewItem}">
         <Border
             x:Name="Border"
             Margin="0"
@@ -45,7 +48,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="GridViewItemTemplate" TargetType="ListViewItem">
+  <ControlTemplate x:Key="GridViewItemTemplate" TargetType="{x:Type controls:ListViewItem}">
         <Border
             x:Name="Border"
             Margin="0"
@@ -55,7 +58,7 @@
             BorderThickness="{TemplateBinding Border.BorderThickness}"
             CornerRadius="{TemplateBinding Border.CornerRadius}">
             <Grid>
-                <GridViewRowPresenter
+                <controls:GridViewRowPresenter
                     Margin="{TemplateBinding Padding}"
                     VerticalAlignment="{TemplateBinding Control.VerticalContentAlignment}"
                     Columns="{TemplateBinding GridView.ColumnCollection}"
@@ -88,7 +91,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="ListViewItemStyle" TargetType="{x:Type ListViewItem}">
+    <Style x:Key="ListViewItemStyle" TargetType="{x:Type controls:ListViewItem}">
         <Setter Property="Foreground" Value="{DynamicResource ListViewItemForeground}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
@@ -104,6 +107,6 @@
         </Style.Triggers>
     </Style>
 
-    <Style BasedOn="{StaticResource ListViewItemStyle}" TargetType="{x:Type ListViewItem}" />
+    <Style BasedOn="{StaticResource ListViewItemStyle}" TargetType="{x:Type controls:ListViewItem}" />
 
 </ResourceDictionary>
diff --git a/src/Wpf.Ui/Resources/Wpf.Ui.xaml b/src/Wpf.Ui/Resources/Wpf.Ui.xaml
index 47117653d..7d574e0d7 100644
--- a/src/Wpf.Ui/Resources/Wpf.Ui.xaml
+++ b/src/Wpf.Ui/Resources/Wpf.Ui.xaml
@@ -45,6 +45,7 @@
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/FluentWindow/FluentWindow.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Flyout/Flyout.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Frame/Frame.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/GridView/GridViewColumnHeader.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/HyperlinkButton/HyperlinkButton.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Image/Image.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/InfoBar/InfoBar.xaml" />