From 7c277f129bf9708fc26581ec3c8242288fed07f6 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Thu, 29 Dec 2022 16:59:13 +0100
Subject: [PATCH] - Aggiornamento grafica ProjManager, TopPanel e LeftPanel

---
 .../DispositionPanel/DispositionPanelV.xaml   | 180 +---
 Icarus/LeftPanel/LeftPanelV.xaml              |   3 +-
 Icarus/MainWindow/MainWindowV.xaml            |   6 +-
 Icarus/ManagePartPanel/ManagePartPanelV.xaml  |  13 +-
 Icarus/ProjManager/ProjManagerV.xaml          |  42 +-
 Icarus/Project/ProjectV.xaml                  |  14 +-
 Icarus/ReferencePanel/ReferencePanelV.xaml    |  11 +-
 Icarus/Resources/DrawPanel/AddPointCurve.png  | Bin 901 -> 765 bytes
 Icarus/Resources/DrawPanel/ApproxCurve.png    | Bin 1424 -> 0 bytes
 Icarus/Resources/DrawPanel/Arc3P.png          | Bin 790 -> 0 bytes
 Icarus/Resources/DrawPanel/ArcCSE.png         | Bin 708 -> 0 bytes
 Icarus/Resources/DrawPanel/ArcFlip.png        | Bin 1665 -> 0 bytes
 Icarus/Resources/DrawPanel/ArcPDP.png         | Bin 780 -> 0 bytes
 Icarus/Resources/DrawPanel/BreakCurve.png     | Bin 707 -> 0 bytes
 Icarus/Resources/DrawPanel/Chamfer.png        | Bin 422 -> 0 bytes
 Icarus/Resources/DrawPanel/ChangeColor.png    | Bin 994 -> 0 bytes
 .../Resources/DrawPanel/ChangeColorAlpha.png  | Bin 1277 -> 0 bytes
 Icarus/Resources/DrawPanel/ChangeLayer.png    | Bin 1350 -> 0 bytes
 Icarus/Resources/DrawPanel/ChangeStart.png    | Bin 764 -> 0 bytes
 Icarus/Resources/DrawPanel/Circle3P.png       | Bin 1300 -> 0 bytes
 Icarus/Resources/DrawPanel/CircleCD.png       | Bin 713 -> 0 bytes
 Icarus/Resources/DrawPanel/CircleCP.png       | Bin 662 -> 0 bytes
 Icarus/Resources/DrawPanel/Delete.png         | Bin 658 -> 448 bytes
 Icarus/Resources/DrawPanel/ExplodeCurve.png   | Bin 932 -> 0 bytes
 Icarus/Resources/DrawPanel/ExplodeSurf.png    | Bin 1069 -> 0 bytes
 Icarus/Resources/DrawPanel/ExtendCurve.png    | Bin 555 -> 0 bytes
 .../Resources/DrawPanel/ExtractFacetLoops.png | Bin 1034 -> 0 bytes
 Icarus/Resources/DrawPanel/ExtractLoops.png   | Bin 1432 -> 0 bytes
 .../Resources/DrawPanel/ExtractSurfFacet.png  | Bin 1117 -> 0 bytes
 Icarus/Resources/DrawPanel/Extrude.png        | Bin 1243 -> 912 bytes
 Icarus/Resources/DrawPanel/Fillet.png         | Bin 594 -> 0 bytes
 .../Resources/DrawPanel/IntersectSurfSurf.png | Bin 1894 -> 0 bytes
 Icarus/Resources/DrawPanel/InvertCurve.png    | Bin 509 -> 0 bytes
 Icarus/Resources/DrawPanel/InvertSurf.png     | Bin 714 -> 0 bytes
 Icarus/Resources/DrawPanel/JoinCurve.png      | Bin 1079 -> 0 bytes
 Icarus/Resources/DrawPanel/Line2P.png         | Bin 595 -> 522 bytes
 Icarus/Resources/DrawPanel/LinePDL.png        | Bin 735 -> 0 bytes
 .../Resources/DrawPanel/LinearDimension.png   | Bin 921 -> 0 bytes
 Icarus/Resources/DrawPanel/MergeSurf.png      | Bin 749 -> 0 bytes
 Icarus/Resources/DrawPanel/Mirror.png         | Bin 437 -> 0 bytes
 Icarus/Resources/DrawPanel/Mirror3D.png       | Bin 538 -> 0 bytes
 Icarus/Resources/DrawPanel/ModifyCurve.png    | Bin 707 -> 732 bytes
 Icarus/Resources/DrawPanel/ModifyText.png     | Bin 749 -> 0 bytes
 Icarus/Resources/DrawPanel/Move.png           | Bin 1115 -> 792 bytes
 Icarus/Resources/DrawPanel/Offset.png         | Bin 658 -> 0 bytes
 Icarus/Resources/DrawPanel/Plane.png          | Bin 686 -> 0 bytes
 Icarus/Resources/DrawPanel/Point.png          | Bin 308 -> 406 bytes
 Icarus/Resources/DrawPanel/Polygon.png        | Bin 682 -> 0 bytes
 Icarus/Resources/DrawPanel/PolygonSide.png    | Bin 620 -> 0 bytes
 Icarus/Resources/DrawPanel/Rectangle2P.png    | Bin 549 -> 0 bytes
 Icarus/Resources/DrawPanel/RemoveColor.png    | Bin 1048 -> 0 bytes
 .../Resources/DrawPanel/RemovePointCurve.png  | Bin 1166 -> 859 bytes
 Icarus/Resources/DrawPanel/Revolve.png        | Bin 2519 -> 0 bytes
 Icarus/Resources/DrawPanel/Rotate.png         | Bin 511 -> 477 bytes
 Icarus/Resources/DrawPanel/Rotate3D.png       | Bin 667 -> 0 bytes
 Icarus/Resources/DrawPanel/Ruled.png          | Bin 1096 -> 0 bytes
 Icarus/Resources/DrawPanel/Scale.png          | Bin 567 -> 0 bytes
 Icarus/Resources/DrawPanel/Scale3D.png        | Bin 687 -> 0 bytes
 Icarus/Resources/DrawPanel/Screw.png          | Bin 1582 -> 0 bytes
 Icarus/Resources/DrawPanel/SolidAddSurf.png   | Bin 1567 -> 0 bytes
 .../DrawPanel/SolidIntersectSurf.png          | Bin 1126 -> 0 bytes
 .../Resources/DrawPanel/SolidSubtractSurf.png | Bin 1408 -> 0 bytes
 Icarus/Resources/DrawPanel/SplitCurve.png     | Bin 675 -> 0 bytes
 Icarus/Resources/DrawPanel/Swept.png          | Bin 2088 -> 0 bytes
 Icarus/Resources/DrawPanel/Text.png           | Bin 705 -> 0 bytes
 Icarus/Resources/DrawPanel/ThickCurve.png     | Bin 758 -> 0 bytes
 Icarus/RibPanel/RibPanelV.xaml                | 465 +++------
 .../ShellNumberPanel/ShellNumberPanelV.xaml   | 533 +++--------
 Icarus/SliceManager/SliceManagerV.xaml        |   2 +-
 Icarus/StartMachPanel/StartMachPanelV.xaml    | 398 +++-----
 Icarus/TopPanel/TopPanelV.xaml                |  80 +-
 Icarus/Utility/Dictionary.xaml                | 896 +++++++++++++++++-
 72 files changed, 1393 insertions(+), 1250 deletions(-)
 delete mode 100644 Icarus/Resources/DrawPanel/ApproxCurve.png
 delete mode 100644 Icarus/Resources/DrawPanel/Arc3P.png
 delete mode 100644 Icarus/Resources/DrawPanel/ArcCSE.png
 delete mode 100644 Icarus/Resources/DrawPanel/ArcFlip.png
 delete mode 100644 Icarus/Resources/DrawPanel/ArcPDP.png
 delete mode 100644 Icarus/Resources/DrawPanel/BreakCurve.png
 delete mode 100644 Icarus/Resources/DrawPanel/Chamfer.png
 delete mode 100644 Icarus/Resources/DrawPanel/ChangeColor.png
 delete mode 100644 Icarus/Resources/DrawPanel/ChangeColorAlpha.png
 delete mode 100644 Icarus/Resources/DrawPanel/ChangeLayer.png
 delete mode 100644 Icarus/Resources/DrawPanel/ChangeStart.png
 delete mode 100644 Icarus/Resources/DrawPanel/Circle3P.png
 delete mode 100644 Icarus/Resources/DrawPanel/CircleCD.png
 delete mode 100644 Icarus/Resources/DrawPanel/CircleCP.png
 delete mode 100644 Icarus/Resources/DrawPanel/ExplodeCurve.png
 delete mode 100644 Icarus/Resources/DrawPanel/ExplodeSurf.png
 delete mode 100644 Icarus/Resources/DrawPanel/ExtendCurve.png
 delete mode 100644 Icarus/Resources/DrawPanel/ExtractFacetLoops.png
 delete mode 100644 Icarus/Resources/DrawPanel/ExtractLoops.png
 delete mode 100644 Icarus/Resources/DrawPanel/ExtractSurfFacet.png
 delete mode 100644 Icarus/Resources/DrawPanel/Fillet.png
 delete mode 100644 Icarus/Resources/DrawPanel/IntersectSurfSurf.png
 delete mode 100644 Icarus/Resources/DrawPanel/InvertCurve.png
 delete mode 100644 Icarus/Resources/DrawPanel/InvertSurf.png
 delete mode 100644 Icarus/Resources/DrawPanel/JoinCurve.png
 delete mode 100644 Icarus/Resources/DrawPanel/LinePDL.png
 delete mode 100644 Icarus/Resources/DrawPanel/LinearDimension.png
 delete mode 100644 Icarus/Resources/DrawPanel/MergeSurf.png
 delete mode 100644 Icarus/Resources/DrawPanel/Mirror.png
 delete mode 100644 Icarus/Resources/DrawPanel/Mirror3D.png
 delete mode 100644 Icarus/Resources/DrawPanel/ModifyText.png
 delete mode 100644 Icarus/Resources/DrawPanel/Offset.png
 delete mode 100644 Icarus/Resources/DrawPanel/Plane.png
 delete mode 100644 Icarus/Resources/DrawPanel/Polygon.png
 delete mode 100644 Icarus/Resources/DrawPanel/PolygonSide.png
 delete mode 100644 Icarus/Resources/DrawPanel/Rectangle2P.png
 delete mode 100644 Icarus/Resources/DrawPanel/RemoveColor.png
 delete mode 100644 Icarus/Resources/DrawPanel/Revolve.png
 delete mode 100644 Icarus/Resources/DrawPanel/Rotate3D.png
 delete mode 100644 Icarus/Resources/DrawPanel/Ruled.png
 delete mode 100644 Icarus/Resources/DrawPanel/Scale.png
 delete mode 100644 Icarus/Resources/DrawPanel/Scale3D.png
 delete mode 100644 Icarus/Resources/DrawPanel/Screw.png
 delete mode 100644 Icarus/Resources/DrawPanel/SolidAddSurf.png
 delete mode 100644 Icarus/Resources/DrawPanel/SolidIntersectSurf.png
 delete mode 100644 Icarus/Resources/DrawPanel/SolidSubtractSurf.png
 delete mode 100644 Icarus/Resources/DrawPanel/SplitCurve.png
 delete mode 100644 Icarus/Resources/DrawPanel/Swept.png
 delete mode 100644 Icarus/Resources/DrawPanel/Text.png
 delete mode 100644 Icarus/Resources/DrawPanel/ThickCurve.png

diff --git a/Icarus/DispositionPanel/DispositionPanelV.xaml b/Icarus/DispositionPanel/DispositionPanelV.xaml
index 7ad69dc..3574294 100644
--- a/Icarus/DispositionPanel/DispositionPanelV.xaml
+++ b/Icarus/DispositionPanel/DispositionPanelV.xaml
@@ -1,14 +1,16 @@
 <Grid x:Class="DispositionPanelV"
-            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-            xmlns:PrintApp="clr-namespace:Icarus"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+      xmlns:PrintApp="clr-namespace:Icarus"
       VerticalAlignment="Stretch"
-            Margin="5">
+      Margin="5,0,0,0">
+   
    <Grid.Resources>
       <PrintApp:CenterToolTipConverter x:Key="CenterToolTipConverter"/>
       <PrintApp:FromBooleanToVisibility x:Key="FromBooleanToVisibility"/>
    </Grid.Resources>
+   
    <Grid.ColumnDefinitions>
       <ColumnDefinition Width="Auto"/>
       <ColumnDefinition Width="Auto"/>
@@ -23,26 +25,21 @@
       <RowDefinition Height="{Binding ActualHeight, ElementName=MoveBtn}"/>
       <RowDefinition Height="1*"/>
    </Grid.RowDefinitions>
+
    <ToggleButton x:Name="MoveBtn" 
                  Grid.Row="3"
                  Content="Move"
                  IsChecked="{Binding bMove_IsChecked}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <!--<Border Background="Red"
-           Grid.Column="1"
-           Grid.Row="1"
-           Grid.RowSpan="5"
-           Width="50"
-           VerticalAlignment="Stretch"/>-->
+                 Margin="0,0,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
 
    <Border x:Name="PopupBrd" 
            Grid.Column="1"
            Grid.Row="1"
            Grid.RowSpan="5"
            VerticalAlignment="Center"
-           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=MoveBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_Popup_Border}">
       <Grid>
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -56,132 +53,65 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="X"
-                          VerticalAlignment="Center"/>
+                       VerticalAlignment="Center"/>
             <EgtWPFLib5:EgtTextBox Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
+                                   Grid.Column="1" 
+                                   Margin="5,0,0,0"
+                                   Style="{StaticResource LeftPanel_TextBox}"/>
          </Grid>
          <Grid Grid.Row="1"
-                  Margin="0,2.5,0,2.5">
+               Margin="0,2.5,0,2.5">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="Y"
-                          VerticalAlignment="Center"/>
+                       VerticalAlignment="Center"/>
             <EgtWPFLib5:EgtTextBox Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
+                                   Grid.Column="1" 
+                                   Margin="5,0,0,0"
+                                   Style="{StaticResource LeftPanel_TextBox}"/>
          </Grid>
          <Grid Grid.Row="2"
-                  Margin="0,2.5,0,0">
+               Margin="0,2.5,0,2.5">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="Z"
-                          VerticalAlignment="Center"/>
+                       VerticalAlignment="Center"/>
             <EgtWPFLib5:EgtTextBox Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
+                                   Grid.Column="1" 
+                                   Margin="5,0,0,0"
+                                   Style="{StaticResource LeftPanel_TextBox}"/>
          </Grid>
          <Grid Grid.Row="3"
-                  Margin="0,2.5,0,0">
+               Margin="0,2.5,0,0">
             <Button Content="Drag"
-                       Command="{Binding DragMove_Command}"
-                       Style="{StaticResource LeftPanel_TextButton}"/>
+                    Command="{Binding DragMove_Command}"
+                    Style="{StaticResource LeftPanel_TextButton}"/>
          </Grid>
       </Grid>
    </Border>
 
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=MoveBtn}"
-          PlacementTarget="{Binding ElementName=MoveBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border x:Name="PopupBrd" Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid Margin="0,0,0,2.5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="X"
-                          VerticalAlignment="Center"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
-            </Grid>
-            <Grid Grid.Row="1"
-                  Margin="0,2.5,0,2.5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="Y"
-                          VerticalAlignment="Center"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
-            </Grid>
-            <Grid Grid.Row="2"
-                  Margin="0,2.5,0,0">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="Z"
-                          VerticalAlignment="Center"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
-            </Grid>
-            <Grid Grid.Row="3"
-                  Margin="0,2.5,0,0">
-               <Button Content="Drag"
-                       Command="{Binding DragMove_Command}"
-                       Style="{StaticResource LeftPanel_TextButton}"/>
-            </Grid>
-         </Grid>
-      </Border>
-   </Popup>-->
- 
    <ToggleButton x:Name="RotateBtn"
                  Grid.Row="4"
                  Content="Rotate"
                  IsChecked="{Binding bRotate_IsChecked}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
-   <!--<Border Background="Blue"
-           Grid.Column="2"
-           Grid.Row="2"
-           Grid.RowSpan="5"
-           Width="50"
-           VerticalAlignment="Stretch"
-           HorizontalAlignment="Stretch"/>-->
+                 Margin="0,2.5,0,0"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
 
    <Border Grid.Column="1"
            Grid.Row="2"
            Grid.RowSpan="5"
            VerticalAlignment="Center"
-           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=RotateBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_Popup_Border}">
       <Grid>
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
          </Grid.RowDefinitions>
          <UniformGrid Columns="3">
             <RadioButton Content="X"
@@ -198,53 +128,15 @@
                             Style="{StaticResource ToolBar_ToggleButton}"/>
          </UniformGrid>
          <EgtWPFLib5:EgtTextBox Grid.Row="1"
-                                   Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
-                                   Margin="0,5,0,0"/>
+                                Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
+                                Margin="0,5,0,2.5"/>
          <Grid Grid.Row="2"
-                  Margin="0,2.5,0,0">
+               Margin="0,2.5,0,0">
             <Button Content="Drag"
-                       Command="{Binding DragRotate_Command}"
-                       Style="{StaticResource LeftPanel_TextButton}"/>
+                    Command="{Binding DragRotate_Command}"
+                    Style="{StaticResource LeftPanel_TextButton}"/>
          </Grid>
       </Grid>
    </Border>
 
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=RotateBtn}"
-          Grid.Column="1"
-          PlacementTarget="{Binding ElementName=RotateBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <UniformGrid Columns="3">
-               <RadioButton Content="X"
-                            GroupName="Axes"
-                            IsChecked="{Binding RotAxes[0]}"
-                            Style="{StaticResource ToolBar_ToggleButton}"/>
-               <RadioButton Content="Y"
-                            GroupName="Axes"
-                            IsChecked="{Binding RotAxes[1]}"
-                            Style="{StaticResource ToolBar_ToggleButton}"/>
-               <RadioButton Content="Z"
-                            GroupName="Axes"
-                            IsChecked="{Binding RotAxes[2]}"
-                            Style="{StaticResource ToolBar_ToggleButton}"/>
-            </UniformGrid>
-            <EgtWPFLib5:EgtTextBox Grid.Row="1"
-                                   Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
-                                   Margin="0,5,0,0"/>
-            <Grid Grid.Row="2"
-                  Margin="0,2.5,0,0">
-               <Button Content="Drag"
-                       Command="{Binding DragRotate_Command}"
-                       Style="{StaticResource LeftPanel_TextButton}"/>
-            </Grid>
-         </Grid>
-      </Border>
-   </Popup>-->
 </Grid>
diff --git a/Icarus/LeftPanel/LeftPanelV.xaml b/Icarus/LeftPanel/LeftPanelV.xaml
index d96e2dd..085059b 100644
--- a/Icarus/LeftPanel/LeftPanelV.xaml
+++ b/Icarus/LeftPanel/LeftPanelV.xaml
@@ -2,8 +2,7 @@
                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-               xmlns:PrintApp="clr-namespace:Icarus"
-               Margin="5">
+               xmlns:PrintApp="clr-namespace:Icarus">
    <TabControl SelectedIndex="{Binding SelPanel}"
                Background="Transparent"
                BorderThickness="0">
diff --git a/Icarus/MainWindow/MainWindowV.xaml b/Icarus/MainWindow/MainWindowV.xaml
index d3eb8a2..854c811 100644
--- a/Icarus/MainWindow/MainWindowV.xaml
+++ b/Icarus/MainWindow/MainWindowV.xaml
@@ -17,7 +17,11 @@
    </EgtWPFLib5:EgtCustomWindow.TitlePanel>-->
 
    <Grid>
-      <PrintApp:SceneHostV/>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="70"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+      <PrintApp:SceneHostV Grid.Row="1"/>
    </Grid>
    <!--Pannello principale --><!--
    <DockPanel>
diff --git a/Icarus/ManagePartPanel/ManagePartPanelV.xaml b/Icarus/ManagePartPanel/ManagePartPanelV.xaml
index 4f98579..174a796 100644
--- a/Icarus/ManagePartPanel/ManagePartPanelV.xaml
+++ b/Icarus/ManagePartPanel/ManagePartPanelV.xaml
@@ -71,9 +71,11 @@
                </Grid>
             </HierarchicalDataTemplate>
             <!-- Menu' tasto destro -->
-            <ContextMenu x:Key="RowMenu" ItemsSource="{Binding MenuList}" >
+            <ContextMenu x:Key="RowMenu" 
+                         ItemsSource="{Binding MenuList}" 
+                         Style="{StaticResource Icarus_ContextMenu}">
                <ContextMenu.ItemContainerStyle>
-                  <Style TargetType="MenuItem">
+                  <Style TargetType="MenuItem" BasedOn="{StaticResource Icarus_MenuItem}">
                      <Setter Property="Command" Value="{Binding MenuItem_Command}"/>
                      <Setter Property="Header" Value="{Binding sMsg}"/>
                   </Style>
@@ -104,9 +106,11 @@
                Visibility="{Binding IsImport_Visibility}">
          <ListBox.Resources>
             <!-- Menu' tasto destro -->
-            <ContextMenu x:Key="RowMenu" ItemsSource="{Binding MenuList}" >
+            <ContextMenu x:Key="RowMenu" 
+                         ItemsSource="{Binding MenuList}"
+                         Style="{StaticResource Icarus_ContextMenu}">
                <ContextMenu.ItemContainerStyle>
-                  <Style TargetType="MenuItem">
+                  <Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource Icarus_MenuItem}">
                      <Setter Property="Command" Value="{Binding MenuItem_Command}"/>
                      <Setter Property="Header" Value="{Binding sMsg}"/>
                   </Style>
@@ -117,6 +121,7 @@
             <Style TargetType="ListBoxItem">
                <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
                <Setter Property="ContextMenu" Value="{StaticResource RowMenu}" />
+               <Setter Property="ContextMenuService.Placement" Value="Right" />
             </Style>
          </ListBox.ItemContainerStyle>
          <ListBox.ItemTemplate>
diff --git a/Icarus/ProjManager/ProjManagerV.xaml b/Icarus/ProjManager/ProjManagerV.xaml
index b414b6b..183fb0a 100644
--- a/Icarus/ProjManager/ProjManagerV.xaml
+++ b/Icarus/ProjManager/ProjManagerV.xaml
@@ -9,19 +9,21 @@
    <Button Command="{Binding New_Command}"
            ToolTip="{Binding NewToolTip}"
            IsEnabled="{Binding ProjCmd_IsEnabled}"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/New.png" Stretch="Uniform"/>
+           Style="{StaticResource TopPanel_Button}">
+      <Image Source="/Resources/ProjectManager/New.png"
+             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button Command="{Binding OpenCommand}"
            ToolTip="{Binding OpenToolTip}"
            ContextMenuService.Placement="Bottom" 
            Tag="{Binding}"
            IsEnabled="{Binding ProjCmd_IsEnabled}"
-           Style="{StaticResource ToolBar_Button}">
+           Style="{StaticResource TopPanel_Button}">
       <Button.ContextMenu>
-         <ContextMenu ItemsSource="{Binding MruFileNames}">
+         <ContextMenu ItemsSource="{Binding MruFileNames}"
+                      Style="{StaticResource Icarus_ContextMenu}">
             <ContextMenu.Resources>
-               <Style TargetType="{x:Type MenuItem}">
+               <Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource Icarus_MenuItem}">
                   <Setter Property="Command"
                           Value="{Binding PlacementTarget.Tag.OpenMruFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}" />
                   <Setter Property="CommandParameter" Value="{Binding}" />
@@ -29,41 +31,45 @@
             </ContextMenu.Resources>
          </ContextMenu>
       </Button.ContextMenu>
-      <Image Source="/Resources/ProjectManager/Open.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ProjectManager/Open.png"
+             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button Command="{Binding SaveCommand}"
            ToolTip="{Binding SaveToolTip}"
            IsEnabled="{Binding ProjCmd_IsEnabled}"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
+           Style="{StaticResource TopPanel_Button}">
+      <Image Source="/Resources/ProjectManager/Save.png"
+             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button Command="{Binding SaveAsCommand}"
            ToolTip="{Binding SaveAsToolTip}"
            IsEnabled="{Binding ProjCmd_IsEnabled}"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/SaveAs.png" Stretch="Uniform"/>
+           Style="{StaticResource TopPanel_Button}">
+      <Image Source="/Resources/ProjectManager/SaveAs.png"
+             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button Command="{Binding ImportCommand}"
            ToolTip="{Binding ImportToolTip}"
            IsEnabled="{Binding ProjCmd_IsEnabled}"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Import.png" Stretch="Uniform"/>
+           Style="{StaticResource TopPanel_Button}">
+      <Image Source="/Resources/ProjectManager/Import.png"
+             Style="{StaticResource Button_Image}"/>
    </Button>
    <!--<Button Command="{Binding ExportCommand}" ToolTip="{Binding ExportToolTip}"
          IsEnabled="{Binding DrawIsChecked}">
       <Image Source="/Resources/ProjectManager/Export.png" Stretch="Uniform"/>
    </Button>-->
    <Button Command="{Binding OptionsCommand}"
-           Width="30"
            ToolTip="{Binding OptionsToolTip}"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Options.png" Height="22" />
+           Style="{StaticResource TopPanel_Button}">
+      <Image Source="/Resources/ProjectManager/Options.png"
+             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button Command="{Binding SendFeedbackCommand}"
-           Width="30"
            ToolTip="{Binding SendFeedbackToolTip}"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Send.png" Height="22" />
+           Style="{StaticResource TopPanel_Button}">
+      <Image Source="/Resources/ProjectManager/Send.png"
+             Style="{StaticResource Button_Image}"/>
    </Button>
 
 </StackPanel>
diff --git a/Icarus/Project/ProjectV.xaml b/Icarus/Project/ProjectV.xaml
index 4d400d7..0065c02 100644
--- a/Icarus/Project/ProjectV.xaml
+++ b/Icarus/Project/ProjectV.xaml
@@ -1,9 +1,9 @@
-<EgtFloating:EgtFloatingManager x:Class="ProjectV"
-                                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-                                xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                xmlns:PrintApp="clr-namespace:Icarus">
+<DockPanel x:Class="ProjectV"
+           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+           xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+           xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+           xmlns:PrintApp="clr-namespace:Icarus">
 
    <Grid DockPanel.Dock="Top">
       <PrintApp:TopPanelV Grid.Column="1"
@@ -58,4 +58,4 @@
    <!-- Grid che occupa lo spazio della scena -->
    <Grid Background="Transparent"/>
 
-</EgtFloating:EgtFloatingManager>
+</DockPanel>
diff --git a/Icarus/ReferencePanel/ReferencePanelV.xaml b/Icarus/ReferencePanel/ReferencePanelV.xaml
index affdb8b..c863ae2 100644
--- a/Icarus/ReferencePanel/ReferencePanelV.xaml
+++ b/Icarus/ReferencePanel/ReferencePanelV.xaml
@@ -1,7 +1,8 @@
 <UserControl x:Class="ReferencePanelV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-   <Border Style="{StaticResource LeftPanelPopup_Border}">
+   <Border Padding="2.5"
+           Style="{StaticResource LeftPanel_PopupButton_Border}">
       <Grid>
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -14,11 +15,13 @@
                   Padding="0">
             <ListBox.ItemsPanel>
                <ItemsPanelTemplate>
-                  <UniformGrid Rows="3"/>
+                  <UniformGrid Rows="3"
+                               Margin="0"/>
                </ItemsPanelTemplate>
             </ListBox.ItemsPanel>
             <ListBox.ItemContainerStyle>
                <Style TargetType="ListBoxItem">
+                  <Setter Property="Margin" Value="0"/>
                   <Setter Property="Template">
                      <Setter.Value>
                         <ControlTemplate TargetType="{x:Type ListBoxItem}">
@@ -34,6 +37,7 @@
                                IsChecked="{Binding IsSelected,RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
                                FontSize="40"
                                GroupName="ReferenceRadio"
+                               Margin="2.5,2.5,2.5,2.5"
                                Style="{StaticResource OptionPanel_NestingToggleButton}"/>
                </DataTemplate>
             </ListBox.ItemTemplate>
@@ -42,7 +46,8 @@
                       Content="From Import"
                       IsChecked="{Binding FromImport_IsChecked}"
                       GroupName="ReferenceRadio"
+                      Margin="2.5"
                       Style="{StaticResource OptionPanel_ToggleButton}"/>
       </Grid>
-   </Border> 
+   </Border>
 </UserControl>
diff --git a/Icarus/Resources/DrawPanel/AddPointCurve.png b/Icarus/Resources/DrawPanel/AddPointCurve.png
index 5bd7bfb77f80d6e86268dd4274d61790310f2156..8945f100d090c92b624eaaa9e83f27624858d973 100644
GIT binary patch
delta 741
zcmV<B0vi2=2mJ+*B!3BTNLh0L01FZT01FZU(%pXi00087Nkl<ZScS!yPl!)Z6vscm
z-;52yBxPq-veN7rDU^kk#zJZolPsjJH(jKxOq7+|+_@pEVPj!KN>bEpu##bRHh!XP
zk%cfuXF9K*=e^&*dH47G?(U!W&Zl$FJ?GwATUuHoRq$>Y7=PAg!z8vrM5(<Au?0LZ
ziTxthmZ5@o8-VM;VPI7TW7Z`0L=3Fp-D$O%)m@X=qjl|&!6P{!(Xrs&bR=ID{dYWg
zH&L6Jz9uewR{)es*7t42K<hJMlGl?#9V`P9{QzzQ^A$oJ04|h_eIIP&2Q>jQiJhy8
zD0tT>f%*ensefzaH-)MaNF^KVS3&<Hli2yXZu?nav0#$)O;t$~yc+>t0+YZHa2~h?
z95RVLNSYFKvh0R48bga3XHzDzS0ezOHHp1ZHZPw%=hL80mn?X<9k>XbN|W0Pf$p2c
zjyIcIFX;Oxs7+!e9junL5xg6V4O9kIBw5x?^3&kmoPU;wC_rsP>1OcS+ylH1-d&0T
z)Hak#AiieWV_Gwt0lnxHs3Ry1^0Z$41U{Dqz5+c5o^}e<5tK@x?f_eXZNa;TO@N-I
zc_%8Ac*Z1l!X)+sun*WDyt`Q?kf@#7R|eP!-tCe=4&E)uS*Qvix>&wEm?Ya#;4<*0
z3ZNB3sedG0d=scFQ1EWA<g}hcX-aqvEL7p46+^`W>KZC0P*+f~f#@_PlmTge%HK|8
z?v{dJms7}OB~UFq)X>_P)rej+^ZhN)WNksUS~9JHbGdJp0lGQgw~VP?#85|2{Q&w0
zN&(gaoBIhw=7A&o*dRBFPrv~1s@FiGfsI4!<X*h}IODaN-u2f=vE8wARIXe-m4KX6
zujEzNZQXN;;obc(+)M)X-;q}JJHi`6+fb6_J{FAK>jTfSvd@brf#dpyFw^X=A639#
X2*)t?FHOku00000NkvXXu0mjfbYNXu

delta 878
zcmV-!1Cjjw1%(HYB!2{FK}|sb0I`n?{9y$E000SaNLh0L01|Kj01|KkA)A<L0000P
zbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@KG4UX2l>h((0!c(cR9HvFmrqDkK^(^o
z`h#`c&<;U=pd$Q3$+Fu9MJ1I*DH~CTMLL)U;VDS!qG?E41b=(6AlyqrhIyz{2O+5_
zsGwV?=pd{6=ee8fZqm(ZzHi>_`#C$UyZUzb3!iy2zc=&SkMmAeF~*7l(bb(qTdXwN
zVm``tQ|b@(zKgMji5Z3`tpj!MTFBQQh=JtMhxjrMNN~`&*>le+c>io~*`ErjK4$pF
zFlU7rZ{`@ZuYY7!DTHrakO!Q;Dg3DHE&Ed;kd3w2U@mz0fxq~anJ1&Inb6qVM0?jp
z)YS&oIc=SSEn=HkLkOQzt|{5bLSJ9sChM;<Z)ovh@K>U}lf`_^Q>lTW`pn3)b98?p
zV7r9(=OtG4;?-;OsY47(s8k}*u|MiQ9-pn*%OVHeOMgb|RTe+pHkf%jI;J+$!ILAj
z8e&jFrT&DTH>P?A*{o|93vYI@@YY%u=JVK*W-zWcr0^6i1ndb3mBPFEOM&i4ori_1
zYlPUg9c*rQ9gCl7TT1mmn2<dvJZlmH_Jl;0LL&8^$Kfs8O{tjo6#ISaPSj}eA4&&D
zF329Fmwzb(iWLI(ghZ7B$@b2dv8H2eZchVSxZ7`}28P|n#Va@BE&f`$$Lg~#Az)8P
zbW*@L>;D#YpGd~fU-m}!9ljp*oW!ktCq33J1ndckPHOS~a5d)#7dwhQT*?(W(DXUd
z=(}c}cSH!-6A~(Al~#l{u+BOr1jL}E7%40zPJajiF(@fi3R8(wLO={k@=0Y6mPiPQ
zLCI=Tcu1TU0%B02lgb__u@JB)B>$7bLsBXsAO`%3^+a@1JY^9AVo;)yTIQ5R2#7(6
zB9-QpO$dlVi6Uj*l1_+5eYYOOpvm~;oAmUjuQ@_8a$O4S3CX~8jCm(#Sm=vUb|H{c
zxMw{T&HnoXG5T)aAJ|FPr6Q*wg(SX-pS&#IB|Ew+Bh^E0%ENCe_<oL;t<7clbU<6g
zCxp<@$J~DwWz@QpXp4nHqkF$rw8cuJEmj(Bv9hqLe@O3J4s|TwGynhq07*qoM6N<$
Ef*eqo&j0`b

diff --git a/Icarus/Resources/DrawPanel/ApproxCurve.png b/Icarus/Resources/DrawPanel/ApproxCurve.png
deleted file mode 100644
index 593f8668d367efcf017848cf6a74e78bcf1ca882..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1424
zcmV;B1#kL^P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA1tm#DK~z{r%~xA!
z990-TXLfe>mP^xSH7*UgnAX^sm>WrYQEL@SK|w8ow+el+rM?7T>IDi~s*ooUf=~&F
z1Zf*ZtDx}~+Cm=GN^HQ`*k)}_vTZiWW;eUdZf1Ap_?^k@vb#=pH=9KA!8hleIhX&N
z|Nm#s8Oj(V`GQia*ZzxDt-I36nS|s6Bl{UeWfL&qtQJu?mRf}Dn|25EYTnTF@XK;s
z4IsEcudWE1-E<+zOa}}V>(!irIVGT3Z)SyNH(f}axd6uOdNn8ThXPG{(-4~NJjL)_
z%7|=&(O(D(dNTzniN4Y|3ybmzg<v`8<o5v2MDI7H57fHOC@PaKj7Lti9NgK9mtaBf
zPXX50gg(FC)Q}LBhaet?niyk`fx84ss=4EXsygQE?kVrG)b1s!N;*qIiut)G4`A#p
z$c;@xgcs$qSXLB_S}{4IHxtmkV+*Tl17^MgF?EQ6C=gnJwW6xSF@5v3Q#IYLrmdFn
z9dhi_nPBBtz5STO4NZe1;1KvXI1kFO6GNGR7E>cHB@2QO?d{Ra+K{R|B@^{18tq7~
zB89ODnW^7KnA&5vTDqF{cQ~4DB9SdtQrTQPi8<UeWneq_JopB99DE$C(7m33Vazb7
z2%`8?@VXXrlvXr%&ML9}R!VC`N}ZGuGgcUqsBjj2e}X=YRo))By?eLI(qk6|^X=>I
zcQ+k6coBUMfe(WfAkRZC<PLZZ{0zK^xx8&GDjg8SJ=(CKs?Wv<tCk3LsD$|;<_g61
zp>F~Us@h;3>1n~eF(QZW+acMuqS*}AgD#No2p;g{>;7A#zeK~KjH0m6W*GCKw7^4q
zBuWn<cg)D61sfFxG2}ex$CxDrI<mddSWk3E7h9{%mR2;IK<=T_;0S-Xte(=nR5BTp
zUn~|(EpSJ$NHAT-y{|zYt`tEW*+j*GwRuXkf&2w<UyVkr$NZi^Mp5<WZaPlaiXV~l
zeeSuwzI%LAw=7!}wa-F@0d$8l3CbiU84$(?@{h3%4DvNoW@3O1H^X|}?)~o9cgBO!
z&M!wjbBCvfXSUyM4aMGi^AU_O{1C1cGCt0wzx>x;{XI~F$0vfSklv1xnd!FHyNo=v
zmN49VIJjHIh2X@|xltl5M#xJp2l-=;{q(4JY+VI$Bt+>+r-6qKh4kCr_Wr65PyX|s
z=fc%JPWtJo>!Bk&S9sneCvz^ybvz%pZ1^DT-g!lN-%RO_88vpcT$D~AY}$6P(qzsR
z@pTQu$3us0qY*YsQF`o@{(#%cQty(OwG_m~Bzsa5l@>bf+`Y(Hqlr){OxW-ilX+;p
zk~>*U9GWN?Og;^8k8DH7gBUKO&Uf@x{}3c2?inLN94X<0m-t30;e50Y0dgU9UK}`n
zUagmsMJy*I83KeP{~`rZRAJL?L8%0oa=A=2k7}KHAXgFT5FkW5E<l_O<k?$?bt<ET
z`NE71qMwIwMaWl79EtG3INx5ZGGlf4P}p!x87~#YD@(n(V>M#pNXaRnS}~cntBlAp
zVWUoyxTXo7D}?xy;Y3jE=>PF^^+;!Z!GR~HB2PcVPm+mmlM&X!D@I8CID9ee>lvGq
z51+d+8+Dn4`QsgB3%j;$uE=IM{Uf@j;k&<7YWc(~(}=xLa$6jwDiO-o%M;m<5H%i%
zecatxO!!~O%Vkz_BM|#u@A}`7@`wDvptqsHDRtS+g0HQr=mq_DMyyBpQbcVOq<<1N
e1U8^3LjDEGeX9L;1T)G20000<MNUMnLSTY50h)IJ

diff --git a/Icarus/Resources/DrawPanel/Arc3P.png b/Icarus/Resources/DrawPanel/Arc3P.png
deleted file mode 100644
index 1df2af491d7f19f571ee4029b60b4961c94ffd93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 790
zcmV+x1L^#UP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0;5Sp
zK~#9!V*LOAKf_=HObmk%3`$3_(A&cA-@gmodh=(;ryu`hI9VB4xY(EuXi4!z45*{-
zz5R1+{<SZf`#${!^Rr|)!$CB%!)P9TjEsy5K%4-?4M2S0*{5IXFb9Fav?t#go__pe
zLGzFTIRr=*0C4~i%OlHu`pt-;UXYWCgJzBbI>rG=H2|?an$$rcJ^;iIGz1wtWmuTR
zp8WX-mT=-@W#D9CyosV3R8CQffxrQ3>3<}=0Tfc`YHvROYzxGX)?9e|f7iA5KdwCf
zbnV->ZvrUhQRo-}AfABakPpz1QlQ9OQZ)d5<pA;-&|(81zJL}o3e*UBMq;a(YtO#a
zz4-j6<lL)Yy!s-nzkk2D!RYN|1xk}2fj9wZ&IYQbO=28%_Q5B;$DjY6s=M)-9VS+)
z$j$Kb*ve<6`Pte)Gd|G0n&D()O55=8J3F#i_x-O7)?N|!sqG-59rg3i|1ScpsO1YV
zTQjh+uzVS?3i<4=71Pr++5dqY0t1B_JU@X{8BMAIBD4MkUq8S9JC2<Hv*XH}CnxWH
zyms`?M=xsRG_r~WXu$}}_5rkV2&s;OmDC&P;UI#JLJFl1)G8Q>!Gsce1C*WsRQ!Nm
zZ7!UJC$#x-AIepvr=#$NQ~{LUNKXe5a#R46UO?|AGuG%si#kDCR3+qulmo2ANN)$>
zbCd#<J}{U%qp*;AFc6MHNmHPXBB);m>IMOO9ZbMR{wr2C)(|xbp2GvyLk2o%<Ls-5
zjv}bnF~L$`DUc~QVA1#e&wrGTBB&d5`Q<O!0ZmiyzyJGzu7Hn?>F0ntN}8YL1h8)p
z=Yu+mQoPLf2E6bD_F7ha`}NP^`|tmMggBY*Dhadrb8>Qi7*I!z4w?-mM*##F009z{
UgFQ)T5C8xG07*qoM6N<$g5JSqpa1{>

diff --git a/Icarus/Resources/DrawPanel/ArcCSE.png b/Icarus/Resources/DrawPanel/ArcCSE.png
deleted file mode 100644
index 64e2aee675cc8b30cbccd0734e1ecece927cd5b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 708
zcmV;#0z3VQP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0#Qjs
zK~#9!?3lkx!$1_rb2aq`rc_WtG)h2ma1cAVDcXNP-E=dvV8yMQ89O?;HvI>*xHt&~
z-5e~A;%_S`2u35QG#cM4cbJye{z@+ueDJtj3U{Brdw2J~A+~J`&1OEK39TuiMBWpg
z-oH-2TXy{7$&$O<eUIIpEr(<M(vqi8S<Bvz9zFMDtS{^itjHaUAC`R;8VW?YEgvCd
z7F+{Qu0<m0gWGool(VhOn~?pq=NcX<09b%V1)q1mH%*goq60`5jmQ;rcN{?1;0f^c
zxUPq%2HT!w@n>3CKEdBYcJsz^<D3EzjLIf>&;gPJ*J1p0u|$6`KgD*Dh{Y0JK&V<B
zOaV{fFw`+hYCU7-#;pSg^Twbs*lP8{)CEP8m_-MdM{x_NCa3}+-A$O9pm+dP1x0hH
z;XoBb(OqWn0ICLxZTobifhvM><dNa_E~^O&tjn=%8V{gKpfq+;^8!LIcOk2^)wmX2
z6&wLvqf{<ZEJ{h<)oIDn1<DcjL#VL)@I=jE3Crpt-ax-qo(wA0OuBD^wrMY*iVBCw
z>Z*c8KGf6=fg*ZFq4#O-kK3wjluUH2pHY|XUB2~5A`!62Zxwy>qkYnW%TRdkZP0EQ
zpi(8FPBP{h2*qKh%TRU1CWGhWa$v;82&pt@XXxuh?krSgt?2UI7*?K8#OJ#gOB#1C
zNQxsu%$5spjl4t;w32M$D3af2dAj?0C2=3cp;IWLE^~1{+&E#nWX#s-yV586@r@Z{
q+8&jw^TUHDiT?l5?5{z63oroj$$D4>77Pyn0000<MNUMnLSTZr4mY9z

diff --git a/Icarus/Resources/DrawPanel/ArcFlip.png b/Icarus/Resources/DrawPanel/ArcFlip.png
deleted file mode 100644
index 4468ce00da9c709525054c3f747f042506d9be85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1665
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
LNkvXXu0mjfd5;w@

diff --git a/Icarus/Resources/DrawPanel/ArcPDP.png b/Icarus/Resources/DrawPanel/ArcPDP.png
deleted file mode 100644
index f74b1a5f186b01828f617c01d44105ee7cfde281..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 780
zcmV+n1M~ceP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0+~rf
zK~#9!V*LOAKf_=HObmk%3`$3_(A&cA-@gmodh=(;ryu`hI9VB4xY(EuXi4!z5Omaj
zF=YiHW#IVg?gnZ*>fYNw$L3%AqPg$WZ!kYghBF*QBRdRN^ff>+#ek8KQ2~e(fVcsO
z4?O$yOC9DQ5SaGlJHykDe=P8Z6fl$ofK&hw^8?uqz|cBCjzfS{0n{9MWVuhj88Org
zax!rcO6Un72O+UZaf|~fG=R+eK%9@{po2i%2*imRf{d?ZSP<4a@v$;+vM}C6F$cYz
z0*1~5G~X!#L+b${$3Uao9!Yp35HA3lkCHBLz4&4aq?TTO`Ae3Mjp?TpFY`SmVHPV+
zPR<Wl9R-Rm5QS!EBhXO|I2<DYbxb}~=pztMfI8*@wTc8#bS(tpc$kBL*a3%w3_z9x
zu|87B6j0(AH~@tdsTfpT05K@I|3m2ja?HVLJ{b;5KyuIpAQqsegK#=(pQzG*5GD{p
z8))Gm5N07EyMr8b09ssZ1ZobTSzSbAlnFqiie^zpa+-o>b6BEQprwO|N>k7x;Xf1y
z(Aq&DOiX(UR&Z`aFP#S@O(BI6U80THkb;HM1gezOl(am7bs&0gV!>c*qi>{VDB(?0
zK=6Q`ISv^!V(a%oTaNc(4MU)s4+9>3z%uGS5QAHc^mY(2Y3cyOKmZ)+=>Rl6CD1!P
zVWcTgM-kL719gLdy$&W&BcGLxHAGE<=kS0<AJ9P?XJ7rI$>LzfB;;z!P<r;O7^smy
zplRy+pZ_Qw#V3FMF@Sm<13H%Q{`<clAUc04qC*4f1`TLPN%OOu0QT)sI*Oov8ND5a
zQFvZ^_GQJlU;iAw|Nj3+h?D6qu%qaY+)*45M~x1e4JAhb1Q-C%tyncld(#pC0000<
KMNUMnLSTYq%{k}*

diff --git a/Icarus/Resources/DrawPanel/BreakCurve.png b/Icarus/Resources/DrawPanel/BreakCurve.png
deleted file mode 100644
index 183d4a2af3407d4af13500ccabbad462eb452708..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 707
zcmV;!0zCbRP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0#Hdr
zK~#9!?3g`I!ax|uuSN&s0IUXMbvA*R=;B~kCy6hM3uQGiV&Z}mo5l$TCkN3@qo#(z
z(GtHv{RGzN<{&V**8fAECJg~B+<_gq<e$47P4CC^b`NNt=ZUC|F%iKrf{HwprfGVl
zpa4|H<X}!m0*ZmMT_2*7Ff3sZ5G`s@y5n<wA8`2*9|RCd#(hPt{F&*|Wp&8F!Oozv
zuf$RcBpp+5VHql_aG8>rVkjM|(X0wcHl~DUCS6Px#h0|p6xS(=t1N=vPyy6@hl<t(
zKsKhh$jvyiK%p#!11a@Of22RTFST7bl?DoJDF!m3b*KuFWo*Qh%`Pj6b9-M*CcX9N
zlU3{b;zi2xy|@o>aZDK&0oFHOjvGJUUyZ4SmFfHW%>?$&0Gl5gR12WKRyn+VdbnBA
z^;zK_RfL#G_#YooR#JA-b669k-w`-$WlKF&Aj`J)3Ojd;yUXli8nZmVHxobzm$TGm
zxIEV{6L5|asBUQw%g{Ony+UNA7&ON<Eof<ahtVvoX0j$#r$W@BQov0HuiJH*dA4X;
zs(6MejQG}Nc3YOSl%BO<nbzRXNXJyzO3i`&20b!Vk>iKlx5_0&XDhYM)bRoILv-Lf
z4$A~$$7MJtn1!ve6uNck^|nXHU_egGo(b7Xx`aM2*Jk!{q4kHwu9Lg_`n~PhC0D_A
z#&?t7N%RG!p#2~q)6Y1}X26QQUo$HDAqGiv_QiOs3X2&s?vrjm`1+ts%#p$Zb*xkL
pJ0JV*zx~fJ`qOL#rFi@bFaTy43}1=tb5{TW002ovPDHLkV1ndBI#K`t

diff --git a/Icarus/Resources/DrawPanel/Chamfer.png b/Icarus/Resources/DrawPanel/Chamfer.png
deleted file mode 100644
index a10190dc374bfc2121bf9c9b382d4bdb3692d699..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 422
zcmV;X0a^ZuP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0W(QN
zK~#9!?ASdD!Y~vE@FuN`C<sMyaIy!`*+mcFO<Z*H3~nwC;$=KS58$96D2S*~5iK?*
z(n5>Xex-SeeGpzKrTlng_@{^vB7Iw7=?hD7HoM+%Ok0!Z$L|;`$Glus4RamzZh125
zyr67Qn<q-PEJ-yiw$)-y%2flp^dy*VF;|#wR^!X{reTcF-MZFq9n3`%luk!Ej|)Nw
zm1vvW(>c-AnGvFc9ds9{;ebd)5LXm05H}Q05Em40P-0XXphT#&K(SG2f?}c421Q1R
z07XKH0)<A21cgG01_h!ZKp#<1ptmSUkS~e_G)Rzd$YY7o9neIBJd<J}pLG^tAweG0
zJ}=jv4``-_1bI*u!(6h?LOvwO_n=3)b^O&0IYVWr3<Xsv`;+&}sD}Up067$_UFUyj
QH~;_u07*qoM6N<$f~1_C3IG5A

diff --git a/Icarus/Resources/DrawPanel/ChangeColor.png b/Icarus/Resources/DrawPanel/ChangeColor.png
deleted file mode 100644
index 3497b6b109cc61c7584ebc48ddd58f5a2e4ede43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 994
zcmV<810DQ{P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?18+%0
zK~#9!V*LOAKf_=HObmk%j5=!6Q6s`pEa(Ck&Y!>h>*p^YGYj*F#2T{Y+UJ@lUw#{W
z{`Ftw*WZ5<_TpC<Y@}DbU|?YT!oVbZfq_YC1p{Zy5wab{%*@30@X^ElK&B%hhpoQ!
zspHoBp9w2peHTX-S7m?pkU?ygK9p+>bXYdS-wQh#m<?KpaU6!DxVX5#zyI(-=->bU
zyMSCbYz_m4jQsU?zcwy@{#BnSum5|@!0@Zroq<WwisA3g9tNJ~CXyTl0<zN5+;{HZ
z7XdOc90qdGk>}rcZF~1ajpW4g?>;ZX@5zk}Uw~{p4#S$zg+)X-85tSBzk2;z?Zu1d
zdy(a?zWuqEEC<2B|Bnn{hkflRB*{@MEG!HH{QRFl?1xXDDDT*|eFum=@67uJOJ96b
zrZ{_n9QJ2h6T`O!@+1`ra<a1U#C!YRUH2V3b{@R){#P*7^8Me#JPiM?%p}QCJUl!M
z>}+gr;10WU+fMK2Egq^CNPkaRV+$?3g(oP%BlAB$xX4h%`H+FCp~b)uOOm5t37)17
z`}atNBu619cx3SN={1Hp&bQQY)c@BiM3qzM2_9IOqKN(a{hNXJ=_!Ue-^6}!?|k|L
zUC$}c4?IfuEItt9rV>R4@hnRc9mUVj&tPL}ev;|Zb8`k3CWd!Rzrf;uSQr^zNiuV2
z*obp**Iq%<!)C<v@ID)dJTZ>i{D$>m7AYac%*@QdFCb8_prFw7cIJZrzvka(5TkO7
zK%HCo0!e8K7)onF4g#?mx!CT~qM4$?D|LrxM+pfE?o?1z41tH5ir5ZnJ4ix621G3;
z%25IW0!I~;lsr(PQiP|QB|!2EH67(FD7Q1mH1Q!pM{#g+-r(ZmipD76V=NxBnai)G
zmV=nNg+AMes<#kT%}7g2M@UFYVl5r{D?Ag}v(+h2TdbT6X;OMU8OCu(sM1Dfvruwo
z4VS$|iJQ{o&DKtHsc#~wk%td}q7l^aV-n%o`*Z3|(wZ?`f()&y&Ye|O*%c(WJc)8x
zjD^Zal|57bTz!`CYtCJ6Leb?Ru5r<jPpS&&plyWAXQaje$ETTxI{rR-Yw-W$ca{I&
zekotDW_(#Gc#=n$mE#VmaMTr4+@5S0wUSu#7)M84MjbWks8L5D06>5N0O3+Ejn<wb
QLI3~&07*qoM6N<$f(=8{SpWb4

diff --git a/Icarus/Resources/DrawPanel/ChangeColorAlpha.png b/Icarus/Resources/DrawPanel/ChangeColorAlpha.png
deleted file mode 100644
index 04bb076c9e2600ae5e8a3dfee0ec465c221d9a45..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1277
zcmV<Z1OoesP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?1d2&S
zK~#9!>{x$j8&w>C_bbUIX)kRO)AYEsX=Yc{u5(p8$L1Ux3f-ty1!Ys%e=1USAar0s
zP|#Tf5fpU)jEM+#c5|~VZE2@PW*M}0O)9q9->qw#rZ&0elHQNpdB=9?C37U#Rv4@g
zj=b;ZUfzA)_kHe@?+YYJ61dwM4DQ0VMQV%GJwXc11g;MZ1UZ&F^4RX0saz-d`toGc
zbeP#0jq}@BAz5TZk&xYL2w(`j>av-}orJ05={-gLxy}b=`cyD5I5Ipuf|Ynm4rqx%
z5cIbE@u_y~2hCpr8h;R+9$QJ9<B%}|aKNQvd%gwShsVHgSKB~q>-XBBBl7brvS!L`
zwj`D#kwQ_DI_2=GjEoJ+lkAi;QxcqxT>NBYz6yYq+g8d*hENx0yQapEN8@EvG@g%D
zpBVh|*hfFUTEFe|twkQsY5SB$k)&mGV!|PJZzHA<y7I?D=MS^X<$AT!8KR}>7+b$C
zq1zn}TwX~cw76J4KR?&4y*Dtq+`S$`Y8#HT{F%O)`sUBhKB9{hilV?q5VX>tnw|Bv
zU-q{v{ZpTx_ni4_!MD-3OCc5pRQ3M-PhvR<eQb2}dNdlXip64JFc?hX#cpz}ZQNOQ
z;YJL~_RxdID35_;Vr}K3A`?UeFssF?NG#FV@S-DUpR!u5z-Tap)%eET-@Y1m9LgmV
zf&?d`l4(Z0Sb)+3K$uJ{Dp(But8>M=%u^A(Hs&LLf>YJm{gwmBYA<IVSFgBaSmI?;
znb`OOEs3J^tS(Zj;MYSe*EYYr>efX{EBG`aG85npAG#@|A`Iuw$)~i<Ls2f-Ow+fA
z=Ya<s11Gmr$==Dhn3N!1y@x;&Vgj7)u#tIUZRHXM0SP{AWYaJaKs+mmX5FL+f&hDJ
zcK<p#yWr$GmO|j07A|iqMj8Yg0Wpic{lRb5@rjjxc3B)A65y_ZRAza)9Ed_5YAo#6
zVp5WGcpUqNbdf?31Q0gcd!?nN?_V2iY3XdgDE&;ma#X!v$8;TK<I(aC=kqC2b)XAC
zhzV=uy(!au4x0e5z)+bONQNEqk9Am=rsOQODuiwtnjriiWs03J(m9hVEGXzG^?F}W
zV^K&XHk%Md7AuZ^B_~Ih^%5)d`Sxn@+S=N8%PV#?O-|2DtC%Dvt+LUWU=#~$u>x0_
z6~=H{gW*6CJB+4bKFZEEH8zl0HD$u_VFZR7GjYG)&s6Ssn9eVBw`oP4O!5U*o2y%k
z!Ki@*CPzx>@GYTB8lk)Lpa%l|KgpSD$X>dTB>B>v(%t;=hjTrBp+Ma?{X?p#6`^0U
z9MUE9y#*HYcJuEm=gzgrmBM!$uhG4vwe9RPl_eX|(rX8N{K<D-AKJ8o1671C?W!p3
zx%6`NLwdh^tjuZmAAdA{WMA<Yx@z=04*ZWA{mr*d0JD{l>-s?Yo9p%g7+EWoa2y9k
z_B;^i`vsi8(3-VIhc@F6j)_^OZYj!{<Ew%(!6uDUA;v4u3t3Dkt(ar66CbI(pXgcl
nX=dv%x<zV>)V)mVUjYUH8<P%fcg6Zq00000NkvXXu0mjfq*`0Z

diff --git a/Icarus/Resources/DrawPanel/ChangeLayer.png b/Icarus/Resources/DrawPanel/ChangeLayer.png
deleted file mode 100644
index cb06885abe47a82255bcbd3e5dfe26113afc0e5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1350
zcmV-M1-bf(P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?1k*`G
zK~#9!?3itAQ&kwp&$+$5UGEBg;kKg=Yv<gSKune?5wd9HgF~XhWe^DwmhFQdgfJ#1
z21I2GZty_}uuM=A#epVE5XpR7NDL%|gk_Np118-ID|6jz-*<c4-g|qG_gvZnx^-<C
zW+Xew)ArwU&wYO9Ip=v!Zy`bmEVM>|1=tp$o@gjClZzpQmGaxGvX#ca^2>Hbwu^GY
zIRDp3$uKptVW-F9Uty3lvh~V_L5Jl2GqM@xg$kF1R2FxRBT|#%8hacRUspQUJ?He9
z29PsdM-NQE{#c;m%aZZT@&3Y5dt6X>zcgfg!+VoK@u=0z8&o{I@CQQ{Q1$V#DBJy&
z>c&|wL1NQqJASr0g;TqC_ZJsiusFV>a@YBDwdK#Qa38oc!ZdE)_RY1e`)jR(#>h#F
zsQ%^Wy=|w@)mN40i-7|!Qs0P|&1$u_wY~B3CAUu3xTpQMYZ=wUnSLe6^~PS;e5&#C
za~oD+y*=3JtSLWaF<YGU)TEtjzq0Q0BauLjQ{%M(i2|Q`ncv^Ob9=4X>!znn40jdU
zzBf6?tIfAORIotD4cedDmkHR6#j~#U#}5)fmFgkgn=f8pPtvLq1z6+L_vO03c4~bq
zv93Tsw=U$^p_N!0)-g`96bud@W(IvGtd|b4bfI(f(9ta$%Cn9XUb4&Pvb71Itp(ra
z=b8Ey_#i8ACvF<Zv*I)*##GWPEbZMhGHEhR`v`yt5DpoF)BRChjw?(^B$NaJx?osh
zm9ZH_>>;RBKz?=!JbqI{wTm7U12Mje*AVXv1=L2LPmt3^3dRgXs86EkyCD&ZNW^2Z
z1xrGu1N5EfhgerdRjAtOg~n;GlJ^1LB!(O!sU72#LI4HuNMMT7y2D>JCxA+cfciCK
zM-m9Pvwtj00x8g=NM&SwipDQf6FHQ2oQqFW=28O^kx<EOLPUgGjq;I}(51V_6vs%2
zw5(x=hm|re>4jVD8c#TK|G<B}gcVi;I;ndtY7|w|5T_~DdPYKmjwC<=`w_tusFqLa
z#xx^0b|%11axb|%`l_cAU`5N_QbP&FC%}&8Mp0+s(@8Lkb{xS{!@PkdmuMk@JyfR_
z3fO;&=RyFRv7%=UM&8pH43z2-pG(5~#Ygd$)KCHhqKIVn<oKhs0Ex0$&%Q+4b?}5W
zx}vQ0y3VE?A@9*$%*Nt2vo^=C^!JZ5M1zB;x&bGj>=N1?(n#wEMpTr*$>kJ^6I>o3
z{`8S*HU^*wB*-IP$#wz)9uiY<I_AcjH>$zF^R_Q{p1*W@PN;OjnjBHG3j_p7_V+%U
zOIGx`fQILk;yDq?BZ(eAq45Z50j2dcGuKiU=M6;;t{l1h0?@_)f?z)(j$L@hHpZ*9
zO1}+y{Z!FXm$-yX3n;BfrHok7DgAQO)nOGO2;F_Fb=!OM2nS+=xPKp?!)$T5v{sk*
zZ>(?YY)tg80MNK1DS<M2LjHHedM2$mx_U~Q_y{e8IX&=<79UyVW@=R;t(-UA5$2}>
z%KkA&YXLT|nQ0m<%x}Ulsem$y)PoTtmf1d%Jj2ZxwDZEYca@{4>YU<W(`U8iVKVmC
zuY21*#QKN&jY|KfV;xF=>*fkY&jyqg)Z)J`i%?G@)IS0Y0KBVLmdWj~Jpcdz07*qo
IM6N<$f<G^RhX4Qo

diff --git a/Icarus/Resources/DrawPanel/ChangeStart.png b/Icarus/Resources/DrawPanel/ChangeStart.png
deleted file mode 100644
index 1321300c7c92919af57f351f74c59c939f154fc1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 764
zcmV<Y0t5YtP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0*OgP
zK~#9!V*LOAKf_=HObmk%j5=yaJBo!GhFp90WySBm{}ou786Rj#@kCH+9wQ~WkCBm4
z;MkRiTUI_{wchvXH-i%&D?_-<@1s^a@;*RwKhQP$fR0H3;tN3L`<Jg@gB=6{AR5F6
ziG$=p>S*pLpd|)C`~b+D55)Q)F%e$QZ=etY0T2!1LzRQ%=Y!OP^pWH$Q1lUlfdJ&|
z|4<Byng$>i`1b9az?H|J4(_`4{=tPupH6`IAaSVt2P8cSMB7D%gEoLHMOU*=RH*@r
zJ^`qDk{m{igA9-iU4Tsu&_N17{2xT)Fk=Cd83u&xBqmL5fYKX*8gM1t1~eKyiGcKN
zL^F@PA_1CvK#BSz5G!EI=KIBzK~V%s{QNL=j<4>1z*c-9sY?W!wSe5*R{*6a;3;<u
zpwZ(9r5$jD7D)dDG;>MIeb7V-O9ujk(g7$<5s^NLG83Nx4p7Y(h|S7G=Hv@da~;S@
z=&%Cs0x{(sFl`ZAUtK^mpQJP;0Hq%gV-qlOGZN{j2WaM#<S1CeR-kf7DWI88lA{O)
zGnpYpI9Uv-+=rG^8mN@>8i>i!#8$)~2!$4*kb;KN2VyE_Vtn@i);gdtlwhre2h?aK
zI1p+j5DF=@R)PcF+EaL<jQZ^<Vp^VicicEJZ^qFF2lw7ONVk?JT2wwjvgrTL?I*ta
zdrkeXt=Ie?M1%Oq@=)~-q}W4J#{sC}01$&p<U}C82oihx^c~loC-1=WAR5GnD!&MA
zH-Xw=2WZ~K0yWTp7*sL~N{EXcRgn<_i-TwoA0!Tv$JdafSq~Z7aI@j(6<EQ@#HjJ@
u>#wuU9vaD%4lgl|j!%s`Y9u%cAiw}K=r+xC&RppL0000<MNUMnLSTZ8I6wLT

diff --git a/Icarus/Resources/DrawPanel/Circle3P.png b/Icarus/Resources/DrawPanel/Circle3P.png
deleted file mode 100644
index ae4f8bdad1a97331db378e37617df05ab27650fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1300
zcmV+v1?&2WP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA1gS|xK~z{r?U-9=
z990~~&&=#4>8>W$q(-9MWWCU8b9oW06|7ZIYSAc>qE@Ld`XHjBSVSM<TLq<6P!POq
zpjFeg)|Y}Hnj$EQFR|#Gm#(NtV=%GWkju>YeP`y3GqY!AHU_Z|{lUka`Old%-~7*Q
zb`95c#hHfbAI~Vxnrf9*jVZ%0w&E}hb;^LpEHs67kMU%%{^L0~JPN&f{Lb|!8OvhD
zrhFs2p%JKqF)fBMXO_-AS{*xNwXfeWipXowGtdmor9QM}Q!vwqLk+r420R+jlrP1w
zFs<QYPhX|?;eBFFbx=4<i;kHum}rA9^Bzo{@~Y}-$rKu6R%l3NW*pj&d&6b|&}H2V
zzcyaTb$0DEi)#vu*?-NshA>W8<&Ir2^_i@gK;}UA-|h%RLtjDtFta<!kk3r9r}DJb
zR(gmh&ceK7l{$=>kKXS8=DsU7${J}fQ%M5M5DQdIS4XEX1BV*hpaa{VfA_7c2RGRW
zvBHS%J|%6C0vtn}Nh>l$DL(G5T1PJ)Xn$_|1LgYVo4dw#?%0bkE3n-@-My4HNC8f1
z7C61Nb&{ljDHD?8mPbF#ZfB)q@%xnYK_NKpS)dZ%C@vi#Q<fiM52&`c#@nEh208~f
z8AqiPetE^v(Df(3b0^nb!Yt((^V{R>CF(g*!VZ;y8cV~v>v6?_nOvy5BKY;W3$QR7
zZ%bZ}2dr}Ejg>ubxL98r@oRA<kyIxZXU14)>cXb(TYJM@qivOqqJM0n9gCn$c@~)R
zWypep#Te_GR0?XHW7Z-BreL4|U30<RdmhZ6w@$QI2f7g+L9Fc6h@u_{BixJ^A?Mk{
zkIPuxjLJX^Wh%UxOQb10m@{Jww9j2$TEyNZTzh#L=dVC_&@hfkv_bNTx4%<&Q8$uZ
zjhReTrg-O1(5FT&Ul5Kh3@ewz`4iCl&=M37%fu;U$YBA7ctMs|Lof#XY+ZEv+o^iK
ztM{tK-+q}cT{_f*%`<q2Zj5l2J@WFTEc25@*L6Bjk1u;0^cd>wmq7(@3afBo_2!;?
zo^p*`A((wS(x$y4+-_VTarQ+{f?#Z&QouwoF=!}!O-H!Rut4fM)wCq|FtvoAu@acz
zV8=b)joYTbZ|W+As*{3hS3M_+Y9K5S+4~q^cZIGe5^hH)kh%9Y1(ZPWmB162Dl*P)
zgSh*1c1DP|p@g-p0PWxr)iS>llDdy@vz&v51}nXv<JgUjm5ml53*E<cOrjdo;jde_
zLI-ER_<)9nAhxUDj6v#P#hBrj=aFl#yv+XN&(mKXZ~VO3yYdfd_rp*Lhf&n23CD4S
zX_~)J*2U~6hwrbBO^he~s>z%|Fvd4}(>s&j==_vz>2n6AZgOq=pzGLcu_$}9!d{+7
z`6ZP0!W3tD6KUNik#C6|1d?3|{Q#pisA(e&!|Pw)yJ6SNhX>A=hFotAM)^e?_(Nn~
z1~g=5N`Z&8{=3gpg(pU#C@N3BK3(3lrDT{Umx2js0a;q$bsa66QovkmzmUDmaviE+
z*3tAW5Pyg!W=OGOQ(=6A%u3>a3IB#wnfkBD9O(ZCXHB(+5Pt(WCLd-%4hOja0000<
KMNUMnLSTYA#AojS

diff --git a/Icarus/Resources/DrawPanel/CircleCD.png b/Icarus/Resources/DrawPanel/CircleCD.png
deleted file mode 100644
index 5480d8f9583c593ef01b339a2f2a0693d47638a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 713
zcmV;)0yh1LP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0#->x
zK~#9!>{u~N!%z@TO80hAHx0Tu*taV*b+%9tv13NTLBY|Xjm{1Z?sahyCwCj6?y0*F
z-4vAM7sR`APadI3-b+&3LJy9l;k~=-cX!{rL=VGIn>8tEGboFoWTl*Ev##qVTo`Co
zc<h6^P^(U6!&vAl3W9<3$a$EcKCLrVedw~?2dEh2q%J&uM^s3;Fw!;Q*)ymGzP!Sa
z0%=8%!QfcR9!Bd#<XTexBm%Mo!-$BXm~MmiaT`{ypa`KqbX03Y)QiKt!FjvMZ6zXB
zmZ%|=TUczVHc@|h18tllIy;(H8SHMp!2LGb1^X<v#u89+c*?S(^R%>XfqsLApg!5<
zsdVD@l@j=ecUdbd-88=55a~zI9|3i4uTFmCkP^BkR~-R5rhu3sYd<b1-u^6OFg?^1
zx){-fRQd?g3KAnMa3^uLkzFL-%D5Dc>pn(T>43KGKe}+~fZEr`4FhUPrc+&FeMU`{
zI3-k7f}(&%|JHsuJ36`Pdy@afjrc2cbm{O;?d)Hz(C?|wQ#K&<DIC1^B<3kUQd@}v
zHRM3bIAYH0!D?61H;ed-=P9ZWyz%n1y~IK7ksmXa5@=!!uru&{ikxMv2udKk*m=R&
z300QSk&!`Nj#3_`&&uegFtQjFNS6-QyPN?Tf^Ac290rITYV{$kVURkXm>y+_2P=@I
zmmzh?Pc`gRuxqMPf<?7eyKFZH6i`4dpEaN!1r(5d^%<Q{o;We$<XBK0rB0snH=|GM
vZDxMo`)2kH`9HrU=!=hLi=YaYUjYUHWKwpHbH60a00000NkvXXu0mjf76Lk%

diff --git a/Icarus/Resources/DrawPanel/CircleCP.png b/Icarus/Resources/DrawPanel/CircleCP.png
deleted file mode 100644
index 77a481b0f117624addf8f4e3b27af922c6fac5af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 662
zcmV;H0%`q;P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0wYO8
zK~#9!V*LOAKf_=HObmk%j5>-~z(S5DMn*;lAmxBX>H!cR0H)Ii6uAnN(22oNM=Sto
zAp&0j;sPKRAl7_j%t$Er0YgOq>KK0{;fJ6Qfrbn+06E+qiT@FZ6M%MXpjt>lE%|^H
z0wBj35YPkiL;}>oaDAkN6h6Zf(4xbD)Mx;L1~fAS$aWOS0cfE^R@%T4+6%~X6g2o@
zLBD}q$Kdf~0XdGE0M-0}k`TgTZUNNX4}{D`*QkKxBL`|Z2+8~dP_rkH;wV_cJV0#+
zA*C;HXp!Qm3s6l7v~Uy%tEebHs;q7Jzi8El9)g7@w2*ucExrVS;vcA8r(JsTdBe+3
zzkQCp{LReE!pPvM$ob~iKZZ6#Io^Jh0vpLuprG9k#0P<54#ZfZxB3w%y6ZuDE``eB
z)pP#Q=Z=$4f0R#q@*PFISBLMX5GRwFu>#*EY^?+VQhW_`&;)1!3(oRD{sAC1z@sG!
z-9aGGf8z@~D+^;2uBM9tQcX_`0I8RUviYHP9!`(F`TF-CHt{Ea{sGewg9I)|9e~mb
zL^=vo(jP>spd0adNQ9diYuinRg$bB+7+z4Nkq1me3y?hW0LX6uVtk>zEK7zHL$FYT
z=jZP~|LbribeiYBYtO!{c=z>B$nGaU@#elkSxya!5`FO1eS@-<FlgITgR<p0Xxr!m
w-J2PD{k}olLmr5+1jf-pvr$J;82|(r0DzAB>k*V7(f|Me07*qoM6N<$f<$o?O8@`>

diff --git a/Icarus/Resources/DrawPanel/Delete.png b/Icarus/Resources/DrawPanel/Delete.png
index b90063f2f6a2cfe1e1bd4a5da4adf232fec8d036..e2f72a7504ade3bd071cee50fc4c52098d0fe270 100644
GIT binary patch
delta 414
zcmV;P0b%}<1;7K4EPoOJ01FZU(%pXi0004UNkl<ZScUD_y-ve05C`x-JOdBXwJ(8K
zJG7!JD2kNsyaAD-2-YGxFc$F=U3n1RA;{82GO=Ty&mZl;jgfW!<$SU&Uk$^6ON;A^
z6X~eFYoGeAU7Q2ackP3k-#`KQ0dOh}Qy>7(0KN=VRX48yc7G*d8faP7&9{Ln4VwcQ
zs8TQ&$coAh^MPhjxnLZS6O|gq1$j}aU?CtDDi#(BVxy!m2`C6<f!*Z*1*0agW8by+
z4$upLRVYY=(qNAO_EVS!+E#V*DakLsy4YY7(3>=O^d(P&9006iK}k>qdneGLs+&!0
zzUZ4LE!}#o6n|Cjd?*6#Rc}#+wrVM3VPez-q?#VoOVKb<PtnGC)ImOQRummEC$)jP
zCM5WWZ(KBr3zCi>gWXe-3FwGfsxvU8$5<%oA4_3gR18Q8bD~m!B(PajN>C`wipl{B
zff=ZrATI0=ssxAw)1QKhfqXE%Qnw{R7TC@B?f-d^6&C=00q5C9aV;a+PXGV_07*qo
IM6N<$f=~9Y?EnA(

delta 625
zcmV-%0*?K_1Cj-hEPoRK01FcV0GgZ_0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBU!A4x<(RCwC#m_bg%Fc3xU3aQJmKw`rJPS79@(A<D<0(yjS19O9L
zgZ2c#2}o~HBvyz;k=P)yXqR1;8R;91tTeTgP%05iqqa^uet$D#|4FOY>$Tdq(NlXk
zI;ak+?)c~*9g>~8^9Ln2@=f-}`N`^Q-XcUyFC#L39g<DRvaL`w7J%ZL2jqz7rerg+
zf*>CPL98!^i7?In&Nc<Ct8|JSCUAHurk7+4mXp)j7ML+IV#hnf(f5j~K(vo|ZdkxZ
zY~&)mPZ*f&+J6azgD^hX)gg+G%<+N)=aStUF|rtmYtP8e%y%7Kr_B%?0~lxV6<Oc8
z^^Rb&Q2)Aa@2e=OEmuZB<DKdhPEJbpS#tReW&9KI<V+lw%wMp4VAJmoiWW4ERJ@YC
zh|dE+tDWpA0^+jWJNgsjec_zW;LRQkg_6w0$>U9(*ncCB>n_+;NGGUMzTA<5RB8~t
z=Qfofdp~=xtns!21@V+heN)yl0G1+)3PG4(DIY-<LYE$C@zf)TCoy&IqwKu^pjZGc
z(e<}!83%Fel)lyS$rCg}iF`!XpmFmU`s}R`C|jy&=ra|vx-1E<J`{8*@^!kQB^d$O
zN~RL~h-wn@2;zX{C}V^J&=|_9wNcGR=4^#VP(x&?(T@mZc_M<W2PHav(<~|BCvKXl
z7$>fkpIY#fS4o3!`Npcn0qt7UZZljyU!iPk=<ffi4(dNZeG4!EEDPUw4DsVv00000
LNkvXXu0mjfFD4)z

diff --git a/Icarus/Resources/DrawPanel/ExplodeCurve.png b/Icarus/Resources/DrawPanel/ExplodeCurve.png
deleted file mode 100644
index be9e1c7ab01a126263325c09c65144af7059e4bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 932
zcmV;V16%xwP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?12IWN
zK~#9!>{v@^6HydBGtED#rdc#bXcJKjZ9yU~>OyFxVpq~Ch%N=el|t=C*A>*27TnaG
zxY4DnE<|Wu2;#yPl_V{tNkiKt{beR;CZWk>yl<L7jZHd9qwOLO4li?uci)+FKkpGv
zQ4}1t!Q%*y2B`+A2C2gux_{+(D|Tv#CU4<!%H|AC9hy=^rjIZ~KgS9tMr@MVH9KJ)
zy<SL0J!1rcFkE6ECQNDd!_{)ka2)5MiD7eSaPXtU;SgLd-SPW(f34fBk!uvHP>FhW
znwZU7`tCqV(YQ_U5t3{f!@$5*Wqy8Mc``bxbab3m3<g7t?CvruzA06(9C(e&eCB!n
zoz-gTG?`4cqJ3>`9k0j7F+Dwvjg3v@a=BJAKP%(r1L2OQ{q_qV5elC<bGog&s~dW~
z9#UGu($X>(7ef%m1Y9l`5(yFMbO!l+o-O%8J}>Q204#)Y-Y<IcKjWh9fg;pIiU_^;
zdcC)<^!LN<aWf?ljYJU+hp`Y`fY0YcGP$+a(h>6evecOJot)&pt)Az2`MWG)gow>l
z)u&i8Q>d<A?CC*oUoW~ysZcNolhK6j?QKYsMB!UQDkT*a+C3f-{vfsWinBKz!-XaX
z*PM;uvi<}f7xJ{KKJ~P{z0E+C1xJemMxzlHiv?zj8D_H?L>M+(GjzH=zspG<b+5!`
zr}D__915B!EAwfzGNRRz>ZEE?6$yrd@caFU#-gN53fXKHvMld7;LEzWvHO8S72>UU
zkqKZ$$zhRpo+y`Bm5!MfR#A~i1aq@<Sf@&p^D>0E06`GcgqNh0nrCIkUn&@HDx;*%
zTcmeL)^zr<oM8z~p@7|PS5;xk#p7}HU7-zB)p#qB(LzdM8wLUaD)%&;PN$kbEXf(6
zSZtMAg81KW2}>-mSjh(hvshkU0n0H)G?PiIRkzQWsF_uTW91wnQ#?|tM1tj1tp___
zf$R^OW@`M_30g1IU8#avtb(Fds^mN96-dkNz)c8iB=q$lVbe@%7rEyZ$T9oFdR-Q)
zzT{EQV%OW^)s~&cpU6k3o-KiE{K3&6)gaX%b;L>i7GMAwR7=_|U*Ze^0000<MNUMn
GLSTZ6siDjO

diff --git a/Icarus/Resources/DrawPanel/ExplodeSurf.png b/Icarus/Resources/DrawPanel/ExplodeSurf.png
deleted file mode 100644
index b62f3e9d3f1afc4c31cce1533e40f13c8c990a4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1069
zcmV+|1k(G7P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA1Hwr}K~z{r?U!Fj
zQ*ji>&z)Otx~7$L5<ym0FKrkm^w(-d3Hc!PpkNO{LeVJeA%dPNBIzI0Lp?-6k71BP
zK_sQ37N|W)6s0s>$ShlwQ)g@L?$<eYzq_t=?>4iQNFO*m=lAdazW3bUy}#cC#u&^r
zbllG<{)<YMzrLo%hL+@`JBlWGv#sAl^-89nDVM;5#GoJ&(~p*o)`HfJbretH_cP@Z
zVgsA+F5R^Cqr06KB?LimpgV(>eel2mht-;6@p^m1S8Kc0Vs^Tz4+?5P*Mj9MRF+9B
z$|Wqq-#oM~sm#fBj!ORVyB!mOPd3B4bM>*5p`bhH%F)uPytk?fEEWsgymbpgp-?T(
zd6Mc;)IN0OD2n>Vh%XAWF`S+YL&k-$si=)ts`IgFuH=sl?|E_i{v$_aMJ3R+dwP4|
z>C<PR*Xv0Tb#Y^T0R`jD^EV2?P#gHhpNM{T)_j=JBUN8hc&8+&k>cl>g??F3T12F~
z00Dlz5u0;FvWB)!NA><{ICc6ol$Mr)!|s5Bf@QKGVi{il7zL4+U&h3@0f>BM+k|vj
zC$%D)3thMlJMv53+qQph%)%@LC=;SC4Hyb0SwAz>WRcA4^@7P{0=L@@;cyrX1_PMQ
z(JU(1$-PHsf>%Ns46<+Vkk_d{J}FZwutSqlM2qUjY}c4H2*<LrvRz<bWd~6dp|7tG
zIyyUHU|>M%#_7O$*YfyRNYu}khy`{2c_dKTUlB8-(a4I6*RTy6*0cQl#Z0HuQG?PN
z<o;@=S~(rt=G+p-N&RS|LWI(SXb!cpvZ+>1$B3*f%MElxXi71%HL8tMn))X}@nMXC
zYesXe@oUKK^4i0fg|d}~7P4BcexJ`*hiw&jEi1Kap(!fIImQc7J~f%6fr_};H550q
ztKv~4BNWhO1_QhXAYjadyY;(CY~1f-(xPOP;-Z0qIOAk!d?Ha(-jH*)&>BuHDL7AQ
zXCPTpAWHpZm<lNnm6&+ziAb@i$&>4a2_D5K#iAxZ$}ltVC_ew>@g-vRilQ&P))w?T
z%-&1|kIyOL;U7U&6#Y@C>n?{H&t)j`cjDQcjz}7~1f%g{sFjyAp*@eRH)AEQ(MDC2
zEjT#$^=cO^*Zbju`vmm1FII?@{%OUwe%xH?&?eE7v65}gYJ{Dc51=f)J|?8ba|v*x
zUO=1pii>X&F21<CbqtqaKEL_i=t6Hh*nO=~=zlKa1bW{313V=R=UE{8!$`EOc9KYf
n<V5{tX7Ahgr}-}`IRL%`VHHjKj%UVW00000NkvXXu0mjfn5Fw_

diff --git a/Icarus/Resources/DrawPanel/ExtendCurve.png b/Icarus/Resources/DrawPanel/ExtendCurve.png
deleted file mode 100644
index cbf8d91f0ffd5e3f5e014e3a62d0953d1aaac178..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 555
zcmV+`0@VG9P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0k}y-
zK~#9!V*LOAKf_=HObmk%41Y&4GBPFr@dY5>0AiDC4hxk%sQ|?KP<&yqM4tl^`@vvw
zlmayz#YoK}0ho^9h5^lG9Pp3=ItV%H9%56oUradxh!@Z^`V5fRxDt5-5XTd87!!@s
z(*;TlVxe_N!9vCH)!hVWNI5{+baxbb&I3gm%whCNQ@}(n0HpYlavnUSpbl9`_aXtB
z^Y%lz7x#%OT|jcsfE5YY(o;M!*`HpHdO%K;p#V_yQHp`!0LUmPcA(TeYK4?NjIr9z
zIA_4yQ)}!^)*$nRufP97u@@-`W?(K`u*BU87H$8frKQhMBRP;AQqY_ge_ucdF81x)
zw_5|&9ELdv+#LAz4=(=x{rgh`;wWSXfgSbs!*^;`#AKD|=nevv-cGOY=_Bz4f#!Xn
zTS#GZ&?G~JTqOQSYB-2!M`3disF2*SYo9Q+qmC#?;c^hLD)~TUYm>T;BH$qOE*0$^
z1$58^0uG{Dmx`2-x<J4|ARv!aGaR6~qks+oMO`8;2NBbyqI=y31PMsZl>^kM^I({g
tj>7|JLrwwOo}yk)dvqjkC_4%uzyMN*(J}0P`Zxdp002ovPDHLkV1j4L;1d7<

diff --git a/Icarus/Resources/DrawPanel/ExtractFacetLoops.png b/Icarus/Resources/DrawPanel/ExtractFacetLoops.png
deleted file mode 100644
index 2fd459194a866c1edc432fe9d93294632b1fed10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1034
zcmV+l1oiugP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf4*&oQ4*`<-1El}}1D{DmK~z{r?U!F@
zTU8u@zne5klm2gLZEIQ9DqCl5la*;Fsk5m#Qd*%nAAFIqfowR%H${CGMSW0M*^9_v
zK4=9MbWE7gIXk*PuvLPKNxIpRwrdx3ZEw?LO>?j3X6YQ5v^PtYJ>-L5&f(s3Pd?7?
z@Vn<qs;cs!VMw<R6a^{06r}XBX;L1Kr#Riso4iVb5GfT+mll%2_^zrXS497?h_8o-
zhnGZqU*seuBpUbZe<K{33^5zJiX556x@89;dn@s32X4b0O6UTSi4gVM+X(wEy(}L4
zE?2><Qd&BmfAhmwWFkl)5F|S3M^zL`96Ko4(!!b2cH%Y7>Cw<=PEuY3TW!!R$(Vv?
z`R&r^T|tMdlaUig%k&6lluD&Vl4O&m7)$-5RJoqvblFZ?>g?QFm53%K;tH&)5~5*k
z21$grNi7DIiXxSVEh<}Cq;mW$k@Kes&rI<_&$GDRd0QKrmGxFio$|a+?fB0W-3YSW
z*pA%%l!#6gvkgTOe=nw1Q!3(Dn?}r45?f?j_;;MwF4GeB(>ZgIZBrqN78AsbM&v_>
z3H0~zbZ>7~v2~?<ul*oWqOvS6P=5V96`^0S%?5}H!6i+w=}D}K6<#@c4EK$5bj<yV
z?ONvSC}snO6@{Cx9wFH4rK`U`KdD8LvNepc1uCwO-WA+mUCzOwq4eD}tzvU+7tvvY
z$3^QjG5JY3j!(x^QniCevkGbCT&I%O3jS*K^2fk?_zxVXr(x{QjXn#E+Ci>^u^RZQ
z3f>YGqfeBtM&q3^I?1beDkf{XC(u@9ml=xJT?AchT1DSX3Q~G0Na>{@rI&(~Uj8>J
z^ISaL+n9_}+5xY)tdfC?A5(eLk4d~aa(;O%iIdhzA#!M5oc!jf|8gpIS-O2Y)viZI
zDRDZC$L0C@N2;wf{P+>hp(8kh-_xMV*o-R1Y?2eJFc>A#yMR&`fq`4_c?_l%<mxIW
zUwDbx7x$$HXD92?WsT#$h&p`5k96e}(^to+ak)u2z0BBKh{Te-f8qf9zWJ6FyBYJJ
z+IPc0L>_Z8-`zuW_Y)-A+mOU}#jcKy4Htbwse3tgE~JiMID>EGCk$pQRh?cAULN7O
zF9uWhlU6J9?k=KkH_ILm>O-}}<8gMnTsdVwC#ic8`_Aid?LIXf@bOt&D~YBiW}2JX
zvv+UK+wWg!Qu#!8cXw%~>-ofeuhf4@p`z=hAf*rZ8%R^eA`o?AUH||907*qoM6N<$
Eg16%1ivR!s

diff --git a/Icarus/Resources/DrawPanel/ExtractLoops.png b/Icarus/Resources/DrawPanel/ExtractLoops.png
deleted file mode 100644
index 6c71a4c14b6ad328d43b4dae59b8b0cd141a98a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1432
zcmV;J1!ww+P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc02y>eSaefwW^{L9
za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00jt1L_t(oN6nUdOqFFE$DhN^LhK5&oY@++
zxkb%suGZXIn=?0C%eC0b*&nuCtF@eNwbpH-5GE?%HKmX;Kq4**${j&K?#TUqQ8bXt
z;c$Qhbn)BodEe(fyze>hfdf>h@Alz6@9(_ldA@v~A3qKQ@V`U1=xTI}u12@$YIKXP
zMz`o{><c=wedgardozb-dq%y^Vp*&V;;Os&LYcRo&o_C{g`06B+<8rr-UbW7d0iNE
zqsP5p4}8m-&O)ST!WKK}JwQK)i6VkmHW80g*-Lu!AChKI^^GpF5v<M~!L}0fh;mQF
zit8)1<|@L6SVAbrJ8vm_T3^`0&h|baHpTs!Mr<w|#jc8Rgg01_&^cu~*E*3Bd41$-
zdf!a65E(=?e_pVO_E|wZLU7ZM5x#^s!Hx5tv@<X5ZEHp<M$Z^x>BCr?XTpwBGlFX;
z5ZyY7#EwavZZIRHVhDS#_TioEUc8#tjde+FSQ+1RMSOOG=pi};?L-9;M+C9ZJYV)r
zE;nYcSq-HQ;?XQ4wib=z)2eYCYqTJ#YZ@`l<2X_?f-g(%;QhSYc=PfNyp-C3r+#U{
zgFiQbovj6nss=k%4tDGsSVS?{k*m_0D*9MR4o}ct4h<y@z;J088?KnJvuq5Zbrblh
zZ3+pL(uulJ>?<3@u7cmNJ^Lm$U+luOzqVpUd=uP%tONU@2JCbt*ojiGqa|SB^fz+2
z5bPj@_-#H|Xs%*vov@*m+LYB$LO<BWA^7KvAh6hsFRI6JvUw7z-P4F}8pFXVBR(tc
z$9s9Vu=P?8UQB6+e?l{S&eelOUk5u=1$I)K5(_Jk4IRh>9UI@Llm%z|3maOgQd%P!
zit7VQ9>CHJBQ_S8@L~BF4%J%_-!X;QHVcl{ny{Br`iN3`JM$(sUg$(XVk`V&8)4un
zeNV^s9kmWmDN-0ZM22`u+z_QCOr^8^*#W|aR(2^R-T_M+!qYSYwwIW(w`KxSEtAws
zQ#eD-eV}p}pA_|DM@}zZOYg?|q;{;LWAoOeR7NS$u|<eu3lqmSlhQO1My8gteOb$d
z6-iP+(hK=71uSJy!k0$C78(J&E5{K@&7Ige1sVYer{@0Z+5kStzm33*8+bXj6RWAY
zAC9HwjuFkxQ#ww^<|w6*9KLNU8Ct{kXL*n*J|?VEo7zK^D~8tR%OfC!MnFuPJOWPD
zk4ht8ccDB2wxo3_BLJT2=H@A>n_Edq92=SXgZ7FbQ_IMZo5Q5I=;bp6FZFXnd;}bC
zvLIQEfWy^Bd`=@^CpGsQmwT`wg+@R^3+|If03BNt9h=PvkW&)JCa3flt<V2m1&|q@
z5;x^3EJ)Ir67mwptcK#-Et(OqEo){3ERSoPdj!lh_wTfBCb5=M@)U-=q-#*7<|~k%
z3{>{x#uOAo@8;ez@)7Vtayy<l?`Q-l$2KzpXpOrBIb=_&4DqYGWFjb&8`C7_Nc>;G
z68gwW!fKGG#F5OX(T;$-loIcqKM8)VV8J=hks)`&KxR1Zgol)pZ0cTlTau%=RO06N
zvHB1X5mtjv@G%{mAN7(a4N8L(d&%MtDmW?iw@w~8{|%R_;P>jUFjBvW^%Y}ET|(5f
zN$If&akCuBj1Yf)55YH{^~<5Ox2+jl{!3Z+R2!I!#b~azH1DZz=7TfR`<yfA7F~^Q
m(beb{U5#$h)#w&o3)tUPI1}h&Bf|s$0000<MNUMnLSTa6z>i@7

diff --git a/Icarus/Resources/DrawPanel/ExtractSurfFacet.png b/Icarus/Resources/DrawPanel/ExtractSurfFacet.png
deleted file mode 100644
index 766017176206fc7cd46e4dff7276321a885fc00e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1117
zcmV-j1fu(iP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA1M*2kK~z{r?U!w6
zTU8jx|0ikQ%v-xAYw3h;!q}IltOz=xu_fyI!Ggn%iTk?Fi5F4CD)`YaV-uM#RKah;
zlp!b%!6AulC}pzFVJ8enw|22H+e(wzymeho?)5qMo?FwkHFrxgC-eu;eV+5ubN)Q%
z<hi#@Q4~CAn1p|z*c4@y`+leLb33+^d!0=6u9j;t-e1mr%@hgZVy=-jl10fTsgK92
zs9UBOW1ZyQC2M^7$dOLJ-{(mrrivdPJ->&tGs)+Wpl``Vsr><O>(nk&5)*+c=oGmL
zvggQp^7(vIDwQ^${Nl9D-5NW<=Loo{UM(zxXR2y@1$OR7{Eu|MdT`*P+wD>g4-P7W
zhYl&hV7Fp2nG~zl%8!KGRsHV@BTe0l-#eAX&sik*5qkB0<Hsklhw0f$rut~-(5DUA
z1U&g!cy7%h+v@wPkZiHMaPk874-DYVp&|Tq_AEw6M-h&MF*S9CucGq??Rz5sG22b?
zFU(3$hIgDVDM$HW1AkORV#<PTE9UHNn6tLv58F1}%$f1KBZ%vb+mNue;i_|&1?@oU
zm=_L*1Jl#fC>D#bSS)b4++v{>`p8a@#Y_%dBHtw6!WllmshlYibi>+)ORf$?w(P}7
z^D~G$+95N#j&zME*))l-q1~zZ{ciO4KZ`&|0Hsn1Gcz+dH!*>DJg$xl&e6VmM7#z=
zqP9PI1EEwHp>%|N1O>Abk>)-`n?ktY>cWn~6<qW^p-$(b>~=c>fez3;LL!mC>}(ve
zEUV*!)3onC5wF3JC|@Wq8X7zEm(iCxgQt=|Aeb2!y&6wn?k)W|5-m{ZB3tj*eVgnt
z+V@wjxt4npwSrtiGU^3}74__>6sX-^ujjK&Cd<pgR<&a_VcK)Ah}Weq6+L}8`}lzu
zd%_f!v>q(`{r-9K!&E-Hw62Y*sVG^(a%qSyP|DK7Urs*%XUu8NjoCqFo%uTFr?$lB
z=^5RKnu=lyGU?+UFBz}Wj$(TQmV&kw<833<`uMg8Ulp|$#n)T)+rJlTEs9h1n)MJ>
z31_7;RBuswNzhp&b7<kl)LWEUc%6rY|5yHt<EzO3QxyM(`f73?UW>htM>7*J%SAEr
z54=K)DqZ14YK)4aT9&T6f9sO4vmt}y({E#HyuD21c|L`I5$I%vuL|Rz!#Wak9qaif
z*OnMZV15j{Ge4JZJFOx6d&^_=vi&YO?Clpb*TpAgR=z4W;_gM=iNx&e6D;wNL?ua7
zv)X?Lsu-Pmiz<KPlPG!NEhjTAC@^JZxK62BH7W=xr}|8l!~el(^`P;lxLS81q@3D{
jsu7#T(<qywi~;-&I6k(}>4Apl00000NkvXXu0mjf#B3g!

diff --git a/Icarus/Resources/DrawPanel/Extrude.png b/Icarus/Resources/DrawPanel/Extrude.png
index 1b245f2db1a3de1b983dfbf2ddb393d4673c8c0d..061a72f15daf4dc3b008c228e7162369e29cf9fb 100644
GIT binary patch
delta 881
zcmV-%1CIRL36KYnEPoOJ01FZU(%pXi0009*Nkl<ZScSz{J&O}j6g|7B*d@h+HWCFJ
zL2zug5lJlUQ`>A-Y#%QSmO^$rZDt*&UN-)Nwb@3&M6?lPcRS12DOhYk&~D|%^W^1b
zW-^m64}>H$^X{B?KhMnC`T04DAc>>v0OS(@sCr9I0G!FUv47!NA!AdJODc(@7Jw#z
z27pQdd#3<;0J_G8CkrJ-GCKfjvl<4_2hh$VC*C(U9O&cg>Y{2AN3zp{ISC2s0FIM5
zYG)9V6zHa%TUQtLXl#+#OX6rJ#h#=@o%c;A#c<tOFd>Hy3q_Oizf(!ImPE)whq0MU
zDv6_@V0F!dz<;f!*IdpvwapQ!dCGT2_};1M(5^4y4l_W9Z0!I4BBet%M(Tn(*<V6S
zIL#sT4!{GBsZ3IWyKHKUXb&-M9dpAY7#sHZb1iL=4xf0bVQeUsvJK$%3`B+iUIDnl
z-j~|7@wW<72e0<jkR3SS-0HI9HdxXVJ%u=<TIe}1(0|4umBrUGyZSef$-2)`(;>l^
z@+l)pk~nIx5pR)9i{wPwWNm5;+EaD9+qu5O5pn7a>!c(C&yzK7XxG?qCyAqO*~Xlf
z=%Ns|jSX8Iq)tz@rx<ry>d@FwHUJXZ%32`NF*ck?c1_A9_5n4O<kcvIo*^BAf!0Jx
z95oqw@qgNG*}1B73Tz1hjaKM^E_0%nW`xBM(5p?7=`#fyOoM)@obqPRkRgz^Q1#^S
z9<OujT+gYhel}$8i5%`x;B~TYo*O=KKX2IO&O|ZBth`a5Vc6WmgAZ2#12@>^S}NE&
zQ=*WE9CY}GG|=>R_y)ia0G9x4kd!Z#o!7nqxPJ&>6Toe@gEsBi(&6(^p|>P#KLI=i
z@NkNay80G;1n|rwl!~I&CrN!1z~?y?#61pM!4dx#h9<QPjlNm7d9FfFZDgHD3msN0
z@~-LwSt`LjI7~cyEdf`GnslDhy=NuJ4Ii6cvDYuNW8$4bZup4zOD1KCUg(n&iScVW
zd}^?7Z1_PRoLYUxhB6jzailDo(33I?vffYabJWb!GQI<NY;1T`cHy))dCvhn0&uOM
zz25*n0eCSBnL?x#!TTJ(G8?54UIy@u;g;%soAy?&GywbopszVf(67iv00000NkvXX
Hu0mjf-qxL@

delta 1215
zcmV;w1VH<c2ipmdEPoRK01FcV0GgZ_0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBU$Xh}ptRCwC#SWRpjMHHT$on3F&e`{~-B#w<t+NhL(NCl$hw`oMB
zazNsU#3h^%NT}iv;Kr#O-~dQ~$^~)YfH*~hL-`R65)w!~(0_^sp^~JDET@it;-9rQ
zYkPK<x5f@>l-O%;TlJ8UMziyF-h1D^{r1h9<t)oW_gcf~9&87ooHo+WV&%<?Q$!%o
zV;-LZE+%=5B@mm?c}C4D7RcX*Zu|=K`O=4HS9{sJ6g@nBI=j5ETh8?&Isj1s$ZL#Q
za~!e)p`ec^UVjOZfZV!o>vJ5}x~3H!(VBsZ<*EsQH$Zeg`~GvE?E@$Y!vcUx_5}(6
zO%uY;%d*Goj|~w%>~kDdnk}PTD$6XBX_T7N5V<S6Kz#(mIq0tdurD2PD*Dz>ueWsL
zk)ZNWvM)d_UPOav^w9}y>%;Vq;dg$1c?Tc`hS~OX)_)PvAwtPUlYSbXOd=8syCW^=
z$Bv94u=j;+w=I4VdZ~S#1dvlbL5Y%hVPsTAI4E~@`1saM^t85&CL5)mQ5zl#iXM-6
zzAc*XaH&16_Wb&2(|n4A{aqc+tX)DM&;1|yH!ggK7QzqjyPj8kh!(XoZ6LQi#qRl@
zkz%IVlYc<WKh)Q2WV!)%nc^x>(OemcU0$CZm6yJ{ibC}QT9L=l0xxxSRIAkN)S<Zo
zl`T}*NI=FmANFgDB0RXLI7$y%)nEdTbFQ|T;Y4I{eJPC^sl2PNuW@4oWo~5Ha6Iy-
z#c|A4q=Z;_HSU!*H~vXKfwLt+O++{W$ZwI}+kYiT8ES57t>g)r-H1JqxXdUM><`=Z
z-Ulh6GWyuW_s#Xq<Yqd5*jP%-O3;g>fEQtp(CVFShSi&`u9s_OrBdU4zC&7MB)m+<
z)KrV;g{pd6H)K0%QRqx>$gHTTR)dE0O3hDACaAn66-;i6@R%NwCCwiRW<y8g1xw(Y
zcYmcyz_O@gS=He(CA4KHYN@H;y@^})HMh0wVD(hhXl)C$SbJgT*pc7WB5&KdPijSm
zguLJG96R#ub$1k0I|AFzdvT((ZotT4Ctx}e=(~0F`UHo&0vZ&|9^kBI^N4#;4ggKi
zs!Gg;|2}go&@-V5!qOc-%^Wv!<73*|lYhiCl<~^SDSO`4k!cc(v10>+g1UT-_Q=3>
zUeqn_zXWNI_PpDA$ow4UxN8F^Pf)&UWQ)grs;{u0;$K2AgOuP!r;*ii<phWEHv>ls
z>gjXEaxF^Jg~aXPxot<&bfsQzygM)``ydIm&+N@q?!m@N=IEecxTYyIuBRu#&VMnF
zB+h`{k}IOaA@XY==81g1>{-8jea3!T+lgZ^YuWMimE~s&6}=92PG;Ua{o5W(f7w&t
z$*-WHxgTGJ>g;Ven%^&br9!|j7ocp>k>t_AApx#XWYlFSUF3?Ut9s2)MS)ynmi0;g
zgEOD^9pQfdPub@-aCQ<C{#lc;M>wDy2q6wp7zqH#34~uXw(39FCA`yD<r>t%|EU8|
d4%)v03;^c5_XS8Fp|}75002ovPDHLkV1kn-RjL30

diff --git a/Icarus/Resources/DrawPanel/Fillet.png b/Icarus/Resources/DrawPanel/Fillet.png
deleted file mode 100644
index b40c3779c35e81463ddf3d6c07ebd2341ba72c47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 594
zcmV-Y0<HatP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0pCeP
zK~#9!V*LOAKf_=HObmk%u)r8k*hRR2lnlKr-V|jiee(yCG>FZ^!nC(_@%rZ&j)FR<
zm=+E=6|5_Do<%_N;`8@Xcb~rCy>|U355s~jaQVClzgQr(1e>E^;5!gMrqm%zB5h5N
zJ^P@udG`TrhUEt^<oWseewgTKKLxSbm>Az+jXossSmx)OUUD45$jB%Fqzb@z;Rb#r
zsfR#(0E#aFGuH*8(i9~C#WBD@Kyt_iAYMSo5ma{+&_Mw}Y61|;BRQr4=#T{z=RPt+
z2jrM|YB`1?M*$tA0F4@bsL({HgFaBToFc(N2G9fxN;@BcH~{FF0|Qo~qdDjz5F1e2
zK_rC~76&;{E4s)EDQFs^i-U-A6f~D@pqGP)4XFvxTn0<jG<6U`M?nilSUCi8(1QVO
zPazeK;Btr-xs05UDu7lU;F5a4Tb@W2ECV%5YDz;2R@*<MMqNftM={Vl+Hg7w)M6aS
zP{QgcP!kr)+%RamSl~7_1S}X7j@lPtssL-Sk=lf%nWJw1=MaW64=@ZMKyehPUpD9*
z1?nh5nHL6)qrg2^AQ;H>gyJYr-yYU;9W<jZu)zjcS9)|P2v^4eG#mpO{XidV7zn^P
gI+8b(9R(0z06*uoo&}B%_W%F@07*qoM6N<$f_{18y#N3J

diff --git a/Icarus/Resources/DrawPanel/IntersectSurfSurf.png b/Icarus/Resources/DrawPanel/IntersectSurfSurf.png
deleted file mode 100644
index 1f4c4aac321df50e954ddf7266592fa332019f55..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1894
zcmV-s2buVZP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00004XF*Lt006O%
z3;baP00009a7bBm000XS000XS0e@s)kpKVy8FWQhbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMGBNQWX_Wu~2IEOYK~z{r%~pF*)KwJz?Lr8O2${l&px`SCd5IXB4+P}33&=|a
zArJ@zBtc+z5fMrR<RvKPYa~sPBsCvdmKK&ujp<ZaX{L>nSu^%W{Zl5gr~BRAb(Y;9
z4|@#VnKOs;-E;2!xc7W_e*zKx?@SaNY7+&A+C;&jHc{~3FxM58juufRu7dv>cby>y
zE|#xvqToL<=Zr>oX-Hv}m0WerG^FT0BSShv3>@>w6RU@bf`8Yn(;8Exi}HVE1k{{J
zU?B;?N)kegH6F2spc;9|7hA^&_&c^dD$~w6TGb>37W6zK6SkIw$Z`^5D@cf|(s;zc
zb>vw7q-fO^)a$R;Yw^c2L69&rgLjEmD4qz&|5F-}uQ`#(G7^?lku<TMhOO92=IPtG
zM+}_LvpnRZj@2vm*Y3U1<Cq}WFiWZSiwTeh<~<Pn^T|A{n4F{5l1V}>nWr_AP4+Gt
zled@b3ifl47&zvgSe^yTM;*J$2Me;QAN82gX1ejg7-yJ7>$Rw6Ktbn6I~1XOgUkG%
zhA+q^VUdD_h%&NItfr^4n#oc126-s=lS}zq^z19gxkn5f^T<O!uVYtf8CCj~gW}+@
zeo5(umY4*8>y-6WXyJ9mwE5jAFLs{OV+m67btEjSAuD!OIGM?%hsk~8Nt)Ymmi(GJ
zxc6W&aLgkQ`MfTm0K|HnQfuM{ONyJmvL^Ya(jnVvygbDvNG%OyhZenoOp=>u^h+(|
zT+&W6s!oyrmU9%o`%{X2?KAEX1IIk_kdHd;X{jZ_Yc>yxl$f#tXD9K}D^|Amyk{n8
z6t#2{4bRw4_C>Aaw&4UV+|of&EtlwpLsu#N$TjW}1IIk_kdHcE&(^jGE;=zcvwGx!
zq{NgZ_e<rZ+Q+&4>@X*tgz!?5EUzc)?A_$Fww-3xyhpN~os`tpMXOHTqQWyjaE}-`
z=8=bd)S(`vEM=;T-dPP}`y~ZMNSHDVm9;c9hm&e?biZr&d?s&LlcdcwI=6+Uu%4M)
ze}<y=T;eBGboLIFUA)JA`q66~$NW^5hkVrWhG(R#WXexwXV%#ENeW6}inz+JOix*m
zby9F9C$)2e*PSQlW${OmlVW``b^Q_E)Y0s!UOal8lpp>`<(<E9j~F=Sk;nTAr0}Q?
zhLlrkZ7fTC$dzHBth|I`PU_g$DK~9#QsL{_!`MJJtM<_3k~e8~-TS<;liR<hywkTy
z)p3`5#K19+JmjMe^&n*uqG}&s)H=LRQcMXAEK$u*$v|1jE9<Ds*_9IucZ*O<(5Q^`
z$dx<ELD5E@m8WP?^T)Jg-xW$@SD1bBCijSeW8Oj8#`F2JAY=bD+sj<0tl=CCNum2;
zObN%qUQAh`weL{7jQy6f@=cE3Y8(I6?6++rnWZ+<*t~r-g<Xv=JB^U-7bte`Wr}b8
zf_ua`C0rfykdHbpAa*OBD=MNzNum2;ObHh_DKTa3xJVVHd+3JiOumG_R~$*TdHC<`
z3tQO>evF>0InADca}>PoJoku!V;*^2d1!L>%veV%x^x_jNTJbSRx(v5C)J0tR`2bk
zj@S&o#KCbc4<^oENfLI=rpb*oiv0uF82QsHPLLOSFyRpc$2{_c82055q9V(Xg5SKe
zH+$+h3{0vIWn~=xhF)ztO5c0V;mg!J&ghx2Fo&eE=)XpO68I6umE-pg9x-tKlE<-Y
zla=7}rQ1}l>h)dKix7-;zXgmb;gII~`c~GOx4)ydlC5;x#fvYsd%RnBkk2x*idaXI
z_*yb!pDQCWcaT-qF76Ra66!Q36jnmRf(m{&U0hl#&#ku5=g^A~2ebo9V5HRizv)L=
zdF@})>ly3mmfI}8+~rYrf7DI%p#a}RvX?2yWN9_)ojOL6sSHgW!QP}0m3o9+b;B`Q
z8OPp3Gb0X0fObF$jMPJ}jQ*5$;B!jc{t*@CZ>9YUVl_)LyEMwKdzXXz!^J*vYIAvs
zS{hN>BMB?MF9}oL^G<nr8zW<7xVO%X0li@zq3GhDuB_PyRMw_<$wzsB;$sxl;1Q%*
zT5Id(#T=NKT2Vedrzs*dr*fp>o`z-&=nW_W%78-92ZK@;>mQr=YMSMjNfpk%bl%3E
ze|Kq@G}=$hi~)lIWk4akx0qrEt1P_omVUY2h0iRkWUHEMmowT=%!~np0c9|S)Icdv
z3{DIRdK_hGm*T^4KQS`~L<STBrC7>U-$FV36=uy3MGd4Z?GlfM;eKLf4D>Ug7$^q{
zf|8&pX=ItGva}^e!*D+_GX@4Rpdcs-it<RSs?t}MHl@#DxSyCA1OM?b+)vCz!J#%$
gaHvfb99kpcFCOFQScG<~8~^|S07*qoM6N<$g2x|`tpET3

diff --git a/Icarus/Resources/DrawPanel/InvertCurve.png b/Icarus/Resources/DrawPanel/InvertCurve.png
deleted file mode 100644
index e10899debed196b0309735b0fed55d10c566b779..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0g6dP
zK~#9!V*LOAKf_=HObmk%j5-P#JYg460Ahnd;V7U(0)Th}ka-`71+b}Mq(?#rIs#;Q
z0uUDfu{>1xq0G-W3fR=M(7{0tKx#i0sR_9B&?}@sp>qs~rI3ULfg$x_K++U6>NY|h
z^c^a^5SN2!?kK2(4gj$}5P#fKm6r3uUHuD?y#Sv+nnfSFgO)Uwq*qGB%w%Br&CbBU
zs`)=b<^f$p3b%t8_<;_(38X*JweZC6Acl)T>;McU`Z<ak4x*}~sO2E4If|MNqKc!a
z?I4OBMGFT}<S1G>h-^pE(m`Z7iq;My*-`Xx5J`@rmxG9Q6g?e8l%weFAcBq>2nP`p
zQUZHQ<J9TtAcBoN#syD+jsAa|3*K+fpCIVnM-K-P<0w$GH6Gfw=A?&%@Hz_UAW(XG
zk0kUAh^>GQdN`2X_5?IOs5kNe5~Ty@r~)K5D0B)zeKlZ69iX+NSa2tBaQ7P2Ut0il
z$Od|jH{j~FgA%eLzHZQfB=pfiv!UQ9fB*vk{Cf#l$9ysi00000NkvXXu0mjfJtWB=

diff --git a/Icarus/Resources/DrawPanel/InvertSurf.png b/Icarus/Resources/DrawPanel/InvertSurf.png
deleted file mode 100644
index 5b3bf7f9e4552bbbf1a6bf9447bda4764dd39bc1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00004XF*Lt006O%
z3;baP00009a7bBm000XS000XS0e@s)kpKVy8FWQhbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMGBNQWX_Wu~0!K+iK~z{r&6PPw13?sqrx3x)vz5fgPUBUG2Wq7jo+#o01`$LB
z4-mAlScs^F2euZbk~9{Af+7kYAc%#fB0?m=11v->Oe5pGB@<@H7iKZ5lj4Kjf7#uS
znYaHEN@>!8hPpvR-JqdUEY5isuv`TiI>GQz=Urz<<12Pe1sWy_2od(^q><u6#%zCb
zNP$p_E1#B}J<^<gs$Yr=<sL;$q0;kby;8D}b}2qX=_3m<A+1v43}w!5>6enX%rFeS
zQXnADkStYv{P4e0(^I|2o`aA@LX-kokp2@XLh~}nTcwYju8)d2NEIK2Q7JCe-d6uZ
zDx8|#%5aMrMx2nzyfkc(kMehROvzKro_HOT%Jc=yfd?UIbI1g#6h;;k8e~w$Hlvn5
zPsVx@>hXX8i4=U9GMu;SFnMgh<ak$FFJvjG1oQX8RxJ8r5kKRGvBQW&GvJ=#Wn@@9
zVh8@Pn>;stT4dr-c2W@(rC`g_YMQBMFGvrI>O>j4fLv@_V^ZeHFII}r5HHWF&1>4X
zyerEYQ5G5YSIQcyXKE&}YR(W}Av@(66#yCgGbLln#rgW+>w*<>9ekJ)a!<vP`u*3Z
z0;EJCOiD|67Vg|yB(U<F80)^m?pJ|^DzKiC%M<>M*u8c@Llu~mSe}Up0cfZKlj7x>
zs1SgLDr6}qwoC*KRftkf3jt`T0;G6(IxPgCp$d?i9Pg%Xx65%M01Z`ulv6{EfrctT
w>aT<VG*q#+G|+|RPJxEHK||f3p<XEY25~6*fWx3&DF6Tf07*qoM6N<$f;8_bxc~qF

diff --git a/Icarus/Resources/DrawPanel/JoinCurve.png b/Icarus/Resources/DrawPanel/JoinCurve.png
deleted file mode 100644
index 666b2e68b72c41da94d4c1057f71ec5f97bb34eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1079
zcmV-71jze|P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?1H?&0
zK~#9!>{x9`Q(+Xon{(5lZsJFwlT4S?k94Jds7dC6B8;R!s2?W%GU&&mKY^hj*bhPc
z06~dDB{1|y6DcBCYGEdQO_3;3TWK)Oi7TCoSJye~+<3ie&Rm;8FMD|RzW2WGeeQG4
zJ?GpjaXOvcR%=pj3pUwi7Pm*nE1}Z}<74AP1D+ry`4jU2nKbD1EFq@N0-gi9f#k?v
zCk12@pvwn@G1G!NsG644pQbq*zyvS@L7T@(0in~-Wix8Dks1!sc{=C>1Tu$483i4i
zCIuHlby8{A4QO6(WAZnFT$1Q;FRDihIyOv7q)-EF@_fCUXnZwsYHy^Xc5%rm?--dY
zN<No*m&l3z5EVDUo^5VFePoK?5|T(HYVxxjy0Gf$2b;6-wOxY84ZDNt6y0w})8a!O
zqWNIYFoq!hceouANdA1mWMV=@#sDa0=Zi|qxSlayGRiNx#$DEVF2VMqAzhnO3d4G^
zjNtqxxJC>;3~tA%Y;sgw)GQ)|cWMOeps7y0Ao|Glt5+=V#up~~?Y!TcS)Mzt3E*y&
zRENW{3IwcerL{&NIO4XWlf*Y^Sk4AT*c8>PL^A<Cp_;Hq2fMzceJmqAN^wgmllohy
zzBips(F~HRti#(Ga>iu@kdzotBI0rZb%1N^JhV()LcopGtF2!P&|-<4h1mx&MM~@N
zytQ&)7WHkbn9Sw$us8=WwUI~-=UV`k03^2$P(^B^>KEx@;Z{>g2e=2Q5Z$Gj?#jFo
zb=*`ilaz{GOQ|%ncXwjTXLZl8y~Av=&D1nKNYZNKztILBZRnE#^i9i((uKl+;Ebk1
zZBXsAFY`z9Ud|{T(J5Smv3+8rCi6r+r4#ZLCeWxLzax#-xt~!QdX-8Y;)^0rAms{_
zazAb`Z+n1i0{i~23ns6UqSz#u4xO4i9IvhowwfK~yST-SXhmn~;B<kvD^EeC0jBmj
zS&(}I{j3Un$<P<4@_LP)#*`*PZp)#$dau7Ykm)q6>4=akm4HfSU%bueh2o1Tx&)Of
zef5g9?5QKuouN6S*GZA-TvZ^bWEQE^D@0kZHYVrAtdi#pp3ZabU`0Izro#;Wk%pn(
zNGt2Uw(Ip-=jm^&F9<CQo>&pwIiP-jxx8gtv4ZD1AGHqq>RZAu^WE>8ygg*+FJa=<
z$fR6xQt;HFI8~@mzq;%RmnRDq0ltaAPwDedK_hm)zDB3w_6N#b6@kUhKlZu#uvK@B
xCniS7%as1o$%8vXE^G->|G(t@YovY%FaSBphnT?Pdy@bF002ovPDHLkV1h%4_Wb|=

diff --git a/Icarus/Resources/DrawPanel/Line2P.png b/Icarus/Resources/DrawPanel/Line2P.png
index 2690838f33eba344abe8abbf50d146853d95a1b9..e4cb9bd7875ac9b71872c11b49f71f8b02166298 100644
GIT binary patch
delta 488
zcmV<E0T=$$1d0TZEPoOJ01FZU(%pXi0005JNkl<ZScS#dKTE?v7{~Fit+Rh{a&vQ1
z6v02>pl?8Y1tRDq94F`G=HeQR0V}xlJqRuib`Ts?sDpc<An0OOMXelMB?gnG&E5Hf
zQfQupPut7GJsD`X+xSit1}ne}&;aT}sz#jP6%~cSK5zh(&3~(tb6`VA)$)pp!r%xH
zKq;l92~2BPT7hlQ1Ryg&I^*V7%q+5*!yMNd1U7x5=5p2z;}O+Ue4*}h*1h2obq0Lo
zs5`|MN=Q`$F1wU9z21FM80hZ33S9kh_!D^O^eD`2=mT^E><Ot(qA(Z%)&bqSG@>S?
zs>jc9+R>Asynp98`}_I@IYSizIYAW#Sx4CbSw-0bSwq<bSwYzb6-K!L6+*cJ^^I}~
z>I>x>)HBKlh~zH842eo_Bg{w7Kt)JZ^#vlnONhdt0&J&jXYPP04R#IsK}BJ(0~{x&
z)?{vlRP(Mu#MV^M1*9`;hDzrtkBtuLb+nc93%o2WE@54}M)lefCLK9`rGt9US>N(t
zqGZOOys3IYnfHnrb+Yo9oI0GMgjBo01@M(prw7GlA0XljT}ZWN9%?<sj=ut7d{Fd}
ee|hGa8Q>e(3AXF&>0&Sd0000<MNUMnLSTYqjovu`

delta 562
zcmV-20?qx31k(hNEPoRK01FcV0GgZ_0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBUz;7LS5RCwC#*gr@DQ5*;G_l^@Y$g`m^GAP$b0%?n=Xl{wbA#e<W
zrUq$hj%X@`Hiv?iXlab5wh+{4=${4}83pM{o#y51e!_v;Re$Qed*|Q}eu$?JKj01D
z?_oj+YPaD~8%_t+=<qCmOp+wWWu_Fe^4QH|R4mA3)jMpD*MASQywUG6@Atbg(S0VC
zkc;Qg=7f;@l*v>*jM?88Pv`xo$&U&MCM}my@FFL4@p#9yd+Is=<$NlXYpwxICdg_U
z>R@YaX1o{ITz{LjTToFZ2~+MVjB!|b3GD43p}x^c6n!ITpo>FuBi)HXf%DpIwrtG-
zKpDBp0Eno&=<{8lL{jUql<5EU3`>x*QDq(fo@+OdVJJNyLr{7_)KN4*R8h1*)KD}*
zR8X`*x=}`ebfJs_wTv<n)Dp^QP}3+Dpr%l)Kn<f<f`4H7zcMvMSV)Y@+xe=GV#-b{
zhqH!-!usS1HRv%{jzGwVObrqC<?0+QFD)<uX=ZfjWl)1cX$c*_7SYCSp%P)0#CXF3
zq=|x}sMa8LAX5i|+hG<UO%ya&D2mksA%Cb}NSgL60je}KR}}^|2wI27)pN)SrCG5e
z526Q}D=QR5=w)M0%gT=$#2VFk6x2cKm~R0F087%r@w=wFiU0rr07*qoM6N<$f|(Zl
A!2kdN

diff --git a/Icarus/Resources/DrawPanel/LinePDL.png b/Icarus/Resources/DrawPanel/LinePDL.png
deleted file mode 100644
index 043fe986f44c340f2e8dec87928ceb822856f484..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 735
zcmV<50wDc~P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0&Gb{
zK~#9!V*LOAKf_=HObmk%j5=!2IO++zNCFTa0OAS6>S3XgLll5i0T3quF+Wr|VL%)O
zbW8x$a(^_bjWR#qJfN$ifQ~T$QX7C+9*2?z$Q(vS#sp|cIsl8L59o>+sZ~w^9VUPj
zWyp?u2n;0!GzZOxaxY?a7|2o7#*f*Aj{xz1C~km>Lmm7d310wW0d)P;3@K0)IRJ43
z5FY^I`%o!CU`TyH3nAR0M9q)_hR6eG$Si>J55U;Oh7b%>Gxvc)$N?BC2}p_i0ZAc5
zjgSI{L;^H~7GRSnHH2W8(h}VPN*}<;*5rf`DIo<62?bI@klYZ0>nFlN0-z|Ob(E1B
zeW0pC9#pXsQb<vhkrI8t5V-)&>MuZ{M5`zxy6^;s4k#h-M-qAu#7dyTkR~BSWP1ud
z$^=0U1C`!T2UFcacpU|;VB<+mLr2{8YAA6K-ZTYFKLtpY>VIgCYXId&YNsKhiv*;)
zYy%Jnkdmlz6&Dma3TUVSG*lGG&1IB0jDemdHPszOj)Q=q<v>+Oef#!J;Ns&?8}{6I
zf8+4gCl8BC%4i-!1RZtz`Io!-JD&a5UG)%*58izHAL=lo9Yk)r!djw#|Nh-z&DC$`
zyYGKR5$}`#^3&B^I|Ru5LQHWpGv3Q1ec`qpIEtbJq;|0cUVi_JA^4Ml{U4AjA+`(z
zItWBr5NL}L?WhaZQtV$Az4*Zc6L8{VWssE;+y(Su0Ij?FI4k7yk3JXv`2DZx=(C?Z
zJS>b1E{a_Dr1_bQIXO8$449*!X$w^UfqK6mfR4F9uTdAq(UH8N>?nW$0|14ycA(8I
R|C;~+002ovPDHLkV1h&LCXfIC

diff --git a/Icarus/Resources/DrawPanel/LinearDimension.png b/Icarus/Resources/DrawPanel/LinearDimension.png
deleted file mode 100644
index 706c9e82268aadb295158850eb3f64af654fc02d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 921
zcmV;K17`e*P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA11?EKK~z{r?UzkR
zltCEBXEk)!4=63QGPDnqE=8qu)LTM_Fb`!1p^y&Np-vG*ZI`-ssY92-gA`#~LZlR=
zK_9m$Du^-(J?NICw)XC-uiN}*pIP6Tef6DXm-4Vbc$|6W<C*_EUpxBZ@i<#;<Wah+
z$cZu~C(0D%^jVhW3rFml@6+~GDq>A_YmaC9gueJX-9uT{xVfM!5C}|>D^Ns@gd;o0
zXYGN|uvI%WJ;z!r{PxlM;`duCiuX|yfzRiooHzOhjf7{%?|h6@hJMCa>-s|0R#!B<
zySj7-RST5m8=bL(Tu@E_uQ_HdG8PI)^B;Vg+U5K*fPqZS3F7pAo)v-s(%vtBwhPCB
zB5G!Sv6c%;P6LGX{;>SyW`*wYDCH7Jfld@rWrcY!Th<kj$5;`s?buk9+A9OPssofu
zfF;yX_SCnDNJVrZ{((>FhR2gJ)>$2xYux02wr5M}A!;JXWKX>t{r%?kSoFZnF^hFn
z`B__i@dV$qRa7ldL}9S|eFJ5-ZTH#pv4)r(51nj3(yj;2l-qYh{r)w12crv%11FBP
zwovgB7*ID(u(`PznV?&Jrsfqt<?_^*2ELo=xV2f%oajDC5w#k~i83W8%9IpQIFe4}
zG4(>WbDEA@xm&w*X6h2RbBS!)ba6v}BaB4xy9Afr6`n0gl&Ii2B8`f4%F!Qj$X^jp
zQ6%Uxx%rePFG2{xbL8;QWF=DgvJTMlh<=EJc*w7WrznRY34#i{_wdPc2$9bbr0`KL
z+vp-(;-%pF&nN<!bUt<ZEV~xpOWqO}d~eyU8`sHOp25LEYzguE=VZm1qE1QRI}N|`
zcz!s6k8-^&RSR@q$8-5y0wkA@KWkd>9+JZ3`v~Q-4W9*N`Md-HlhYUEfn;Et(&U|k
z2O5MtYAT;Vx~;NAeXu1qyoEm$M-l0^eH2j$KtUEn0b}!&VhJwt)b+?im^3L?8*GI4
zKhIM+OEP|p##2anc@mx68o0gU_1&T*i|}#I@MJ%?r`&q94_H=|Cwd?^OylXXl;uOE
v$zT8jrt=Z$;CfH}Z%j_#KPM;3495Nf7H1i_Q1#x_00000NkvXXu0mjf^7F0a

diff --git a/Icarus/Resources/DrawPanel/MergeSurf.png b/Icarus/Resources/DrawPanel/MergeSurf.png
deleted file mode 100644
index f3f6ed3eacb236e29b6cc88725ab3a1f16681aeb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 749
zcmV<J0uud+P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0(wbA
zK~#9!?3lkxBT*2?HyT8PVi1cUDwZk4TxlbuwcADzu5hum@(-}E@DC8H<Ah_CgDVcX
z!@^Do+N6x(3Pr^Dlfc2T!Jl`L?9Iq5JYU{C*Uh?a;lPkA^Vt0`^L^j9Y{GS2BW}@V
z#4tjG8vB0Q87n9N%D|5q8z=&@Amh;~0cbxKni7G^Q^P;s9O^ZJ0znBt7^T;+gk%dE
za^m7s)2fk$=~2F+688BANCdfOfUHQN5D0z>kZFXH${tWPGAIFv+hOS9)yOPC1ahrG
zOEI!+q?X_V$f9vZV+jHfhON=iek7J4X=quoKBLl5*p`qKfYJo>I5N0ilxhYG)Np67
zONZT~OY4gPIdE5h`n9*<$m7E<IkJWbs6Y<hYzY8VKRD@0Z53;9y#hCWvSu{5WKxH1
zrk16e!wFqJIy@jw&?W-4Z|u}G5A_37eaYEp3*#&_S;Eo9EdZqmJOd9hq|Rqa5?rkb
zh=rn&nOaLYy69+p+x`dt%hU}q#;NN?re<(JoF#Z88-bixSwf<A)7$v5bEO%Jqp4|u
zR8XRZR8E}%pu5KE=9PP2{}Pslo`cFku5p&|2=sZg%l%tNVNXjs>GXVzsipk@si5{4
zOW1`>m6JV_#@xpsK7>|d20dm}mViJ5kY^}<xVa-i+q9eVObuc3VZIKpK|T;rJ}3~>
zN-aYPmhc<09}@M2Z=d2ai`H10+KYjnvxIKQYsjzE4KdIvDs*V8YDQ2Xoh1xGUTVft
z(bQT3;w<400Zl}up{8khAI;#VxI;D|`_LMgotV?qM#2D+J9P{>Lpll)6#%M)@sgK#
f|Gelk{tGYwt0{TLU$DzK00000NkvXXu0mjfApb_$

diff --git a/Icarus/Resources/DrawPanel/Mirror.png b/Icarus/Resources/DrawPanel/Mirror.png
deleted file mode 100644
index c8edab75fca9e5b046f23608c0a5a13b65cc759b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 437
zcmV;m0ZRUfP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0YXVc
zK~#9!V*LOAKf_=HObmk%j5=!6QKOC;@{VF;WTaYw$3m_~fx;aLKq>*sEdUn6jC!jd
z835T6pkfOyg~~0UcStD!u{{(EKtoCZNlanDqYo5P!#YhdQIMVr2!vDtFpVY9#ZgcP
z%?DzB0wD#GpHGg%n8<VxDQSvihcQvZK}4h}k{rfFq=OdVa}bfa59F`~)C{S3D&@X-
zx)uqe<<w|MjfT{42q|J4d5!J&*BCqyQh70x-{1un`3Ino(p~jX5u_Gb!sOd?4)-H-
z40hV2TsXre`GcrXC$`(ZUradw+Nw-&e0BE#k$ONaQIOgXAiY3+6R7Gas3i)}CNRjd
z2S9uQN;6z=P%|(%aO(n8sRL5W^8nB>BsGf}DH-4ZI?@4$)B~VH9*~`BMn_#n9X0Bx
fQAZ&FK!5=NJcWdHZ|On+00000NkvXXu0mjf2Kt_I

diff --git a/Icarus/Resources/DrawPanel/Mirror3D.png b/Icarus/Resources/DrawPanel/Mirror3D.png
deleted file mode 100644
index a169939c381afb47c80f4f6c4161b2323e605e2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 538
zcmV+#0_FXQP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0jEhs
zK~#9!?3h1G!$26ud%@jIjvA6(3i<)!Ah_w0*-pCFNjDvJvU4Z*4rX)^nvYQ2E5Xqv
z{RZ)Q;XOE{%_a0rh<FDt_otWMkLR9yb3~P8Ip|yQ20bhe%0Wq&ovI)Go3|rW6ob|C
z+0^W#ykqRM4JcKW5&&_F>IxAeA_VmlM8Q*z0akRneOT~`6hX`kRj3_tJL%k0P%2@i
zdS~=&+CBh2*7Ac=WvfQl+r^#=wU+=G8fyBehTP5JQALfz*;lMx@R95<B$cAATXH@9
zHC8Y%0nIr^hEjTLB5m|jI$?D3&?dv*@hPPK+LNc1YIXa}T*MHC%~RWgNo4fcqErBX
z1)V{`<S(f1EvN4Qu>jbxbtne9tm&y;L{=BflLWHlsoG#(Ll_^CZUU-t`ZU;uq*A2N
z`IZ@-z+S5qYYOGtCNxL~erK0FiFcnklte~%N;#$eg;J{N2afq(G(t6|+ri2Aa@Fv;
z2SkeJ#-dQX0R1VwDpFn~-*lhC+<>n)6OIh?GjS+m!I&4Mh4VF2^tcs749b1ra8Q2*
c>PLV90O~Hdo=U~?!T<mO07*qoM6N<$f=}q|^#A|>

diff --git a/Icarus/Resources/DrawPanel/ModifyCurve.png b/Icarus/Resources/DrawPanel/ModifyCurve.png
index f84dfcff225ca86eaa20a81182e438a9a0d36295..f297c26e6a2cdf15dcdaec86ab56f86f97e4dc17 100644
GIT binary patch
delta 708
zcmV;#0z3V~1>6OYB!3BTNLh0L01FZT01FZU(%pXi0007xNkl<ZScS!yziSjh6vsc8
z98oO9kjhTcT4SRIEzW;HEUfe&(7?L5jVUawM9^DqZyTE+f~bW>5Di#)sYI(ZDeM$Q
zY}B(5gP5GW%iCkJxgT@0JMjy{?ajV<?{hP6_vTHd)9GL;O@HE9;DUCwf-q`rGbll6
z5{rL{)7BWPrq>>n!aN5K0#(E2Cs4}|bWxhbmw`p~KWVsF1I`9v)b2s0Nqh)+4@?b-
zb)pEE0zJ&ZnED1B6|f2Id^7?`^wbqdwKxPwGy~j{iwx?Fh0`Ot#A7Q>;u^5WV%(K3
zln(f7F+lR*fPV{=<fNrt7hGoQgXMrtM<B+C(bYr{MlxW-#uji*^i|8%_=J&D4GXXb
z*&{oy^r>ANF-%tCS`R7+qXl4jz!C|p%x2^QWJvPr$AEhh<7E&=OBgdHVCUrn_+l7~
zlY2oJ9d?~1LzjSkz+-(OXObnmsPVTXFVB2yHtL;z{eP~l*{IJq8};AKMt#=C$Ha(V
zS6FEh&jWQ}&h{U{E0hb6S14B?Z%{>myg(HNDjli}pi-gA0xAuvOrTPr$_6S7<pZb?
zlrJD>D4#%1P`-gM>pl%Ad+@8kZQvEK0zA>(>8=2gD@G+?+^6dJ16<c@??4#EsO$<~
z53$?S-GAXp-#{2Sb>G5neK&walQYx%C6De}*jC=Xee>ef>AA1Ip{jcNu@3AVVLMfz
z80{%dVwvq$*81)Jt6C^l2fHa<$F+rQL9Qs^QkEWBqJIabEu)_^9*S|VN9h;vESsTV
z#4*i=mRbw?y<*%O>pD&1PR{p7V>xBE+U9%e4n1&V0MPQbx~zcGByQ&*cAPWh-{>{1
qgpX<0XW*ufBgSFcapw8o1^fe+hJ6|;vWM^h0000<MNUMnLSTZBolQ~z

delta 683
zcmV;c0#yCn1;Yi9B!2{FK}|sb0I`n?{9y$E000SaNLh0L01|Tm01|Tnj3T)Q0000P
zbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@KG4UX2l>h(&KuJVFR9HvNn9WO6Q5c73
z72>9ahKmRy2%~Ueh1RM<7q%G0f;QG7B8J3OP@BL3!$?HXg?|K1A_x|ki(CtdMvM9v
zTFEqDcNo9-ujhB;Uhc<loSA#h%uRT_zRx-5@-TPforH+|cTgEORKD6MNZ;Cyy#G;B
zV|ZPciSI?}S=|v_gKHopUaKG+00^7g$|>#Nqr=R0$-RHIFy8>Y2f*#sKT7-e=n%X=
z2=4I>0FTbu+<&h=so=T^yg_w+QebkkXgo;$;FtRI-;5wUN@w;G5)NP1*42ftHHs4i
z(&@BPlKA}fn|)<aiG$u7=)i(%L8YmvC_#Wq6H!rv0F}B?IzfO+ohaQPKxNb@6G4E=
zC{d<@0F{kKnG6C{HWFnz2vAvXR5OAAmGwk5D+o|oD}Sn)L4eBBqM989sH_&%iXcEG
zi)vL6pfVWM${;|cH>%Y^fXYlJBdJtME9l_uw7T%MT2Kk_@9^f&-;shq;ab0xhaO1f
z$#XUGJ=LJnd2v|$Wkr5urNLpzws%SPOo!wy^@uf)l;g!^wZ!*(35nBQvC1Q(QhEBq
zb>)YTrGId1z@76~Zb<%euRR~Uo3(>n+RoWnLnCrHGw+^ZgoG31;C&gbJR6tYv6t?=
zKQSeHZzkQj*mqB?<Rg3DPftnq?0H{UzWcfzb-c9Vo?(Q9sn>REFlmSU?Yt<t3s>c6
z;iJ-gZxAYVzu-8WTaeP-`%=7lM~*&xQi|`Z1|*enLuK4h88=kM4VCdCi4*Q4Cb8<h
RW~KlD002ovPDHLkV1mMML1X{`

diff --git a/Icarus/Resources/DrawPanel/ModifyText.png b/Icarus/Resources/DrawPanel/ModifyText.png
deleted file mode 100644
index ba37037d310416b7883e3e565fc102753127efe1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 749
zcmV<J0uud+P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc02y>eSaefwW^{L9
za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00Lb}L_t(oN9~tSOB+!X#p6l@p;Ay{7j5Xi
z;2%T~i?JU-+>2o8t}A!C%trkJf+&s@)I$6h(4DyPqa-LKp>&}!2GorAjPJ^uH#bf)
z;yf35@PnCi&wKaG%nQ6ET-SYfh@x#o(Ke!J8&R~4D1vW$`FSFvF-@djiMeKv)H@)6
zAKCKxXQx_EZPi@nqjU9Y{A=F2W7*=R)IT5qERa~Gi#G;+%-$d%04Y@0+JpCmcv^mP
zXr_<7?D^zWym^urb^3&9v%l{K;5)<26F;oi+@y1JmD(w-s(pZcf&K9Z&GaS=bkvp4
z+eet+zghj?y-|JkwGt|=he|q?n(0x#Oh~AVG!GBRzDS|)mQvfLCDWsPkwSghE-&!g
ziWI8PxxS}+@n;(~6zFxX@8D}CRL?}VRK$egzvWG{&X8}e->KBiKp-p>_7~PiAM`Wp
zz8eNcVnC`fRQK&Y9sEM6J}=E<Fdu!ST0m%)mqIoAEX^W{&Cm|jEbUOV*a&e*tQhPP
zlbSESP~UR}EGU8+`{+KtP&22O?%-a2nHF8-Ft{F~w>5i)<Ij^1O=Al+b$n5!1<|yV
z;82|j8mO_4v{?642Ld1n;R}VD=8G>B4+J56p)lBortMG|2%-W-4VBW@ZH1tq27;(S
zflz4pb*GrqkG49{)$#eolSU(gf*Q2oFBJ&<R<ajp{Gd?7UnD6IgF1Zhn?1q^3Tlk*
z=XWQL3bz2)N=B&Z$-~0^&y#=NVXhIV!w0|FBMeat1C0p%pKc>s4g^HeHlk=7QM8RH
f+C~)Z;wBye?On3|S1d>Y00000NkvXXu0mjfk1$W!

diff --git a/Icarus/Resources/DrawPanel/Move.png b/Icarus/Resources/DrawPanel/Move.png
index 78ab3a246420db4311c9761e3e09bf8fa45b57f6..89fb52d28f034d2c5303f37b4c4846a48021032f 100644
GIT binary patch
delta 760
zcmV<U0tfxu2$%+tEPoOJ01FZU(%pXi0008YNkl<ZScT1)OK8<l5QaasRt3Sj6^lhT
zZqyb;cXHQCOWjE+qFo6kro@e|6cJRA&@@n76%l+Dk&7a3>%zxEv{u{;K5*9-6?|VA
znImaP?kf}QK;UMQ%>DD9fBth$R@7=WmRqb`c8GwEvI@sh*nbNg0d@nM6PJDhAA$S8
z4bKnWq@Oh(zBmdiz*S%qu&RkiUIW9PAIz2lDvrXt!2Tw|q+`_cgGnqk6-VI(;6NQf
z3&7_(B_`r195e+5jOEmu2aW;<fqvj3@IB)`d6@~Ugs!5_)4^8H4;B*VGjS9?1#SVI
zse8LIWJ)?{ZGT2yI_-QMg<US8zehyR8TWs~Qs{9MO84x_0rm@cr{~-1l!-h)7_;;#
zv4Ri4x>UYHk9uGv-U4T^6uRn0yy>Mf(@I<ib~^2qGWV&02EaaGgW7@9mDs|1?aC@}
zHtp)AO~@+f%fK<9H+6Y7)sai0l(|otng;IZpU<@NyniVuWk<y717CoX?bI;?rR-b*
zwrJ{7y&)<clrmIRQA;cW<L%Znu>@sgGLaf@mnAb$I&`OiL%_o#EMZ{@IvGC!PPp|@
z(I~`J9ECl=V>Lh%Kont0#r*<!<@v#Y6(9;S^{fm)G_nNMi!f5rlyl}lSBi(N0cC>H
zPLd_-9)I9#YVmd&_yMd2=72#pOw;(MDb<KDv7?1y{SCYa29jH(qVX4$0-AGc<TgS!
z0(-51IYw^g0FuSpC*YAD^SZoEN2k^>WlFTOCUs4;bKCQSp=2_SLUHbMIYYd$$n@gE
z6;1;}w@lL+`3E_Ggu$MofJiX)9O%or=N>SnOL1DUfT5h1SoHj$D<j`>I7=8&cg_mg
z)%G_iEZQ5j0E8O`?V4e?8Ehktdwy`u6qEv!qT6-2Xs}Ik9Vi{yXE_;@HzBKURrHXL
qUa}=}A>RSys9JPd)1dxq0Dk~A@AkCV`c(%20000<MNUMnLSTYA+FV%x

delta 1086
zcmV-E1i|~52HOabEPoRK01FcV0GgZ_0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBU#=t)FDRCwBA{Qv(y!(anU41*91N=LEK%HTt1p6f9)Gv+ffGH8GN
z`iJ53x8D*%ylfA+IG8!uSedqIDe+F?<mCK-O)n$0(-g=tLVx^h>(AVHC%yd4Gxn38
zzGJ8fmltC2&=dPCA;h`Q(m*_brjELN>y7Q}_dhojtiK`j=;v>O>OI8y7@ER0Udl>v
zY9NOiRnyeFkH1$3t+-5-gFs-%%TEk-D{qKjxcPAhO%nQ!qfb({o_#KkO|I8LiQ#go
zB{<r!Iqc1cUw_IpaTG8i^L+gA2SYqbik-pq+Cql^M^-YVx+q}P`}XrsUYa;cT##d*
zrLy2pWU;gl7Z_X?lrp^SU%{~Ut{{WU+;dp<8mbDuqDhfpXCirt@A~UQ9#{EX*&kkG
z@V&T_LHN!+u-tc1L59Xxyjb<E4AJ@Z?Z@9TniZY~nt!5hmCi!@<6dt4$N&5pT>O=+
z3Wi#9K2C-m35FkeI9V!y#li}jmQ%2@ie*C1u3y*gi~N7`k@<FH62n<VR|b9#76vV8
z-k++{ysv)#{(HnyPbdpp0ZNk+{jZme(O(7z4j@y6k(KF+hn+-8te5T!kQ~qv2M8Jf
z3Mp#heSe}#20;7)h#jDO2U5+TYV_?FQx*VHppe+$`08%MU}+^R0OALfIEbog3K&WS
zpbQAb6alJ4AJ9P{hnxqMgTPR_FyM_mXgb;e#D&yw5Vg`2C>>n@I%vY6Xn6ud36!8g
zwXDOSXbuA%1ab%{aXSD*=>y#z_5J&I<dAr9LVsT812i2KP%9k~bQI7L0+(O>p2o_|
zX!G#nAF(?hezSl61IeX&LaYoDmdd}Fh56sJ*5PQ2P}@=GAAK%lVPdGCcJ&MYx$l^b
zHuW{l3?D!LWLq88DDMCH?<t<=Uk<5D^0?8=QJ0>4j`;TLUq|Nok8Ic!$2{K0Aij4$
z!+(m(ISgl+co@#!_{{Fa$LgBNz_5#&4nrvtI9M3Fa5*TK^EHFf%x;FWX{8J&xuoIZ
z`#$|<xc=t1-Ps49^l0L!Yp;KcVN<l+N{GR9V+Vs+gbTx0Lr)C(^KX8!zx)2ri6+q}
z$j<l~NU@_UT6OCyLt<JH!&x?UhV{3;V1F3G%fiUO#me}FT8=`g`z}8Id}98!FXo^q
zAq6bA6nvvC!z)UY=u;D6@yIvidkIXuL}``*X45$)0`FK^7=x&p`>?hWfVptPo3DSJ
z4nF(IyZ+5j40$6?7KQ+M&YwD>Y)?P__#0@fz;}t}j)E1S_uv1``~CO7*N@--em8vj
z`CkE;ZeH-PGXa~d3|IgD`#+J|j-hF9W^^QvUH~A#00|)OeGR_g?EnA(07*qoM6N<$
Ef^}RQE&u=k

diff --git a/Icarus/Resources/DrawPanel/Offset.png b/Icarus/Resources/DrawPanel/Offset.png
deleted file mode 100644
index 81c0be2532baed4776cb29a55f1b2ecb4d826343..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 658
zcmV;D0&V??P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA0w+mCK~z{r?Uyl2
z96=a{cViNW2`U-{L6S6rAVNqHEClTo5lM5liGM&&Y%MJ9)ck_fR+1tK*l1%R2#0}S
zrzV<8#T-O1YR>1?{qVq>yE!?B1Mh{0Z`|YD=f0htosDz3TvTm&kkqP5P0BYlDc=;l
z`<f=c^;3jzn&1eQA#*f4sPV0HLn@Brs4@L@is1y<hv#797#_moWGpO?K%aevMdUu|
zV7YNgy=B+|l2QIczEoWv$}?z$9vA=#D=UyjE_3y#UkXZfFYLTw_zFx)A~yddXxNvZ
zzzOUhZ|-LI53?!8X^`k2jmznpOX?Rx{WG0dk(6B;9Xm^~&lO2)ZXG}ia>K}dWZVbJ
zn6FsDiGJH8KS*M;&<m-bt3TAS_n;ry?{g_DE@eS(h%y81h;2~Su@$6B-qm-uPJJJJ
z`Gv9sd(WF2#;NL5AIr@LYSC0wN?p(IJYtiS_4>~CHR{~u!6<r{RA)l0=+p3*ZY@xC
zhmO!K%{yoAM9MlQHc~IPIh3JW4OA_vr|=q_3DGH~4O&5q>E&Gr&V-VB3c6&6aGZ>t
z2_>b+&OgY4=2g)Lb|@)Zz*MgnGe<&6sXLnB_P8pV(4ErxY-iz2C@D+HOQ(dE@=7Qv
zZF9VHucgXLC@I@MdnJ^VR&(w5wMJ<_Uo@elY?Gz)Rn3a77Y=nvlssn;DR!V;l;5xg
s^Po3rXDa&QP^pBvd}XC3<(DYB0J-m|RZQ5PfB*mh07*qoM6N<$f}%4Y*Z=?k

diff --git a/Icarus/Resources/DrawPanel/Plane.png b/Icarus/Resources/DrawPanel/Plane.png
deleted file mode 100644
index bb85fcb63af58406b0149a98e9c444265b5b0523..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 686
zcmV;f0#W^mP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0y{}W
zK~#9!V*LOAKf_=HObmk%j5=yaJBo!IO^l3;0YIvNN^ZCS%xnb|ISS|?10b~^C@_#8
z2q<>Z`~?dz?I5K{fI8?vU2QFYMP(&bf{BZZ>mbk#4rGNC%t46>32+C!_|Cxa<1cxR
zQQ)C4O#vMw0E@D&o*uB+`L_%VrFVXj9YTA|*~rg*PzN0VI!J%!?AZ+5TwDw{K2qi&
zii!km4gy74>z&^NT24(scTnlI-we<H{2v%c0YeFthT`e%Ae@dGNC#nc6wpBh3JUV^
z&8=+%;vif_LV%-#BZH!XJj2Id)N_y|3nPPv5Ho`!HzR`-7bE#~-+Q2=D0Pq~2O~q0
z3@d}7FpVo@VnMkq3xlf^B8A+$caP!l;X@3kPM)H_qd=iktjr3pN-kf%%+T4<!LV-q
zdYF=rpw<DX3<Tl_ba7O*8Y_bYCj-N`@820FO_;#Y)Z7e{S_rDHfEDlox`tGfBE&&o
zzkOp!Pfdk|&O;zhAmkXDILb?anZZg7lCxTYp#yc$MId$nI_SfIG>3zvnZfk>_3IcW
zOq@uTgQ)5#P$+>CHYnPvtE*wc38XrRs*Z9LfrQfWqemGYJOCvjhDM-+E(~aIMv{vG
z8g=k&zhJ<-SfCt-)DZx+yC2Y`izNxPXpS};Ip!Xq#DjPp#m<bsfsYPAB{!@uM|DT-
zKd_%6J1dK1!#;le2xESr#8DXiK45!l0+2GGFo_kAoAXHSjE;`Fj5=zlItn1b0Dv3e
UF-Y!^4gdfE07*qoM6N<$f{!&7&;S4c

diff --git a/Icarus/Resources/DrawPanel/Point.png b/Icarus/Resources/DrawPanel/Point.png
index 5a43bfeb6dc74fba4b9fef9404e7528612f79ad2..34ed268b39b9ed5c12730d3e012e5cab7189aabf 100644
GIT binary patch
delta 371
zcmV-(0gV2%0+s`iEPoOJ01FZU(%pXi0003<Nkl<ZScUDEK}y3w6o$Wus7o)<EA$My
z@Csg{gg{n3LRW=Syn>5d!Hs9=6?y@eRRWQ~Q(~0NpUe}3%(p4D)1R-CH*a3ErfHZP
zXR|X(QX@!GDzlV2j}6%Gwm1Fv@}hi>$(+=uOk@qTuNiRB`G5EgXhU1E%@n~=Qv2QZ
z8h8Ni#a*s}3RvYu`Qk2RLI+@>hIcpuOI1uN^hhD>dk4$$k+MfNRp^6-<pc>nJ}c@c
zkCSROb{8ssWvALx<{^aruytsWB6aKI^U1fq)@M-ar^e_&7Rpt2s@oVn2<D{=Sw)d*
z?=nw<c}kx;0c@9!Qm=VYUJWf!b}DKNnUbeSZLAY}P+MM{lwApxlT@Y5SL*3o+4vE|
z(Q<-FQZ@%IBgFjYsh-&5h#ISHy)4APn9&CWzwjsjW`3J=A*&=Ql_VtryaPgabeoET
Rcr^e3002ovPDHLkV1gTns|x@C

delta 273
zcmbQnyoG6kPQ5S#1Gg|E!>l<H3=9mCC9V-A!TD(=<%vb942~)JNvR5+xryniL8*x;
zm4zo$ZGegndb&7<RNPAX^Z&p7;RI$Mo@Rj_tE?-5i~FQXudG<?CTn_0=BU$3#^>_2
z?-J6II4Xbs)bF;?|2%*He~D`nr#^-SB&jK@`cCiex1WEb{_lg`KNpGHKS(MRlHpm$
zHAnqxYNhTAx!MH+PUQj|4L=kLC)nJTW$iL5VOO-~QSmQ#Z@eU+`pKkFL?bX*$zRyL
zu}D%QFqs*s?$3f#wez~>v~NkRc*}kyuzAxQskOg>&Uv*W(7hMx!ef0*90m-&$_eT@
VTc*xsVBlh4@O1TaS?83{1OUr^Yt;Y%

diff --git a/Icarus/Resources/DrawPanel/Polygon.png b/Icarus/Resources/DrawPanel/Polygon.png
deleted file mode 100644
index fe09e3ae0a12320c4746e407af391e96088c1910..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 682
zcmV;b0#*HqP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0yjxS
zK~#9!?3h1G!$1_klhTUX!GIs2*_?z<I;b_HgF`0=L7Gj`!HT;CKY(U*vx7q&)QaHb
zkU_8%lvHO+iV9+()Jd?)`3|mfXq&#fWN4uWk2H{b_q%uR&%LUI5T(~fMCrjXfa+_g
zDE32DRW*2I1FU63P&H6r(&)no42ymqKrHN9Dkdd>m2`NxAY&j^5Kq8DbZ!FV9V7|s
zd7)SeMvm>4nqSB6n9bGMJo=JD%|R$NWRAe+=#4O-9Hz{Z0pj#{Opg-?3Wmw;FdYyo
z&FM0wpkQd6FE~Mf+E|_H)nuS}KS+iImBjd`U&IiRh!FtGak_O8r~<~!l2E)`6i`rq
zQa~2F*u_JARsbyPmm>T^7o7s~SLMCT#S1yOdE1dl5&zbSv?(VE_FBN!k){&axcm50
zNb_@5p!~G-C)m23%M8X5d3hQdH@)cza+yDAmX41m1xioHK$3Dq4oCxOfDn+Zz|r{z
zQlMG|AQl7i1c18MQj8<I9e{KOM8yz*a=Qf*c1LC#D2D+#0zf9_1f*&ewG3w^T_R~Z
zL2e0rl-L}U$AD}BE7{nn7FI^1i~-T8(<D-W9mXZ^*X;55=rxxD%&@O4Er}xT@D0eg
zG)3$$EoWwKV>M;?_4#q(wCF(zFp!PIJo{~-+AQpD*EhE-Yv&cRTPTycR7$4Ba<OZn
zJLIXwm16Zfri{d*vdt*IkrlZM9hPcaXZQ6)nD;B`W_0ie#{jC|p?(Ay0KJ+3?`T|p
Q5C8xG07*qoM6N<$f(?}@!vFvP

diff --git a/Icarus/Resources/DrawPanel/PolygonSide.png b/Icarus/Resources/DrawPanel/PolygonSide.png
deleted file mode 100644
index c90cd4bf39657dd193a5cd9e52dcb030da9db3b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0r^Qp
zK~#9!V*LOAKf_=HObmk%j5=yaJBo!^g^Y}h0zj&O0=p&vGt~#8RDyCJF&GFMK*}k=
z4aC~TNKBCc3?&61bpeR^f%qX1KOiB5KzikY_#+S-0PTA~m5>601yJ9Df?t7HA4Byj
zK=pw*3y9J~grN@PL;;?tcc6x&4nPfiK#qfu%y|Gc=Kw{H0)hl29|ln9r~o9h63B8C
z5C|Zpg#(m02urAg%oQNVQON1QfJ%-sASQj{%Q62+$uT52Yypzl3Zyt{12Mr&rlXLP
z#Rj4rg;oR<P}4z3b`;<%BJgG12efbyG4?QFsZQjf+zm8t48Y8nhuVv~njt13QX!P^
zW+bu_A{88kHzQG{t|HMv1nW{_65<6aJL&?Vj6|%D5~$>$1Y%-<Ds>eZh2{ZDS_#Ox
zWCDebnm}x>rmA7o@*Guzom$C&*p36JuIf)r&1Crd=Xc4X`E$;a(s3xMZkXTG3Myq7
z3W4@bAZQ=4102}}CHEMdvJ}<-y=5@iP{Z)|-CLsceTZ#fn9X9qVDog(i>jOiNvd{6
z&3s}{to+QTXu<}ptZqDHU_Sqbpq{^mA`JVu#2FZVF)&DL815&!<4ej=(5fSMsti`w
z+~u0F=OwXvzGb+GUkGhc4zp2dqlu$NM_oo8HB=o15MTfmDvP+;`#bOe0000<MNUMn
GLSTZGwfgY@

diff --git a/Icarus/Resources/DrawPanel/Rectangle2P.png b/Icarus/Resources/DrawPanel/Rectangle2P.png
deleted file mode 100644
index 51bb0a70dd77fc4d917e41723b4f2c291c2f03e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 549
zcmV+=0^0qFP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0kTO%
zK~#9!V*LOAKf_=HObmk%j5=yaJBo##mYsj}x#QQLe-`X4On22qS&BJ1IX_@i$4IZ-
zcmLJb7YnX_5nuo2CqtkJJ43K4*IiX%787g^!y8hJjEoLI%7Ib`t=zEP{*jOo*g+rw
zrIiE!arGL=F(i{3eIN(bQ|hR{zkf0;dhr8A4CF8`c@AYt($qm9K0vOcegM-^mOQ8X
zv?t%;VxTDG<zU`NiK7kx(_RB5p>^@`=MzB69OSS#2@Zx}b?%pnV%$vwS|sSp@>;Mz
zJhHQr@jQd@)1y0q4wAsB7?k^PVITm74v5i!PaUzCSo20p^ifBRI%?EWqmCMN)My(W
z3Cvr*&Vqx53EUnU6d?s_Q@@qAc5nZ0$naC%#vR%o8n}?U_UudD%9~%|ZE9$X(fr)e
zJv)*jgD7#F1KE!H{Nt|^%t0^!a#$q`lRJ><J|H0l>X!lA(Duj<12tip-?1Nnw$~{I
zc-#9}`+eWPe;2s@_RpEMx4$XF`e_N;JTLJ!VW|jkc1A%CyZQQ0@6SK~ltH}?Eh(NR
ndL?wm(ebHKM~wtW0R$KTY=;97e_hp=00000NkvXXu0mjfe6H+E

diff --git a/Icarus/Resources/DrawPanel/RemoveColor.png b/Icarus/Resources/DrawPanel/RemoveColor.png
deleted file mode 100644
index c3b2850b79faa5e67c6ee2a86a96ed581c458d6f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1048
zcmV+z1n2vSP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?1Eons
zK~#9!V*LOAKf_=HObmk%j5=!6QPc)3lp645GNT2M(gk8g5T7Uae-+gob?)q00V8AM
z4+I>-4W#^l*dK_ws2x&_=;hS8GiUF9{`@)D-qB$j4hJa#DNtyLfeqji5@O;OlxAf6
zF9h@=ACsLo1Jm<gFaO?rF3!Nj_L7NH<N}kB<`HJ&ycV(@b?xfaYo|`1mRFQl2t{`o
z&_T{XDj%$om5Y-}SW=sj?Th4phA)UjY9+wHaPRxW->2TmBkN_A4|&NVZc@W+UOtE9
zgwD>+{_D@5KcDYEe7NG^{sUfUAp~&{w}=>%xUeMy+Y1y2;RC-Pt`Yxnv2XV8efew1
z%6-z3l6;@PeCB=e^2MA}Cr-*k(@+)6LCiwT#tcmFxJgYb|9`$>_<40w@bBH3J4kkv
zxP$~JBO~MYS8v`(-hcRD*LNZBBv2XxN0}g}{(r_V6y@5VH)gp1K2W-V<Z?<>MC2=o
ze)amb+6m^M=3iU}T%a@r3?U9`<gnilcf|iaKh1_DN6E^_h``tn-hAUf&XZ&Hhf73~
zTG{^Jrz;Hq-dwIB$x$2}91NTs94}$~d#}H99{HBU@P}EMYUR=2w^!Z&o}DC5QZ)lg
z@W}i-FMlyyVaTMKqyD@;%<%vB*G!Te1xoPDj10e!#m+qV!*GS8n}JDy6)Pq=NB(#x
zL2`vGEF$^|UF^i|zYLdH`WP6rxG^!Qj{5e(faD4pl;D9m5JUXL`L7KB-&K9repmPk
zGtd78RTB@1t5cYMlk6xye!kD{j<y?kULT5m{~i%&Z~lugeE-eB`A#5LUhq*bx;Bu5
z<cV_>%M+3u#mvmiz|Y5DFDob4|8qlKEZ>t&a5;G@C3Z#*p*uvUDX@bC1i%ggYi8rS
zNRw73uPpJ75)u-gs-U3I1Xn1ewS(FYVwDU0imge5)lou%f;(m9WOGo0nU#Awi<tcv
zs)iE3@*1K_bRHg_Lkdbt9vIPSocEAL+IAt;+TlPC0;8^;s74+k@M}l%kzcpxSrbr(
zH}^5Ji!pHM7p3BA@R8h`VHVYoW>bu~OLlGpI*3g*svchpl#$%A1W*g|*PRu?poSZ<
zAq9#uRt3*OLQP^uN(MOop6pEd`}RuCpVt@kK}``{jsiJ`S=@9jC=G$qCdnNKvTFMy
zwV<}V*S{~%3>g0X;sIA3|NpUq3PxZKy8x71OpIfw>ZsANgi%M0I*JSc5MThH8%D(z
SmHwCj0000<MNUMnLSTaHF6g2F

diff --git a/Icarus/Resources/DrawPanel/RemovePointCurve.png b/Icarus/Resources/DrawPanel/RemovePointCurve.png
index ee039fe3f647e46d9219d29cd6546bbb5db1e2e7..34215582ff5bf56184f834894318d79064847818 100644
GIT binary patch
delta 836
zcmV-K1H1f=3EKvcB!3BTNLh0L01FZT01FZU(%pXi0009GNkl<ZScT1)Pe>GT6vscV
zkwTD4&?N#7QBe`nMWrA+b_ov=1wz&#q8LVg6-cLwf-XBa4V6@&h1J!lE)nEy(@QH9
z)hR>h6t$hoC^vq~oBBEK&YyL5=nJ#VpWnXu%=^9HoA;)vTz@X3<+;u!;1KW`xM$hw
z77dc;I(<N&Sf8|PRW$EZf%07EHLy(|%lSp%t!1knX<~V<(*;ZcYk*b8rFr0h57)e|
zV{IpJ*#JWJ*UwBBX1jZO-=zpNEkL=z<u>5>%yeO*yQjCLY0n0LOx^KZ=Rz7#z*b;&
z$aQ^f0@$OWet(4w90i`I0JI6X9b?>X{nK=9B(JCMLzMxGmaUpo0P+L-MU0_8fc-hk
zR&&4r@I?Y#>nHHrbDf)MKp8fp)C!dTrUd>4<13&8&>k!RXDnOY2paQTrx<nv%T`^+
z*mmG+45$UmR;^1`fxjdzTa{$L7sz|AbE=Agp@_}2TYmz^B7pQPjS$Ec)t<KKxsC=a
zc&>x#G0Rp{F`nGi8=x#(FePZ9r<SdTBcZB+0S|z2U{E{|De<(<g}Z>mzzGQvtxv!e
z^MNCw0$?wJ^S}m~y2u<RKzSVs5)yhF4*O5gjbYNO^rHZ24SBB9nGh(Jl0fMo+-w}T
zg?Xx8Ab*lTS+*JkE&|_-(?_d$OMtEeN0I_1f)X(88J&L~8K=i<03EYzHJKDBF_eJK
zS+?p2_DRXHS6(AQpz&yH)wLv}i{Y|mt6EjVGI_3Z6*veuX#i1=r-G7%cQ-AdRG>W9
z(F;JA(x=k^S}~LWjS0}Qmv-h*jRLA0%5$CmMt=d-1tm4t!$tumh7zEfg<nIVbTaf4
zV%9*I$y4586Vg%WI;mai>iZHu&$0l*=#Vv#ZaQ0PjML=jEL-Ip4TLd$PeOovsEt_w
zY30OA+oQ$-Co^KI+$^+uG}I!kQYKLUopMrphkZ}*wGg*^S*iTC{e28Oqgi>>pT2>J
zUOj(4PCJ#BDo|3~Zvke-uI^aB%l>0vXI4|ERjnM>E6o2mQOpviBH$11%{9?uoC68~
O0000<MNUMnLSTZU<bkXJ

delta 1145
zcmV-<1cv+D2961kB!2{FK}|sb0I`n?{9y$E000SaNLh0L01|Hi01|Hj9ziC$0000P
zbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@KG4UX2l>h()3rR#lR9HvFms@C5M;OOX
zHra&KB5fm@mX?adSn-B7O=_X`BGI%>jm8T?2tH^OZx2dM3x5SSiA@`oVp=rC7++Lu
zE5V1>CoR=h6j6Lq5X1+=CcAsqY?HWa^rbufe`n6@IcMhVCH3h3;Wy`-Z@!uNGqY#2
z(HLVBg5;L>64zwDaZTnM-ekEFS-I4tliOSw-blrJ|BSGCX9gHO#kiM}*OyUr@NYdy
z69hC7>673a(0>8;nNUo$+YmW<jONm_2kYOH*UxGSg+bsjhO}p3y<7IRiL9nbC>#+J
z%#->9oCn81ulYP~auoD{BcK}`1p94J|IjO%_T$T%_QT_uvuCV7c5MJ_|0~u{Ys%~t
z7##=`9@ABZ<}cn5nziU^Xy(E)%14*4dT+F&>-N~b{ePuKVGhE|F9QF=hQ=w;t$VIS
zw|+6+)O&RZ>t6@OiYe1fDiH_-{OGpvwY0WK&Br&x)gL8cYLouynwoIchcSKG${R38
z(+r8Zc7zZW(KFGoVp?=t>t(>ATXx^?KXnFW>O6ussxAQ<xTJs5I4xSgcJoMkSJgjX
zwM7S~&wpi+Menm%bIUJAC8R8B3Q-~OCF(ybPZ`?QdItvQ%X92lfm5lI8as5jUSGa)
zVQklzVVoEX7MHPL$rKivTm8LJ2{{%th3ExPkf^JBRW@Xd+vdnvfm10{qwU}Q8mV28
z7@9tZ1t*nrQ>9Z`XihbI(Acz{iskv}m4E`rm4Dd`k;J}kSb<Y1Q`CvPyYw_*!Lm0E
zLu70a@#x-8mN<UGxC$XeKJdQ{5mw-o!xSn0Q{PFwwxLu1d|h(rt+yWyPMwhqS1r+p
zn>JROCE|o!KSO4TWAk)afm4bpQv67-_VDo0x{*NVyvX9E7lxZ#l4A$D@6s5GU&>~P
zWPjg09ai9!t0|%3=FM7cXRANncjEVWPv1LU8X|b3Dx)d8P&6qQLnL|gbnr%1PNq=6
z-?B8Xy<PIgnc$5o!<5hGqhABA!Yuk8D)RD#1iVotPKthRD8c}pkbnGxC2x3bh~SN?
zwAY7Z5h#ANtoF5RhDh>;xnKoOxtc<v6o2@0xiXS{qlv&9Rl-!j=t1bvAJ>fE)I#zm
z6NNYCLN*CgyQqVp9C-TLXM#7X3{!=Lg{v`2-$Nx{zxJ8njVgNU*xAXGcVaZ_XGmW3
zY2l5eii(P#@n9{QcJ4`K<pMWD@;v*ZPm2|pqPXK?gw^y9u;0$#9CtHB67!w~R&ro&
zwC6%N^{>y@2l~lO{COH8l!P!OX#e(9QW$!$s_AvP{#l?TT5Ts)jVtW_YY1sR7TdTZ
zKc)z}LNe5KSx48(KaZ;;oE?`<<(!Z`=QXa$eB+wTH?GP2!nFSYrycwHF$YtF00000
LNkvXXu0mjfwd*S1

diff --git a/Icarus/Resources/DrawPanel/Revolve.png b/Icarus/Resources/DrawPanel/Revolve.png
deleted file mode 100644
index 821795ffa4fed85a2253629053c6c9b64ab734c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2519
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

diff --git a/Icarus/Resources/DrawPanel/Rotate.png b/Icarus/Resources/DrawPanel/Rotate.png
index ec86735928a59a49e5156956f54acc25aa0c01ec..174e83abaa0f6ab53a97ae9381c472009a90f1d2 100644
GIT binary patch
delta 443
zcmV;s0Yv`)1Kk6VEPoOJ01FZU(%pXi0004xNkl<ZScUDEKTg9i6vn?IMkKm1k{gsG
zl!>)BXgGl7;)$^w04v592sg;c7;caYAi)M(*}4Ti@q$__MRA&cLq4feS}RXKeYU^%
zI(dp7bNJ~&NVWES$4e(|7O$(*rV3f3rvR?#SxA+34YjaF&wu$j0C4H7e*>6y4fO(G
z3t$D{yk!0T7$DR<Q(Hdh<kB604`)5FMyES&daL%C5>jmdMD(#nhXB^Rl_76mLU81$
zkjl%wMsA;wDi%_abGHC8`p!-gOlFN<_|$7Xrx++^$KopQw4PH!sszA%XPf(n!Y^3n
z1J+rhJ7E9b%zsYX41=xsW*!XK&U+sp_LL)}RDCsMax1h(2ZMp)FpUnm)#vC!P|Gs6
zdV}IN^-NQTyVm!RmvFD#Q?F2*_A@sghA<Ala;W}k2vAuuMi&|a)W#j3hX9qjPSu&G
zz5skS2z3VF0>E4G1C7Ji9tG|J+;EYmH7n{(^1QlH)--5prpp$9_B6<U$Rku$jZjrJ
lLRHlWRaL%F)Y01&fFF^day5}|;dB51002ovPDHLkV1hx(%Mt(p

delta 477
zcmV<30V4k01OEe%EPoRK01FcV0GgZ_0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBUzj7da6RCwBA{Qv(y!(anU41*AiI%-HeiUpgX-s(pJK+1rC-UpXL
z<sQ(@QD6uC{kQ+$*PmD=8QEDG7=Hg<2xKPE(@_i{2R*rRAAhTyl&ly7vmozinj#tO
z7gGkMKL;RIaC~*QU_c!Obj$>3y5fflr4EMZYXIT}Nc<k4Lk~bhZeSb*jH(aN=rRQ2
zgFqYu#0Nka=&*(XP3S;}T>xTGnmPic8=&bc0O+s<1D^XpAqR6L)L{nXgc!|=1gHZ+
znV<mZFo!`?PJcl|tO1G#PvHr47^v7#ASJZuRibYorJkgxqYMU>qkvHeD!cTDbcM`_
ztv3T~<T?ER`Dg#%S0AwZgrA$?|IgodKR$nZgc8fYeEHt+q2J>Hu@&+IMs}7)7FiLj
zl7HWRcKG|{yFHH}uQIs~dJpk1sKh7EQP5^C&ay?Ia8^fygshl78xBVk12{i@W%&8?
z*Jy8M)KR0IQL?f$C<l=XK7IK?bw@1#X6FOAvNQ?c0?{S<Xqp;z)NpeYK!5=NHo=k2
TT1r1m00000NkvXXu0mjf8Xe1N

diff --git a/Icarus/Resources/DrawPanel/Rotate3D.png b/Icarus/Resources/DrawPanel/Rotate3D.png
deleted file mode 100644
index f9d6d3dce3fe1dfde18c1b4a20e2639d9eee9022..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 667
zcmV;M0%ZM(P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0w_sD
zK~#9!?3g`B!$1_rbE#jI`cd$si(2g9B32Nb6<ToAp{^E`3Qjr+P94=nSDl=s;3Bv<
z6s((rLJ?fV+6+R)78(^xs%h*0;MGAAiPGu`Ie6UbU6T9p@_+X(WtB=r60OOSfX#;b
z*H8`hdT{5;@fbR8lDajui{FEA12lbsu?w?%S-r9k5Uc1SFb?A*pmkUt=7t5$zzicb
zyq{iTMSa|KMF-QEvuXV@)UTLbf(17yI&S#4@cD2az7PHm0WVsHg3uy*LGw$+H)A1s
z+!~Xl7+mFxNQG$OgPLiokX0r1@x^ei&)ud;jSef%=aGm2kiWKDQL>LmDNeeoMsScc
zRiErT>G5@<n}AJIADw(i?a?%UbvxwG5*W7>i9J|zsQH^C54r@*PeZv+LJv|@xVZBa
zr8rH0j9K0iM)uRmr|UbvsisDJDswf@Ao~)CRun@kuneq)E(s%Ii9g%Xv3QiCbq3$d
zUm@%eu-kuHW&oqW!sK&JjdG0vY)_cl$04f;0I+3Y3NpadYDNOgE6gbYU`eho(wR_4
z7Y;N>dzu(fq_0!jV1+v5B`70>f=Y@Ar4X2<W?W`s%6a*<G{j0}-S94FQ~O)`KC3<#
zw4YMydP&V~21czHWQV*UJ7v>sdA-TRWS6tItGnaJp}V_M2EKJlK%xCI)Sk7J#)0IH
zR{OiphO(i4^|QTHE^A2Xx<N7fPcs{;#_e5z0RWG6$&3Tv6sZ6J002ovPDHLkV1k7z
BC%gav

diff --git a/Icarus/Resources/DrawPanel/Ruled.png b/Icarus/Resources/DrawPanel/Ruled.png
deleted file mode 100644
index 25aa70c43abe23d0d8c72a8051f1f5f7a66eb712..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1096
zcmV-O1h@N%P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?1Jy}H
zK~#9!?3m4K6Hye!@0%pGQEDPsrB!sQAmS!bHwr?7P`Ay}Wx-wDbg7`ID7X@;(1nQ7
zy0M5tr8`|X{STrGmof`cG+GmrG)?BqbKktlSCh0Br4{nv^vz63->>JMcjvXj^E}#a
zL!)gtdQd&69@KvcC4`7?3#c<jJ_VRGWa4(}UqFR7?8@Tz_((K7m3TDy8Ml*A3U32*
z%bXGm*;Ic-Gxa`UE<AtsO+8NjtMZBU-hJZ5*P9d#-#8u((dlR?e=HiBx^Z%sp-Pv8
zbch|xKslvM%a1Yt#MO>aV(wF%`opu(cnm;iAqLZ<8VyIaeARZ0<#IK%ylNTQRVz1>
zIuN*~D>V*=Z|f@7Pi+WF%mSz{WYCUK0xr=hz$ABSbQJS&zeWQgBEZo1a+Q8y&aT?D
zT(Rj()uOLedns!<RIzL#fRp3!Oysyku2ha(F9R`=>0LQ*t{Zd-qzQw<T7n`P4MhYU
z?h`bK>sVM&40EAkQ3(r|p_1iN*><Ub#eZSplH-n6B!I^NqZC|wEh0JJ!o|(5L6<;8
z24EzRfR6TQ5@=7v2eR?oGElK<Q-PrXQ-BjcZN7FTm~zBdBZ!0}buX7pZDjWu6ar8f
zj{$H5K*N~#DWKh$OMqdh6$MeW7(@Z#nZr<lT(9m@lUvl_SQjX`#9@>Uv35Zt5iXm6
zOTJUmAq7;lU0FJI>6h(FmHd(^hq^dMq`+vjE0i~JFawA30hA7iA?Xsbglm{4U0RVj
z@>K*--u4|TVPUVHrL`bUFe+1Q#+^6Gwoqt-+z4j@Gs~shE1{4jknBOo<A7>{v3#cr
zD&P#XQY%@Y#*$GBV8G<H&6TEl1vk6Y#kY5#0PNieVD<xMugsE=KZt`Z%cg)zTs8m|
z9lvy)fm&c{cGaedZb6@zfB4|(<@fXBha%$speoyLI46VMP_k03Z2oSu8ne@}1yHj~
z^^hmT?bmwyOnDx^I;Ll?UVioRTx=R89Knv8t2p(tNlBOd9T)7nnltTMfZM^P<}uZ^
zqa#~f<7sGt=f@ukgx5(LojZ-rokHi1eW}RKO<8npE~o6+vTFx&n<3k^gSs31HP5dm
z@A`#Y+m5ar<KQ#Bap}YW=WPMc)BOFh#g9qsHXT_?!lfh@jzc<Hz~Ne+I_|oT@8Foq
z*7U|s3BGe_B~vz7{}f=V4YKw#_m*_P>1zRN&g8snW0_4KUD_OflWH3Wr-8USt^^~~
za^E^yPZ71x2PX#cxBr*GJ+IR-MU7l1hd1R^?@z2AR1c~LwFTq100RI!l;<u9ASjOj
O0000<MNUMnLSTZB<n_n^

diff --git a/Icarus/Resources/DrawPanel/Scale.png b/Icarus/Resources/DrawPanel/Scale.png
deleted file mode 100644
index ab5f4479b715fdbecdf2aba344c5c9645cb150cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 567
zcmV-70?7S|P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0mMl}
zK~#9!V*LOAKf_=HObmk%j5>-~z(T13Zk<bXe>1ZRlcSgW&o5Ttcdvdd>?%G?HAmU>
zt}!|)YGJ~_#6h~|zuy>q?_d1G!oYQpYS9OFke~rY4m$LemxXF+ik1!{%Tcs;5Xp|B
zhl5CR6ulfow4><hAfk$d<feWtPF`6(lW#YFl9MUaUcP1C`c;giqKBYjK8A11YUY}3
z<Q5&@cf9>cYI!(X_l-JgwCMr@U;eX8GF-gkj86@hpzwn~a*}uH;;7(;De~*Y&1W)j
zDk|Vq^XTYLj?a(wFp%LWdFH<i48J~nB0BmY4l>$B$U%GF^Ru%sGk+z=LB>o^&di-q
zd5$PYAsi&9M#w?rL=VhC^SaW{5tYyf+Cf;;lr#_Hyga4{Y79RgVAb&B@iT@KKQw9P
zAgqoO5afOQR#P8$UHJ1i!^8W`G;<K$$|+JDL>EUf{r$;Eii4=q@AKh!{rLC0XLH&1
zY<P}M{{MgGztg%ZuF<VC>dgM}7W?-nZc`>yJ{%NvAIL!hKkm8BrLu#_b`&iggf;qp
zfBAew`1)Dg74+ASvI0MzCDF=3Aiy{}Xg2C7Dg%H30|0(8^UFe_%C7(b002ovPDHLk
FV1hDZ0vG@Q

diff --git a/Icarus/Resources/DrawPanel/Scale3D.png b/Icarus/Resources/DrawPanel/Scale3D.png
deleted file mode 100644
index 08bf3a113edaff1de529a58072675b947b50c1e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 687
zcmV;g0#N;lP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0z64X
zK~#9!V*LOAKf_=HObmk%j5>-~z=F&XDBPh0q+FofJy06PKl`EI<1F1B1q8-GTn@y7
zKwJS8>j2{SATgk$U9maLqjRy`Pi8hHavdS{_8HsK_QG9Q9R;*-HPB)~sKZtRaVW?^
zKyhWD_)H)>4T#gx9kf$O-<g3`h?N`%X}!MmPyRpmH=Jn-8h!APA!Hym9K`bSKhs|Z
zj-U7vIxO1m0r4t&IOySDW}<T69%$4FqJ^L!JsgBBp}RoS69{xdX^?~NLZj4`)(*m!
z&^v*lvKq?12Mr}y(eU0v;x#X=9fU2U;EqA((<6j%Itmw%{QuP{{MXHY48ItDlIkGN
z5AT>Ceh_Cl_m_jL!V@QuS65(rEiOw|;mCF748!_297L-ht&m3@HS*e1_`s99kDVD`
ze8efw%E9%XQC;aA-5g~&VdIVqBA)KJ<aOU%{$u{)@qIQj9mT}(?>9-&2X>HvF<u8T
zzWB$&#K!%G90xhGfBeYu<M}?K9Yw5zh^aboIY{8gy{&U6RDL1KQ3K^5ylKkn=VN!f
zpI>nr`tj4BzZ?FFu~6GVcpW9Grow=)u48(3{x2;YME7!v7zfeSQN%ikq{0&&{Qrk2
zTjZI6G5O`~5w<-Wj$>2%^A8idzz>ES#5jl|M=>%o{DV2jnCVIV%=WydK~eX?95k;h
zy@{GpO}3+${{Cd7g@f=$->*maRtmp+^#hmuTgLZ4r*@S!(IQhYj*jFFWk&%77yv_t
VF99PtC&K^$002ovPDHLkV1jN=Hv0eo

diff --git a/Icarus/Resources/DrawPanel/Screw.png b/Icarus/Resources/DrawPanel/Screw.png
deleted file mode 100644
index f9d52270d13b5a988d895a0b5b99e08190b34dd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1582
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

diff --git a/Icarus/Resources/DrawPanel/SolidAddSurf.png b/Icarus/Resources/DrawPanel/SolidAddSurf.png
deleted file mode 100644
index cd687b1e32d07cdb09c5bf6ceb8020bfc74ae451..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1567
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
Rq6`24002ovPDHLkV1iX029N*%

diff --git a/Icarus/Resources/DrawPanel/SolidIntersectSurf.png b/Icarus/Resources/DrawPanel/SolidIntersectSurf.png
deleted file mode 100644
index b5d1518ea79f627ba6eb6a3f979aa8c5724471de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1126
zcmV-s1eyDZP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00004XF*Lt006O%
z3;baP00009a7bBm000XS000XS0e@s)kpKVy8FWQhbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMGBNQWX_Wu~1LH|VK~z{r&6oR26j2n%XEO{ziHJ6$Vj${==ta;^MG%zKW@SVL
z(Su46D=Z{6Ezu-gldyL`6qVQymX?*~&hF06>Sl#e|3Cy4MGv9}NH3xCcFs5>Gxwg^
z#}sS_KHQyi?>XnoojG%7CC1o)2kA^Vq%+-+&U8aM|CU%R=Isiq=iBcDTUu`gM!;+I
z<2)5-LOR`o#X16N8x$UZ-^>Y|$93?V6el>`f(5!&?VYuFB8>HdFx!P&E?>B^C=}6t
z@I{j$3~?B5&1XyQ21x7;gd(5#VyOV}pJ5!?F`-B*V4|R^^;-+L#mJ)z6AGEuGhrIy
zF-F}7K{8O(c<K7Gtaa71wVqzTne<<P`QnN)%@F2+AUU9F56uLleHDY!()~k#klZa-
zJA)6B5(SGV0qYet`revA$}ML(yDl&kHfu+NExB8|Ly<2qdJ~EYDxu?iFfz~IZHi)2
z-XUS$Evgo6j4KKj$stuEUxYSMYigKh%W+|i8x&PL?I;Qs$j}k@`5+UUsQkk$W7|nK
zes43mHWdP4?Tn)+=!AMI$iyaUZQZb_ea+0*)J3jO7DrJqDZ}I|KER6o_SLdcTTifY
zC70Rs>Ko+xWKpBN^fLvMMf_r(rDyJ%qK2eZ)lAxSOuwFb;2N9XppY?%aO}Rt#f>@8
z0Y~`&o^{QSO;Nw36_rfd;Afcy=a{$j3Y$@TlZ;73duOmu-xyxhg54*)*a1`!Pl@t;
zSQxys@L|Ue#OulBt!!ppCmE9fA1P{K@v({cun_?Q717tah-_ckfaI%U()xNfdiyCh
zcF#p!7!~6LYy_Sb^x2n+D5S3cBg^nrJ(6<Ee(KNGMnB5{VJLP&X$u*{b6Zhg!sz^!
zFr}h3D-un7&?-HB`dAfv%PM={=px1}FZ(X#fiT!H&*mnUx$~?L#{=i-*Bf2RJgWwq
zAl;E<_gN{t`9v3%xw5i9dv(=QxRpcrjN!vSx4`*agwNt<9l_`vL4)8J79}fT?FFAC
z9)&IU*utjB$otEaSNXw{cW`i2e$8)67~G8x7==$^U4!5-3<6TxEt4hw>$)gYoJm`!
z@~r(%_%0r}u+9gNf)LSR7zD{iN07x6fxCkpiJiG%&&l~lTA?0==&%?hm%GCe+jmqd
zpfKDeBb{!1JqppmSwxE-p$aAo#v7@0<Lgm~4$dI4j9(1!k0b5@&4cTWFAdp9r5j(5
zLUcG7CWnq`w-$E7SZ5Ps8efk>bi^?%1QbCB`Jt0y;Yjowiog-C(U0>^g3$PS6rv*q
sGeyP|!5d$Xf^?=E(wS~ZXL@1MA84no*8|_m2><{907*qoM6N<$f<s>Y)c^nh

diff --git a/Icarus/Resources/DrawPanel/SolidSubtractSurf.png b/Icarus/Resources/DrawPanel/SolidSubtractSurf.png
deleted file mode 100644
index 0672f49421b0fb2c23c2c62e86b37c3a8bc1de0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1408
zcmV-`1%LX9P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00004XF*Lt006O%
z3;baP00009a7bBm000XS000XS0e@s)kpKVy8FWQhbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMGBNQWX_Wu~1pP@wK~z{r%~pL()MXt1-9ah|gmao3!Sa?ir$!X5a${==#0e+H
zg_UCCO(ifLaBv(DLX)?S7olVZ4ki`7kd|p|pk&S?JmKEJCE40?%eB@&nXMTL-@f0+
z-`$Si?*Wfv?D}q>J@<T`=lOg;_dL(<c^&}({&(P#z6O`{HMpd&!6oO5v9Yl*lX;|l
z*kZeSdBi&I1l5VBcHTHAxTLqhWb22m_HnD-F@e8fCQv)|!{6(9Ix@l=pm-Rfz%e>{
z$C=m@i2Vx?(`Ig(xHlj{%ZTNKGm$qC$GeQllFSt-M*ozXY>p^!YRZz#1t=6|vpas5
zh<gQ5hs~BOku$zsp&}^6Qe^MNhK!o<faJ0bR{LnZRGf!P7CV=hg7juJ<qXl7f_|&^
zHb*Gcg|)#N!??e?=(c&p_8U*!TaccorWiu9n$wkW`F{$V3#Jet#1_K$mo0zu#JvUS
zd1NXzIeV2#YiJQ-b(2mr!nR6SmfKGIV3H^9ElBUfQ)k!S*VH<#UjIN${=dqYd=TP`
z(NF~_cQrCoJmL9bz+~PttEm@q>LL_z`4htCd{~lD0;=Rv@Y`9>3@wzYa~CgV&uA)4
z|H<OO<nk+Q$>Q`NBvnA@t~!??pO{*mS)YQ2?g}wF5HxRt@VXI#celbS-A52neFnC)
z^exDq>gpd-&1gyyU(m$9G@2#tA@ECUf#nA}K~>fRPuKQBYKMs~);ZmE_XB=?x0na1
zsp#ywAVNTV(bsJ05=udM?Ok|q?@<UX>V_u{orV|R`wn)W9Onwp2j&s$4X&xEoTin8
zz(m6!GqtrG6se66l6wqRm-fK3#(qd_8v@-|V^DYD7q0j`!0tbpsZH6&hY7)nh9PDO
zH@M#$hhh2tPFPcZ0-_twL2}11n<+Ad`(TPAJ`MOp;qvZ4otf`GnJGLdnJL^)YY(1;
z=%xYCb`HayFMovM^EcqUZT`#XaIklk>%k{8^+-{70Krdf`261T9mK=336{Op0gsh^
z0h=1m!q#JENbC6l^7^hrz3Dm(JFak(c?z4|-r(+GnjuDru_UqBh^D55#4>gq1ije?
zVfs%YvZfc}j$DLSyR49fOPG7+XDIpRs#nHvh9+zd_R^UB<>`#bj4Cafy34MXlxkR%
zc?4GGb-@~3!sl_e)JF#)<+ufQbURp?(KQ5pLso8b9&n#s!_u=ix_g8q>BrawjGLXl
zK$@-4!fsesc?zC0_TkZR0peRttfYEuV=ov!9)RxtL059zz!UhX|An||w%C5PI~*qD
zW$$u#$O*TI$~_zzsMg&S)CLe<sRIABW_SpX1~Nup;>N1e@Dv`TR8pOIYJc=Vo9ili
zJhk!`>4=iDd_2erN%(6F>G*89!}iwpYCPGS*^I5oJI)T%aKmS;q&o3*@>4(7AIGur
zZXwObgPf3rW`A9P|I6jZ#V_gp5fU&F&X{6n11!pTAC_i+0Kqx!tfV^e)K2}VKaQ)X
z@uCz9X+9q01Sjytuqa$xygg83xQ0tPMSF}kzhZ|G_gVuhsV*c{0<|yI7=EJuG)|Oo
zg)|=za$=UiB*9VX@3blsivLg~l-yP(l}{?SRZLMyb>gX=`iVniA<f5wobVvF?5hdd
zxUVJYnarxnC$nm6siZpbVwV|1nvVxLvA`kC#{-x2HMpd&!6khQ5dH%onKUutQAG*>
O0000<MNUMnLSTY4G^cC;

diff --git a/Icarus/Resources/DrawPanel/SplitCurve.png b/Icarus/Resources/DrawPanel/SplitCurve.png
deleted file mode 100644
index 25386eb5239433684fc2356aaf18d6257c51741e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0x(HL
zK~#9!>{zi%13?ho3-%t`D#kA`SP7y=ZLCZXtVBG~%EqLyu+emag+ve(RC4(OW1;m~
z*l2TtSVt5)A$~wu-<UaxOA@npN0Q<e9vkkG-M2Gu-YhYsl%m&0O!VN0NJXT2l9XY;
z$6LNP3=^<v?qsAa5X&?pgvkNc0K1c<@<0Z}%qE1!fG;4|F;dbRs&Eu?EeIuH)NWgH
z2+PqqN@dzytPhv{5(>5YI9f<!^&|+P&@Ex{{k9-vbz(WY=bKRNgh-zbMB%Lj*nkC?
zf8Igt3kO9h&Y!EP)y*m0wLQdqq$$nSmLLs5ORjP8a=Ns!b%_P@;^C$s`ubznbNloD
zwcztKztK5+T$!9se$rCQyN43dbAU2HpA$-y6F^dZuA(nc#nsAw=U#{b($L4?=n>{|
zU<9}$!6T9m3*Q3B`AK6YS8E=T&xd9St$c_#B;QKa{p6KW&Q<EQrV_1zXPLm&_n$HH
z#@<FnAlpEj<YlDKZMApC!X~6_dd)qL2%4PEWPQ)%x#By0x~&5Qy!PXA#d_bJ;rWSL
z6An=FU449F$tO#+;b~H-yo%~=zI}@CL+KwM65?3HslU9N1ES%wu+xFtOkK*Zm{>-m
zb(HFKBe-G51CeT=p|WOO<oKTDi96m_W||2-$bCo=yTu}}u&K@>m5w&4um~x4_%s`(
ztKIw9Ph6cU3mZL0s1Yf<+k~1$%IPK{f)V`{6p@NZb!mJHFaX>*mLYP1L7D&n002ov
JPDHLkV1gVDGuHqB

diff --git a/Icarus/Resources/DrawPanel/Swept.png b/Icarus/Resources/DrawPanel/Swept.png
deleted file mode 100644
index 88f86ee1018b303d21ffbdafd29c95011af0d9dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2088
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
S?kX+-0000<MNUMnLSTYuV(WYW

diff --git a/Icarus/Resources/DrawPanel/Text.png b/Icarus/Resources/DrawPanel/Text.png
deleted file mode 100644
index c7af3e01d5516076a951009836e5b575b24ed810..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 705
zcmV;y0zUnTP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0!~Rp
zK~#9!V*LOAKf_=HObmk%j5=yaJBkIDgx=~$1wcvwN$3I)f1uDl12i)yTnd%@K$N4R
zHa*>>&%xrY$jt-~$qjFRQ5*t5GylQN{P_Dn!`<(H<AF>?q8xSQ=U?CDmVyjQ!U*X~
zDkqnFZ~rhv9)GVuQuM*Vvrm5+cHR5V@cjE<F#rD7fB!E2_yaaPK$wl8(vlxTPy6wY
z@Q{^aVft^z&%y{|OL8(Zm`JiS=!mm2Nbxhnl8FN_3J>6Q6i^X7&fkCk&yaES!#`$5
zhWpR{{96JQ{s2v12|yf=$3F{!cmYtK0nmY9GgVlb1ExRuuD{++h(U^vnWThn0QMo!
zC!2462fJ-Ypo|I@$2$-R<Ok3YKn{flkM&RP07G6m!GMRnB4P2P@Bd!@{ntXx><$dM
z7GP+BV}WEx?Z5w%;oJZJpoFo2nvMd7-U2Qr#_uPd{3OXy7l3j9xZ&n!23{t{iP*{!
zSo9qK@aG>n4*T}+e;3GnkUh}!iQiEmN8I`SR}aWE1g515d}#(4wOB(Mltb|qv_Lx=
zfRrQ19-<3RsKN{6MiI2gxIiEp4~$mGqmCMN)TpCI9X0Bx;ovAx^BGoQ)74SHR;L2A
zIg9~*{DwE)5`gLq$T6Rh)Bz5VgZP;kZy52guxs$KFrYVUfBgB+Fz3P-h9}?tGMxMJ
z=jX?N|22Ru0+K?Fg$$1vure~R@B;}@4+qq9!3IF`Aa&3-{{xza6g0E~U>yts-~up|
nHqbo!MvH_|M-4?s0R$KT@uusdCEH>~00000NkvXXu0mjfFhV*q

diff --git a/Icarus/Resources/DrawPanel/ThickCurve.png b/Icarus/Resources/DrawPanel/ThickCurve.png
deleted file mode 100644
index 03ac50ca188cd6fa3b2d34ea6c6299239b70b9ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 758
zcmV<S0tx+zP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0)t6J
zK~#9!V*LOAKf_=HObmk%j5=!6QKOC;D8NFlMuEZ|TY=PTAbvoGc5xs!{m}1WLN!ML
z9kc*Qc>(cLAijf54Liesrk@Oq|8Ur81jL+F3n{3B;(_=k5U&9GwgFwuelcZPASLYh
z>h1+Jy#he$01!U|Vr8nNDI^Ca0`UtxO4Wf_7U(!GEDi#J0;(i*WCsC5X8|sC&`^R!
zjT#mQIRNn&iXBC)gP;HuI^Ut}-{=kk>i<A-kwBt@7=Y;rl-9n1*n!bgpOWezf{r59
zLD1*}r6;b>vXb1g|9_n%)j@c3AJ9P{AKC+PC#Wm}@*U8X0I>qPxNmS3pY)GcE}Qsu
z!v8QZz9ZE^go*@HC|wT4C_wYycZTasochp^goDi-(hLkh3^e#p_Pdh?jSK5PkXr2E
zbJS@dZUFl705-`59uZHzbMTzW+%P8qUCtwKRo{C?Hann$p3|+GnG%#CuYT*Y^lwg1
zX<+nWwx^l-U`c?iwl>KXGAN6){QZ5B<;xES&e!i5rk|ezN^_2Acp(s9#3JqpO{1`w
zpgg2tWscChryLASjE@=q{r@L%?K;PY1E^69P5cVzQ4bVPfTqudK)D2Jl<4q6FwLYu
z0qCH6pj-(omkNl~4|2qOLJlIOL`Nx=*DuX3fEEb?z;da8nhqkiM8{T5C;+iO6n~(m
zgNShy4~}XA)?E1r#2cvTAVQ7;Wr7LVstI5^dH~H~6M$@7AtgbMgFt{0SGOJL%O5}r
z)N(ur#DCD`Bfj3@xy>o@<17=;A1vBcfLNLw2N5a~wnH0oFR@9k;8wwBE+`~L$#D?g
okQ(h`jXG-7QKOC;Bmf}50IvZDt|=^@wEzGB07*qoM6N<$g3ER}-~a#s

diff --git a/Icarus/RibPanel/RibPanelV.xaml b/Icarus/RibPanel/RibPanelV.xaml
index 2608893..b3ff1d2 100644
--- a/Icarus/RibPanel/RibPanelV.xaml
+++ b/Icarus/RibPanel/RibPanelV.xaml
@@ -32,76 +32,56 @@
              SelectedItem="{Binding SelRib}"
              IsEnabled="{Binding RibList_IsEnabled}"
              DisplayMemberPath="ghName"
-             Style="{StaticResource FeatureComboBox}"/>
+             Style="{StaticResource LeftPanel_ComboBox}"/>
     <!--Add Button--> 
    <ToggleButton x:Name="AddBtn" 
                  Grid.Row="4"
                  Content="Add"
                  IsChecked="{Binding bAdd_IsChecked}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
    <Border Grid.Column="1"
            Grid.Row="3"
            Grid.RowSpan="3"
            VerticalAlignment="Center"
-           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=AddBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_PopupButton_Border}">
       <Grid>
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <Button Grid.Column="0"
-                    Command="{Binding Import_Command}"
-                    ToolTip="{Binding Import_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/ProjectManager/Import.png" Stretch="Uniform"/>
+                 Command="{Binding Import_Command}"
+                 ToolTip="{Binding Import_ToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/ProjectManager/Import.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="1"
-                    Command="{Binding Line2P_Command}"
-                    ToolTip="{Binding Line2P_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
+                 Command="{Binding Line2P_Command}"
+                 ToolTip="{Binding Line2P_ToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Line2P.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
       </Grid>
    </Border>
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=AddBtn}"
-          PlacementTarget="{Binding ElementName=AddBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <Button Grid.Column="0"
-                    Command="{Binding Import_Command}"
-                    ToolTip="{Binding Import_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/ProjectManager/Import.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="1"
-                    Command="{Binding Line2P_Command}"
-                    ToolTip="{Binding Line2P_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
-            </Button>
-         </Grid>
-      </Border>
-   </Popup>-->
     <!--Edit Button--> 
    <ToggleButton x:Name="EditBtn"
                  Grid.Row="5"
                  Content="Edit"
                  IsChecked="{Binding bEdit_IsChecked}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
    <Border Grid.Column="1"
            Grid.Row="4"
            Grid.RowSpan="3"
            VerticalAlignment="Center"
-           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=EditBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_PopupButton_Border}">
       <Grid>
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
@@ -114,107 +94,65 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <Button Grid.Column="0"
-                    Command="{Binding Delete_Command}"
-                    ToolTip="{Binding Delete_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
+                 Command="{Binding Delete_Command}"
+                 ToolTip="{Binding Delete_ToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Delete.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="1"
-                    Command="{Binding ModifyCurve_Command}"
-                    ToolTip="{Binding ModifyCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
+                 Command="{Binding ModifyCurve_Command}"
+                 ToolTip="{Binding ModifyCurve_ToolTip}"
+                 Visibility="{Binding Compo_Visibility}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/ModifyCurve.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="2"
-                    Command="{Binding AddPointCurve_Command}"
-                    ToolTip="{Binding AddPointCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
+                 Command="{Binding AddPointCurve_Command}"
+                 ToolTip="{Binding AddPointCurve_ToolTip}"
+                 Visibility="{Binding Compo_Visibility}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/AddPointCurve.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="3"
-                    Command="{Binding RemovePointCurve_Command}"
-                    ToolTip="{Binding RemovePointCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
+                 Command="{Binding RemovePointCurve_Command}"
+                 ToolTip="{Binding RemovePointCurve_ToolTip}"
+                 Visibility="{Binding Compo_Visibility}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/RemovePointCurve.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="4"
-                    Command="{Binding Extrude_Command}"
-                    ToolTip="{Binding Extrude_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/Extrude.png" Stretch="Uniform"/>
+                 Command="{Binding Extrude_Command}"
+                 ToolTip="{Binding Extrude_ToolTip}"
+                 Visibility="{Binding Compo_Visibility}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Extrude.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
       </Grid>
    </Border>
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=EditBtn}"
-          PlacementTarget="{Binding ElementName=EditBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <Button Grid.Column="0"
-                    Command="{Binding Delete_Command}"
-                    ToolTip="{Binding Delete_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="1"
-                    Command="{Binding ModifyCurve_Command}"
-                    ToolTip="{Binding ModifyCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="2"
-                    Command="{Binding AddPointCurve_Command}"
-                    ToolTip="{Binding AddPointCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="3"
-                    Command="{Binding RemovePointCurve_Command}"
-                    ToolTip="{Binding RemovePointCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="4"
-                    Command="{Binding Extrude_Command}"
-                    ToolTip="{Binding Extrude_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/Extrude.png" Stretch="Uniform"/>
-            </Button>
-         </Grid>
-      </Border>
-   </Popup>-->
     <!--Grid Button--> 
    <ToggleButton x:Name="GridBtn"
                  Grid.Row="6"
                  Content="Grid"
                  IsChecked="{Binding bGrid_IsChecked}"
                  IsEnabled="{Binding bGrid_IsEnabled}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
    <Border Grid.Column="1"
            Grid.Row="5"
            Grid.RowSpan="3"
            VerticalAlignment="Center"
-           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=GridBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_PopupButton_Border}">
       <Grid>
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
@@ -230,159 +168,91 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <Button Command="{Binding CPlaneTop_Command}" 
-                    ToolTip="{Binding CPlaneTopToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneTOP.png" Stretch="Uniform"/>
+                 ToolTip="{Binding CPlaneTopToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneTOP.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="1"
-                    Command="{Binding CPlaneFront_Command}" 
-                    ToolTip="{Binding CPlaneFrontToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneFRONT.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneFront_Command}" 
+                 ToolTip="{Binding CPlaneFrontToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneFRONT.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="2" 
-                    Command="{Binding CPlaneRight_Command}" 
-                    ToolTip="{Binding CPlaneRightToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneRight_Command}" 
+                 ToolTip="{Binding CPlaneRightToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="3"
-                    Command="{Binding CPlaneBack_Command}" 
-                    ToolTip="{Binding CPlaneBackToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneBACK.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneBack_Command}" 
+                 ToolTip="{Binding CPlaneBackToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneBACK.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="4"
-                    Command="{Binding CPlaneLeft_Command}"
-                    ToolTip="{Binding CPlaneLeftToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneLEFT.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneLeft_Command}"
+                 ToolTip="{Binding CPlaneLeftToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneLEFT.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="5"
-                    Command="{Binding CPlaneBottom_Command}"
-                    ToolTip="{Binding CPlaneBottomToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneBottom_Command}"
+                 ToolTip="{Binding CPlaneBottomToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="6" 
-                    Command="{Binding CPlaneElevation_Command}" 
-                    ToolTip="{Binding CPlaneElevationToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneElevation_Command}" 
+                 ToolTip="{Binding CPlaneElevationToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="7" 
-                    Command="{Binding CPlaneOrigin_Command}" 
-                    ToolTip="{Binding CPlaneOriginToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneORIGIN.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneOrigin_Command}" 
+                 ToolTip="{Binding CPlaneOriginToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneORIGIN.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="8"
-                    Command="{Binding CPlaneObj_Command}"
-                    ToolTip="{Binding CPlaneObjToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneObj_Command}"
+                 ToolTip="{Binding CPlaneObjToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png"
+                   Style="{StaticResource Button_Image}"/>
             </Button>
       </Grid>
    </Border>
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=GridBtn}"
-          PlacementTarget="{Binding ElementName=GridBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <Button Command="{Binding CPlaneTop_Command}" 
-                    ToolTip="{Binding CPlaneTopToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneTOP.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="1"
-                    Command="{Binding CPlaneFront_Command}" 
-                    ToolTip="{Binding CPlaneFrontToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneFRONT.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="2" 
-                    Command="{Binding CPlaneRight_Command}" 
-                    ToolTip="{Binding CPlaneRightToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="3"
-                    Command="{Binding CPlaneBack_Command}" 
-                    ToolTip="{Binding CPlaneBackToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneBACK.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="4"
-                    Command="{Binding CPlaneLeft_Command}"
-                    ToolTip="{Binding CPlaneLeftToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneLEFT.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="5"
-                    Command="{Binding CPlaneBottom_Command}"
-                    ToolTip="{Binding CPlaneBottomToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="6" 
-                    Command="{Binding CPlaneElevation_Command}" 
-                    ToolTip="{Binding CPlaneElevationToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="7" 
-                    Command="{Binding CPlaneRotate_Command}" 
-                    ToolTip="{Binding CPlaneRotateToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneROTATE.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="8"
-                    Command="{Binding CPlane3P_Command}"
-                    ToolTip="{Binding CPlane3PToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CPlane3POINTS.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="9"
-                    Command="{Binding CPlanePerpObj_Command}"
-                    ToolTip="{Binding CPlanePerpObjToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CPlanePERPCURVE.png" Stretch="Uniform"/>
-            </Button>
-            --><!--<Button Grid.Column="10"
-                    Command="{Binding CPlaneObj_Command}"
-                    ToolTip="{Binding CPlaneObjToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png" Stretch="Uniform"/>
-            </Button>--><!--
-         </Grid>
-      </Border>
-   </Popup>-->
     <!--Move Button--> 
    <ToggleButton x:Name="MoveBtn"
                  Grid.Row="7"
                  Content="Move"
                  IsChecked="{Binding bMove_IsChecked}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
    <Border Grid.Column="1"
            Grid.Row="5"
            Grid.RowSpan="5"
            VerticalAlignment="Center"
-           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=MoveBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_Popup_Border}">
       <Grid>
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -425,7 +295,7 @@
                           VerticalAlignment="Center"/>
             <EgtWPFLib5:EgtTextBox Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
                                       Grid.Column="1" 
-                                      Margin="5,0,0,0"
+                                      Margin="5,0,0,2.5"
                                       Style="{StaticResource LeftPanel_TextBox}"/>
          </Grid>
          <Grid Grid.Row="3"
@@ -436,76 +306,19 @@
          </Grid>
       </Grid>
    </Border>
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=MoveBtn}"
-          PlacementTarget="{Binding ElementName=MoveBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid Margin="0,0,0,2.5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="X"
-                          VerticalAlignment="Center"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
-            </Grid>
-            <Grid Grid.Row="1"
-                  Margin="0,2.5,0,2.5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="Y"
-                          VerticalAlignment="Center"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
-            </Grid>
-            <Grid Grid.Row="2"
-                  Margin="0,2.5,0,0">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="Z"
-                          VerticalAlignment="Center"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
-            </Grid>
-            <Grid Grid.Row="3"
-                  Margin="0,2.5,0,0">
-               <Button Content="Drag"
-                       Command="{Binding DragMove_Command}"
-                       Style="{StaticResource LeftPanel_TextButton}"/>
-            </Grid>
-         </Grid>
-      </Border>
-   </Popup>-->
+   <!--Rotate Button-->
    <ToggleButton x:Name="RotateBtn"
                  Grid.Row="8"
                  Content="Rotate"
                  IsChecked="{Binding bRotate_IsChecked}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
    <Border Grid.Column="1"
            Grid.Row="6"
            Grid.RowSpan="5"
            VerticalAlignment="Center"
-           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=RotateBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_Popup_Border}">
       <Grid>
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -529,7 +342,7 @@
          </UniformGrid>
          <EgtWPFLib5:EgtTextBox Grid.Row="1"
                                    Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
-                                   Margin="0,5,0,0"/>
+                                   Margin="0,5,0,2.5"/>
          <Grid Grid.Row="2"
                   Margin="0,2.5,0,0">
             <Button Content="Drag"
@@ -538,47 +351,11 @@
          </Grid>
       </Grid>
    </Border>
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=RotateBtn}"
-          Grid.Column="1"
-          PlacementTarget="{Binding ElementName=RotateBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <UniformGrid Columns="3">
-               <RadioButton Content="X"
-                            GroupName="Axes"
-                            IsChecked="{Binding RotAxes[0]}"
-                            Style="{StaticResource ToolBar_ToggleButton}"/>
-               <RadioButton Content="Y"
-                            GroupName="Axes"
-                            IsChecked="{Binding RotAxes[1]}"
-                            Style="{StaticResource ToolBar_ToggleButton}"/>
-               <RadioButton Content="Z"
-                            GroupName="Axes"
-                            IsChecked="{Binding RotAxes[2]}"
-                            Style="{StaticResource ToolBar_ToggleButton}"/>
-            </UniformGrid>
-            <EgtWPFLib5:EgtTextBox Grid.Row="1"
-                                   Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
-                                   Margin="0,5,0,0"/>
-            <Grid Grid.Row="2"
-                  Margin="0,2.5,0,0">
-               <Button Content="Drag"
-                       Command="{Binding DragRotate_Command}"
-                       Style="{StaticResource LeftPanel_TextButton}"/>
-            </Grid>
-         </Grid>
-      </Border>
-   </Popup>-->
+
    <ToggleButton Content="Parameters"
                  Grid.Row="9"
                  IsChecked="{Binding bMachParam_IsChecked}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
 
 </Grid>
diff --git a/Icarus/ShellNumberPanel/ShellNumberPanelV.xaml b/Icarus/ShellNumberPanel/ShellNumberPanelV.xaml
index 59cf40c..c4f02e4 100644
--- a/Icarus/ShellNumberPanel/ShellNumberPanelV.xaml
+++ b/Icarus/ShellNumberPanel/ShellNumberPanelV.xaml
@@ -32,76 +32,56 @@
              SelectedItem="{Binding SelShellNumber}"
              IsEnabled="{Binding ShellNumberList_IsEnabled}"
              DisplayMemberPath="ghName"
-             Style="{StaticResource FeatureComboBox}"/>
-    <!--Add Button--> 
+             Style="{StaticResource LeftPanel_ComboBox}"/>
+   <!--Add Button-->
    <ToggleButton x:Name="AddBtn" 
                  Grid.Row="4"
                  Content="Add"
                  IsChecked="{Binding bAdd_IsChecked}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
    <Border Grid.Column="1"
            Grid.Row="3"
            Grid.RowSpan="3"
            VerticalAlignment="Center"
-           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=AddBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_PopupButton_Border}">
       <Grid>
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <Button Grid.Column="0"
-                    Command="{Binding Import_Command}"
-                    ToolTip="{Binding Import_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/ProjectManager/Import.png" Stretch="Uniform"/>
+                 Command="{Binding Import_Command}"
+                 ToolTip="{Binding Import_ToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/ProjectManager/Import.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="1"
-                    Command="{Binding Line2P_Command}"
-                    ToolTip="{Binding Line2P_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
+                 Command="{Binding Line2P_Command}"
+                 ToolTip="{Binding Line2P_ToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Line2P.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
       </Grid>
    </Border>
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=AddBtn}"
-          PlacementTarget="{Binding ElementName=AddBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <Button Grid.Column="0"
-                    Command="{Binding Import_Command}"
-                    ToolTip="{Binding Import_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/ProjectManager/Import.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="1"
-                    Command="{Binding Line2P_Command}"
-                    ToolTip="{Binding Line2P_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
-            </Button>
-         </Grid>
-      </Border>
-   </Popup>-->
-    <!--Edit Button--> 
+   <!--Edit Button-->
    <ToggleButton x:Name="EditBtn"
                  Grid.Row="5"
                  Content="Edit"
                  IsChecked="{Binding bEdit_IsChecked}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
    <Border Grid.Column="1"
            Grid.Row="4"
            Grid.RowSpan="3"
            VerticalAlignment="Center"
-           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=EditBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_PopupButton_Border}">
       <Grid>
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
@@ -114,107 +94,65 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <Button Grid.Column="0"
-                    Command="{Binding Delete_Command}"
-                    ToolTip="{Binding Delete_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
+                 Command="{Binding Delete_Command}"
+                 ToolTip="{Binding Delete_ToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Delete.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="1"
-                    Command="{Binding ModifyCurve_Command}"
-                    ToolTip="{Binding ModifyCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
+                 Command="{Binding ModifyCurve_Command}"
+                 ToolTip="{Binding ModifyCurve_ToolTip}"
+                 Visibility="{Binding Compo_Visibility}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/ModifyCurve.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="2"
-                    Command="{Binding AddPointCurve_Command}"
-                    ToolTip="{Binding AddPointCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
+                 Command="{Binding AddPointCurve_Command}"
+                 ToolTip="{Binding AddPointCurve_ToolTip}"
+                 Visibility="{Binding Compo_Visibility}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/AddPointCurve.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="3"
-                    Command="{Binding RemovePointCurve_Command}"
-                    ToolTip="{Binding RemovePointCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
+                 Command="{Binding RemovePointCurve_Command}"
+                 ToolTip="{Binding RemovePointCurve_ToolTip}"
+                 Visibility="{Binding Compo_Visibility}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/RemovePointCurve.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="4"
-                    Command="{Binding Extrude_Command}"
-                    ToolTip="{Binding Extrude_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/Extrude.png" Stretch="Uniform"/>
+                 Command="{Binding Extrude_Command}"
+                 ToolTip="{Binding Extrude_ToolTip}"
+                 Visibility="{Binding Compo_Visibility}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Extrude.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
       </Grid>
    </Border>
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=EditBtn}"
-          PlacementTarget="{Binding ElementName=EditBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <Button Grid.Column="0"
-                    Command="{Binding Delete_Command}"
-                    ToolTip="{Binding Delete_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="1"
-                    Command="{Binding ModifyCurve_Command}"
-                    ToolTip="{Binding ModifyCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="2"
-                    Command="{Binding AddPointCurve_Command}"
-                    ToolTip="{Binding AddPointCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="3"
-                    Command="{Binding RemovePointCurve_Command}"
-                    ToolTip="{Binding RemovePointCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="4"
-                    Command="{Binding Extrude_Command}"
-                    ToolTip="{Binding Extrude_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/Extrude.png" Stretch="Uniform"/>
-            </Button>
-         </Grid>
-      </Border>
-   </Popup>-->
-    <!--Grid Button--> 
+   <!--Grid Button-->
    <ToggleButton x:Name="GridBtn"
                  Grid.Row="6"
                  Content="Grid"
                  IsChecked="{Binding bGrid_IsChecked}"
                  IsEnabled="{Binding bGrid_IsEnabled}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
    <Border Grid.Column="1"
            Grid.Row="5"
            Grid.RowSpan="3"
            VerticalAlignment="Center"
-           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=GridBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_PopupButton_Border}">
       <Grid>
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
@@ -230,159 +168,91 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <Button Command="{Binding CPlaneTop_Command}" 
-                    ToolTip="{Binding CPlaneTopToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneTOP.png" Stretch="Uniform"/>
+                 ToolTip="{Binding CPlaneTopToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneTOP.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="1"
-                    Command="{Binding CPlaneFront_Command}" 
-                    ToolTip="{Binding CPlaneFrontToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneFRONT.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneFront_Command}" 
+                 ToolTip="{Binding CPlaneFrontToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneFRONT.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="2" 
-                    Command="{Binding CPlaneRight_Command}" 
-                    ToolTip="{Binding CPlaneRightToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneRight_Command}" 
+                 ToolTip="{Binding CPlaneRightToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="3"
-                    Command="{Binding CPlaneBack_Command}" 
-                    ToolTip="{Binding CPlaneBackToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneBACK.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneBack_Command}" 
+                 ToolTip="{Binding CPlaneBackToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneBACK.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="4"
-                    Command="{Binding CPlaneLeft_Command}"
-                    ToolTip="{Binding CPlaneLeftToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneLEFT.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneLeft_Command}"
+                 ToolTip="{Binding CPlaneLeftToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneLEFT.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="5"
-                    Command="{Binding CPlaneBottom_Command}"
-                    ToolTip="{Binding CPlaneBottomToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneBottom_Command}"
+                 ToolTip="{Binding CPlaneBottomToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="6" 
-                    Command="{Binding CPlaneElevation_Command}" 
-                    ToolTip="{Binding CPlaneElevationToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneElevation_Command}" 
+                 ToolTip="{Binding CPlaneElevationToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="7"
-                    Command="{Binding CPlaneOrigin_Command}"
-                    ToolTip="{Binding CPlaneOriginToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CPlaneORIGIN.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneOrigin_Command}"
+                 ToolTip="{Binding CPlaneOriginToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CPlaneORIGIN.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="8"
-                    Command="{Binding CPlaneObj_Command}"
-                    ToolTip="{Binding CPlaneObjToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png" Stretch="Uniform"/>
-            </Button>
+                 Command="{Binding CPlaneObj_Command}"
+                 ToolTip="{Binding CPlaneObjToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
       </Grid>
    </Border>
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=GridBtn}"
-          PlacementTarget="{Binding ElementName=GridBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <Button Command="{Binding CPlaneTop_Command}" 
-                    ToolTip="{Binding CPlaneTopToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneTOP.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="1"
-                    Command="{Binding CPlaneFront_Command}" 
-                    ToolTip="{Binding CPlaneFrontToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneFRONT.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="2" 
-                    Command="{Binding CPlaneRight_Command}" 
-                    ToolTip="{Binding CPlaneRightToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="3"
-                    Command="{Binding CPlaneBack_Command}" 
-                    ToolTip="{Binding CPlaneBackToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneBACK.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="4"
-                    Command="{Binding CPlaneLeft_Command}"
-                    ToolTip="{Binding CPlaneLeftToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneLEFT.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="5"
-                    Command="{Binding CPlaneBottom_Command}"
-                    ToolTip="{Binding CPlaneBottomToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="6" 
-                    Command="{Binding CPlaneElevation_Command}" 
-                    ToolTip="{Binding CPlaneElevationToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="7" 
-                    Command="{Binding CPlaneRotate_Command}" 
-                    ToolTip="{Binding CPlaneRotateToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneROTATE.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="8"
-                    Command="{Binding CPlane3P_Command}"
-                    ToolTip="{Binding CPlane3PToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CPlane3POINTS.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="9"
-                    Command="{Binding CPlanePerpObj_Command}"
-                    ToolTip="{Binding CPlanePerpObjToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CPlanePERPCURVE.png" Stretch="Uniform"/>
-            </Button>
-            --><!--<Button Grid.Column="10"
-                    Command="{Binding CPlaneObj_Command}"
-                    ToolTip="{Binding CPlaneObjToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png" Stretch="Uniform"/>
-            </Button>--><!--
-         </Grid>
-      </Border>
-   </Popup>-->
-    <!--Move Button--> 
+   <!--Move Button-->
    <ToggleButton x:Name="MoveBtn" 
                  Grid.Row="7"
                  Content="Move"
                  IsChecked="{Binding bMove_IsChecked}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
    <Border Grid.Column="1"
            Grid.Row="5"
            Grid.RowSpan="5"
            VerticalAlignment="Center"
-           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=MoveBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_Popup_Border}">
       <Grid>
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -396,116 +266,59 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="X"
-                          VerticalAlignment="Center"/>
+                       VerticalAlignment="Center"/>
             <EgtWPFLib5:EgtTextBox Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
+                                   Grid.Column="1" 
+                                   Margin="5,0,0,0"
+                                   Style="{StaticResource LeftPanel_TextBox}"/>
          </Grid>
          <Grid Grid.Row="1"
-                  Margin="0,2.5,0,2.5">
+               Margin="0,2.5,0,2.5">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="Y"
-                          VerticalAlignment="Center"/>
+                       VerticalAlignment="Center"/>
             <EgtWPFLib5:EgtTextBox Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
+                                   Grid.Column="1" 
+                                   Margin="5,0,0,0"
+                                   Style="{StaticResource LeftPanel_TextBox}"/>
          </Grid>
          <Grid Grid.Row="2"
-                  Margin="0,2.5,0,0">
+               Margin="0,2.5,0,2.5">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="Z"
-                          VerticalAlignment="Center"/>
+                       VerticalAlignment="Center"/>
             <EgtWPFLib5:EgtTextBox Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
+                                   Grid.Column="1" 
+                                   Margin="5,0,0,0"
+                                   Style="{StaticResource LeftPanel_TextBox}"/>
          </Grid>
          <Grid Grid.Row="3"
-                  Margin="0,2.5,0,0">
+               Margin="0,2.5,0,0">
             <Button Content="Drag"
-                       Command="{Binding DragMove_Command}"
-                       Style="{StaticResource LeftPanel_TextButton}"/>
+                    Command="{Binding DragMove_Command}"
+                    Style="{StaticResource LeftPanel_TextButton}"/>
          </Grid>
       </Grid>
    </Border>
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=MoveBtn}"
-          PlacementTarget="{Binding ElementName=MoveBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid Margin="0,0,0,2.5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="X"
-                          VerticalAlignment="Center"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
-            </Grid>
-            <Grid Grid.Row="1"
-                  Margin="0,2.5,0,2.5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="Y"
-                          VerticalAlignment="Center"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
-            </Grid>
-            <Grid Grid.Row="2"
-                  Margin="0,2.5,0,0">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="Z"
-                          VerticalAlignment="Center"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
-            </Grid>
-            <Grid Grid.Row="3"
-                  Margin="0,2.5,0,0">
-               <Button Content="Drag"
-                       Command="{Binding DragMove_Command}"
-                       Style="{StaticResource LeftPanel_TextButton}"/>
-            </Grid>
-         </Grid>
-      </Border>
-   </Popup>-->
+   <!--Rotate Button-->
    <ToggleButton x:Name="RotateBtn"
                  Grid.Row="8"
                  Content="Rotate"
                  IsChecked="{Binding bRotate_IsChecked}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
    <Border Grid.Column="1"
            Grid.Row="6"
            Grid.RowSpan="5"
            VerticalAlignment="Center"
-           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=RotateBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_Popup_Border}">
       <Grid>
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -515,70 +328,34 @@
          </Grid.RowDefinitions>
          <UniformGrid Columns="3">
             <RadioButton Content="X"
-                            GroupName="Axes"
-                            IsChecked="{Binding RotX}"
-                            Style="{StaticResource ToolBar_ToggleButton}"/>
+                         GroupName="Axes"
+                         IsChecked="{Binding RotX}"
+                         Style="{StaticResource ToolBar_ToggleButton}"/>
             <RadioButton Content="Y"
-                            GroupName="Axes"
-                            IsChecked="{Binding RotY}"
-                            Style="{StaticResource ToolBar_ToggleButton}"/>
+                         GroupName="Axes"
+                         IsChecked="{Binding RotY}"
+                         Style="{StaticResource ToolBar_ToggleButton}"/>
             <RadioButton Content="Z"
-                            GroupName="Axes"
-                            IsChecked="{Binding RotZ}"
-                            Style="{StaticResource ToolBar_ToggleButton}"/>
+                         GroupName="Axes"
+                         IsChecked="{Binding RotZ}"
+                         Style="{StaticResource ToolBar_ToggleButton}"/>
          </UniformGrid>
          <EgtWPFLib5:EgtTextBox Grid.Row="1"
-                                   Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
-                                   Margin="0,5,0,0"/>
+                                Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
+                                Margin="0,5,0,2.5"/>
          <Grid Grid.Row="2"
-                  Margin="0,2.5,0,0">
+               Margin="0,2.5,0,0">
             <Button Content="Drag"
-                       Command="{Binding DragRotate_Command}"
-                       Style="{StaticResource LeftPanel_TextButton}"/>
+                    Command="{Binding DragRotate_Command}"
+                    Style="{StaticResource LeftPanel_TextButton}"/>
          </Grid>
       </Grid>
    </Border>
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=RotateBtn}"
-          Grid.Column="1"
-          PlacementTarget="{Binding ElementName=RotateBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <UniformGrid Columns="3">
-               <RadioButton Content="X"
-                            GroupName="Axes"
-                            IsChecked="{Binding RotAxes[0]}"
-                            Style="{StaticResource ToolBar_ToggleButton}"/>
-               <RadioButton Content="Y"
-                            GroupName="Axes"
-                            IsChecked="{Binding RotAxes[1]}"
-                            Style="{StaticResource ToolBar_ToggleButton}"/>
-               <RadioButton Content="Z"
-                            GroupName="Axes"
-                            IsChecked="{Binding RotAxes[2]}"
-                            Style="{StaticResource ToolBar_ToggleButton}"/>
-            </UniformGrid>
-            <EgtWPFLib5:EgtTextBox Grid.Row="1"
-                                   Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
-                                   Margin="0,5,0,0"/>
-            <Grid Grid.Row="2"
-                  Margin="0,2.5,0,0">
-               <Button Content="Drag"
-                       Command="{Binding DragRotate_Command}"
-                       Style="{StaticResource LeftPanel_TextButton}"/>
-            </Grid>
-         </Grid>
-      </Border>
-   </Popup>-->
+   <!--Parameters Button-->
    <ToggleButton Content="Parameters"
                  Grid.Row="9"
                  IsChecked="{Binding bMachParam_IsChecked}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
 
 </Grid>
diff --git a/Icarus/SliceManager/SliceManagerV.xaml b/Icarus/SliceManager/SliceManagerV.xaml
index 546451d..3084603 100644
--- a/Icarus/SliceManager/SliceManagerV.xaml
+++ b/Icarus/SliceManager/SliceManagerV.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Width="320">
    <Border VerticalAlignment="Bottom"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_Popup_Border}">
       <Grid>
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
diff --git a/Icarus/StartMachPanel/StartMachPanelV.xaml b/Icarus/StartMachPanel/StartMachPanelV.xaml
index e2cd325..c6f2be8 100644
--- a/Icarus/StartMachPanel/StartMachPanelV.xaml
+++ b/Icarus/StartMachPanel/StartMachPanelV.xaml
@@ -29,76 +29,56 @@
              ItemsSource="{Binding StartList}"
              SelectedItem="{Binding SelStart}"
              DisplayMemberPath="ghName"
-             Style="{StaticResource FeatureComboBox}"/>
+             Style="{StaticResource LeftPanel_ComboBox}"/>
    <!-- Add Button -->
    <ToggleButton x:Name="AddBtn"
                  Grid.Row="4"
                  Content="Add"
                  IsChecked="{Binding bAdd_IsChecked}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
    <Border Grid.Column="1"
            Grid.Row="3"
            Grid.RowSpan="3"
            VerticalAlignment="Center"
-           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=AddBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_PopupButton_Border}">
       <Grid>
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <Button Grid.Column="0"
-                    Command="{Binding Point_Command}"
-                    ToolTip="{Binding Point_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
+                 Command="{Binding Point_Command}"
+                 ToolTip="{Binding Point_ToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Point.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="1"
-                    Command="{Binding Line2P_Command}"
-                    ToolTip="{Binding Line2P_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
+                 Command="{Binding Line2P_Command}"
+                 ToolTip="{Binding Line2P_ToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Line2P.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
       </Grid>
    </Border>
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=AddBtn}"
-          PlacementTarget="{Binding ElementName=AddBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <Button Grid.Column="0"
-                    Command="{Binding Point_Command}"
-                    ToolTip="{Binding Point_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="1"
-                    Command="{Binding Line2P_Command}"
-                    ToolTip="{Binding Line2P_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
-            </Button>
-         </Grid>
-      </Border>
-   </Popup>-->
    <!-- Edit Button -->
    <ToggleButton x:Name="EditBtn"
                  Grid.Row="5"
                  Content="Edit"
                  IsChecked="{Binding bEdit_IsChecked}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
    <Border Grid.Column="1"
            Grid.Row="4"
            Grid.RowSpan="3"
            VerticalAlignment="Center"
-           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=EditBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_PopupButton_Border}">
       <Grid>
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
@@ -111,93 +91,56 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <Button Grid.Column="0"
-                    Command="{Binding Delete_Command}"
-                    ToolTip="{Binding Delete_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
+                 Command="{Binding Delete_Command}"
+                 ToolTip="{Binding Delete_ToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/Delete.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="1"
-                    Command="{Binding ModifyCurve_Command}"
-                    ToolTip="{Binding ModifyCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
+                 Command="{Binding ModifyCurve_Command}"
+                 ToolTip="{Binding ModifyCurve_ToolTip}"
+                 Visibility="{Binding Compo_Visibility}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/ModifyCurve.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="2"
-                    Command="{Binding AddPointCurve_Command}"
-                    ToolTip="{Binding AddPointCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
+                 Command="{Binding AddPointCurve_Command}"
+                 ToolTip="{Binding AddPointCurve_ToolTip}"
+                 Visibility="{Binding Compo_Visibility}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/AddPointCurve.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="3"
-                    Command="{Binding RemovePointCurve_Command}"
-                    ToolTip="{Binding RemovePointCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
+                 Command="{Binding RemovePointCurve_Command}"
+                 ToolTip="{Binding RemovePointCurve_ToolTip}"
+                 Visibility="{Binding Compo_Visibility}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/DrawPanel/RemovePointCurve.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
       </Grid>
    </Border>
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=EditBtn}"
-          PlacementTarget="{Binding ElementName=EditBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <Button Grid.Column="0"
-                    Command="{Binding Delete_Command}"
-                    ToolTip="{Binding Delete_ToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="1"
-                    Command="{Binding ModifyCurve_Command}"
-                    ToolTip="{Binding ModifyCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="2"
-                    Command="{Binding AddPointCurve_Command}"
-                    ToolTip="{Binding AddPointCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="3"
-                    Command="{Binding RemovePointCurve_Command}"
-                    ToolTip="{Binding RemovePointCurve_ToolTip}"
-                    Visibility="{Binding Compo_Visibility}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
-            </Button>
-         </Grid>
-      </Border>
-   </Popup>-->
    <!-- Grid Button -->
    <ToggleButton x:Name="GridBtn"
                  Grid.Row="6"
                  Content="Grid"
                  IsChecked="{Binding bGrid_IsChecked}"
                  IsEnabled="{Binding bGrid_IsEnabled}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
    <Border Grid.Column="1"
            Grid.Row="5"
            Grid.RowSpan="3"
            VerticalAlignment="Center"
-           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=GridBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_PopupButton_Border}">
       <Grid>
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
@@ -211,138 +154,91 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <Button Command="{Binding CPlaneTop_Command}" 
-                    ToolTip="{Binding CPlaneTopToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneTOP.png" Stretch="Uniform"/>
+                 ToolTip="{Binding CPlaneTopToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneTOP.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="1"
-                    Command="{Binding CPlaneFront_Command}" 
-                    ToolTip="{Binding CPlaneFrontToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneFRONT.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneFront_Command}" 
+                 ToolTip="{Binding CPlaneFrontToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneFRONT.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="2" 
-                    Command="{Binding CPlaneRight_Command}" 
-                    ToolTip="{Binding CPlaneRightToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneRight_Command}" 
+                 ToolTip="{Binding CPlaneRightToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="3"
-                    Command="{Binding CPlaneBack_Command}" 
-                    ToolTip="{Binding CPlaneBackToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneBACK.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneBack_Command}" 
+                 ToolTip="{Binding CPlaneBackToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneBACK.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="4"
-                    Command="{Binding CPlaneLeft_Command}"
-                    ToolTip="{Binding CPlaneLeftToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneLEFT.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneLeft_Command}"
+                 ToolTip="{Binding CPlaneLeftToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneLEFT.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="5"
-                    Command="{Binding CPlaneBottom_Command}"
-                    ToolTip="{Binding CPlaneBottomToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneBottom_Command}"
+                 ToolTip="{Binding CPlaneBottomToolTip}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="6" 
-                    Command="{Binding CPlaneElevation_Command}" 
-                    ToolTip="{Binding CPlaneElevationToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneElevation_Command}" 
+                 ToolTip="{Binding CPlaneElevationToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="7"
-                    Command="{Binding CPlaneOrigin_Command}"
-                    ToolTip="{Binding CPlaneOriginToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneORIGIN.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneOrigin_Command}"
+                 ToolTip="{Binding CPlaneOriginToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneORIGIN.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="8"
-                    Command="{Binding CPlaneObj_Command}"
-                    ToolTip="{Binding CPlaneObjToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png" Stretch="Uniform"/>
+                 Command="{Binding CPlaneObj_Command}"
+                 ToolTip="{Binding CPlaneObjToolTip}" 
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
       </Grid>
    </Border>
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=GridBtn}"
-          PlacementTarget="{Binding ElementName=GridBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <Button Command="{Binding CPlaneTop_Command}" 
-                    ToolTip="{Binding CPlaneTopToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneTOP.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="1"
-                    Command="{Binding CPlaneFront_Command}" 
-                    ToolTip="{Binding CPlaneFrontToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneFRONT.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="2" 
-                    Command="{Binding CPlaneRight_Command}" 
-                    ToolTip="{Binding CPlaneRightToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="3"
-                    Command="{Binding CPlaneBack_Command}" 
-                    ToolTip="{Binding CPlaneBackToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneBACK.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="4"
-                    Command="{Binding CPlaneLeft_Command}"
-                    ToolTip="{Binding CPlaneLeftToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneLEFT.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="5"
-                    Command="{Binding CPlaneBottom_Command}"
-                    ToolTip="{Binding CPlaneBottomToolTip}"
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="6" 
-                    Command="{Binding CPlaneElevation_Command}" 
-                    ToolTip="{Binding CPlaneElevationToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png" Stretch="Uniform"/>
-            </Button>
-            <Button Grid.Column="7"
-                    Command="{Binding CPlaneOrigin_Command}"
-                    ToolTip="{Binding CPlaneOriginToolTip}" 
-                    Style="{StaticResource ToolBar_Button}">
-               <Image Source="/Resources/GridViewPanel/CplaneORIGIN.png" Stretch="Uniform"/>
-            </Button>
-         </Grid>
-      </Border>
-   </Popup>-->
    <!-- Move Button -->
    <ToggleButton x:Name="MoveBtn" 
                  Grid.Row="7"
                  Content="Move"
                  IsChecked="{Binding bMove_IsChecked}"
-                 Style="{StaticResource ToolBar_TextToggleButton}"/>
+                 Margin="0,2.5,0,2.5"
+                 Style="{StaticResource LeftPanel_ToggleButton}"/>
    <Border Grid.Column="1"
            Grid.Row="5"
            Grid.RowSpan="5"
            VerticalAlignment="Center"
-           Margin="5,0,0,0"
            Visibility="{Binding IsChecked, ElementName=MoveBtn, Converter={StaticResource FromBooleanToVisibility}}"
-           Style="{StaticResource LeftPanelPopup_Border}">
+           Style="{StaticResource LeftPanel_Popup_Border}">
       <Grid>
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -358,9 +254,9 @@
             <TextBlock Text="X"
                           VerticalAlignment="Center"/>
             <EgtWPFLib5:EgtTextBox Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
+                                   Grid.Column="1"
+                                   Margin="5,0,0,0"
+                                   Style="{StaticResource LeftPanel_TextBox}"/>
          </Grid>
          <Grid Grid.Row="1"
                   Margin="0,2.5,0,2.5">
@@ -371,12 +267,12 @@
             <TextBlock Text="Y"
                           VerticalAlignment="Center"/>
             <EgtWPFLib5:EgtTextBox Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
+                                   Grid.Column="1" 
+                                   Margin="5,0,0,0"
+                                   Style="{StaticResource LeftPanel_TextBox}"/>
          </Grid>
          <Grid Grid.Row="2"
-                  Margin="0,2.5,0,0">
+                  Margin="0,2.5,0,2.5">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="1*"/>
@@ -384,75 +280,17 @@
             <TextBlock Text="Z"
                           VerticalAlignment="Center"/>
             <EgtWPFLib5:EgtTextBox Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
+                                   Grid.Column="1" 
+                                   Margin="5,0,0,0"
+                                   Style="{StaticResource LeftPanel_TextBox}"/>
          </Grid>
          <Grid Grid.Row="3"
-                  Margin="0,2.5,0,0">
+               Margin="0,2.5,0,0">
             <Button Content="Drag"
-                       Command="{Binding DragMove_Command}"
-                       Style="{StaticResource LeftPanel_TextButton}"/>
+                    Command="{Binding DragMove_Command}"
+                    Style="{StaticResource LeftPanel_TextButton}"/>
          </Grid>
       </Grid>
    </Border>
-   <!--<Popup IsOpen="{Binding IsChecked, ElementName=MoveBtn}"
-          PlacementTarget="{Binding ElementName=MoveBtn}"
-          Style="{StaticResource LeftPanel_Popup}">
-      <Border Style="{StaticResource LeftPanelPopup_Border}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid Margin="0,0,0,2.5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="X"
-                          VerticalAlignment="Center"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
-            </Grid>
-            <Grid Grid.Row="1"
-                  Margin="0,2.5,0,2.5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="Y"
-                          VerticalAlignment="Center"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
-            </Grid>
-            <Grid Grid.Row="2"
-                  Margin="0,2.5,0,0">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="Z"
-                          VerticalAlignment="Center"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
-            </Grid>
-            <Grid Grid.Row="3"
-                  Margin="0,2.5,0,0">
-               <Button Content="Drag"
-                       Command="{Binding DragMove_Command}"
-                       Style="{StaticResource LeftPanel_TextButton}"/>
-            </Grid>
-         </Grid>
-      </Border>
-   </Popup>-->
    
 </Grid>
diff --git a/Icarus/TopPanel/TopPanelV.xaml b/Icarus/TopPanel/TopPanelV.xaml
index 0e4bd94..58b91c2 100644
--- a/Icarus/TopPanel/TopPanelV.xaml
+++ b/Icarus/TopPanel/TopPanelV.xaml
@@ -50,8 +50,9 @@
             </ComboBox>
             <Button Grid.Column="1"
                     Command="{Binding PartModify_Command}"
+                    Margin="-2"
                     Style="{StaticResource TopPanel_Button}">
-               <Image Source="/Resources/TopPanel/ManagePart.png"/>
+               <Image Source="/Resources/TopPanel/ManagePart.png" Stretch="Uniform"/>
             </Button>
          </Grid>
       </Border>
@@ -68,7 +69,9 @@
           PlacementTarget="{Binding ElementName=ModifyBtn}"
           StaysOpen="False"
           Style="{StaticResource BottomPanel_Popup}">
-         <Border x:Name="PopupBrd">
+         <Border x:Name="PopupBrd"
+                 Height="56"
+                 Style="{StaticResource TopPanel_ModifyMode_Border}">
             <!--<Border.Background>
                <SolidColorBrush Color="White" Opacity="0.5"/>
             </Border.Background>-->
@@ -102,8 +105,7 @@
                   <DataTemplate>
                      <RadioButton Content="{Binding sName}"
                                   IsChecked="{Binding IsSelected,RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
-                                  Margin="5,0,5,0"
-                                  Width="100"
+                                  Margin="2.5,0,2.5,0"
                                   Style="{StaticResource TopPanel_ModifyMode_ToggleButton}"/>
                   </DataTemplate>
                </ListBox.ItemTemplate>
@@ -127,8 +129,11 @@
                       Style="{StaticResource TopPanel_ComboBox}"/>
             <Button Grid.Column="1"
                     Command="{Binding MaterialDb_Command}"
+                    Width="40"
+                    Height="40"
+                    Margin="-2"
                     Style="{StaticResource TopPanel_Button}">
-               <Image Source="/Resources/TopPanel/MaterialDb.png"/>
+               <Image Source="/Resources/TopPanel/MaterialDb.png" Stretch="Uniform"/>
             </Button>
          </Grid>
       </Border>
@@ -150,8 +155,9 @@
             </ComboBox>
             <Button Grid.Column="1"
                     Command="{Binding PrintParamDb_Command}"
-                    Style="{StaticResource PrintParamDb_Button}">
-               <Image Source="/Resources/TopPanel/MachiningDb.png"/>
+                    Margin="-2"
+                    Style="{StaticResource TopPanel_Button}">
+               <Image Source="/Resources/TopPanel/MachiningDb.png" Stretch="Uniform"/>
             </Button>
          </Grid>
       </Border>
@@ -162,64 +168,70 @@
               Command="{Binding Machining_Command}"
               Margin="2.5,0,0,0"
               HorizontalContentAlignment="Stretch"
+              VerticalContentAlignment="Center"
               Style="{StaticResource TopPanel_CurrMachining_Button}">
-         <Grid HorizontalAlignment="Stretch">
+         <Grid Margin="5,0,5,0">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="3*"/>
+               <ColumnDefinition Width="4*"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="1.5*"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="1.5*"/>
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1.5*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="Slicing direction:"
-                       HorizontalAlignment="Right"
-                       Style="{StaticResource TopPanel_TextBlock}"/>
+                       VerticalAlignment="Bottom"
+                       Style="{StaticResource TopPanelFixed_TextBlock}"/>
             <TextBlock Grid.Column="1"
                        Text="{Binding CurrMachining.sCurrSlicingType}"
                        HorizontalAlignment="Left"
-                       Margin="5,0,0,0"
-                       Style="{StaticResource TopPanel_TextBlock}"/>
+                       VerticalAlignment="Bottom"
+                       Margin="5,0,5,0"
+                       Style="{StaticResource TopPanelData_TextBlock}"/>
             <TextBlock Grid.Column="2"
                        Text="StrandH:"
-                       HorizontalAlignment="Right"
-                       Style="{StaticResource TopPanel_TextBlock}"/>
+                       VerticalAlignment="Bottom"
+                       Style="{StaticResource TopPanelFixed_TextBlock}"/>
             <TextBlock Grid.Column="3"
                        Text="{Binding CurrMachining.sCurrStrandH}"
                        HorizontalAlignment="Left"
-                       Margin="5,0,0,0"
-                       Style="{StaticResource TopPanel_TextBlock}"/>
+                       VerticalAlignment="Bottom"
+                       Margin="5,0,5,0"
+                       Style="{StaticResource TopPanelData_TextBlock}"/>
             <TextBlock Grid.Column="4"
                        Text="StrandW:"
-                       HorizontalAlignment="Right"
-                       Style="{StaticResource TopPanel_TextBlock}"/>
+                       VerticalAlignment="Bottom"
+                       Style="{StaticResource TopPanelFixed_TextBlock}"/>
             <TextBlock Grid.Column="5"
                        Text="{Binding CurrMachining.sCurrStrandW}"
                        HorizontalAlignment="Left"
-                       Margin="5,0,0,0"
-                       Style="{StaticResource TopPanel_TextBlock}"/>
+                       VerticalAlignment="Bottom"
+                       Margin="5,0,5,0"
+                       Style="{StaticResource TopPanelData_TextBlock}"/>
             <TextBlock Grid.Column="6"
                        Text="StrandCount:"
-                       HorizontalAlignment="Right"
-                       Style="{StaticResource TopPanel_TextBlock}"/>
+                       VerticalAlignment="Bottom"
+                       Style="{StaticResource TopPanelFixed_TextBlock}"/>
             <TextBlock Grid.Column="7"
                        Text="{Binding CurrMachining.sCurrStrandCount}"
                        HorizontalAlignment="Left"
-                       Margin="5,0,0,0"
-                       Style="{StaticResource TopPanel_TextBlock}"/>
+                       VerticalAlignment="Bottom"
+                       Margin="5,0,5,0"
+                       Style="{StaticResource TopPanelData_TextBlock}"/>
             <TextBlock Grid.Column="8"
                        Text="Offset:"
-                       HorizontalAlignment="Right"
-                       Style="{StaticResource TopPanel_TextBlock}"/>
+                       VerticalAlignment="Bottom"
+                       Style="{StaticResource TopPanelFixed_TextBlock}"/>
             <TextBlock Grid.Column="9"
                        Text="{Binding CurrMachining.sCurrOffset}"
                        HorizontalAlignment="Left"
-                       Margin="5,0,0,0"
-                       Style="{StaticResource TopPanel_TextBlock}"/>
+                       VerticalAlignment="Bottom"
+                       Margin="5,0,5,0"
+                       Style="{StaticResource TopPanelData_TextBlock}"/>
          </Grid>
       </Button>
 
diff --git a/Icarus/Utility/Dictionary.xaml b/Icarus/Utility/Dictionary.xaml
index d8d1fbd..6afa01b 100644
--- a/Icarus/Utility/Dictionary.xaml
+++ b/Icarus/Utility/Dictionary.xaml
@@ -135,14 +135,16 @@
    <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383"/>
    <Style TargetType="{x:Type Button}">
       <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
-      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderBrush" Value="{StaticResource Icarus_Gray}"/>
+      <Setter Property="Foreground" Value="{StaticResource Icarus_Gray}"/>
       <Setter Property="BorderThickness" Value="1"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
       <Setter Property="Padding" Value="1"/>
-      <Setter Property="Margin" Value="1"/>
+      <Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
+      <Setter Property="FontWeight" Value="Normal"/>
+      <Setter Property="FontSize" Value="12"/>
       <Setter Property="ToolTipService.ShowOnDisabled" Value="True"/>
       <Setter Property="Template">
          <Setter.Value>
@@ -245,10 +247,17 @@
       </Setter>
    </Style>
 
-   <Style x:Key="TopPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+   <Style x:Key="ProjManager_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
       <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderThickness" Value="0"/>
+   </Style>
+
+   <Style x:Key="TopPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="35"/>
+      <Setter Property="Width" Value="35"/>
+      <Setter Property="Background" Value="White"/>
       <Setter Property="BorderBrush" Value="White"/>
       <Setter Property="BorderThickness" Value="0"/>
    </Style>
@@ -266,14 +275,15 @@
 
    <Style TargetType="{x:Type ToggleButton}">
       <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-      <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
-      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="Background" Value="White" />
+      <Setter Property="BorderBrush" Value="{StaticResource Icarus_Gray}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Foreground" Value="{StaticResource Icarus_Gray}" />
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
       <Setter Property="Padding" Value="1"/>
-      <Setter Property="Margin" Value="1"/>
+      <Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
+      <Setter Property="FontWeight" Value="Normal"/>
       <Setter Property="Template">
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type ToggleButton}">
@@ -293,8 +303,9 @@
                      <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
                   </Trigger>
                   <Trigger Property="IsChecked" Value="true">
-                     <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Pressed.Background}"/>
-                     <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>
+                     <Setter Property="Background" TargetName="border" Value="{StaticResource Icarus_Gray}"/>
+                     <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="White"/>
+                     <!--<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>-->
                   </Trigger>
                   <Trigger Property="IsEnabled" Value="false">
                      <Setter Property="Background" TargetName="border" Value="{StaticResource Button.Disabled.Background}"/>
@@ -412,6 +423,7 @@
 
    <Style x:Key="TopPanel_Modify_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
       <Setter Property="Background" Value="White" />
+      <Setter Property="Foreground" Value="Black" />
       <Setter Property="BorderBrush" Value="White"/>
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="Padding" Value="4"/>
@@ -423,17 +435,21 @@
    <Style x:Key="TopPanel_ModifyMode_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
       <Setter Property="Height" Value="28"/>
       <Setter Property="Width" Value="110"/>
-      <Setter Property="Background" Value="White" />
-      <Setter Property="BorderBrush" Value="{StaticResource Icarus_Gray}" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="Foreground" Value="{StaticResource Icarus_Gray}" />
+      <Setter Property="FontSize" Value="12"/>
+   </Style>
+
+   <Style x:Key="LeftPanel_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+      <Setter Property="Height" Value="28"/>
+      <Setter Property="Width" Value="125"/>
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="HorizontalContentAlignment" Value="Left"/>
+      <Setter Property="Padding" Value="20,0,0,0"/>
       <Style.Triggers>
          <Trigger Property="IsChecked" Value="True">
-            <Setter Property="Background" Value="{StaticResource Icarus_Gray}" />
-            <Setter Property="TextElement.Foreground" Value="White" />
+            <Setter Property="Width" Value="136"/>
+            <Setter Property="BorderThickness" Value="0"/>
          </Trigger>
       </Style.Triggers>
-
    </Style>
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
@@ -477,14 +493,22 @@
       <Setter Property="Margin" Value="10,0,10,0"/>
    </Style>
 
-   <Style x:Key="TopPanel_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+   <Style x:Key="TSFEditor_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+
+   <Style x:Key="TopPanelFixed_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="FontSize" Value="16"/>
+      <Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
+      <Setter Property="FontWeight" Value="Light"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+   
+   <Style x:Key="TopPanelData_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
       <Setter Property="FontSize" Value="18"/>
       <Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
       <Setter Property="FontWeight" Value="Light"/>
-   </Style>
-
-   <Style x:Key="TSFEditor_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
    </Style>
 
@@ -540,6 +564,421 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+   <!-- Image -->
+
+   <Style x:Key="Button_Image" TargetType="{x:Type Image}">
+      <Setter Property="Stretch" Value="Uniform" />
+   </Style>
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!-- ContextMenu -->
+
+   <Style x:Key="Icarus_ContextMenu" TargetType="{x:Type ContextMenu}">
+      <Setter Property="SnapsToDevicePixels" Value="True" />
+      <Setter Property="OverridesDefaultStyle" Value="True" />
+      <Setter Property="Grid.IsSharedSizeScope" Value="true" />
+      <Setter Property="HasDropShadow" Value="True" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ContextMenu}">
+               <Border x:Name="Border"
+                       CornerRadius="4"
+                       Background="White"
+                       BorderBrush="{StaticResource Icarus_Gray}"
+                       BorderThickness="1"
+                       Padding="4">
+                  <StackPanel IsItemsHost="True"
+                              KeyboardNavigation.DirectionalNavigation="Cycle" />
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="HasDropShadow" Value="true">
+                     <Setter TargetName="Border" Property="Padding" Value="4" />
+                     <Setter TargetName="Border" Property="CornerRadius" Value="4" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+
+   <!-- ContextMenuItem -->
+
+   <!-- Fill Brushes -->
+
+   <LinearGradientBrush x:Key="NormalBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFF" Offset="0.0"/>
+            <GradientStop Color="#CCC" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="HorizontalNormalBrush" StartPoint="0,0" EndPoint="1,0">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFF" Offset="0.0"/>
+            <GradientStop Color="#CCC" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="LightBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFF" Offset="0.0"/>
+            <GradientStop Color="#EEE" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="HorizontalLightBrush" StartPoint="0,0" EndPoint="1,0">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFF" Offset="0.0"/>
+            <GradientStop Color="#EEE" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="DarkBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFF" Offset="0.0"/>
+            <GradientStop Color="#AAA" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PressedBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#BBB" Offset="0.0"/>
+            <GradientStop Color="#EEE" Offset="0.1"/>
+            <GradientStop Color="#EEE" Offset="0.9"/>
+            <GradientStop Color="#FFF" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#888" />
+
+   <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#EEE" />
+
+   <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FFF" />
+
+   <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#DDD" />
+
+   <!-- Border Brushes -->
+
+   <LinearGradientBrush x:Key="NormalBorderBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#CCC" Offset="0.0"/>
+            <GradientStop Color="#444" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="HorizontalNormalBorderBrush" StartPoint="0,0" EndPoint="1,0">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#CCC" Offset="0.0"/>
+            <GradientStop Color="#444" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="DefaultedBorderBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#777" Offset="0.0"/>
+            <GradientStop Color="#000" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PressedBorderBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#444" Offset="0.0"/>
+            <GradientStop Color="#888" Offset="1.0"/>
+         </GradientStopCollection>
+      </GradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
+
+   <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
+
+   <SolidColorBrush x:Key="LightBorderBrush" Color="#AAA" />
+
+   <!-- Miscellaneous Brushes -->
+   <SolidColorBrush x:Key="GlyphBrush" Color="#444" />
+
+   <SolidColorBrush x:Key="LightColorBrush" Color="#DDD" />
+   <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="Separator">
+      <Setter Property="Height" Value="1"/>
+      <Setter Property="Margin" Value="0,4,0,4"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Separator">
+               <Border BorderBrush="{StaticResource SolidBorderBrush}"
+                       BorderThickness="1"/>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- TopLevelHeader -->
+   <ControlTemplate x:Key="{x:Static MenuItem.TopLevelHeaderTemplateKey}" TargetType="MenuItem">
+      <Border Name="Border">
+         <Grid>
+            <ContentPresenter Margin="6,3,6,3" 
+                              ContentSource="Header"
+                              RecognizesAccessKey="True" />
+            <Popup Name="Popup"
+                   Placement="Bottom"
+                   IsOpen="{TemplateBinding IsSubmenuOpen}"
+                   AllowsTransparency="True" 
+                   Focusable="False"
+                   PopupAnimation="Fade">
+               <Border Name="SubmenuBorder"
+                       SnapsToDevicePixels="True"
+                       Background="{StaticResource WindowBackgroundBrush}"
+                       BorderBrush="{StaticResource SolidBorderBrush}"
+                       BorderThickness="1" >
+                  <StackPanel IsItemsHost="True" 
+                              KeyboardNavigation.DirectionalNavigation="Cycle" />
+               </Border>
+            </Popup>
+         </Grid>
+      </Border>
+      <ControlTemplate.Triggers>
+         <Trigger Property="IsSuspendingPopupAnimation" Value="true">
+            <Setter TargetName="Popup" Property="PopupAnimation" Value="None"/>
+         </Trigger>
+         <Trigger Property="IsHighlighted" Value="true">
+            <Setter TargetName="Border" Property="Background"  Value="{StaticResource NormalBrush}"/>
+            <Setter TargetName="Border" Property="BorderBrush" Value="Transparent"/>
+         </Trigger>
+         <Trigger SourceName="Popup" Property="Popup.AllowsTransparency" Value="True">
+            <Setter TargetName="SubmenuBorder" Property="CornerRadius" Value="0,0,4,4"/>
+            <Setter TargetName="SubmenuBorder" Property="Padding" Value="0,0,0,3"/>
+         </Trigger>
+         <Trigger Property="IsEnabled" Value="False">
+            <Setter Property="Foreground" Value="{StaticResource DisabledForegroundBrush}"/>
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+   
+   <!-- TopLevelItem -->
+   <ControlTemplate x:Key="{x:Static MenuItem.TopLevelItemTemplateKey}" TargetType="MenuItem">
+      <Border Name="Border">
+         <Grid>
+            <ContentPresenter Margin="6,3,6,3" 
+                              ContentSource="Header"
+                              RecognizesAccessKey="True" />
+         </Grid>
+      </Border>
+      <ControlTemplate.Triggers>
+         <Trigger Property="IsHighlighted" Value="true">
+            <Setter TargetName="Border" Property="Background" Value="{StaticResource NormalBrush}"/>
+            <Setter TargetName="Border" Property="BorderBrush" Value="Transparent"/>
+         </Trigger>
+         <Trigger Property="IsEnabled" Value="False">
+            <Setter Property="Foreground" Value="{StaticResource DisabledForegroundBrush}"/>
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
+   <!-- SubmenuItem -->
+   <ControlTemplate x:Key="{x:Static MenuItem.SubmenuItemTemplateKey}" TargetType="MenuItem">
+      <Border Name="Border"
+              Padding="3,3,3,3">
+         <Grid>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="12"/>
+               <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Height="8"
+                    Width="8"
+                    Background="{StaticResource Icarus_Gray}"
+                    BorderThickness="0"
+                    HorizontalAlignment="Left"/>
+            <ContentPresenter Name="HeaderHost"
+                              Grid.Column="1"
+                              ContentSource="Header"
+                              RecognizesAccessKey="True"
+                              VerticalAlignment="Center"
+                              TextBlock.FontSize="12"/>
+         </Grid>
+      </Border>
+      <ControlTemplate.Triggers>
+         <!--<Trigger Property="Icon" Value="{x:Null}">
+            <Setter TargetName="Icon" Property="Visibility" Value="Hidden"/>
+         </Trigger>
+         <Trigger Property="IsChecked" Value="true">
+            <Setter TargetName="CheckMark" Property="Visibility" Value="Visible"/>
+         </Trigger>
+         <Trigger Property="IsCheckable" Value="true">
+            <Setter TargetName="Check" Property="Visibility" Value="Visible"/>
+            <Setter TargetName="Icon" Property="Visibility" Value="Hidden"/>
+         </Trigger>-->
+         <Trigger Property="IsHighlighted" Value="true">
+            <Setter TargetName="Border" Property="Background" Value="{StaticResource SelectedBackgroundBrush}"/>
+         </Trigger>
+         <Trigger Property="IsEnabled" Value="false">
+            <Setter Property="Foreground" Value="{StaticResource DisabledForegroundBrush}"/>
+         </Trigger>
+      </ControlTemplate.Triggers>
+      <!--<Border Name="Border">
+         <Grid>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" SharedSizeGroup="Icon"/>
+               <ColumnDefinition Width="*" />
+               <ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut"/>
+               <ColumnDefinition Width="13"/>
+            </Grid.ColumnDefinitions>
+            <ContentPresenter Name="Icon"
+                              Margin="6,0,6,0"
+                              VerticalAlignment="Center"
+                              ContentSource="Icon"/>
+            <Border Name="Check"  
+                    Width="13" Height="13" 
+                    Visibility="Collapsed"
+                    Margin="6,0,6,0" 
+                    Background="{StaticResource NormalBrush}"
+                    BorderThickness="1"
+                    BorderBrush="{StaticResource NormalBorderBrush}">
+               <Path Name="CheckMark"
+                     Width="7" Height="7" 
+                     Visibility="Hidden" 
+                     SnapsToDevicePixels="False" 
+                     Stroke="{StaticResource GlyphBrush}"
+                     StrokeThickness="2"
+                     Data="M 0 0 L 7 7 M 0 7 L 7 0" />
+            </Border>
+            <ContentPresenter Name="HeaderHost"
+                              Grid.Column="1"
+                              ContentSource="Header"
+                              RecognizesAccessKey="True"/>
+            <TextBlock x:Name="InputGestureText"
+                       Grid.Column="2"
+                       Text="{TemplateBinding InputGestureText}"
+                       Margin="5,2,0,2"
+                       DockPanel.Dock="Right" />
+         </Grid>
+      </Border>
+      <ControlTemplate.Triggers>
+         <Trigger Property="Icon" Value="{x:Null}">
+            <Setter TargetName="Icon" Property="Visibility" Value="Hidden"/>
+         </Trigger>
+         <Trigger Property="IsChecked" Value="true">
+            <Setter TargetName="CheckMark" Property="Visibility" Value="Visible"/>
+         </Trigger>
+         <Trigger Property="IsCheckable" Value="true">
+            <Setter TargetName="Check" Property="Visibility" Value="Visible"/>
+            <Setter TargetName="Icon" Property="Visibility" Value="Hidden"/>
+         </Trigger>
+         <Trigger Property="IsHighlighted" Value="true">
+            <Setter TargetName="Border" Property="Background" Value="{StaticResource SelectedBackgroundBrush}"/>
+         </Trigger>
+         <Trigger Property="IsEnabled" Value="false">
+            <Setter Property="Foreground" Value="{StaticResource DisabledForegroundBrush}"/>
+         </Trigger>
+      </ControlTemplate.Triggers>-->
+   </ControlTemplate>
+
+   <!-- SubmenuHeader -->
+   <ControlTemplate x:Key="{x:Static MenuItem.SubmenuHeaderTemplateKey}" TargetType="MenuItem">
+      <Border Name="Border">
+         <Grid>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" SharedSizeGroup="Icon"/>
+               <ColumnDefinition Width="*" />
+               <ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut"/>
+               <ColumnDefinition Width="13"/>
+            </Grid.ColumnDefinitions>
+            <ContentPresenter Name="Icon"
+                              Margin="6,0,6,0"
+                              VerticalAlignment="Center"
+                              ContentSource="Icon"/>
+            <ContentPresenter Name="HeaderHost"
+                              Grid.Column="1"
+                              ContentSource="Header"
+                              RecognizesAccessKey="True"/>
+            <TextBlock x:Name="InputGestureText"
+                       Grid.Column="2"
+                       Text="{TemplateBinding InputGestureText}"
+                       Margin="5,2,2,2"
+                       DockPanel.Dock="Right"/>
+            <Path Grid.Column="3"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  Data="M 0 0 L 0 7 L 4 3.5 Z" 
+                  Fill="{StaticResource GlyphBrush}" />
+            <Popup Name="Popup"
+                   Placement="Right"
+                   HorizontalOffset="-4" 
+                   IsOpen="{TemplateBinding IsSubmenuOpen}"
+                   AllowsTransparency="True" 
+                   Focusable="False"
+                   PopupAnimation="Fade">
+               <Border Name="SubmenuBorder"
+                       SnapsToDevicePixels="True"
+                       Background="{StaticResource WindowBackgroundBrush}"
+                       BorderBrush="{StaticResource SolidBorderBrush}"
+                       BorderThickness="1" >
+                  <StackPanel IsItemsHost="True" 
+                              KeyboardNavigation.DirectionalNavigation="Cycle" />
+               </Border>
+            </Popup>
+         </Grid>
+      </Border>
+      <ControlTemplate.Triggers>
+         <Trigger Property="Icon" Value="{x:Null}">
+            <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
+         </Trigger>
+         <Trigger Property="IsHighlighted" Value="true">
+            <Setter TargetName="Border" Property="Background" Value="{StaticResource SelectedBackgroundBrush}"/>
+         </Trigger>
+         <Trigger SourceName="Popup" Property="Popup.AllowsTransparency" Value="True">
+            <Setter TargetName="SubmenuBorder" Property="CornerRadius" Value="4"/>
+            <Setter TargetName="SubmenuBorder" Property="Padding" Value="0,3,0,3"/>
+         </Trigger>
+         <Trigger Property="IsEnabled" Value="false">
+            <Setter Property="Foreground" Value="{StaticResource DisabledForegroundBrush}"/>
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
+   <!-- MenuItem Style -->
+   <Style x:Key="Icarus_MenuItem" TargetType="{x:Type MenuItem}">
+      <Setter Property="OverridesDefaultStyle" Value="True"/>
+      <Style.Triggers>
+         <Trigger Property="Role" Value="TopLevelHeader">
+            <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.TopLevelHeaderTemplateKey}}"/>
+            <Setter Property="Grid.IsSharedSizeScope" Value="true"/>
+         </Trigger>
+         <Trigger Property="Role" Value="TopLevelItem">
+            <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.TopLevelItemTemplateKey}}"/>
+         </Trigger>
+         <Trigger Property="Role" Value="SubmenuHeader">
+            <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.SubmenuHeaderTemplateKey}}"/>
+         </Trigger>
+         <Trigger Property="Role" Value="SubmenuItem">
+            <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.SubmenuItemTemplateKey}}"/>
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+   
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
    <!-- MachGroup -->
 
    <SolidColorBrush x:Key="ScrollBar.Static.Background" Color="#F0F0F0"/>
@@ -631,6 +1070,30 @@
       <Setter Property="Padding" Value="4"/>
    </Style>
 
+   <Style x:Key="TopPanel_ModifyMode_Border" TargetType="{x:Type Border}">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderBrush" Value="Transparent"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="CornerRadius" Value="4"/>
+      <Setter Property="Padding" Value="0"/>
+   </Style>
+
+   <Style x:Key="LeftPanel_Popup_Border" TargetType="Border">
+      <Setter Property="Background" Value="White" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="CornerRadius" Value="4" />
+      <Setter Property="BorderBrush" Value="{StaticResource Icarus_Gray}" />
+      <Setter Property="Padding" Value="4" />
+   </Style>
+   
+   <Style x:Key="LeftPanel_PopupButton_Border" TargetType="Border">
+      <Setter Property="Background" Value="White" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="CornerRadius" Value="4" />
+      <Setter Property="BorderBrush" Value="{StaticResource Icarus_Gray}" />
+      <Setter Property="Padding" Value="2.5,4,2.5,4" />
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- EgtCustomWindow -->
@@ -776,6 +1239,375 @@
 
    <!-- ComboBox -->
 
+   <Style x:Key="ComboBox_FocusVisual">
+      <Setter Property="Control.Template">
+         <Setter.Value>
+            <ControlTemplate>
+               <Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <SolidColorBrush x:Key="ComboBox.Static.Background" Color="White"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Border" Color="#FFACACAC"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Background" Color="#FFFFFFFF"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Border" Color="#FFABADB3"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Glyph" Color="#FF000000"/>
+   <LinearGradientBrush x:Key="ComboBox.MouseOver.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#FFECF4FC" Offset="0.0"/>
+      <GradientStop Color="#FFDCECFC" Offset="1.0"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Border" Color="#FF7EB4EA"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Background" Color="#FFFFFFFF"/>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Border" Color="#FF7EB4EA"/>
+   <LinearGradientBrush x:Key="ComboBox.MouseOver.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#FFEBF4FC" Offset="0.0"/>
+      <GradientStop Color="#FFDCECFC" Offset="1.0"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Button.Border" Color="#FF7EB4EA"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Glyph" Color="#FF000000"/>
+   <LinearGradientBrush x:Key="ComboBox.Pressed.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#FFDAECFC" Offset="0.0"/>
+      <GradientStop Color="#FFC4E0FC" Offset="1.0"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Border" Color="#FF569DE5"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Background" Color="#FFFFFFFF"/>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Border" Color="#FF569DE5"/>
+   <LinearGradientBrush x:Key="ComboBox.Pressed.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#FFDAEBFC" Offset="0.0"/>
+      <GradientStop Color="#FFC4E0FC" Offset="1.0"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Button.Border" Color="#FF569DE5"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Glyph" Color="#FFBFBFBF"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Background" Color="#FFF0F0F0"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Border" Color="#FFD9D9D9"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Background" Color="#FFFFFFFF"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Border" Color="#FFBFBFBF"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Background" Color="Transparent"/>
+   <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Border" Color="Transparent"/>
+   <SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="#FF606060"/>
+   <Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
+      <Setter Property="OverridesDefaultStyle" Value="true"/>
+      <Setter Property="IsTabStop" Value="false"/>
+      <Setter Property="Focusable" Value="false"/>
+      <Setter Property="ClickMode" Value="Press"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border x:Name="templateRoot"
+                       BorderBrush="{StaticResource ComboBox.Static.Border}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       Background="{StaticResource ComboBox.Static.Background}"
+                       CornerRadius="4"
+                       SnapsToDevicePixels="true">
+                  <Border x:Name="splitBorder"
+                          BorderBrush="Transparent"
+                          BorderThickness="1"
+                          HorizontalAlignment="Right"
+                          Margin="0"
+                          SnapsToDevicePixels="true"
+                          Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                     <Path x:Name="arrow"
+                           Data="F1 M 0,0 L 7.11537,7.11502 L 14.23014,0 L 12.44846,0 L 7.11507,5.33338 L1.78168,0 L0,0 Z"
+                           Fill="{StaticResource Icarus_Gray}"
+                           HorizontalAlignment="Center"
+                           Margin="0,0,5,0"
+                           VerticalAlignment="Center"/>
+                  </Border>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true"/>
+                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="false"/>
+                        <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="false"/>
+                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="true"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Static.Editable.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Static.Editable.Border}"/>
+                     <Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.Static.Editable.Button.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.Static.Editable.Button.Border}"/>
+                  </MultiDataTrigger>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ComboBox.MouseOver.Glyph}"/>
+                  </Trigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Border}"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Editable.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Editable.Border}"/>
+                     <Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.MouseOver.Editable.Button.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.MouseOver.Editable.Button.Border}"/>
+                  </MultiDataTrigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ComboBox.Pressed.Glyph}"/>
+                  </Trigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
+                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Border}"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
+                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Editable.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Editable.Border}"/>
+                     <Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.Pressed.Editable.Button.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.Pressed.Editable.Button.Border}"/>
+                  </MultiDataTrigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ComboBox.Disabled.Glyph}"/>
+                  </Trigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Border}"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Editable.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Editable.Border}"/>
+                     <Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.Disabled.Editable.Button.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.Disabled.Editable.Button.Border}"/>
+                  </MultiDataTrigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <ControlTemplate x:Key="ComboBoxTemplate" TargetType="{x:Type ComboBox}">
+      <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
+         </Grid.ColumnDefinitions>
+         <Popup x:Name="PART_Popup"
+                AllowsTransparency="true"
+                Grid.ColumnSpan="2"
+                IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}"
+                Margin="1"
+                Placement="Bottom">
+            <Border x:Name="dropDownBorder"
+                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                    MinWidth="{Binding ActualWidth, ElementName=templateRoot}"
+                    BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" 
+                    BorderThickness="1"
+                    Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
+               <ScrollViewer x:Name="DropDownScrollViewer">
+                  <Grid x:Name="grid" 
+                        RenderOptions.ClearTypeHint="Enabled">
+                     <Canvas x:Name="canvas" 
+                             HorizontalAlignment="Left" 
+                             VerticalAlignment="Top"
+                             Height="0"
+                             Width="0">
+                        <Rectangle x:Name="opaqueRect"
+                                   Fill="{Binding Background, ElementName=dropDownBorder}"
+                                   Height="{Binding ActualHeight, ElementName=dropDownBorder}"
+                                   Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
+                     </Canvas>
+                     <ItemsPresenter x:Name="ItemsPresenter"
+                                     KeyboardNavigation.DirectionalNavigation="Contained"
+                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                  </Grid>
+               </ScrollViewer>
+            </Border>
+         </Popup>
+         <ToggleButton x:Name="toggleButton"
+                       Grid.ColumnSpan="2"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       Background="{TemplateBinding Background}"
+                       IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                       Style="{StaticResource ComboBoxToggleButton}"/>
+         <ContentPresenter x:Name="contentPresenter"
+                           ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                           ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                           Content="{TemplateBinding SelectionBoxItem}"
+                           ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
+                           IsHitTestVisible="false" Margin="{TemplateBinding Padding}"
+                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+      </Grid>
+      <ControlTemplate.Triggers>
+         <Trigger Property="HasItems" Value="false">
+            <Setter Property="Height" TargetName="dropDownBorder" Value="95"/>
+         </Trigger>
+         <MultiTrigger>
+            <MultiTrigger.Conditions>
+               <Condition Property="IsGrouping" Value="true"/>
+               <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+            </MultiTrigger.Conditions>
+            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+         </MultiTrigger>
+         <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
+            <Setter Property="Canvas.Top" TargetName="opaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
+            <Setter Property="Canvas.Left" TargetName="opaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+   <SolidColorBrush x:Key="TextBox.Static.Background" Color="#FFFFFFFF"/>
+   <Style x:Key="ComboBoxEditableTextBox" TargetType="{x:Type TextBox}">
+      <Setter Property="OverridesDefaultStyle" Value="true"/>
+      <Setter Property="AllowDrop" Value="true"/>
+      <Setter Property="MinWidth" Value="0"/>
+      <Setter Property="MinHeight" Value="0"/>
+      <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+      <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
+      <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type TextBox}">
+               <ScrollViewer x:Name="PART_ContentHost" 
+                             Background="Transparent" 
+                             Focusable="false" 
+                             HorizontalScrollBarVisibility="Hidden" 
+                             VerticalScrollBarVisibility="Hidden"/>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <ControlTemplate x:Key="ComboBoxEditableTemplate" TargetType="{x:Type ComboBox}">
+      <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
+         </Grid.ColumnDefinitions>
+         <Popup x:Name="PART_Popup" 
+                AllowsTransparency="true" 
+                Grid.ColumnSpan="2" 
+                IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}"
+                Placement="Bottom">
+            <Border x:Name="dropDownBorder"
+                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                    MinWidth="{Binding ActualWidth, ElementName=templateRoot}"
+                    BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" 
+                    BorderThickness="1" 
+                    Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
+               <ScrollViewer x:Name="DropDownScrollViewer">
+                  <Grid x:Name="grid" 
+                        RenderOptions.ClearTypeHint="Enabled">
+                     <Canvas x:Name="canvas" 
+                             HorizontalAlignment="Left"
+                             Height="0"
+                             VerticalAlignment="Top"
+                             Width="0">
+                        <Rectangle x:Name="opaqueRect"
+                                   Fill="{Binding Background, ElementName=dropDownBorder}"
+                                   Height="{Binding ActualHeight, ElementName=dropDownBorder}"
+                                   Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
+                     </Canvas>
+                     <ItemsPresenter x:Name="ItemsPresenter"
+                                     KeyboardNavigation.DirectionalNavigation="Contained"
+                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                  </Grid>
+               </ScrollViewer>
+            </Border>
+         </Popup>
+         <ToggleButton x:Name="toggleButton"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       Background="{TemplateBinding Background}"
+                       Grid.ColumnSpan="2"
+                       IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                       Style="{StaticResource ComboBoxToggleButton}"/>
+         <Border x:Name="border"
+                 Background="{StaticResource TextBox.Static.Background}"
+                 Margin="{TemplateBinding BorderThickness}">
+            <TextBox x:Name="PART_EditableTextBox"
+                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                     IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                     Margin="{TemplateBinding Padding}"
+                     Style="{StaticResource ComboBoxEditableTextBox}"
+                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+         </Border>
+      </Grid>
+      <ControlTemplate.Triggers>
+         <Trigger Property="IsEnabled" Value="false">
+            <Setter Property="Opacity" TargetName="border" Value="0.56"/>
+         </Trigger>
+         <Trigger Property="IsKeyboardFocusWithin" Value="true">
+            <Setter Property="Foreground" Value="Black"/>
+         </Trigger>
+         <Trigger Property="HasItems" Value="false">
+            <Setter Property="Height" TargetName="dropDownBorder" Value="95"/>
+         </Trigger>
+         <MultiTrigger>
+            <MultiTrigger.Conditions>
+               <Condition Property="IsGrouping" Value="true"/>
+               <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+            </MultiTrigger.Conditions>
+            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+         </MultiTrigger>
+         <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
+            <Setter Property="Canvas.Top" TargetName="opaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
+            <Setter Property="Canvas.Left" TargetName="opaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+   <Style TargetType="{x:Type ComboBox}">
+      <Setter Property="FocusVisualStyle" Value="{StaticResource ComboBox_FocusVisual}"/>
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderBrush" Value="White"/>
+      <Setter Property="Foreground" Value="{StaticResource Icarus_Gray}"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
+      <Setter Property="FontWeight" Value="Normal"/>
+      <Setter Property="FontSize" Value="12"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+      <Setter Property="Padding" Value="6,3,5,3"/>
+      <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+      <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+      <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+      <Setter Property="Template" Value="{StaticResource ComboBoxTemplate}"/>
+      <Style.Triggers>
+         <Trigger Property="IsEditable" Value="true">
+            <Setter Property="IsTabStop" Value="false"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Template" Value="{StaticResource ComboBoxEditableTemplate}"/>
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+
+
+
+
+   <!--<Style TargetType="{x:Type ComboBox}">
+      <Setter Property="FontSize" Value="12"/>
+      <Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
+      <Setter Property="FontWeight" Value="Normal"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+   </Style>-->
+   
    <Style x:Key="MachiningsComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
       <Setter Property="Margin" Value="0,0,0,10"/>
    </Style>
@@ -807,11 +1639,15 @@
 
    <Style x:Key="TopPanel_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
       <Setter Property="FontSize" Value="18"/>
-      <Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
-      <Setter Property="FontWeight" Value="Light"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
    </Style>
 
+   <Style x:Key="LeftPanel_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+      <!--<Setter Property="Height" Value="33"/>-->
+      <Setter Property="Width" Value="125"/>
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- CheckBox -->
@@ -1003,14 +1839,6 @@
       </Setter>
    </Style>
 
-   <Style x:Key="LeftPanelPopup_Border" TargetType="Border">
-      <Setter Property="Background" Value="White" />
-      <Setter Property="BorderThickness" Value="2" />
-      <Setter Property="CornerRadius" Value="5" />
-      <Setter Property="BorderBrush" Value="{StaticResource EgaltechBlue1}" />
-      <Setter Property="Padding" Value="5" />
-   </Style>
-
    <Style x:Key="BottomPanel_Popup" TargetType="Popup">
       <Setter Property="AllowsTransparency" Value="True" />
       <Setter Property="StaysOpen" Value="True" />