diff --git a/src/Avalonia.Themes.Fluent/Controls/DrawerPage.xaml b/src/Avalonia.Themes.Fluent/Controls/DrawerPage.xaml
index 612db8d69c..e93d6c9022 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DrawerPage.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DrawerPage.xaml
@@ -112,14 +112,15 @@
                         VerticalAlignment="Center"/>
                     </Panel>
                   </ToggleButton>
-                  <ContentControl x:Name="PART_TitlePresenter"
-                                  Content="{TemplateBinding Header}"
-                                  VerticalAlignment="Center"
-                                  VerticalContentAlignment="Center"
-                                  FontSize="16"
-                                  FontWeight="SemiBold"
-                                  Margin="8,0,0,0"
-                                  IsVisible="{TemplateBinding Header, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                  <ContentPresenter x:Name="PART_TitlePresenter"
+                                    Content="{TemplateBinding Header}"
+                                    ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                    VerticalAlignment="Center"
+                                    VerticalContentAlignment="Center"
+                                    FontSize="16"
+                                    FontWeight="SemiBold"
+                                    Margin="8,0,0,0"
+                                    IsVisible="{TemplateBinding Header, Converter={x:Static ObjectConverters.IsNotNull}}" />
                 </DockPanel>
               </Border>
               <Border
@@ -159,14 +160,15 @@
                         VerticalAlignment="Center"/>
                     </Panel>
                   </ToggleButton>
-                  <ContentControl x:Name="PART_BottomTitlePresenter"
-                                  Content="{TemplateBinding Header}"
-                                  VerticalAlignment="Center"
-                                  VerticalContentAlignment="Center"
-                                  FontSize="16"
-                                  FontWeight="SemiBold"
-                                  Margin="8,0,0,0"
-                                  IsVisible="{TemplateBinding Header, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                  <ContentPresenter x:Name="PART_BottomTitlePresenter"
+                                    Content="{TemplateBinding Header}"
+                                    ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                    VerticalAlignment="Center"
+                                    VerticalContentAlignment="Center"
+                                    FontSize="16"
+                                    FontWeight="SemiBold"
+                                    Margin="8,0,0,0"
+                                    IsVisible="{TemplateBinding Header, Converter={x:Static ObjectConverters.IsNotNull}}" />
                 </DockPanel>
               </Border>
               <ContentPresenter Name="PART_ContentPresenter"
diff --git a/src/Avalonia.Themes.Simple/Controls/DrawerPage.xaml b/src/Avalonia.Themes.Simple/Controls/DrawerPage.xaml
index 42445ff4c3..fa1b5796eb 100644
--- a/src/Avalonia.Themes.Simple/Controls/DrawerPage.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/DrawerPage.xaml
@@ -103,14 +103,15 @@
                         VerticalAlignment="Center"/>
                     </Panel>
                   </ToggleButton>
-                  <ContentControl x:Name="PART_TitlePresenter"
-                                  Content="{TemplateBinding Header}"
-                                  VerticalAlignment="Center"
-                                  VerticalContentAlignment="Center"
-                                  FontSize="16"
-                                  FontWeight="SemiBold"
-                                  Margin="8,0,0,0"
-                                  IsVisible="{TemplateBinding Header, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                  <ContentPresenter x:Name="PART_TitlePresenter"
+                                    Content="{TemplateBinding Header}"
+                                    ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                    VerticalAlignment="Center"
+                                    VerticalContentAlignment="Center"
+                                    FontSize="16"
+                                    FontWeight="SemiBold"
+                                    Margin="8,0,0,0"
+                                    IsVisible="{TemplateBinding Header, Converter={x:Static ObjectConverters.IsNotNull}}" />
                 </DockPanel>
               </Border>
               <Border
@@ -142,14 +143,15 @@
                         VerticalAlignment="Center"/>
                     </Panel>
                   </ToggleButton>
-                  <ContentControl x:Name="PART_BottomTitlePresenter"
-                                  Content="{TemplateBinding Header}"
-                                  VerticalAlignment="Center"
-                                  VerticalContentAlignment="Center"
-                                  FontSize="16"
-                                  FontWeight="SemiBold"
-                                  Margin="8,0,0,0"
-                                  IsVisible="{TemplateBinding Header, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                  <ContentPresenter x:Name="PART_BottomTitlePresenter"
+                                    Content="{TemplateBinding Header}"
+                                    ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                    VerticalAlignment="Center"
+                                    VerticalContentAlignment="Center"
+                                    FontSize="16"
+                                    FontWeight="SemiBold"
+                                    Margin="8,0,0,0"
+                                    IsVisible="{TemplateBinding Header, Converter={x:Static ObjectConverters.IsNotNull}}" />
                 </DockPanel>
               </Border>
               <ContentPresenter Name="PART_ContentPresenter"