diff --git a/HandyControl/Controls/Badge/Badge.cs b/HandyControl/Controls/Badge/Badge.cs
index 3b3cc918..23faa7f4 100644
--- a/HandyControl/Controls/Badge/Badge.cs
+++ b/HandyControl/Controls/Badge/Badge.cs
@@ -6,11 +6,6 @@ namespace HandyControl.Controls
 {
     public class Badge : ContentControl
     {
-        public Badge()
-        {
-            
-        }
-
         public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
             "Text", typeof(string), typeof(Badge), new PropertyMetadata(default(string)));
 
diff --git a/HandyControl/Controls/Panel/SimplePanel.cs b/HandyControl/Controls/Panel/SimplePanel.cs
new file mode 100644
index 00000000..41e9c532
--- /dev/null
+++ b/HandyControl/Controls/Panel/SimplePanel.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace HandyControl.Controls
+{
+    public class SimplePanel : Panel
+    {
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            var maxSize = new Size();
+            var children = InternalChildren;
+
+            for (int i = 0, count = children.Count; i < count; ++i)
+            {
+                var child = children[i];
+                if (child != null)
+                {
+                    child.Measure(availableSize);
+                    maxSize.Width = Math.Max(maxSize.Width, child.DesiredSize.Width);
+                    maxSize.Height = Math.Max(maxSize.Height, child.DesiredSize.Height);
+                }
+            }
+
+            return maxSize;
+        }
+
+        protected override Size ArrangeOverride(Size arrangeSize)
+        {
+            foreach (UIElement child in InternalChildren)
+            {
+                child?.Arrange(new Rect(arrangeSize));
+            }
+
+            return arrangeSize;
+        }
+    }
+}
\ No newline at end of file
diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj
index a56db0e9..da2a09d7 100644
--- a/HandyControl/HandyControl.csproj
+++ b/HandyControl/HandyControl.csproj
@@ -116,6 +116,7 @@
     <Compile Include="Controls\Other\Dialog.cs" />
     <Compile Include="Controls\Other\GotoTop.cs" />
     <Compile Include="Controls\Other\Gravatar.cs" />
+    <Compile Include="Controls\Panel\SimplePanel.cs" />
     <Compile Include="Controls\Transfer\Transfer.cs" />
     <Compile Include="Controls\Transfer\TransferGroup.cs" />
     <Compile Include="Controls\Transfer\TransferItem.cs" />
diff --git a/HandyControl/Themes/Styles/Base/BadgeBaseStyle.xaml b/HandyControl/Themes/Styles/Base/BadgeBaseStyle.xaml
index 811df7bf..f17adcc1 100644
--- a/HandyControl/Themes/Styles/Base/BadgeBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/BadgeBaseStyle.xaml
@@ -15,12 +15,12 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:Badge">
-                    <Grid>
+                    <controls:SimplePanel>
                         <ContentPresenter/>
-                        <Border HorizontalAlignment="Right" VerticalAlignment="Top" Style="{StaticResource BorderCircular}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <Border Margin="0,-10,-20,0" HorizontalAlignment="Right" VerticalAlignment="Top" Style="{StaticResource BorderCircular}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
                             <ContentPresenter ContentSource="Text" Margin="{TemplateBinding Padding}"/>
                         </Border>
-                    </Grid>
+                    </controls:SimplePanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/HandyControlDemo/UserControl/Controls/BadgeDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/BadgeDemoCtl.xaml
index e341b740..f030241c 100644
--- a/HandyControlDemo/UserControl/Controls/BadgeDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/BadgeDemoCtl.xaml
@@ -5,10 +5,10 @@
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              Background="{DynamicResource RegionBrush}">
     <StackPanel Margin="32" Orientation="Horizontal">
-        <controls:Badge Value="99">
+        <controls:Badge Value="99" Height="30">
             <Button Content="{x:Static langs:Lang.Comment}"/>
         </controls:Badge>
-        <controls:Badge Value="99" Margin="16,0,0,0" Style="{StaticResource BadgeChromeDanger}">
+        <controls:Badge Value="99" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeChromeDanger}">
             <Button Content="{x:Static langs:Lang.Reply}"/>
         </controls:Badge>
     </StackPanel>