diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ToolTip.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ToolTip.axaml
index 25281214..aa6d4bb8 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ToolTip.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ToolTip.axaml
@@ -20,6 +20,7 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <ContentPresenter Name="PART_ContentPresenter"
+                                  Margin="8"
                                   Effect="{StaticResource EffectShadow2}"
                                   Background="{TemplateBinding Background}"
                                   Padding="{TemplateBinding Padding}"
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index f1595e98..8c6fc365 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -11468,7 +11468,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ToolTip">
-					<Border Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" BorderThickness="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}">
+					<Border Margin="8" Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" BorderThickness="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}">
 						<ContentPresenter />
 					</Border>
 				</ControlTemplate>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToolTipBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToolTipBaseStyle.xaml
index 1f088de2..81e8767c 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToolTipBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToolTipBaseStyle.xaml
@@ -21,7 +21,8 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ToolTip">
-                    <Border Effect="{StaticResource EffectShadow2}"
+                    <Border Margin="8"
+                            Effect="{StaticResource EffectShadow2}"
                             Background="{TemplateBinding Background}"
                             Padding="{TemplateBinding Padding}"
                             BorderThickness="1"
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 8cc37b97..5f50dd9c 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -11587,7 +11587,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ToolTip">
-					<Border Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" BorderThickness="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}">
+					<Border Margin="8" Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" BorderThickness="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}">
 						<ContentPresenter />
 					</Border>
 				</ControlTemplate>