diff --git a/src/WPFDevelopers.Net40/Themes/Theme.xaml b/src/WPFDevelopers.Net40/Themes/Theme.xaml
index a8ddc30d..b0d7b7c6 100644
--- a/src/WPFDevelopers.Net40/Themes/Theme.xaml
+++ b/src/WPFDevelopers.Net40/Themes/Theme.xaml
@@ -2458,7 +2458,7 @@
 		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
 		<Setter Property="BorderThickness" Value="0,0,0,1" />
 		<Setter Property="BorderBrush" Value="{DynamicResource BaseSolidColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource BackgroundColor}" />
+		<Setter Property="Background" Value="{DynamicResource BackgroundSolidColorBrush}" />
 		<Setter Property="Cursor" Value="Hand" />
 		<Setter Property="ValidationErrorTemplate">
 			<Setter.Value>
@@ -2536,10 +2536,11 @@
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="HorizontalAlignment" Value="Center" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type DataGridRowHeader}">
-					<Grid HorizontalAlignment="Center">
+					<controls:SmallPanel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="CommonStates">
 								<VisualState x:Name="Normal" />
@@ -2568,7 +2569,7 @@
 						</Border>
 						<Thumb x:Name="PART_TopHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Top" />
 						<Thumb x:Name="PART_BottomHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Bottom" />
-					</Grid>
+					</controls:SmallPanel>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
@@ -2609,7 +2610,7 @@
 							<DoubleAnimation Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" Storyboard.TargetName="SortArrow" Duration="00:00:.2" To="0" />
 						</Storyboard>
 					</ControlTemplate.Resources>
-					<Grid>
+					<controls:SmallPanel>
 						<Border x:Name="columnHeaderBorder" Background="{TemplateBinding Background}" Padding="10" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
 							<Grid Name="HedearGrid">
 								<Grid.ColumnDefinitions>
@@ -2626,7 +2627,7 @@
 						</Border>
 						<Thumb x:Name="PART_LeftHeaderGripper" HorizontalAlignment="Left" Style="{StaticResource ColumnHeaderGripperStyle}" />
 						<Thumb x:Name="PART_RightHeaderGripper" HorizontalAlignment="Right" Style="{StaticResource ColumnHeaderGripperStyle}" />
-					</Grid>
+					</controls:SmallPanel>
 					<ControlTemplate.Triggers>
 						<Trigger Property="SortDirection" Value="Ascending">
 							<Setter TargetName="SortArrow" Property="Visibility" Value="Visible" />
diff --git a/src/WPFDevelopers.Net45x/Themes/Theme.xaml b/src/WPFDevelopers.Net45x/Themes/Theme.xaml
index fb557665..4472f806 100644
--- a/src/WPFDevelopers.Net45x/Themes/Theme.xaml
+++ b/src/WPFDevelopers.Net45x/Themes/Theme.xaml
@@ -2459,7 +2459,7 @@
 		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
 		<Setter Property="BorderThickness" Value="0,0,0,1" />
 		<Setter Property="BorderBrush" Value="{DynamicResource BaseSolidColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource BackgroundColor}" />
+		<Setter Property="Background" Value="{DynamicResource BackgroundSolidColorBrush}" />
 		<Setter Property="Cursor" Value="Hand" />
 		<Setter Property="ValidationErrorTemplate">
 			<Setter.Value>
@@ -2537,10 +2537,11 @@
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="HorizontalAlignment" Value="Center" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type DataGridRowHeader}">
-					<Grid HorizontalAlignment="Center">
+					<controls:SmallPanel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="CommonStates">
 								<VisualState x:Name="Normal" />
@@ -2569,7 +2570,7 @@
 						</Border>
 						<Thumb x:Name="PART_TopHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Top" />
 						<Thumb x:Name="PART_BottomHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Bottom" />
-					</Grid>
+					</controls:SmallPanel>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
@@ -2610,7 +2611,7 @@
 							<DoubleAnimation Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" Storyboard.TargetName="SortArrow" Duration="00:00:.2" To="0" />
 						</Storyboard>
 					</ControlTemplate.Resources>
-					<Grid>
+					<controls:SmallPanel>
 						<Border x:Name="columnHeaderBorder" Background="{TemplateBinding Background}" Padding="10" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
 							<Grid Name="HedearGrid">
 								<Grid.ColumnDefinitions>
@@ -2627,7 +2628,7 @@
 						</Border>
 						<Thumb x:Name="PART_LeftHeaderGripper" HorizontalAlignment="Left" Style="{StaticResource ColumnHeaderGripperStyle}" />
 						<Thumb x:Name="PART_RightHeaderGripper" HorizontalAlignment="Right" Style="{StaticResource ColumnHeaderGripperStyle}" />
-					</Grid>
+					</controls:SmallPanel>
 					<ControlTemplate.Triggers>
 						<Trigger Property="SortDirection" Value="Ascending">
 							<Setter TargetName="SortArrow" Property="Visibility" Value="Visible" />
diff --git a/src/WPFDevelopers.Samples/ExampleViews/BasicControlsExample.xaml b/src/WPFDevelopers.Samples/ExampleViews/BasicControlsExample.xaml
index 7de45fc8..c2ac6136 100644
--- a/src/WPFDevelopers.Samples/ExampleViews/BasicControlsExample.xaml
+++ b/src/WPFDevelopers.Samples/ExampleViews/BasicControlsExample.xaml
@@ -225,7 +225,7 @@
                                     </DataGridTemplateColumn.HeaderTemplate>
                                     <DataGridTemplateColumn.CellTemplate>
                                         <DataTemplate>
-                                            <CheckBox IsChecked="{Binding IsChecked}"/>
+                                                <CheckBox Margin="10,0,0,0" IsChecked="{Binding IsChecked}"/>
                                         </DataTemplate>
                                     </DataGridTemplateColumn.CellTemplate>
                                 </DataGridTemplateColumn>
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.DataGrid.xaml b/src/WPFDevelopers.Shared/Styles/Styles.DataGrid.xaml
index 40004c34..20bc3b64 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.DataGrid.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.DataGrid.xaml
@@ -214,7 +214,7 @@
         <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
         <Setter Property="BorderThickness" Value="0,0,0,1"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BaseSolidColorBrush}"/>
-        <Setter Property="Background" Value="{DynamicResource BackgroundColor}"/>
+        <Setter Property="Background" Value="{DynamicResource BackgroundSolidColorBrush}"/>
         <Setter Property="Cursor" Value="Hand"/>
         <Setter Property="ValidationErrorTemplate">
             <Setter.Value>
@@ -325,10 +325,12 @@
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGridRowHeader}">
-                    <Grid HorizontalAlignment="Center">
+                    <controls:SmallPanel HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                         VerticalAlignment="{TemplateBinding VerticalAlignment}">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
@@ -371,7 +373,7 @@
                         <Thumb x:Name="PART_BottomHeaderGripper"
                  Style="{StaticResource RowHeaderGripperStyle}"
                  VerticalAlignment="Bottom" />
-                    </Grid>
+                    </controls:SmallPanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -424,7 +426,7 @@
                                                  Duration="00:00:.2" To="0"/>
                         </Storyboard>
                     </ControlTemplate.Resources>
-                    <Grid>
+                    <controls:SmallPanel>
                         <Border x:Name="columnHeaderBorder" 
                                 Background="{TemplateBinding Background}"
                                 Padding="10"
@@ -459,7 +461,7 @@
                         <Thumb x:Name="PART_RightHeaderGripper"
                  HorizontalAlignment="Right"
                  Style="{StaticResource ColumnHeaderGripperStyle}" />
-                    </Grid>
+                    </controls:SmallPanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="SortDirection" Value="Ascending">
                             <Setter TargetName="SortArrow" Property="Visibility" Value="Visible" />