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 5bd7bfb..8945f10 100644
Binary files a/Icarus/Resources/DrawPanel/AddPointCurve.png and b/Icarus/Resources/DrawPanel/AddPointCurve.png differ
diff --git a/Icarus/Resources/DrawPanel/ApproxCurve.png b/Icarus/Resources/DrawPanel/ApproxCurve.png
deleted file mode 100644
index 593f866..0000000
Binary files a/Icarus/Resources/DrawPanel/ApproxCurve.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Arc3P.png b/Icarus/Resources/DrawPanel/Arc3P.png
deleted file mode 100644
index 1df2af4..0000000
Binary files a/Icarus/Resources/DrawPanel/Arc3P.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/ArcCSE.png b/Icarus/Resources/DrawPanel/ArcCSE.png
deleted file mode 100644
index 64e2aee..0000000
Binary files a/Icarus/Resources/DrawPanel/ArcCSE.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/ArcFlip.png b/Icarus/Resources/DrawPanel/ArcFlip.png
deleted file mode 100644
index 4468ce0..0000000
Binary files a/Icarus/Resources/DrawPanel/ArcFlip.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/ArcPDP.png b/Icarus/Resources/DrawPanel/ArcPDP.png
deleted file mode 100644
index f74b1a5..0000000
Binary files a/Icarus/Resources/DrawPanel/ArcPDP.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/BreakCurve.png b/Icarus/Resources/DrawPanel/BreakCurve.png
deleted file mode 100644
index 183d4a2..0000000
Binary files a/Icarus/Resources/DrawPanel/BreakCurve.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Chamfer.png b/Icarus/Resources/DrawPanel/Chamfer.png
deleted file mode 100644
index a10190d..0000000
Binary files a/Icarus/Resources/DrawPanel/Chamfer.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/ChangeColor.png b/Icarus/Resources/DrawPanel/ChangeColor.png
deleted file mode 100644
index 3497b6b..0000000
Binary files a/Icarus/Resources/DrawPanel/ChangeColor.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/ChangeColorAlpha.png b/Icarus/Resources/DrawPanel/ChangeColorAlpha.png
deleted file mode 100644
index 04bb076..0000000
Binary files a/Icarus/Resources/DrawPanel/ChangeColorAlpha.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/ChangeLayer.png b/Icarus/Resources/DrawPanel/ChangeLayer.png
deleted file mode 100644
index cb06885..0000000
Binary files a/Icarus/Resources/DrawPanel/ChangeLayer.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/ChangeStart.png b/Icarus/Resources/DrawPanel/ChangeStart.png
deleted file mode 100644
index 1321300..0000000
Binary files a/Icarus/Resources/DrawPanel/ChangeStart.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Circle3P.png b/Icarus/Resources/DrawPanel/Circle3P.png
deleted file mode 100644
index ae4f8bd..0000000
Binary files a/Icarus/Resources/DrawPanel/Circle3P.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/CircleCD.png b/Icarus/Resources/DrawPanel/CircleCD.png
deleted file mode 100644
index 5480d8f..0000000
Binary files a/Icarus/Resources/DrawPanel/CircleCD.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/CircleCP.png b/Icarus/Resources/DrawPanel/CircleCP.png
deleted file mode 100644
index 77a481b..0000000
Binary files a/Icarus/Resources/DrawPanel/CircleCP.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Delete.png b/Icarus/Resources/DrawPanel/Delete.png
index b90063f..e2f72a7 100644
Binary files a/Icarus/Resources/DrawPanel/Delete.png and b/Icarus/Resources/DrawPanel/Delete.png differ
diff --git a/Icarus/Resources/DrawPanel/ExplodeCurve.png b/Icarus/Resources/DrawPanel/ExplodeCurve.png
deleted file mode 100644
index be9e1c7..0000000
Binary files a/Icarus/Resources/DrawPanel/ExplodeCurve.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/ExplodeSurf.png b/Icarus/Resources/DrawPanel/ExplodeSurf.png
deleted file mode 100644
index b62f3e9..0000000
Binary files a/Icarus/Resources/DrawPanel/ExplodeSurf.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/ExtendCurve.png b/Icarus/Resources/DrawPanel/ExtendCurve.png
deleted file mode 100644
index cbf8d91..0000000
Binary files a/Icarus/Resources/DrawPanel/ExtendCurve.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/ExtractFacetLoops.png b/Icarus/Resources/DrawPanel/ExtractFacetLoops.png
deleted file mode 100644
index 2fd4591..0000000
Binary files a/Icarus/Resources/DrawPanel/ExtractFacetLoops.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/ExtractLoops.png b/Icarus/Resources/DrawPanel/ExtractLoops.png
deleted file mode 100644
index 6c71a4c..0000000
Binary files a/Icarus/Resources/DrawPanel/ExtractLoops.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/ExtractSurfFacet.png b/Icarus/Resources/DrawPanel/ExtractSurfFacet.png
deleted file mode 100644
index 7660171..0000000
Binary files a/Icarus/Resources/DrawPanel/ExtractSurfFacet.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Extrude.png b/Icarus/Resources/DrawPanel/Extrude.png
index 1b245f2..061a72f 100644
Binary files a/Icarus/Resources/DrawPanel/Extrude.png and b/Icarus/Resources/DrawPanel/Extrude.png differ
diff --git a/Icarus/Resources/DrawPanel/Fillet.png b/Icarus/Resources/DrawPanel/Fillet.png
deleted file mode 100644
index b40c377..0000000
Binary files a/Icarus/Resources/DrawPanel/Fillet.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/IntersectSurfSurf.png b/Icarus/Resources/DrawPanel/IntersectSurfSurf.png
deleted file mode 100644
index 1f4c4aa..0000000
Binary files a/Icarus/Resources/DrawPanel/IntersectSurfSurf.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/InvertCurve.png b/Icarus/Resources/DrawPanel/InvertCurve.png
deleted file mode 100644
index e10899d..0000000
Binary files a/Icarus/Resources/DrawPanel/InvertCurve.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/InvertSurf.png b/Icarus/Resources/DrawPanel/InvertSurf.png
deleted file mode 100644
index 5b3bf7f..0000000
Binary files a/Icarus/Resources/DrawPanel/InvertSurf.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/JoinCurve.png b/Icarus/Resources/DrawPanel/JoinCurve.png
deleted file mode 100644
index 666b2e6..0000000
Binary files a/Icarus/Resources/DrawPanel/JoinCurve.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Line2P.png b/Icarus/Resources/DrawPanel/Line2P.png
index 2690838..e4cb9bd 100644
Binary files a/Icarus/Resources/DrawPanel/Line2P.png and b/Icarus/Resources/DrawPanel/Line2P.png differ
diff --git a/Icarus/Resources/DrawPanel/LinePDL.png b/Icarus/Resources/DrawPanel/LinePDL.png
deleted file mode 100644
index 043fe98..0000000
Binary files a/Icarus/Resources/DrawPanel/LinePDL.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/LinearDimension.png b/Icarus/Resources/DrawPanel/LinearDimension.png
deleted file mode 100644
index 706c9e8..0000000
Binary files a/Icarus/Resources/DrawPanel/LinearDimension.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/MergeSurf.png b/Icarus/Resources/DrawPanel/MergeSurf.png
deleted file mode 100644
index f3f6ed3..0000000
Binary files a/Icarus/Resources/DrawPanel/MergeSurf.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Mirror.png b/Icarus/Resources/DrawPanel/Mirror.png
deleted file mode 100644
index c8edab7..0000000
Binary files a/Icarus/Resources/DrawPanel/Mirror.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Mirror3D.png b/Icarus/Resources/DrawPanel/Mirror3D.png
deleted file mode 100644
index a169939..0000000
Binary files a/Icarus/Resources/DrawPanel/Mirror3D.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/ModifyCurve.png b/Icarus/Resources/DrawPanel/ModifyCurve.png
index f84dfcf..f297c26 100644
Binary files a/Icarus/Resources/DrawPanel/ModifyCurve.png and b/Icarus/Resources/DrawPanel/ModifyCurve.png differ
diff --git a/Icarus/Resources/DrawPanel/ModifyText.png b/Icarus/Resources/DrawPanel/ModifyText.png
deleted file mode 100644
index ba37037..0000000
Binary files a/Icarus/Resources/DrawPanel/ModifyText.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Move.png b/Icarus/Resources/DrawPanel/Move.png
index 78ab3a2..89fb52d 100644
Binary files a/Icarus/Resources/DrawPanel/Move.png and b/Icarus/Resources/DrawPanel/Move.png differ
diff --git a/Icarus/Resources/DrawPanel/Offset.png b/Icarus/Resources/DrawPanel/Offset.png
deleted file mode 100644
index 81c0be2..0000000
Binary files a/Icarus/Resources/DrawPanel/Offset.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Plane.png b/Icarus/Resources/DrawPanel/Plane.png
deleted file mode 100644
index bb85fcb..0000000
Binary files a/Icarus/Resources/DrawPanel/Plane.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Point.png b/Icarus/Resources/DrawPanel/Point.png
index 5a43bfe..34ed268 100644
Binary files a/Icarus/Resources/DrawPanel/Point.png and b/Icarus/Resources/DrawPanel/Point.png differ
diff --git a/Icarus/Resources/DrawPanel/Polygon.png b/Icarus/Resources/DrawPanel/Polygon.png
deleted file mode 100644
index fe09e3a..0000000
Binary files a/Icarus/Resources/DrawPanel/Polygon.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/PolygonSide.png b/Icarus/Resources/DrawPanel/PolygonSide.png
deleted file mode 100644
index c90cd4b..0000000
Binary files a/Icarus/Resources/DrawPanel/PolygonSide.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Rectangle2P.png b/Icarus/Resources/DrawPanel/Rectangle2P.png
deleted file mode 100644
index 51bb0a7..0000000
Binary files a/Icarus/Resources/DrawPanel/Rectangle2P.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/RemoveColor.png b/Icarus/Resources/DrawPanel/RemoveColor.png
deleted file mode 100644
index c3b2850..0000000
Binary files a/Icarus/Resources/DrawPanel/RemoveColor.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/RemovePointCurve.png b/Icarus/Resources/DrawPanel/RemovePointCurve.png
index ee039fe..3421558 100644
Binary files a/Icarus/Resources/DrawPanel/RemovePointCurve.png and b/Icarus/Resources/DrawPanel/RemovePointCurve.png differ
diff --git a/Icarus/Resources/DrawPanel/Revolve.png b/Icarus/Resources/DrawPanel/Revolve.png
deleted file mode 100644
index 821795f..0000000
Binary files a/Icarus/Resources/DrawPanel/Revolve.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Rotate.png b/Icarus/Resources/DrawPanel/Rotate.png
index ec86735..174e83a 100644
Binary files a/Icarus/Resources/DrawPanel/Rotate.png and b/Icarus/Resources/DrawPanel/Rotate.png differ
diff --git a/Icarus/Resources/DrawPanel/Rotate3D.png b/Icarus/Resources/DrawPanel/Rotate3D.png
deleted file mode 100644
index f9d6d3d..0000000
Binary files a/Icarus/Resources/DrawPanel/Rotate3D.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Ruled.png b/Icarus/Resources/DrawPanel/Ruled.png
deleted file mode 100644
index 25aa70c..0000000
Binary files a/Icarus/Resources/DrawPanel/Ruled.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Scale.png b/Icarus/Resources/DrawPanel/Scale.png
deleted file mode 100644
index ab5f447..0000000
Binary files a/Icarus/Resources/DrawPanel/Scale.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Scale3D.png b/Icarus/Resources/DrawPanel/Scale3D.png
deleted file mode 100644
index 08bf3a1..0000000
Binary files a/Icarus/Resources/DrawPanel/Scale3D.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Screw.png b/Icarus/Resources/DrawPanel/Screw.png
deleted file mode 100644
index f9d5227..0000000
Binary files a/Icarus/Resources/DrawPanel/Screw.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/SolidAddSurf.png b/Icarus/Resources/DrawPanel/SolidAddSurf.png
deleted file mode 100644
index cd687b1..0000000
Binary files a/Icarus/Resources/DrawPanel/SolidAddSurf.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/SolidIntersectSurf.png b/Icarus/Resources/DrawPanel/SolidIntersectSurf.png
deleted file mode 100644
index b5d1518..0000000
Binary files a/Icarus/Resources/DrawPanel/SolidIntersectSurf.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/SolidSubtractSurf.png b/Icarus/Resources/DrawPanel/SolidSubtractSurf.png
deleted file mode 100644
index 0672f49..0000000
Binary files a/Icarus/Resources/DrawPanel/SolidSubtractSurf.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/SplitCurve.png b/Icarus/Resources/DrawPanel/SplitCurve.png
deleted file mode 100644
index 25386eb..0000000
Binary files a/Icarus/Resources/DrawPanel/SplitCurve.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Swept.png b/Icarus/Resources/DrawPanel/Swept.png
deleted file mode 100644
index 88f86ee..0000000
Binary files a/Icarus/Resources/DrawPanel/Swept.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/Text.png b/Icarus/Resources/DrawPanel/Text.png
deleted file mode 100644
index c7af3e0..0000000
Binary files a/Icarus/Resources/DrawPanel/Text.png and /dev/null differ
diff --git a/Icarus/Resources/DrawPanel/ThickCurve.png b/Icarus/Resources/DrawPanel/ThickCurve.png
deleted file mode 100644
index 03ac50c..0000000
Binary files a/Icarus/Resources/DrawPanel/ThickCurve.png and /dev/null differ
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" />