diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
index 172288f23a..3831b634f0 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -43,8 +43,15 @@
                 <Button Content="Print" />
             </Controls:Badged>
             <Controls:Badged x:Name="CountingBadge"
+                             BadgeFontSize="12"
+                             BadgeMargin="4 0"
                              Width="100"
                              Margin="{StaticResource ControlMargin}">
+                <Controls:Badged.BadgeTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding StringFormat='{}Click-count: {0:00}'}" />
+                    </DataTemplate>
+                </Controls:Badged.BadgeTemplate>
                 <Button Click="CountingButton_OnClick" Content="Click Me" />
             </Controls:Badged>
             <Button Width="100"
diff --git a/src/MahApps.Metro/Converters/SizeToCornerRadiusConverter.cs b/src/MahApps.Metro/Converters/SizeToCornerRadiusConverter.cs
new file mode 100644
index 0000000000..acbe9ced51
--- /dev/null
+++ b/src/MahApps.Metro/Converters/SizeToCornerRadiusConverter.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Markup;
+
+namespace MahApps.Metro.Converters
+{
+    /// <summary>
+    /// This Converter converts a given height or width of an control to a CornerRadius
+    /// </summary>
+    [ValueConversion(typeof(double), typeof(CornerRadius))]
+    [MarkupExtensionReturnType(typeof(SizeToCornerRadiusConverter))]
+    public class SizeToCornerRadiusConverter : MarkupConverter
+    {
+        protected override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value is double val ? new CornerRadius(val / 2) : new CornerRadius();
+        }
+
+        protected override object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return Binding.DoNothing;
+        }
+
+        public override object ProvideValue(IServiceProvider serviceProvider)
+        {
+            return this;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/Badged.xaml b/src/MahApps.Metro/Themes/Badged.xaml
index a7cb6177bf..9db533206f 100644
--- a/src/MahApps.Metro/Themes/Badged.xaml
+++ b/src/MahApps.Metro/Themes/Badged.xaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
                     xmlns:controls="clr-namespace:MahApps.Metro.Controls">
 
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
@@ -22,7 +23,10 @@
     <Style TargetType="{x:Type controls:Badged}">
         <Setter Property="BadgeBackground" Value="{DynamicResource MahApps.Brushes.Badged.Background}" />
         <Setter Property="BadgeChangedStoryboard" Value="{StaticResource BadgeChangedStoryboard}" />
+        <Setter Property="BadgeFontSize" Value="11" />
+        <Setter Property="BadgeFontWeight" Value="DemiBold" />
         <Setter Property="BadgeForeground" Value="{DynamicResource MahApps.Brushes.Badged.Foreground}" />
+        <Setter Property="BadgeMargin" Value="1 0" />
         <Setter Property="BadgePlacementMode" Value="TopRight" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="IsTabStop" Value="False" />
@@ -43,26 +47,34 @@
                                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <Border x:Name="PART_BadgeContainer"
-                                MinWidth="18"
+                                MinWidth="{Binding RelativeSource={RelativeSource Mode=Self}, Path=ActualHeight}"
                                 MinHeight="18"
                                 Padding="2"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Top"
                                 Background="{TemplateBinding BadgeBackground}"
-                                CornerRadius="9"
+                                BorderBrush="{TemplateBinding BadgeBorderBrush}"
+                                BorderThickness="{TemplateBinding BadgeBorderThickness}"
+                                CornerRadius="{Binding RelativeSource={RelativeSource Mode=Self}, Path=ActualHeight, Converter={converters:SizeToCornerRadiusConverter}}"
                                 RenderTransformOrigin=".5,.5"
-                                TextElement.FontSize="11"
-                                TextElement.FontWeight="DemiBold"
                                 Visibility="{TemplateBinding IsBadgeSet, Converter={StaticResource BooleanToVisibilityConverter}}">
                             <Border.RenderTransform>
                                 <ScaleTransform ScaleX="1" ScaleY="1" />
                             </Border.RenderTransform>
                             <ContentControl x:Name="PART_BadgeContent"
-                                            Margin="1 0 1 0"
+                                            Margin="{TemplateBinding BadgeMargin}"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             Content="{TemplateBinding Badge}"
+                                            ContentStringFormat="{TemplateBinding BadgeStringFormat}"
+                                            ContentTemplate="{TemplateBinding BadgeTemplate}"
+                                            ContentTemplateSelector="{TemplateBinding BadgeTemplateSelector}"
                                             Focusable="False"
+                                            FontFamily="{TemplateBinding BadgeFontFamily}"
+                                            FontSize="{TemplateBinding BadgeFontSize}"
+                                            FontStretch="{TemplateBinding BadgeFontStretch}"
+                                            FontStyle="{TemplateBinding BadgeFontStyle}"
+                                            FontWeight="{TemplateBinding BadgeFontWeight}"
                                             Foreground="{TemplateBinding BadgeForeground}"
                                             IsTabStop="False" />
                         </Border>