diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index 0825feb..74da0d8 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -54,6 +54,11 @@
     <x:Double x:Key="ListAccentLowOpacity">0.6</x:Double>
     <x:Double x:Key="ListAccentMediumOpacity">0.8</x:Double>
     <x:Double x:Key="DataGridSortIconMinWidth">32</x:Double>
+    <Thickness x:Key="DataGridColumnHeaderPadding">12,0,0,0</Thickness>
+    <Thickness x:Key="DataGridCellPadding">0</Thickness>
+    <x:Double x:Key="DataGridCellFontSize">15</x:Double>
+    <x:Double x:Key="DataGridCellMinHeight">32</x:Double>
+    <x:Double x:Key="DataGridColumnHeaderFontSize">12</x:Double>
 
     <StreamGeometry x:Key="DataGridSortIconDescendingPath">M1875 1011l-787 787v-1798h-128v1798l-787 -787l-90 90l941 941l941 -941z</StreamGeometry>
     <StreamGeometry x:Key="DataGridSortIconAscendingPath">M1965 947l-941 -941l-941 941l90 90l787 -787v1798h128v-1798l787 787z</StreamGeometry>
@@ -85,8 +90,9 @@
       <Setter Property="Background" Value="{DynamicResource DataGridCellBackgroundBrush}" />
       <Setter Property="HorizontalContentAlignment" Value="Stretch" />
       <Setter Property="VerticalContentAlignment" Value="Stretch" />
-      <Setter Property="FontSize" Value="15" />
-      <Setter Property="MinHeight" Value="32" />
+      <Setter Property="FontSize" Value="{DynamicResource DataGridCellFontSize}" />
+      <Setter Property="MinHeight" Value="{DynamicResource DataGridCellMinHeight}" />
+      <Setter Property="Padding" Value="{DynamicResource DataGridCellPadding}" />
       <Setter Property="Template">
         <ControlTemplate>
           <Border x:Name="CellBorder"
@@ -162,9 +168,9 @@
       <Setter Property="HorizontalContentAlignment" Value="Stretch" />
       <Setter Property="VerticalContentAlignment" Value="Center" />
       <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
-      <Setter Property="Padding" Value="12,0,0,0" />
-      <Setter Property="FontSize" Value="12" />
-      <Setter Property="MinHeight" Value="32" />
+      <Setter Property="Padding" Value="{DynamicResource DataGridColumnHeaderPadding}" />
+      <Setter Property="FontSize" Value="{DynamicResource DataGridColumnHeaderFontSize}" />
+      <Setter Property="MinHeight" Value="{DynamicResource DataGridCellMinHeight}" />
       <Setter Property="Template">
         <ControlTemplate>
           <Border x:Name="HeaderBorder"
@@ -414,8 +420,8 @@
     <ControlTheme x:Key="{x:Type DataGridRowGroupHeader}" TargetType="DataGridRowGroupHeader">
       <Setter Property="Foreground" Value="{DynamicResource DataGridRowGroupHeaderForegroundBrush}" />
       <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderBackgroundBrush}" />
-      <Setter Property="FontSize" Value="15" />
-      <Setter Property="MinHeight" Value="32" />
+      <Setter Property="FontSize" Value="{DynamicResource DataGridCellFontSize}" />
+      <Setter Property="MinHeight" Value="{DynamicResource DataGridCellMinHeight}" />
       <Setter Property="Template">
         <ControlTemplate x:DataType="collections:DataGridCollectionViewGroup">
           <DataGridFrozenGrid Name="PART_Root"