From afd565abd1b2ccf78a90bf528db537d4025bd4cd Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 29 Sep 2020 21:31:55 +0100
Subject: [PATCH 1/2] ensure path icon is centered.

---
 src/Avalonia.Themes.Default/PathIcon.xaml | 3 ++-
 src/Avalonia.Themes.Fluent/PathIcon.xaml  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Themes.Default/PathIcon.xaml b/src/Avalonia.Themes.Default/PathIcon.xaml
index 2c9d1baeb4..20b01b46f4 100644
--- a/src/Avalonia.Themes.Default/PathIcon.xaml
+++ b/src/Avalonia.Themes.Default/PathIcon.xaml
@@ -9,7 +9,8 @@
         <Viewbox Height="{TemplateBinding Height}"
                  Width="{TemplateBinding Width}">
           <Path Fill="{TemplateBinding Foreground}"
-                Data="{TemplateBinding Data}" />
+                Data="{TemplateBinding Data}"
+                Stretch="Uniform" />
         </Viewbox>
       </ControlTemplate>
     </Setter>
diff --git a/src/Avalonia.Themes.Fluent/PathIcon.xaml b/src/Avalonia.Themes.Fluent/PathIcon.xaml
index 4ec5b9aaa4..dfaa476439 100644
--- a/src/Avalonia.Themes.Fluent/PathIcon.xaml
+++ b/src/Avalonia.Themes.Fluent/PathIcon.xaml
@@ -17,7 +17,8 @@
         <Viewbox Height="{TemplateBinding Height}"
                  Width="{TemplateBinding Width}">
           <Path Fill="{TemplateBinding Foreground}"
-                Data="{TemplateBinding Data}" />
+                Data="{TemplateBinding Data}"
+                Stretch="Uniform" />
         </Viewbox>
       </ControlTemplate>
     </Setter>

From bed7e90f540d4c5e01b27cb4f9aabb0cc647fbf9 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 29 Sep 2020 21:40:09 +0100
Subject: [PATCH 2/2] fix resource usage.

---
 src/Avalonia.Themes.Default/PathIcon.xaml | 4 ++--
 src/Avalonia.Themes.Fluent/PathIcon.xaml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Themes.Default/PathIcon.xaml b/src/Avalonia.Themes.Default/PathIcon.xaml
index 20b01b46f4..a2d01f7b5b 100644
--- a/src/Avalonia.Themes.Default/PathIcon.xaml
+++ b/src/Avalonia.Themes.Default/PathIcon.xaml
@@ -2,8 +2,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Style Selector="PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
-    <Setter Property="Height" Value="16" />
-    <Setter Property="Width" Value="16" />
+    <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
+    <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Viewbox Height="{TemplateBinding Height}"
diff --git a/src/Avalonia.Themes.Fluent/PathIcon.xaml b/src/Avalonia.Themes.Fluent/PathIcon.xaml
index dfaa476439..0a2c747514 100644
--- a/src/Avalonia.Themes.Fluent/PathIcon.xaml
+++ b/src/Avalonia.Themes.Fluent/PathIcon.xaml
@@ -10,8 +10,8 @@
   </Design.PreviewWith>
   <Style Selector="PathIcon">
     <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
-    <Setter Property="Height" Value="16" />
-    <Setter Property="Width" Value="16" />
+    <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
+    <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Viewbox Height="{TemplateBinding Height}"