diff --git a/src/Avalonia.Themes.Default/PathIcon.xaml b/src/Avalonia.Themes.Default/PathIcon.xaml
index 2c9d1baeb4..a2d01f7b5b 100644
--- a/src/Avalonia.Themes.Default/PathIcon.xaml
+++ b/src/Avalonia.Themes.Default/PathIcon.xaml
@@ -2,14 +2,15 @@
         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}"
                  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..0a2c747514 100644
--- a/src/Avalonia.Themes.Fluent/PathIcon.xaml
+++ b/src/Avalonia.Themes.Fluent/PathIcon.xaml
@@ -10,14 +10,15 @@
   </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}"
                  Width="{TemplateBinding Width}">
           <Path Fill="{TemplateBinding Foreground}"
-                Data="{TemplateBinding Data}" />
+                Data="{TemplateBinding Data}"
+                Stretch="Uniform" />
         </Viewbox>
       </ControlTemplate>
     </Setter>