diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index c637cc45..ce5ab4fd 100644
--- a/Ink Canvas/InkCanvasForClass.csproj	
+++ b/Ink Canvas/InkCanvasForClass.csproj	
@@ -461,6 +461,37 @@
   <ItemGroup>
     <Resource Include="Resources\Icons-png\geo-icons\cube.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\arrow_white.png" />
+    <Resource Include="Resources\Icons-png\geo-icons\dashed-line_white.png" />
+    <Resource Include="Resources\Icons-png\geo-icons\dotted-line_white.png" />
+    <Resource Include="Resources\Icons-png\geo-icons\line_white.png" />
+    <Resource Include="Resources\Icons-png\geo-icons\paralle-lines_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\centered-square_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\centered-circle_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\centered-circle-dashed_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\centered-oval_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\square_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\cylinder_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\cone_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\geo-icons\cube_white.png" />
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Icons-png\EasiNote.png" />
     <Resource Include="Resources\Icons-png\EasiNote3C.png" />
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 6a020698..925bd4e0 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -8579,7 +8579,7 @@
                                                                          MouseDown="Image_MouseDown"
                                                                          MouseUp="BtnDrawLine_Click" Margin="0,0,0,0"
                                                                          Height="38" Width="32" Orientation="Vertical">
-                                                        <Image Source="/Resources/Icons-png/geo-icons/line.png"
+                                                        <Image Source="{DynamicResource GeoIconLine}"
                                                                RenderOptions.BitmapScalingMode="HighQuality"
                                                                Margin="0,4,0,2" Height="19" Width="19" />
                                                         <Label Content="画直线" FontSize="8" HorizontalAlignment="Center" />
@@ -8589,7 +8589,7 @@
                                                                          MouseUp="BtnDrawDashedLine_Click"
                                                                          Margin="0,0,0,0"
                                                                          Height="38" Width="32" Orientation="Vertical">
-                                                        <Image Source="/Resources/Icons-png/geo-icons/dashed-line.png"
+                                                        <Image Source="{DynamicResource GeoIconDashedLine}"
                                                                RenderOptions.BitmapScalingMode="HighQuality"
                                                                Margin="0,4,0,2" Height="19" Width="19" />
                                                         <Label Content="画虚线" FontSize="8" HorizontalAlignment="Center" />
@@ -8599,7 +8599,7 @@
                                                                          MouseUp="BtnDrawDotLine_Click"
                                                                          Margin="0,0,0,0"
                                                                          Height="38" Width="32" Orientation="Vertical">
-                                                        <Image Source="/Resources/Icons-png/geo-icons/dotted-line.png"
+                                                        <Image Source="{DynamicResource GeoIconDotLine}"
                                                                RenderOptions.BitmapScalingMode="HighQuality"
                                                                Margin="0,4,0,2" Height="19" Width="19" />
                                                         <Label Content="画点线" FontSize="8" HorizontalAlignment="Center" />
@@ -8608,7 +8608,7 @@
                                                                          MouseDown="Image_MouseDown"
                                                                          MouseUp="BtnDrawArrow_Click" Margin="0,0,0,0"
                                                                          Height="38" Width="32" Orientation="Vertical">
-                                                        <Image Source="/Resources/Icons-png/geo-icons/arrow.png"
+                                                        <Image Source="{DynamicResource GeoIconArrow}"
                                                                RenderOptions.BitmapScalingMode="HighQuality"
                                                                Margin="0,4,0,2" Height="19" Width="19" />
                                                         <Label Content="画箭头" FontSize="8" HorizontalAlignment="Center" />
@@ -8619,7 +8619,7 @@
                                                                          Margin="0,0,0,0" Height="38" Width="32"
                                                                          Orientation="Vertical">
                                                         <Image
-                                                            Source="/Resources/Icons-png/geo-icons/paralle-lines.png"
+                                                            Source="{DynamicResource GeoIconParallelLine}"
                                                             RenderOptions.BitmapScalingMode="HighQuality"
                                                             Margin="0,4,0,2" Height="19" Width="19" />
                                                         <Label Content="4平行线" FontSize="8" HorizontalAlignment="Center" />
@@ -8628,7 +8628,7 @@
                                                                          Margin="0,0,0,0" Height="38" Width="32"
                                                                          Orientation="Vertical">
                                                         <Image
-                                                            Source="/Resources/Icons-png/geo-icons/centered-square.png"
+                                                            Source="{DynamicResource GeoIconRectangleCenter}"
                                                             RenderOptions.BitmapScalingMode="HighQuality"
                                                             Margin="0,4,0,2" Height="19" Width="19" />
                                                         <Label Content="中心正方" FontSize="8" HorizontalAlignment="Center" />
@@ -8636,7 +8636,7 @@
                                                     <ui:SimpleStackPanel MouseUp="BtnDrawCircle_Click" Margin="0,0,0,0"
                                                                          Height="38" Width="32" Orientation="Vertical">
                                                         <Image
-                                                            Source="/Resources/Icons-png/geo-icons/centered-circle.png"
+                                                            Source="{DynamicResource GeoIconCircle}"
                                                             RenderOptions.BitmapScalingMode="HighQuality"
                                                             Margin="0,4,0,2" Height="19" Width="19" />
                                                         <Label Content="中心圆" FontSize="8" HorizontalAlignment="Center" />
@@ -8645,7 +8645,7 @@
                                                                          Margin="0,0,0,0" Height="38" Width="32"
                                                                          Orientation="Vertical">
                                                         <Image
-                                                            Source="/Resources/Icons-png/geo-icons/centered-circle-dashed.png"
+                                                            Source="{DynamicResource GeoIconDashedCircle}"
                                                             RenderOptions.BitmapScalingMode="HighQuality"
                                                             Margin="0,4,0,2"
                                                             Height="19" Width="19" />
@@ -8655,7 +8655,7 @@
                                                                          Margin="0,0,0,0" Height="38" Width="32"
                                                                          Orientation="Vertical">
                                                         <Image
-                                                            Source="/Resources/Icons-png/geo-icons/centered-oval.png"
+                                                            Source="{DynamicResource GeoIconEllipseCenter}"
                                                             RenderOptions.BitmapScalingMode="HighQuality"
                                                             Margin="0,4,0,2" Height="19" Width="19" />
                                                         <Label Content="中心椭圆" FontSize="8" HorizontalAlignment="Center" />
@@ -8685,7 +8685,7 @@
                                                                      Margin="4,0,4,6">
                                                     <ui:SimpleStackPanel MouseUp="BtnDrawCuboid_Click" Margin="0,0,0,0"
                                                                          Height="38" Width="32" Orientation="Vertical">
-                                                        <Image Source="/Resources/Icons-png/geo-icons/cube.png"
+                                                        <Image Source="{DynamicResource GeoIconCuboid}"
                                                                RenderOptions.BitmapScalingMode="HighQuality"
                                                                Margin="0,4,0,2" Height="19" Width="19" />
                                                         <Label Content="长方体" FontSize="8" HorizontalAlignment="Center" />
@@ -8693,7 +8693,7 @@
                                                     <ui:SimpleStackPanel MouseUp="BtnDrawRectangle_Click"
                                                                          Margin="0,0,0,0"
                                                                          Height="38" Width="32" Orientation="Vertical">
-                                                        <Image Source="/Resources/Icons-png/geo-icons/square.png"
+                                                        <Image Source="{DynamicResource GeoIconRectangle}"
                                                                RenderOptions.BitmapScalingMode="HighQuality"
                                                                Margin="0,4,0,2" Height="19" Width="19" />
                                                         <Label Content="正方形" FontSize="8" HorizontalAlignment="Center" />
@@ -8701,14 +8701,14 @@
                                                     <ui:SimpleStackPanel MouseUp="BtnDrawCylinder_Click"
                                                                          Margin="0,0,0,0"
                                                                          Height="38" Width="32" Orientation="Vertical">
-                                                        <Image Source="/Resources/Icons-png/geo-icons/cylinder.png"
+                                                        <Image Source="{DynamicResource GeoIconCylinder}"
                                                                RenderOptions.BitmapScalingMode="HighQuality"
                                                                Margin="0,4,0,2" Height="19" Width="19" />
                                                         <Label Content="画圆柱" FontSize="8" HorizontalAlignment="Center" />
                                                     </ui:SimpleStackPanel>
                                                     <ui:SimpleStackPanel MouseUp="BtnDrawCone_Click" Margin="0,0,0,0"
                                                                          Height="38" Width="32" Orientation="Vertical">
-                                                        <Image Source="/Resources/Icons-png/geo-icons/cone.png"
+                                                        <Image Source="{DynamicResource GeoIconCone}"
                                                                RenderOptions.BitmapScalingMode="HighQuality"
                                                                Margin="0,4,0,2" Height="19" Width="19" />
                                                         <Label Content="画圆锥" FontSize="8" HorizontalAlignment="Center" />
diff --git a/Ink Canvas/Resources/Icons-png/geo-icons/arrow_white.png b/Ink Canvas/Resources/Icons-png/geo-icons/arrow_white.png
new file mode 100644
index 00000000..fe543c63
Binary files /dev/null and b/Ink Canvas/Resources/Icons-png/geo-icons/arrow_white.png differ
diff --git a/Ink Canvas/Resources/Icons-png/geo-icons/centered-circle-dashed_white.png b/Ink Canvas/Resources/Icons-png/geo-icons/centered-circle-dashed_white.png
new file mode 100644
index 00000000..61c9e76f
Binary files /dev/null and b/Ink Canvas/Resources/Icons-png/geo-icons/centered-circle-dashed_white.png differ
diff --git a/Ink Canvas/Resources/Icons-png/geo-icons/centered-circle_white.png b/Ink Canvas/Resources/Icons-png/geo-icons/centered-circle_white.png
new file mode 100644
index 00000000..48ad499d
Binary files /dev/null and b/Ink Canvas/Resources/Icons-png/geo-icons/centered-circle_white.png differ
diff --git a/Ink Canvas/Resources/Icons-png/geo-icons/centered-oval_white.png b/Ink Canvas/Resources/Icons-png/geo-icons/centered-oval_white.png
new file mode 100644
index 00000000..93f3a72e
Binary files /dev/null and b/Ink Canvas/Resources/Icons-png/geo-icons/centered-oval_white.png differ
diff --git a/Ink Canvas/Resources/Icons-png/geo-icons/centered-square_white.png b/Ink Canvas/Resources/Icons-png/geo-icons/centered-square_white.png
new file mode 100644
index 00000000..850c032d
Binary files /dev/null and b/Ink Canvas/Resources/Icons-png/geo-icons/centered-square_white.png differ
diff --git a/Ink Canvas/Resources/Icons-png/geo-icons/cone_white.png b/Ink Canvas/Resources/Icons-png/geo-icons/cone_white.png
new file mode 100644
index 00000000..26ab8818
Binary files /dev/null and b/Ink Canvas/Resources/Icons-png/geo-icons/cone_white.png differ
diff --git a/Ink Canvas/Resources/Icons-png/geo-icons/cube_white.png b/Ink Canvas/Resources/Icons-png/geo-icons/cube_white.png
new file mode 100644
index 00000000..68aba97a
Binary files /dev/null and b/Ink Canvas/Resources/Icons-png/geo-icons/cube_white.png differ
diff --git a/Ink Canvas/Resources/Icons-png/geo-icons/cylinder_white.png b/Ink Canvas/Resources/Icons-png/geo-icons/cylinder_white.png
new file mode 100644
index 00000000..e56b2d60
Binary files /dev/null and b/Ink Canvas/Resources/Icons-png/geo-icons/cylinder_white.png differ
diff --git a/Ink Canvas/Resources/Icons-png/geo-icons/dashed-line_white.png b/Ink Canvas/Resources/Icons-png/geo-icons/dashed-line_white.png
new file mode 100644
index 00000000..3604c7bd
Binary files /dev/null and b/Ink Canvas/Resources/Icons-png/geo-icons/dashed-line_white.png differ
diff --git a/Ink Canvas/Resources/Icons-png/geo-icons/dotted-line_white.png b/Ink Canvas/Resources/Icons-png/geo-icons/dotted-line_white.png
new file mode 100644
index 00000000..6891ac09
Binary files /dev/null and b/Ink Canvas/Resources/Icons-png/geo-icons/dotted-line_white.png differ
diff --git a/Ink Canvas/Resources/Icons-png/geo-icons/line_white.png b/Ink Canvas/Resources/Icons-png/geo-icons/line_white.png
new file mode 100644
index 00000000..9458e110
Binary files /dev/null and b/Ink Canvas/Resources/Icons-png/geo-icons/line_white.png differ
diff --git a/Ink Canvas/Resources/Icons-png/geo-icons/paralle-lines_white.png b/Ink Canvas/Resources/Icons-png/geo-icons/paralle-lines_white.png
new file mode 100644
index 00000000..587af434
Binary files /dev/null and b/Ink Canvas/Resources/Icons-png/geo-icons/paralle-lines_white.png differ
diff --git a/Ink Canvas/Resources/Icons-png/geo-icons/square_white.png b/Ink Canvas/Resources/Icons-png/geo-icons/square_white.png
new file mode 100644
index 00000000..13433b49
Binary files /dev/null and b/Ink Canvas/Resources/Icons-png/geo-icons/square_white.png differ
diff --git a/Ink Canvas/Resources/Styles/Dark.xaml b/Ink Canvas/Resources/Styles/Dark.xaml
index 4e56de25..50f8176e 100644
--- a/Ink Canvas/Resources/Styles/Dark.xaml	
+++ b/Ink Canvas/Resources/Styles/Dark.xaml	
@@ -44,7 +44,7 @@
     <SolidColorBrush x:Key="HistoryWindowTextPrimaryBrush" Color="#f9fafb"/>
     <SolidColorBrush x:Key="HistoryWindowTextSecondaryBrush" Color="#9ca3af"/>
     
-    <!-- 快速面板图标资源 - 深色主题 -->
+    <!-- 快速面板图标资源 -->
     <BitmapImage x:Key="QuickPanelPersonMoneyIcon" UriSource="/Resources/Icons-Fluent/ic_fluent_person_money_24_regular-light.png"/>
     <BitmapImage x:Key="QuickPanelPeopleMoneyIcon" UriSource="/Resources/Icons-Fluent/ic_fluent_people_money_24_regular-light.png"/>
     <BitmapImage x:Key="QuickPanelTimerIcon" UriSource="/Resources/Icons-Fluent/ic_fluent_timer_24_regular-light.png"/>
@@ -52,4 +52,19 @@
     <BitmapImage x:Key="QuickPanelEndSlideshowIcon" UriSource="/Resources/new-icons/end-slides-show-light.png"/>
     <BitmapImage x:Key="QuickPanelEyeIcon" UriSource="/Resources/new-icons/eye-light.png"/>
     <BitmapImage x:Key="QuickPanelChevronLeftIcon" UriSource="/Resources/new-icons/chevron-left-light.png"/>
+    
+    <!-- 几何面板图标资源 -->
+    <BitmapImage x:Key="GeoIconLine" UriSource="/Resources/Icons-png/geo-icons/line_white.png"/>
+    <BitmapImage x:Key="GeoIconDashedLine" UriSource="/Resources/Icons-png/geo-icons/dashed-line_white.png"/>
+    <BitmapImage x:Key="GeoIconDotLine" UriSource="/Resources/Icons-png/geo-icons/dotted-line_white.png"/>
+    <BitmapImage x:Key="GeoIconArrow" UriSource="/Resources/Icons-png/geo-icons/arrow_white.png"/>
+    <BitmapImage x:Key="GeoIconParallelLine" UriSource="/Resources/Icons-png/geo-icons/paralle-lines_white.png"/>
+    <BitmapImage x:Key="GeoIconRectangleCenter" UriSource="/Resources/Icons-png/geo-icons/centered-square_white.png"/>
+    <BitmapImage x:Key="GeoIconCircle" UriSource="/Resources/Icons-png/geo-icons/centered-circle_white.png"/>
+    <BitmapImage x:Key="GeoIconDashedCircle" UriSource="/Resources/Icons-png/geo-icons/centered-circle-dashed_white.png"/>
+    <BitmapImage x:Key="GeoIconEllipseCenter" UriSource="/Resources/Icons-png/geo-icons/centered-oval_white.png"/>
+    <BitmapImage x:Key="GeoIconCuboid" UriSource="/Resources/Icons-png/geo-icons/cube_white.png"/>
+    <BitmapImage x:Key="GeoIconRectangle" UriSource="/Resources/Icons-png/geo-icons/square_white.png"/>
+    <BitmapImage x:Key="GeoIconCylinder" UriSource="/Resources/Icons-png/geo-icons/cylinder_white.png"/>
+    <BitmapImage x:Key="GeoIconCone" UriSource="/Resources/Icons-png/geo-icons/cone_white.png"/>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Ink Canvas/Resources/Styles/Light.xaml b/Ink Canvas/Resources/Styles/Light.xaml
index c6bf8faf..280e950c 100644
--- a/Ink Canvas/Resources/Styles/Light.xaml	
+++ b/Ink Canvas/Resources/Styles/Light.xaml	
@@ -44,7 +44,7 @@
     <SolidColorBrush x:Key="HistoryWindowTextPrimaryBrush" Color="#1f2937"/>
     <SolidColorBrush x:Key="HistoryWindowTextSecondaryBrush" Color="#6b7280"/>
     
-    <!-- 快速面板图标资源 - 浅色主题 -->
+    <!-- 快速面板图标资源 -->
     <BitmapImage x:Key="QuickPanelPersonMoneyIcon" UriSource="/Resources/Icons-Fluent/ic_fluent_person_money_24_regular.png"/>
     <BitmapImage x:Key="QuickPanelPeopleMoneyIcon" UriSource="/Resources/Icons-Fluent/ic_fluent_people_money_24_regular.png"/>
     <BitmapImage x:Key="QuickPanelTimerIcon" UriSource="/Resources/Icons-Fluent/ic_fluent_timer_24_regular.png"/>
@@ -52,4 +52,19 @@
     <BitmapImage x:Key="QuickPanelEndSlideshowIcon" UriSource="/Resources/new-icons/end-slides-show.png"/>
     <BitmapImage x:Key="QuickPanelEyeIcon" UriSource="/Resources/new-icons/eye.png"/>
     <BitmapImage x:Key="QuickPanelChevronLeftIcon" UriSource="/Resources/new-icons/chevron-left.png"/>
+    
+    <!-- 几何面板图标资源 -->
+    <BitmapImage x:Key="GeoIconLine" UriSource="/Resources/Icons-png/geo-icons/line.png"/>
+    <BitmapImage x:Key="GeoIconDashedLine" UriSource="/Resources/Icons-png/geo-icons/dashed-line.png"/>
+    <BitmapImage x:Key="GeoIconDotLine" UriSource="/Resources/Icons-png/geo-icons/dotted-line.png"/>
+    <BitmapImage x:Key="GeoIconArrow" UriSource="/Resources/Icons-png/geo-icons/arrow.png"/>
+    <BitmapImage x:Key="GeoIconParallelLine" UriSource="/Resources/Icons-png/geo-icons/paralle-lines.png"/>
+    <BitmapImage x:Key="GeoIconRectangleCenter" UriSource="/Resources/Icons-png/geo-icons/centered-square.png"/>
+    <BitmapImage x:Key="GeoIconCircle" UriSource="/Resources/Icons-png/geo-icons/centered-circle.png"/>
+    <BitmapImage x:Key="GeoIconDashedCircle" UriSource="/Resources/Icons-png/geo-icons/centered-circle-dashed.png"/>
+    <BitmapImage x:Key="GeoIconEllipseCenter" UriSource="/Resources/Icons-png/geo-icons/centered-oval.png"/>
+    <BitmapImage x:Key="GeoIconCuboid" UriSource="/Resources/Icons-png/geo-icons/cube.png"/>
+    <BitmapImage x:Key="GeoIconRectangle" UriSource="/Resources/Icons-png/geo-icons/square.png"/>
+    <BitmapImage x:Key="GeoIconCylinder" UriSource="/Resources/Icons-png/geo-icons/cylinder.png"/>
+    <BitmapImage x:Key="GeoIconCone" UriSource="/Resources/Icons-png/geo-icons/cone.png"/>
 </ResourceDictionary>
\ No newline at end of file