diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 2a0eca63..47296b51 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -3503,6 +3503,12 @@
                                                                    Padding="0,7"
                                                                    FontSize="17" FontWeight="Bold"
                                                                    TextAlignment="Center" />
+                                                        <Image Margin="144,10,0,0"
+                                                               Source="/Resources/new-icons/close-white.png"
+                                                               RenderOptions.BitmapScalingMode="HighQuality"
+                                                               Height="16"
+                                                               Width="16" MouseDown="Border_MouseDown"
+                                                               MouseUp="CloseBordertools_MouseUp" />
                                                     </Canvas>
                                                 </Border>
                                                 <Viewbox Margin="8,0,8,0">
@@ -4625,6 +4631,12 @@
                                                                        Padding="0,5"
                                                                        FontSize="11" FontWeight="Bold"
                                                                        TextAlignment="Center" />
+                                                            <Image Margin="100,4,0,0"
+                                                           Source="/Resources/new-icons/close-white.png"
+                                                           RenderOptions.BitmapScalingMode="HighQuality"
+                                                           Height="16"
+                                                           Width="16" MouseDown="Border_MouseDown"
+                                                           MouseUp="CloseBordertools_MouseUp" />
                                                         </Canvas>
                                                     </Border>
                                                     <ui:SimpleStackPanel Orientation="Horizontal" Margin="0,6,0,0"
@@ -7056,7 +7068,7 @@
                                         <Border x:Name="BorderDrawShape" Background="#fafafa" Opacity="1"
                                                 Visibility="Visible" BorderBrush="#2563eb"
                                                 BorderThickness="1"
-                                                CornerRadius="5" Margin="-200,-122,-117,37">
+                                                CornerRadius="5" Margin="-170,-122,-147,37">
                                             <ui:SimpleStackPanel Spacing="0" Orientation="Vertical">
                                                 <!--<TextBlock FontSize="16" Foreground="{DynamicResource FloatBarForeground}" HorizontalAlignment="Left" Margin="10,8">
                                                 <Run Text="图形"/>
@@ -7072,6 +7084,12 @@
                                                             <TextBlock Text="几何绘图" Canvas.Left="8" Foreground="White"
                                                                        Padding="0,5" FontSize="11" FontWeight="Bold"
                                                                        TextAlignment="Center" />
+                                                            <Image Margin="295,3.5,0,0"
+                                                                   Source="/Resources/new-icons/close-white.png"
+                                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                                   Height="16"
+                                                                   Width="16" MouseDown="Border_MouseDown"
+                                                                   MouseUp="CloseBordertools_MouseUp" />
                                                         </Canvas>
                                                     </ui:SimpleStackPanel>
                                                 </Border>
@@ -7386,6 +7404,12 @@
                                                     <TextBlock Text="橡皮选项" Canvas.Left="8" Foreground="White"
                                                                Padding="0,5"
                                                                FontSize="11" FontWeight="Bold" TextAlignment="Center" />
+                                                    <Image Margin="100,4,0,0"
+                                                           Source="/Resources/new-icons/close-white.png"
+                                                           RenderOptions.BitmapScalingMode="HighQuality"
+                                                           Height="16"
+                                                           Width="16" MouseDown="Border_MouseDown"
+                                                           MouseUp="CloseBordertools_MouseUp" />
                                                 </Canvas>
                                             </Border>
                                             <ui:SimpleStackPanel Orientation="Horizontal" Margin="0,8,0,0" Spacing="-2"
@@ -7541,7 +7565,7 @@
                                                    Margin="0,1,0,0" TextAlignment="Center" />
                                     </ui:SimpleStackPanel>
                                     <Grid Width="0">
-                                        <Border ClipToBounds="True" Name="BorderTools" Margin="-133,-156,14,37"
+                                        <Border ClipToBounds="True" Name="BorderTools" Margin="-100,-156,-19,37"
                                                 CornerRadius="5" Background="#fafafa" Opacity="1" BorderThickness="1"
                                                 BorderBrush="#2563eb">
                                             <ui:SimpleStackPanel Margin="-1,0,0,0">
@@ -7789,6 +7813,12 @@
                                     <Canvas Height="24" ClipToBounds="True">
                                         <TextBlock Text="手势选项" Canvas.Left="8" Foreground="White" Padding="0,5"
                                                    FontSize="11" FontWeight="Bold" TextAlignment="Center" />
+                                        <Image Margin="98,5,0,0"
+                                                               Source="/Resources/new-icons/close-white.png"
+                                                               RenderOptions.BitmapScalingMode="HighQuality"
+                                                               Height="16"
+                                                               Width="16" MouseDown="Border_MouseDown"
+                                                               MouseUp="CloseBordertools_MouseUp" />
                                     </Canvas>
                                 </Border>
                                 <ui:SimpleStackPanel Orientation="Horizontal" Spacing="4" VerticalAlignment="Center"