diff --git a/MapControl/Avalonia/Themes/Generic.axaml b/MapControl/Avalonia/Themes/Generic.axaml
index caecb9b0..377c268e 100644
--- a/MapControl/Avalonia/Themes/Generic.axaml
+++ b/MapControl/Avalonia/Themes/Generic.axaml
@@ -36,9 +36,11 @@
     <ControlTheme TargetType="map:Pushpin" x:Key="{x:Type map:Pushpin}" BasedOn="{StaticResource ContentControlTheme}">
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="CornerRadius" Value="5"/>
-        <Setter Property="Padding" Value="7,5"/>
+        <Setter Property="CornerRadius" Value="0"/>
+        <Setter Property="Padding" Value="6,4"/>
         <Setter Property="Template">
             <ControlTemplate TargetType="map:Pushpin">
                 <map:PushpinBorder
diff --git a/MapControl/Shared/PushpinBorder.cs b/MapControl/Shared/PushpinBorder.cs
index 57c2feaa..8b6f6aaa 100644
--- a/MapControl/Shared/PushpinBorder.cs
+++ b/MapControl/Shared/PushpinBorder.cs
@@ -54,38 +54,38 @@ namespace MapControl
                 IsFilled = true
             };
 
-            figure.Segments.Add(ArcTo(x1 + r1, y1, r1));
-            figure.Segments.Add(LineTo(x2 - r2, y1));
-            figure.Segments.Add(ArcTo(x2, y1 + r2, r2));
+            figure.ArcTo(x1 + r1, y1, r1);
+            figure.LineTo(x2 - r2, y1);
+            figure.ArcTo(x2, y1 + r2, r2);
 
             if (HorizontalAlignment == HorizontalAlignment.Right)
             {
-                figure.Segments.Add(LineTo(x2, y3));
-                figure.Segments.Add(LineTo(x2 - aw, y2));
+                figure.LineTo(x2, y3);
+                figure.LineTo(x2 - aw, y2);
             }
             else
             {
-                figure.Segments.Add(LineTo(x2, y2 - r3));
-                figure.Segments.Add(ArcTo(x2 - r3, y2, r3));
+                figure.LineTo(x2, y2 - r3);
+                figure.ArcTo(x2 - r3, y2, r3);
             }
 
             if (HorizontalAlignment == HorizontalAlignment.Center)
             {
                 var c = width / 2d;
-                figure.Segments.Add(LineTo(c + aw / 2d, y2));
-                figure.Segments.Add(LineTo(c, y3));
-                figure.Segments.Add(LineTo(c - aw / 2d, y2));
+                figure.LineTo(c + aw / 2d, y2);
+                figure.LineTo(c, y3);
+                figure.LineTo(c - aw / 2d, y2);
             }
 
             if (HorizontalAlignment == HorizontalAlignment.Left || HorizontalAlignment == HorizontalAlignment.Stretch)
             {
-                figure.Segments.Add(LineTo(x1 + aw, y2));
-                figure.Segments.Add(LineTo(x1, y3));
+                figure.LineTo(x1 + aw, y2);
+                figure.LineTo(x1, y3);
             }
             else
             {
-                figure.Segments.Add(LineTo(x1 + r4, y2));
-                figure.Segments.Add(ArcTo(x1, y2 - r4, r4));
+                figure.LineTo(x1 + r4, y2);
+                figure.ArcTo(x1, y2 - r4, r4);
             }
 
             var geometry = new PathGeometry();
@@ -93,23 +93,29 @@ namespace MapControl
 
             return geometry;
         }
+    }
 
-        private static LineSegment LineTo(double x, double y)
+    internal static class PathFigureExtensions
+    {
+        public static void LineTo(this PathFigure figure, double x, double y)
         {
-            return new LineSegment
+            figure.Segments.Add(new LineSegment
             {
                 Point = new Point(x, y)
-            };
+            });
         }
 
-        private static ArcSegment ArcTo(double x, double y, double r)
+        public static void ArcTo(this PathFigure figure, double x, double y, double r)
         {
-            return new ArcSegment
+            if (r > 0d)
             {
-                Point = new Point(x, y),
-                Size = new Size(r, r),
-                SweepDirection = SweepDirection.Clockwise
-            };
+                figure.Segments.Add(new ArcSegment
+                {
+                    Point = new Point(x, y),
+                    Size = new Size(r, r),
+                    SweepDirection = SweepDirection.Clockwise
+                });
+            }
         }
     }
 }
diff --git a/MapControl/UWP/Themes/Generic.xaml b/MapControl/UWP/Themes/Generic.xaml
index 2194b398..a84410d9 100644
--- a/MapControl/UWP/Themes/Generic.xaml
+++ b/MapControl/UWP/Themes/Generic.xaml
@@ -50,9 +50,11 @@
     <Style TargetType="map:Pushpin" BasedOn="{StaticResource ContentControlStyle}">
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="CornerRadius" Value="5"/>
-        <Setter Property="Padding" Value="5,7"/>
+        <Setter Property="CornerRadius" Value="0"/>
+        <Setter Property="Padding" Value="3,6,4,6"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="map:Pushpin">
diff --git a/MapControl/WPF/Themes/Generic.xaml b/MapControl/WPF/Themes/Generic.xaml
index d7cb6d22..196cd354 100644
--- a/MapControl/WPF/Themes/Generic.xaml
+++ b/MapControl/WPF/Themes/Generic.xaml
@@ -49,9 +49,11 @@
     <Style TargetType="map:Pushpin" BasedOn="{StaticResource ContentControlStyle}">
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="CornerRadius" Value="5"/>
-        <Setter Property="Padding" Value="7,5"/>
+        <Setter Property="CornerRadius" Value="0"/>
+        <Setter Property="Padding" Value="6,3,6,4"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="map:Pushpin">
diff --git a/MapControl/WinUI/Themes/Generic.xaml b/MapControl/WinUI/Themes/Generic.xaml
index ef87a1a8..743e4ca7 100644
--- a/MapControl/WinUI/Themes/Generic.xaml
+++ b/MapControl/WinUI/Themes/Generic.xaml
@@ -50,9 +50,11 @@
     <Style TargetType="map:Pushpin" BasedOn="{StaticResource ContentControlStyle}">
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="CornerRadius" Value="5"/>
-        <Setter Property="Padding" Value="7,5"/>
+        <Setter Property="CornerRadius" Value="0"/>
+        <Setter Property="Padding" Value="6,3,6,4"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="map:Pushpin">