diff --git a/MapControl/Shared/PushpinBorder.cs b/MapControl/Shared/PushpinBorder.cs
index 5c525b55..92612286 100644
--- a/MapControl/Shared/PushpinBorder.cs
+++ b/MapControl/Shared/PushpinBorder.cs
@@ -69,7 +69,7 @@ namespace MapControl
                 figure.Segments.Add(ArcTo(x2 - r3, y2, r3));
             }
 
-            if (HorizontalAlignment != HorizontalAlignment.Left && HorizontalAlignment != HorizontalAlignment.Right)
+            if (HorizontalAlignment == HorizontalAlignment.Center)
             {
                 var c = width / 2d;
                 figure.Segments.Add(LineTo(c + aw / 2d, y2));
@@ -77,7 +77,7 @@ namespace MapControl
                 figure.Segments.Add(LineTo(c - aw / 2d, y2));
             }
 
-            if (HorizontalAlignment == HorizontalAlignment.Left)
+            if (HorizontalAlignment == HorizontalAlignment.Left || HorizontalAlignment == HorizontalAlignment.Stretch)
             {
                 figure.Segments.Add(LineTo(x1 + aw, y2));
                 figure.Segments.Add(LineTo(x1, y3));
diff --git a/MapControl/UWP/Themes/Generic.xaml b/MapControl/UWP/Themes/Generic.xaml
index fbd41ed6..e574f2bc 100644
--- a/MapControl/UWP/Themes/Generic.xaml
+++ b/MapControl/UWP/Themes/Generic.xaml
@@ -47,7 +47,7 @@
     <Style TargetType="map:MapItem" BasedOn="{StaticResource ContentControlStyle}"/>
 
     <Style TargetType="map:Pushpin" BasedOn="{StaticResource ContentControlStyle}">
-        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Bottom"/>
         <Setter Property="Padding" Value="5,7"/>
         <Setter Property="Template">
diff --git a/MapControl/WPF/Themes/Generic.xaml b/MapControl/WPF/Themes/Generic.xaml
index 2d4a2746..ca4c1005 100644
--- a/MapControl/WPF/Themes/Generic.xaml
+++ b/MapControl/WPF/Themes/Generic.xaml
@@ -51,7 +51,7 @@
     <Style TargetType="map:MapItem" BasedOn="{StaticResource ContentControlStyle}"/>
 
     <Style TargetType="map:Pushpin" BasedOn="{StaticResource ContentControlStyle}">
-        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Bottom"/>
         <Setter Property="Padding" Value="7,5"/>
         <Setter Property="Template">
diff --git a/MapControl/WinUI/Themes/Generic.xaml b/MapControl/WinUI/Themes/Generic.xaml
index 2a711066..202edd70 100644
--- a/MapControl/WinUI/Themes/Generic.xaml
+++ b/MapControl/WinUI/Themes/Generic.xaml
@@ -47,7 +47,7 @@
     <Style TargetType="map:MapItem" BasedOn="{StaticResource ContentControlStyle}"/>
 
     <Style TargetType="map:Pushpin" BasedOn="{StaticResource ContentControlStyle}">
-        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Bottom"/>
         <Setter Property="Padding" Value="7,5"/>
         <Setter Property="Template">