diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 3ba9eb0..626c210 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -97,7 +97,7 @@
                         Executed="KeyDrawLine" />
     </Window.CommandBindings>
 
-    <Grid x:Name="Main_Grid" >
+    <Grid x:Name="Main_Grid">
 
         <!--// 设置界面 //-->
         <Grid Panel.ZIndex="999" x:Name="BorderSettingsMask" MouseDown="SettingsOverlayClick" IsHitTestVisible="False"
@@ -160,7 +160,7 @@
                                                                             </GeometryDrawing>
                                                                         </DrawingGroup>
                                                                     </DrawingGroup>
-                                                                  </DrawingImage.Drawing>
+                                                                </DrawingImage.Drawing>
                                                             </DrawingImage>
                                                         </Image.Source>
                                                     </Image>
@@ -512,7 +512,8 @@
                                         <Slider x:Name="ViewboxFloatingBarOpacityValueSlider" Minimum="0.3"
                                                 Maximum="1" Width="168" FontFamily="Microsoft YaHei UI"
                                                 FontSize="20" IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05"
-                                                TickPlacement="None" AutoToolTipPlacement="None" ValueChanged="ViewboxFloatingBarOpacityValueSlider_ValueChanged"/>
+                                                TickPlacement="None" AutoToolTipPlacement="None"
+                                                ValueChanged="ViewboxFloatingBarOpacityValueSlider_ValueChanged" />
                                         <TextBlock
                                             Text="{Binding ElementName=ViewboxFloatingBarOpacityValueSlider, Path=Value}"
                                             VerticalAlignment="Center" FontSize="14" FontFamily="Consolas"
@@ -524,7 +525,8 @@
                                         <Slider x:Name="ViewboxFloatingBarOpacityInPPTValueSlider" Minimum="0.3"
                                                 Maximum="1" Width="168" FontFamily="Microsoft YaHei UI"
                                                 FontSize="20" IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05"
-                                                TickPlacement="None" AutoToolTipPlacement="None" ValueChanged="ViewboxFloatingBarOpacityInPPTValueSlider_ValueChanged"/>
+                                                TickPlacement="None" AutoToolTipPlacement="None"
+                                                ValueChanged="ViewboxFloatingBarOpacityInPPTValueSlider_ValueChanged" />
                                         <TextBlock
                                             Text="{Binding ElementName=ViewboxFloatingBarOpacityInPPTValueSlider, Path=Value}"
                                             VerticalAlignment="Center" FontSize="14" FontFamily="Consolas"
@@ -548,7 +550,7 @@
                     <TextBlock Text="浮动工具栏背景色" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
                     <ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchColorfulViewboxFloatingBar" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" Toggled="ToggleSwitchIsColorfulViewboxFloatingBar_Toggled" />
                 </ui:SimpleStackPanel>-->
-                                    
+
                                     <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                         <TextBlock Foreground="#fafafa" Text="白板 UI 80% 缩放" VerticalAlignment="Center"
                                                    FontSize="14" Margin="0,0,16,0" />
@@ -566,18 +568,20 @@
                                                          Toggled="ToggleSwitchEnableTimeDisplayInWhiteboardMode_Toggled" />
                                     </ui:SimpleStackPanel>
                                     <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                        <TextBlock Foreground="#fafafa" Text="在白板中显示信仰の源1（好喝的/毒的鸡汤）" VerticalAlignment="Center"
+                                        <TextBlock Foreground="#fafafa" Text="在白板中显示信仰の源1（好喝的/毒的鸡汤）"
+                                                   VerticalAlignment="Center"
                                                    FontSize="14" Margin="0,0,16,0" />
                                         <ui:ToggleSwitch OnContent="" OffContent=""
                                                          Name="ToggleSwitchEnableChickenSoupInWhiteboardMode"
                                                          IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
-                                                         Toggled="ToggleSwitchEnableChickenSoupInWhiteboardMode_Toggled"/>
+                                                         Toggled="ToggleSwitchEnableChickenSoupInWhiteboardMode_Toggled" />
                                     </ui:SimpleStackPanel>
                                     <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                         <TextBlock Foreground="#fafafa" Text="信仰の源出自Where？" VerticalAlignment="Center"
                                                    FontSize="14" Margin="0,0,16,0" />
                                         <ComboBox Name="ComboBoxChickenSoupSource" FontFamily="Microsoft YaHei UI"
-                                                  SelectedIndex="1" SelectionChanged="ComboBoxChickenSoupSource_SelectionChanged">
+                                                  SelectedIndex="1"
+                                                  SelectionChanged="ComboBoxChickenSoupSource_SelectionChanged">
                                             <ComboBoxItem Content="osu!玩家语录" FontFamily="Microsoft YaHei UI" />
                                             <ComboBoxItem Content="励志立志的名言警句" FontFamily="Microsoft YaHei UI" />
                                             <ComboBoxItem Content="高考祝福语" FontFamily="Microsoft YaHei UI" />
@@ -1786,19 +1790,20 @@
                                 </Border>
                                 <Border>
                                     <Grid Margin="0,5,0,5" Width="0">
-                                        <Grid Name="BoardPenPaletteGrid" Margin="-160,-200,-33,50" RenderTransformOrigin="0,1">
+                                        <Grid Name="BoardPenPaletteGrid" Margin="-160,-200,-33,50"
+                                              RenderTransformOrigin="0,1">
                                             <Grid.RenderTransform>
                                                 <TransformGroup>
-                                                    <ScaleTransform ScaleX="1.5" ScaleY="1.5"/>
-                                                    <SkewTransform/>
-                                                    <RotateTransform/>
-                                                    <TranslateTransform/>
+                                                    <ScaleTransform ScaleX="1.5" ScaleY="1.5" />
+                                                    <SkewTransform />
+                                                    <RotateTransform />
+                                                    <TranslateTransform />
                                                 </TransformGroup>
                                             </Grid.RenderTransform>
                                             <Border x:Name="BoardPenPalette" Visibility="Visible" Background="#fafafa"
-                                                Opacity="1" BorderBrush="#2563eb"
-                                                BorderThickness="1" CornerRadius="8">
-                                            <ui:SimpleStackPanel>
+                                                    Opacity="1" BorderBrush="#2563eb"
+                                                    BorderThickness="1" CornerRadius="8">
+                                                <ui:SimpleStackPanel>
                                                     <Border BorderBrush="#1e3a8a" Height="32" BorderThickness="0,0,0,1"
                                                             CornerRadius="8,8,0,0" Background="#2563eb"
                                                             Margin="-1,-1,-1,0"
@@ -2581,7 +2586,7 @@
                                                 </ui:SimpleStackPanel>
                                             </Border>
                                         </Grid>
-                                        
+
                                     </Grid>
                                 </Border>
                                 <Border x:Name="BoardEraser" Width="60" Height="50" MouseDown="Border_MouseDown"
@@ -2607,21 +2612,114 @@
                                                    HorizontalAlignment="Center" FontSize="12" />
                                     </Grid>
                                 </Border>
-                                <Border Width="0" MouseDown="Border_MouseDown" MouseUp="BoardSymbolIconDelete_MouseUp">
-                                    <Border x:Name="BoardDeleteIcon" Margin="-61,-55,-61,55" Background="LightGray"
-                                            Opacity="0.85" BorderBrush="Black" BorderThickness="1,1,1,0"
-                                            CornerRadius="5,5,0,0">
-                                        <Grid>
-                                            <ui:SimpleStackPanel Margin="6" Orientation="Horizontal"
-                                                                 HorizontalAlignment="Center">
-                                                <Image Source="/Resources/Icons-Fluent/ic_fluent_delete_24_regular.png"
-                                                       RenderOptions.BitmapScalingMode="HighQuality" Height="28"
-                                                       Width="28" />
-                                                <TextBlock Margin="5,0,0,0" Text="点击清屏" Foreground="Black"
-                                                           VerticalAlignment="Center" FontSize="14" />
+                                <Border>
+                                    <Grid RenderTransformOrigin="0,1" Margin="-133,-134,13,55" >
+                                        <Grid.RenderTransform>
+                                            <TransformGroup>
+                                                <ScaleTransform ScaleX="1.5" ScaleY="1.5"/>
+                                                <SkewTransform/>
+                                                <RotateTransform/>
+                                                <TranslateTransform/>
+                                            </TransformGroup>
+                                        </Grid.RenderTransform>
+                                        <Border Visibility="Visible" ClipToBounds="True" Name="BoardEraserSizePanel" CornerRadius="5" Background="#fafafa"
+                                                Opacity="1"
+                                                BorderBrush="#2563eb" BorderThickness="1">
+                                            <ui:SimpleStackPanel Margin="0">
+                                                <Border BorderBrush="#1e3a8a" BorderThickness="0,0,0,1"
+                                                        CornerRadius="6,6,0,0"
+                                                        Background="#2563eb" Margin="-1,-1,-1,1">
+                                                    <Canvas Height="24" ClipToBounds="True">
+                                                        <TextBlock Text="橡皮选项" Canvas.Left="8" Foreground="White"
+                                                                   Padding="0,5"
+                                                                   FontSize="11" FontWeight="Bold"
+                                                                   TextAlignment="Center" />
+                                                    </Canvas>
+                                                </Border>
+                                                <ui:SimpleStackPanel Orientation="Horizontal" Margin="0,8,0,0"
+                                                                     Spacing="-2"
+                                                                     VerticalAlignment="Center"
+                                                                     HorizontalAlignment="Center">
+                                                    <Label Margin="0,0,0,0" Content="大小" FontWeight="Bold"
+                                                           Foreground="{DynamicResource FloatBarForeground}"
+                                                           FontSize="10"
+                                                           VerticalAlignment="Center" />
+                                                    <Viewbox Margin="8,0,0,0" Height="20" Width="52">
+                                                        <ComboBox Name="BoardComboBoxEraserSizeFloatingBar"
+                                                                  FontFamily="Microsoft YaHei UI" SelectedIndex="2"
+                                                                  SelectionChanged="ComboBoxEraserSizeFloatingBar_SelectionChanged">
+                                                            <ComboBoxItem Content="很小" FontFamily="Microsoft YaHei UI" />
+                                                            <ComboBoxItem Content="较小" FontFamily="Microsoft YaHei UI" />
+                                                            <ComboBoxItem Content="中等" FontFamily="Microsoft YaHei UI" />
+                                                            <ComboBoxItem Content="较大" FontFamily="Microsoft YaHei UI" />
+                                                            <ComboBoxItem Content="很大" FontFamily="Microsoft YaHei UI" />
+                                                        </ComboBox>
+                                                    </Viewbox>
+                                                </ui:SimpleStackPanel>
+                                                <TextBlock HorizontalAlignment="Center" Margin="0,12,0,6" Text="橡皮形状"
+                                                           FontWeight="Bold"
+                                                           Foreground="{DynamicResource FloatBarForeground}"
+                                                           FontSize="10" VerticalAlignment="Center" />
+                                                <ui:SimpleStackPanel Orientation="Horizontal"
+                                                                     HorizontalAlignment="Center"
+                                                                     Margin="0,0,0,0" Spacing="4">
+                                                    <Border x:Name="BoardCircleEraserTabButton"
+                                                            MouseDown="SwitchToCircleEraser"
+                                                            Background="#553b82f6" Height="20" Width="40"
+                                                            CornerRadius="3">
+                                                        <Canvas>
+                                                            <ui:SimpleStackPanel
+                                                                x:Name="BoardCircleEraserTabButtonIndicator"
+                                                                Visibility="Visible" Orientation="Horizontal"
+                                                                Canvas.Left="11" Canvas.Right="11"
+                                                                Canvas.Bottom="0">
+                                                                <Border Width="18" Height="2" Background="#2563eb"
+                                                                        CornerRadius="1" />
+                                                            </ui:SimpleStackPanel>
+                                                            <ui:SimpleStackPanel Orientation="Vertical" Height="20"
+                                                                Width="40">
+                                                                <ui:SimpleStackPanel VerticalAlignment="Center"
+                                                                    Orientation="Horizontal"
+                                                                    HorizontalAlignment="Center" Margin="0,3">
+                                                                    <TextBlock x:Name="BoardCircleEraserTabButtonText"
+                                                                               Foreground="#172554" FontWeight="Medium"
+                                                                               FontSize="9" TextAlignment="Center"
+                                                                               Text="圆形擦"
+                                                                               Margin="2,1,0,0" />
+                                                                </ui:SimpleStackPanel>
+                                                            </ui:SimpleStackPanel>
+                                                        </Canvas>
+                                                    </Border>
+                                                    <Border x:Name="BoardRectangleEraserTabButton"
+                                                            MouseDown="SwitchToRectangleEraser"
+                                                            Background="Transparent"
+                                                            Height="20" Width="40" CornerRadius="3">
+                                                        <Canvas>
+                                                            <ui:SimpleStackPanel Visibility="Collapsed"
+                                                                x:Name="BoardRectangleEraserTabButtonIndicator"
+                                                                Orientation="Horizontal" Canvas.Left="11"
+                                                                Canvas.Right="11" Canvas.Bottom="0">
+                                                                <Border Width="18" Height="2" Background="#2563eb"
+                                                                        CornerRadius="1" />
+                                                            </ui:SimpleStackPanel>
+                                                            <ui:SimpleStackPanel Orientation="Vertical" Height="20"
+                                                                Width="40">
+                                                                <ui:SimpleStackPanel VerticalAlignment="Center"
+                                                                    Orientation="Horizontal"
+                                                                    HorizontalAlignment="Center" Margin="0,3">
+                                                                    <TextBlock x:Name="BoardRectangleEraserTabButtonText"
+                                                                               Foreground="#172554" FontWeight="Medium"
+                                                                               FontSize="9" TextAlignment="Center"
+                                                                               Text="黑板擦"
+                                                                               Margin="2,1,0,0" />
+                                                                </ui:SimpleStackPanel>
+                                                            </ui:SimpleStackPanel>
+                                                        </Canvas>
+                                                    </Border>
+                                                </ui:SimpleStackPanel>
                                             </ui:SimpleStackPanel>
-                                        </Grid>
-                                    </Border>
+                                        </Border>
+                                    </Grid>
                                 </Border>
                                 <Border x:Name="BoardEraserByStrokes" Width="60" Height="55"
                                         MouseDown="Border_MouseDown"
diff --git a/Ink Canvas/MainWindow_cs/MW_BoardIcons.cs b/Ink Canvas/MainWindow_cs/MW_BoardIcons.cs
index b08a2e1..8ebb2bd 100644
--- a/Ink Canvas/MainWindow_cs/MW_BoardIcons.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_BoardIcons.cs	
@@ -26,10 +26,10 @@ namespace Ink_Canvas {
         }
 
         private void BoardEraserIcon_Click(object sender, RoutedEventArgs e) {
-            if (BoardEraser.Background.ToString() == "#FF679CF4") {
-                AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardDeleteIcon);
-            }
-            else {
+            //if (BoardEraser.Background.ToString() == "#FF679CF4") {
+            //    AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardDeleteIcon);
+            //}
+            //else {
                 forceEraser = true;
                 forcePointEraser = true;
                 double k = 1;
@@ -56,14 +56,14 @@ namespace Ink_Canvas {
                 CancelSingleFingerDragMode();
 
                 HideSubPanels("eraser");
-            }
+            //}
         }
 
         private void BoardEraserIconByStrokes_Click(object sender, RoutedEventArgs e) {
-            if (BoardEraserByStrokes.Background.ToString() == "#FF679CF4") {
-                AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardDeleteIcon);
-            }
-            else {
+            //if (BoardEraserByStrokes.Background.ToString() == "#FF679CF4") {
+            //    AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardDeleteIcon);
+            //}
+            //else {
                 forceEraser = true;
                 forcePointEraser = false;
 
@@ -75,7 +75,7 @@ namespace Ink_Canvas {
                 CancelSingleFingerDragMode();
 
                 HideSubPanels("eraserByStrokes");
-            }
+            //}
         }
 
         private void BoardSymbolIconDelete_MouseUp(object sender, MouseButtonEventArgs e) {
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index 5ea053e..af35978 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
@@ -33,10 +33,30 @@ namespace Ink_Canvas {
         /// </summary>
         private void TwoFingerGestureBorder_MouseUp(object sender, RoutedEventArgs e) {
             if (TwoFingerGestureBorder.Visibility == Visibility.Visible) {
+                AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
+                AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                AnimationsHelper.HideWithSlideAndFade(PenPalette);
+                AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
+                AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
+                AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
+                AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
                 AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
                 AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
             }
             else {
+                AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
+                AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                AnimationsHelper.HideWithSlideAndFade(PenPalette);
+                AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
+                AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
+                AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
+                AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
                 AnimationsHelper.ShowWithSlideFromBottomAndFade(TwoFingerGestureBorder);
                 AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardTwoFingerGestureBorder);
             }
@@ -180,12 +200,12 @@ namespace Ink_Canvas {
         /// </summary>
         private void HideSubPanelsImmediately()
         {
-            BorderTools.Visibility = Visibility.Collapsed;
             BorderTools.Visibility = Visibility.Collapsed;
             BoardBorderTools.Visibility = Visibility.Collapsed;
             PenPalette.Visibility = Visibility.Collapsed;
             BoardPenPalette.Visibility = Visibility.Collapsed;
-            BoardDeleteIcon.Visibility = Visibility.Collapsed;
+            BoardEraserSizePanel.Visibility = Visibility.Collapsed;
+            EraserSizePanel.Visibility = Visibility.Collapsed;
             BorderSettings.Visibility = Visibility.Collapsed;
         }
 
@@ -253,7 +273,9 @@ namespace Ink_Canvas {
             AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
             AnimationsHelper.HideWithSlideAndFade(PenPalette);
             AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
-            AnimationsHelper.HideWithSlideAndFade(BoardDeleteIcon);
+            AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
+            AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
+            AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
 
             if (BorderSettings.Visibility == Visibility.Visible) {
                 BorderSettingsMask.IsHitTestVisible = false;
@@ -805,10 +827,30 @@ namespace Ink_Canvas {
 
         private void SymbolIconTools_MouseUp(object sender, MouseButtonEventArgs e) {
             if (BorderTools.Visibility == Visibility.Visible) {
+                AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
                 AnimationsHelper.HideWithSlideAndFade(BorderTools);
                 AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                AnimationsHelper.HideWithSlideAndFade(PenPalette);
+                AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
+                AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
+                AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
+                AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
+                AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
             }
             else {
+                AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
+                AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                AnimationsHelper.HideWithSlideAndFade(PenPalette);
+                AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
+                AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
+                AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
+                AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
+                AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
                 AnimationsHelper.ShowWithSlideFromBottomAndFade(BorderTools);
                 AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardBorderTools);
             }
@@ -998,10 +1040,30 @@ namespace Ink_Canvas {
             else {
                 if (inkCanvas.EditingMode == InkCanvasEditingMode.Ink) {
                     if (PenPalette.Visibility == Visibility.Visible) {
+                        AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
+                        AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                        AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
                         AnimationsHelper.HideWithSlideAndFade(PenPalette);
                         AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
+                        AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
+                        AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
+                        AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
+                        AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                        AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                        AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
+                        AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
                     }
                     else {
+                        AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
+                        AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                        AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                        AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
+                        AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
+                        AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
+                        AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                        AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                        AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
+                        AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
                         AnimationsHelper.ShowWithSlideFromBottomAndFade(PenPalette);
                         AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardPenPalette);
                     }
@@ -1066,9 +1128,31 @@ namespace Ink_Canvas {
             }
 
             if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
-                HideSubPanels();
-                HideSubPanelsImmediately();
-                AnimationsHelper.ShowWithSlideFromBottomAndFade(EraserSizePanel);
+                if (EraserSizePanel.Visibility == Visibility.Collapsed) {
+                    AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                    AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                    AnimationsHelper.HideWithSlideAndFade(PenPalette);
+                    AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
+                    AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
+                    AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
+                    AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                    AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                    AnimationsHelper.ShowWithSlideFromBottomAndFade(EraserSizePanel);
+                    AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardEraserSizePanel);
+                } else {
+                    AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
+                    AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                    AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                    AnimationsHelper.HideWithSlideAndFade(PenPalette);
+                    AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
+                    AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
+                    AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
+                    AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
+                    AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                    AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                    AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
+                    AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
+                }
             }
             else {
                 HideSubPanels("eraser");
diff --git a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
index a084ac7..028471c 100644
--- a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
@@ -19,10 +19,30 @@ namespace Ink_Canvas {
         private void ImageDrawShape_MouseUp(object sender, MouseButtonEventArgs e) {
             // FloatingBarIcons_MouseUp_New(sender);
             if (BorderDrawShape.Visibility == Visibility.Visible) {
+                AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
+                AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                AnimationsHelper.HideWithSlideAndFade(PenPalette);
+                AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
                 AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
                 AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
+                AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
+                AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
+                AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
             }
             else {
+                AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
+                AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                AnimationsHelper.HideWithSlideAndFade(PenPalette);
+                AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
+                AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
+                AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
+                AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
                 AnimationsHelper.ShowWithSlideFromBottomAndFade(BorderDrawShape);
                 AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardBorderDrawShape);
             }
diff --git a/Ink Canvas/Windows/RandWindow.xaml b/Ink Canvas/Windows/RandWindow.xaml
index d567f42..f5de16f 100644
--- a/Ink Canvas/Windows/RandWindow.xaml	
+++ b/Ink Canvas/Windows/RandWindow.xaml	
@@ -11,7 +11,7 @@
         Title="Ink Canvas 抽奖" Height="500" Width="900">
     <Border Background="#F0F3F9" CornerRadius="10" BorderThickness="1" BorderBrush="#0066BF" Margin="0" ClipToBounds="True">
         <Canvas>
-            <Image Source="/Resources/hatsune-miku1.png" Width="300" Canvas.Bottom="-140" Canvas.Left="-48" Canvas.Top="314"></Image>
+            <Image Source="/Resources/hatsune-miku1.png" Width="300" Canvas.Bottom="-140" Canvas.Left="-48" Canvas.Top="304"></Image>
             <Grid Canvas.Left="0" Canvas.Right="0" Canvas.Top="0" Canvas.Bottom="0" Width="900" Height="309" HorizontalAlignment="Center" VerticalAlignment="Top">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1.8*"/>
@@ -24,14 +24,29 @@
                         <Label Name="LabelOutput3" FontSize="130" Visibility="Collapsed" Content="" Block.TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                     </ui:SimpleStackPanel>
                 </Viewbox>
-                <ui:SimpleStackPanel Spacing="50" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Opacity="1" Name="PeopleControlPane">
+                <ui:SimpleStackPanel Spacing="8" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Opacity="1" Name="PeopleControlPane" Width="256">
                     <StackPanel Orientation="Horizontal">
                         <Border x:Name="BorderBtnMinus" MouseUp="BorderBtnMinus_MouseUp" Background="#FBFBFD" Height="70" Width="70" CornerRadius="100">
                             <Border.Effect>
                                 <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.15" BlurRadius="3"/>
                             </Border.Effect>
                             <Viewbox Margin="20">
-                                <ui:SymbolIcon Symbol="Remove" Foreground="Black"/>
+                                <Image Width="18" Height="18">
+                                    <Image.Source>
+                                        <DrawingImage>
+                                            <DrawingImage.Drawing>
+                                                <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                                    <DrawingGroup Opacity="1">
+                                                        <DrawingGroup.ClipGeometry>
+                                                            <RectangleGeometry RadiusX="0" RadiusY="0" Rect="0,0,24,24" />
+                                                        </DrawingGroup.ClipGeometry>
+                                                        <GeometryDrawing Brush="#FF000000" Geometry="F0 M24,24z M0,0z M4,12C4,11.4477,4.44772,11,5,11L19,11C19.5523,11 20,11.4477 20,12 20,12.5523 19.5523,13 19,13L5,13C4.44772,13,4,12.5523,4,12z" />
+                                                    </DrawingGroup>
+                                                </DrawingGroup>
+                                            </DrawingImage.Drawing>
+                                        </DrawingImage>
+                                    </Image.Source>
+                                </Image>
                             </Viewbox>
                         </Border>
                         <TextBlock Name="LabelNumberCount" Text="1" FontFamily="Consolas" FontSize="55" Margin="10" Width="80" TextAlignment="Center"/>
@@ -40,30 +55,52 @@
                                 <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.15" BlurRadius="3"/>
                             </Border.Effect>
                             <Viewbox Margin="20">
-                                <ui:SymbolIcon Symbol="Add" Foreground="Black"/>
+                                <Image Width="18" Height="18">
+                                    <Image.Source>
+                                        <DrawingImage>
+                                            <DrawingImage.Drawing>
+                                                <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                                    <DrawingGroup Opacity="1">
+                                                        <DrawingGroup.ClipGeometry>
+                                                            <RectangleGeometry RadiusX="0" RadiusY="0" Rect="0,0,24,24" />
+                                                        </DrawingGroup.ClipGeometry>
+                                                        <GeometryDrawing Brush="#18181b" Geometry="F0 M24,24z M0,0z M13,5C13,4.44772 12.5523,4 12,4 11.4477,4 11,4.44772 11,5L11,11 5,11C4.44772,11 4,11.4477 4,12 4,12.5523 4.44772,13 5,13L11,13 11,19C11,19.5523 11.4477,20 12,20 12.5523,20 13,19.5523 13,19L13,13 19,13C19.5523,13 20,12.5523 20,12 20,11.4477 19.5523,11 19,11L13,11 13,5z" />
+                                                    </DrawingGroup>
+                                                </DrawingGroup>
+                                            </DrawingImage.Drawing>
+                                        </DrawingImage>
+                                    </Image.Source>
+                                </Image>
                             </Viewbox>
                         </Border>
                     </StackPanel>
-                    <Grid>
-                        <Border x:Name="BorderBtnRand" MouseUp="BorderBtnRand_MouseUp" Background="#0066BF"
-                Height="70" Width="200" CornerRadius="10">
-                            <ui:SimpleStackPanel Margin="3,0" Spacing="20" Orientation="Horizontal" HorizontalAlignment="Center">
-                                <Viewbox Margin="0,20">
-                                    <ui:SymbolIcon Name="SymbolIconStart" Symbol="Contact" Foreground="White"/>
-                                </Viewbox>
-                                <TextBlock Text="抽奖" Foreground="White" FontSize="35" Margin="-1,-1,4,0" VerticalAlignment="Center"/>
-                            </ui:SimpleStackPanel>
-                        </Border>
-                        <Border x:Name="BorderBtnRandCover" Background="#BFBFBF" Visibility="Collapsed"
-                Height="70" Width="200" CornerRadius="10">
-                            <ui:SimpleStackPanel Margin="3,0" Spacing="20" Orientation="Horizontal" HorizontalAlignment="Center">
-                                <Viewbox Margin="0,20">
-                                    <ui:SymbolIcon Symbol="{Binding ElementName=SymbolIconStart, Path=Symbol}" Foreground="White"/>
-                                </Viewbox>
-                                <TextBlock Text="抽奖" Foreground="White" FontSize="35" Margin="-1,-1,4,0" VerticalAlignment="Center"/>
-                            </ui:SimpleStackPanel>
-                        </Border>
-                    </Grid>
+                    <ui:SimpleStackPanel Margin="0,8,0,0" Orientation="Horizontal" HorizontalAlignment="Center" Spacing="24">
+                        <CheckBox x:Name="NoHotStudents" MinWidth="0"
+                                  Content="不抽热门人选" IsThreeState="True"
+                                  HorizontalAlignment="Center" />
+                        <CheckBox x:Name="NoShengPiZi" MinWidth="0"
+                                  Content="避开生僻字" IsThreeState="True"
+                                  HorizontalAlignment="Center" />
+                    </ui:SimpleStackPanel>
+                    <ui:SimpleStackPanel Margin="0,0,0,8" Orientation="Horizontal" HorizontalAlignment="Center" Spacing="24">
+                        <ComboBox Name="ComboBoxRandMode"
+                                  MinWidth="0"
+                                  IsEditable="False"
+                                  SelectedIndex="0"
+                                  IsReadOnly="True">
+                            <ComboBoxItem>全都抽</ComboBoxItem>
+                            <ComboBoxItem>只抽男</ComboBoxItem>
+                            <ComboBoxItem>只抽女</ComboBoxItem>
+                        </ComboBox>
+                    </ui:SimpleStackPanel>
+                    <Border x:Name="BorderBtnRand" MouseUp="BorderBtnRand_MouseUp" Background="#0066BF" Height="70" Width="200" CornerRadius="35">
+                        <ui:SimpleStackPanel Margin="3,0" Spacing="20" Orientation="Horizontal" HorizontalAlignment="Center">
+                            <Viewbox Margin="0,20">
+                                <ui:SymbolIcon Name="SymbolIconStart" Symbol="Contact" Foreground="White"/>
+                            </Viewbox>
+                            <TextBlock Text="开抽" Foreground="White" FontSize="32" Margin="-1,-1,4,0" VerticalAlignment="Center"/>
+                        </ui:SimpleStackPanel>
+                    </Border>
                 </ui:SimpleStackPanel>
             </Grid>
             <Border UseLayoutRounding="True" Canvas.Bottom="8" Canvas.Right="8" x:Name="BorderBtnHelp" MouseUp="BorderBtnHelp_MouseUp" Background="#FBFBFD" Grid.Column="1" Margin="10,10,60,10" Height="40" VerticalAlignment="Bottom" HorizontalAlignment="Right" CornerRadius="20">
diff --git a/Ink Canvas/Windows/RandWindow.xaml.cs b/Ink Canvas/Windows/RandWindow.xaml.cs
index be0ccb3..1681e3a 100644
--- a/Ink Canvas/Windows/RandWindow.xaml.cs	
+++ b/Ink Canvas/Windows/RandWindow.xaml.cs	
@@ -76,7 +76,6 @@ namespace Ink_Canvas {
 
             LabelOutput2.Visibility = Visibility.Collapsed;
             LabelOutput3.Visibility = Visibility.Collapsed;
-            BorderBtnRandCover.Visibility = Visibility.Visible;
 
             new Thread(new ThreadStart(() => {
                 for (int i = 0; i < RandWaitingTimes; i++) {
@@ -148,7 +147,6 @@ namespace Ink_Canvas {
                         }
                         LabelOutput3.Content = outputString.ToString().Trim();
                     }
-                    BorderBtnRandCover.Visibility = Visibility.Collapsed;
 
                     if (isAutoClose) {
                         new Thread(new ThreadStart(() => {