diff --git a/src/Avalonia/HandyControlDemo_Avalonia/Data/DemoInfo.json b/src/Avalonia/HandyControlDemo_Avalonia/Data/DemoInfo.json
index be2fde9a..70825d32 100644
--- a/src/Avalonia/HandyControlDemo_Avalonia/Data/DemoInfo.json
+++ b/src/Avalonia/HandyControlDemo_Avalonia/Data/DemoInfo.json
@@ -15,7 +15,6 @@
       [ "TextBlock", "TextBlockDemo", "Brush.TextBlock", "", "" ],
       [ "TextBox", "TextBoxDemo", "Brush.TextBox", "", "" ],
       [ "ComboBox", "NativeComboBoxDemo", "Brush.ComboBox", "", "" ],
-      [ "PasswordBox", "NativePasswordBoxDemo", "Brush.PasswordBox", "", "" ],
       [ "Expander", "ExpanderDemo", "Brush.Expander", "", "" ],
       [ "ProgressBar", "NativeProgressBarDemo", "Brush.ProgressBar", "", "" ],
       [ "Calendar", "CalendarDemo", "Brush.Calendar", "", "" ],
@@ -55,7 +54,6 @@
       [ "ComboBox", "ComboBoxDemo", "Brush.ComboBox", "", "DataEntry" ],
       [ "CheckComboBox", "CheckComboBoxDemo", "Brush.CheckBoxList", "", "DataEntry" ],
       [ "AutoCompleteTextBox", "AutoCompleteTextBoxDemo", "Brush.AutoComplete", "1", "DataEntry" ],
-      [ "PasswordBox", "PasswordBoxDemo", "Brush.PasswordBox", "", "DataEntry" ],
       [ "PinBox", "PinBoxDemo", "Brush.Ellipsis", "", "DataEntry" ],
       [ "DatePicker", "DatePickerDemo", "Brush.DateTimePicker", "", "DataEntry" ],
       [ "Clock", "ClockDemo", "Brush.Time", "", "DataEntry" ],
diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/TextBoxDemo.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/TextBoxDemo.axaml
index 44cafce7..ba453683 100644
--- a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/TextBoxDemo.axaml
+++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/TextBoxDemo.axaml
@@ -53,6 +53,7 @@
             </StackPanel>
             <StackPanel>
                 <TextBox Text="This is the content"
+                         PasswordChar="●"
                          Theme="{StaticResource TextBox.Small}" />
                 <TextBox Text="This is the content"
                          Margin="0,16,0,0"
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/CheckBox.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/CheckBox.axaml
index c7cfb96d..33c51b1a 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/CheckBox.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/CheckBox.axaml
@@ -60,14 +60,16 @@
                                    Opacity="1"
                                    x:Name="indeterminateMark" />
                     </Panel>
-                    <ContentPresenter x:Name="contentPresenter"
-                                      IsVisible="{Binding $self.Content, Converter={x:Static ObjectConverters.IsNotNull}}"
+                    <ContentPresenter Name="PART_ContentPresenter"
                                       Grid.Column="1"
-                                      Focusable="False"
-                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                       Margin="{TemplateBinding Padding}"
+                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                      Content="{TemplateBinding Content}"
+                                      ContentTemplate="{TemplateBinding ContentTemplate}"
+                                      IsVisible="{TemplateBinding Content, Converter={x:Static ObjectConverters.IsNotNull}}"
                                       RecognizesAccessKey="True"
-                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                      TextElement.Foreground="{TemplateBinding Foreground}" />
                 </Grid>
             </ControlTemplate>
         </Setter>
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/DataValidationErrors.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/DataValidationErrors.axaml
index 48603a48..26f088f2 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/DataValidationErrors.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/DataValidationErrors.axaml
@@ -28,12 +28,6 @@
                         Height="16"
                         Margin="4,0,1,0"
                         Background="Transparent">
-                    <Canvas.Styles>
-                        <Style Selector="ToolTip">
-                            <Setter Property="BorderBrush"
-                                    Value="{DynamicResource DangerBrush}" />
-                        </Style>
-                    </Canvas.Styles>
                     <ToolTip.Tip>
                         <ItemsControl x:DataType="DataValidationErrors"
                                       ItemsSource="{Binding}" />
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/PopupRoot.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/PopupRoot.axaml
new file mode 100644
index 00000000..4841ddb0
--- /dev/null
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/PopupRoot.axaml
@@ -0,0 +1,29 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type PopupRoot}"
+                  TargetType="PopupRoot">
+        <Setter Property="Background"
+                Value="{x:Null}" />
+        <Setter Property="TransparencyLevelHint"
+                Value="Transparent" />
+        <Setter Property="Foreground"
+                Value="{DynamicResource PrimaryTextBrush}" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
+                    <Panel>
+                        <Border Name="PART_TransparencyFallback"
+                                IsHitTestVisible="False" />
+                        <VisualLayerManager IsPopup="True">
+                            <ContentPresenter Name="PART_ContentPresenter"
+                                              Background="{TemplateBinding Background}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              Content="{TemplateBinding Content}"
+                                              Padding="{TemplateBinding Padding}" />
+                        </VisualLayerManager>
+                    </Panel>
+                </LayoutTransformControl>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ToolTip.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ToolTip.axaml
new file mode 100644
index 00000000..25281214
--- /dev/null
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ToolTip.axaml
@@ -0,0 +1,34 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:hc="https://handyorg.github.io/handycontrol">
+    <ControlTheme x:Key="{x:Type ToolTip}"
+                  TargetType="ToolTip">
+        <Setter Property="Padding"
+                Value="{StaticResource DefaultControlPadding}" />
+        <Setter Property="Background"
+                Value="{DynamicResource RegionBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource BorderBrush}" />
+        <Setter Property="BorderThickness"
+                Value="1" />
+        <Setter Property="Foreground"
+                Value="{DynamicResource PrimaryTextBrush}" />
+        <Setter Property="FontSize"
+                Value="12" />
+        <Setter Property="hc:BorderElement.CornerRadius"
+                Value="{StaticResource DefaultCornerRadius}" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <ContentPresenter Name="PART_ContentPresenter"
+                                  Effect="{StaticResource EffectShadow2}"
+                                  Background="{TemplateBinding Background}"
+                                  Padding="{TemplateBinding Padding}"
+                                  BorderThickness="{TemplateBinding BorderThickness}"
+                                  CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                                  BorderBrush="{TemplateBinding BorderBrush}"
+                                  Content="{TemplateBinding Content}"
+                                  ContentTemplate="{TemplateBinding ContentTemplate}" />
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Theme.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Theme.axaml
index f0f8220b..ec1700e4 100644
--- a/src/Avalonia/HandyControl_Avalonia/Themes/Theme.axaml
+++ b/src/Avalonia/HandyControl_Avalonia/Themes/Theme.axaml
@@ -16,6 +16,8 @@
                 <MergeResourceInclude Source="/Themes/Basic/Converters.axaml" />
 
                 <MergeResourceInclude Source="/Themes/Styles/DataValidationErrors.axaml" />
+                <MergeResourceInclude Source="/Themes/Styles/PopupRoot.axaml" />
+                <MergeResourceInclude Source="/Themes/Styles/ToolTip.axaml" />
                 <MergeResourceInclude Source="/Themes/Styles/TextBlock.axaml" />
                 <MergeResourceInclude Source="/Themes/Styles/ContentControl.axaml" />
                 <MergeResourceInclude Source="/Themes/Styles/UserControl.axaml" />
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 70099c34..f1595e98 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -11458,16 +11458,18 @@
 		</Style.Triggers>
 	</Style>
 	<Style x:Key="ToolTipBaseStyle" TargetType="ToolTip">
-		<Setter Property="Padding" Value="0,6" />
-		<Setter Property="Background" Value="White" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
 		<Setter Property="FontSize" Value="12" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="2" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ToolTip">
-					<Border Effect="{StaticResource EffectShadow2}" Margin="8" Background="{DynamicResource RegionBrush}" Padding="{TemplateBinding Padding}" BorderThickness="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}">
-						<ContentPresenter Margin="10,0" />
+					<Border 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>
 			</Setter.Value>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToolTipBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToolTipBaseStyle.xaml
index 09242d57..1f088de2 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToolTipBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToolTipBaseStyle.xaml
@@ -2,17 +2,32 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:hc="clr-namespace:HandyControl.Controls">
 
-    <Style x:Key="ToolTipBaseStyle" TargetType="ToolTip">
-        <Setter Property="Padding" Value="0,6"/>
-        <Setter Property="Background" Value="White"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="FontSize" Value="12"/>
-        <Setter Property="hc:BorderElement.CornerRadius" Value="2"/>
+    <Style x:Key="ToolTipBaseStyle"
+           TargetType="ToolTip">
+        <Setter Property="Padding"
+                Value="{StaticResource DefaultControlPadding}" />
+        <Setter Property="Background"
+                Value="{DynamicResource RegionBrush}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource BorderBrush}" />
+        <Setter Property="BorderThickness"
+                Value="1" />
+        <Setter Property="Foreground"
+                Value="{DynamicResource PrimaryTextBrush}" />
+        <Setter Property="FontSize"
+                Value="12" />
+        <Setter Property="hc:BorderElement.CornerRadius"
+                Value="{StaticResource DefaultCornerRadius}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ToolTip">
-                    <Border Effect="{StaticResource EffectShadow2}" Margin="8" Background="{DynamicResource RegionBrush}" Padding="{TemplateBinding Padding}" BorderThickness="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}">
-                        <ContentPresenter Margin="10,0"/>
+                    <Border 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>
             </Setter.Value>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 4c7f55fe..8cc37b97 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -11577,16 +11577,18 @@
 		</Style.Triggers>
 	</Style>
 	<Style x:Key="ToolTipBaseStyle" TargetType="ToolTip">
-		<Setter Property="Padding" Value="0,6" />
-		<Setter Property="Background" Value="White" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
 		<Setter Property="FontSize" Value="12" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="2" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ToolTip">
-					<Border Effect="{StaticResource EffectShadow2}" Margin="8" Background="{DynamicResource RegionBrush}" Padding="{TemplateBinding Padding}" BorderThickness="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}">
-						<ContentPresenter Margin="10,0" />
+					<Border 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>
 			</Setter.Value>