diff --git a/MapControl/UWP/Themes/Generic.xaml b/MapControl/UWP/Themes/Generic.xaml
index e574f2bc..8e39fede 100644
--- a/MapControl/UWP/Themes/Generic.xaml
+++ b/MapControl/UWP/Themes/Generic.xaml
@@ -49,17 +49,19 @@
     <Style TargetType="map:Pushpin" BasedOn="{StaticResource ContentControlStyle}">
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="5"/>
         <Setter Property="Padding" Value="5,7"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="map:Pushpin">
                     <map:PushpinBorder
                         HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        Padding="{TemplateBinding Padding}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderWidth="1"
-                        CornerRadius="5">
+                        BorderWidth="{Binding BorderThickness.Left, RelativeSource={RelativeSource TemplatedParent}}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        Padding="{TemplateBinding Padding}">
                         <ContentPresenter
                             Content="{TemplateBinding Content}"
                             ContentTemplate="{TemplateBinding ContentTemplate}"
diff --git a/MapControl/WPF/MapContentControl.WPF.cs b/MapControl/WPF/MapContentControl.WPF.cs
index 9d0e7a85..c607d635 100644
--- a/MapControl/WPF/MapContentControl.WPF.cs
+++ b/MapControl/WPF/MapContentControl.WPF.cs
@@ -49,5 +49,14 @@ namespace MapControl
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(Pushpin), new FrameworkPropertyMetadata(typeof(Pushpin)));
         }
+
+        public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register(
+            nameof(CornerRadius), typeof(CornerRadius), typeof(Pushpin));
+
+        public CornerRadius CornerRadius
+        {
+            get { return (CornerRadius)GetValue(CornerRadiusProperty); }
+            set { SetValue(CornerRadiusProperty, value); }
+        }
     }
 }
diff --git a/MapControl/WPF/Themes/Generic.xaml b/MapControl/WPF/Themes/Generic.xaml
index ca4c1005..c14c8442 100644
--- a/MapControl/WPF/Themes/Generic.xaml
+++ b/MapControl/WPF/Themes/Generic.xaml
@@ -53,17 +53,19 @@
     <Style TargetType="map:Pushpin" BasedOn="{StaticResource ContentControlStyle}">
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="5"/>
         <Setter Property="Padding" Value="7,5"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="map:Pushpin">
                     <map:PushpinBorder
                         HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        Padding="{TemplateBinding Padding}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderWidth="1"
-                        CornerRadius="5">
+                        BorderWidth="{Binding BorderThickness.Left, RelativeSource={RelativeSource TemplatedParent}}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        Padding="{TemplateBinding Padding}">
                         <ContentPresenter
                             Content="{TemplateBinding Content}"
                             ContentTemplate="{TemplateBinding ContentTemplate}"
diff --git a/MapControl/WinUI/Themes/Generic.xaml b/MapControl/WinUI/Themes/Generic.xaml
index 202edd70..0225062c 100644
--- a/MapControl/WinUI/Themes/Generic.xaml
+++ b/MapControl/WinUI/Themes/Generic.xaml
@@ -49,17 +49,19 @@
     <Style TargetType="map:Pushpin" BasedOn="{StaticResource ContentControlStyle}">
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="5"/>
         <Setter Property="Padding" Value="7,5"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="map:Pushpin">
                     <map:PushpinBorder
                         HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        Padding="{TemplateBinding Padding}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderWidth="1"
-                        CornerRadius="5">
+                        BorderWidth="{Binding BorderThickness.Left, RelativeSource={RelativeSource TemplatedParent}}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        Padding="{TemplateBinding Padding}">
                         <ContentPresenter
                             Content="{TemplateBinding Content}"
                             ContentTemplate="{TemplateBinding ContentTemplate}"