diff --git a/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml
index 116945f..0195714 100644
--- a/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml
+++ b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml
@@ -1,141 +1,162 @@
-<UserControl x:Class="CurrMachiningPanelV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:PrintApp="clr-namespace:Icarus"
-             Width="300">
-   <Border VerticalAlignment="Center" 
-           Style="{StaticResource RightPanel_Border}">
-      <Grid>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="Auto"/>
-         </Grid.RowDefinitions>
-         <ScrollViewer VerticalScrollBarVisibility="Auto"
-                       HorizontalScrollBarVisibility="Disabled">
-            <ItemsControl Grid.Row="1"
-                          ItemsSource="{Binding CurrMachining.CathegoryList}">
-               <ItemsControl.ItemsPanel>
-                  <ItemsPanelTemplate>
-                     <StackPanel Orientation="Vertical"/>
-                  </ItemsPanelTemplate>
-               </ItemsControl.ItemsPanel>
-               <ItemsControl.ItemTemplate>
-                  <DataTemplate>
-                     <Expander Header="{Binding sName}"
-                               IsExpanded="{Binding Cathegory_IsExpanded}"
-                               VerticalContentAlignment="Top">
-                        <ItemsControl ItemsSource="{Binding MachiningParamList}">
-                           <ItemsControl.ItemsPanel>
-                              <ItemsPanelTemplate>
-                                 <UniformGrid Columns="1"
-                                              HorizontalAlignment="Stretch"/>
-                              </ItemsPanelTemplate>
-                           </ItemsControl.ItemsPanel>
-                           <ItemsControl.Resources>
-                              <DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
-                                 <Grid>
-                                    <Grid.ColumnDefinitions>
-                                       <ColumnDefinition Width="2*"/>
-                                       <ColumnDefinition Width="1*"/>
-                                       <ColumnDefinition Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"/>
-                                    <TextBox Grid.Column="1"
-                                             Text="{Binding sValue}"/>
-                                    <Button Grid.Column="2"
-                                            Content="R"
-                                            Command="{Binding ResetParam_Command}"
-                                            IsEnabled="{Binding bIsModifiedFromDb}"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            Margin="5,0,0,0"
-                                            Style="{StaticResource ToolBar_SmallButton}"/>
-                                 </Grid>
-                              </DataTemplate>
-                              <DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
-                                 <Grid>
-                                    <Grid.ColumnDefinitions>
-                                       <ColumnDefinition Width="2*"/>
-                                       <ColumnDefinition Width="1*"/>
-                                       <ColumnDefinition Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"/>
-                                    <ComboBox Grid.Column="1"
-                                              ItemsSource="{Binding ValueList}"
-                                              SelectedItem="{Binding SelValue}"
-                                              HorizontalAlignment="Stretch"/>
-                                    <Button Grid.Column="2"
-                                            Content="R"
-                                            Command="{Binding ResetParam_Command}"
-                                            IsEnabled="{Binding bIsModifiedFromDb}"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            Margin="5,0,0,0"
-                                            Style="{StaticResource ToolBar_SmallButton}"/>
-                                 </Grid>
-                              </DataTemplate>
-                              <DataTemplate DataType="{x:Type PrintApp:CheckMachiningParam}">
-                                 <Grid>
-                                    <Grid.ColumnDefinitions>
-                                       <ColumnDefinition Width="2*"/>
-                                       <ColumnDefinition Width="1*"/>
-                                       <ColumnDefinition Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"/>
-                                    <CheckBox Grid.Column="1"
-                                              IsChecked="{Binding bValue}"
-                                              HorizontalAlignment="Center"
-                                              VerticalAlignment="Center"/>
-                                    <Button Grid.Column="2"
-                                            Content="R"
-                                            Command="{Binding ResetParam_Command}"
-                                            IsEnabled="{Binding bIsModifiedFromDb}"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            Margin="5,0,0,0"
-                                            Style="{StaticResource ToolBar_SmallButton}"/>
-                                 </Grid>
-                              </DataTemplate>
-                              <DataTemplate DataType="{x:Type PrintApp:MaterialMachiningParam}">
-                                 <Grid>
-                                    <Grid.ColumnDefinitions>
-                                       <ColumnDefinition Width="2*"/>
-                                       <ColumnDefinition Width="1*"/>
-                                       <ColumnDefinition Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding sName}"/>
-                                    <CheckBox Grid.Column="1"
-                                              IsChecked="{Binding bValue}"
-                                              HorizontalAlignment="Center"
-                                              VerticalAlignment="Center"/>
-                                    <Button Grid.Column="2"
-                                            Content="R"
-                                            Command="{Binding ResetParam_Command}"
-                                            IsEnabled="{Binding bIsModifiedFromDb}"
-                                            VerticalContentAlignment="Center"
-                                            HorizontalContentAlignment="Center"
-                                            Margin="5,0,0,0"
-                                            Style="{StaticResource ToolBar_SmallButton}"/>
-                                 </Grid>
-                              </DataTemplate>
-                           </ItemsControl.Resources>
-                        </ItemsControl>
-                     </Expander>
-                  </DataTemplate>
-               </ItemsControl.ItemTemplate>
-            </ItemsControl>
-         </ScrollViewer>
-         <UniformGrid Grid.Row="1" Rows="1">
-            <Button Content="Ok"
-                    Command="{Binding Ok_Command}"
-                    Style="{StaticResource ToolBar_TextButton}"/>
-            <Button Content="Cancel"
-                    Command="{Binding Cancel_Command}"
-                    Style="{StaticResource ToolBar_TextButton}"/>
-            <Button Content="Save in Db"
-                    Command="{Binding SaveInDb_Command}"
-                    Style="{StaticResource ToolBar_TextButton}"/>
-         </UniformGrid>
-      </Grid>
-   </Border>
-</UserControl>
+<Border x:Class="CurrMachiningPanelV"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:PrintApp="clr-namespace:Icarus"
+        Width="310"
+        VerticalAlignment="center"
+        Style="{StaticResource BottomGrayRow_Border}">
+   <Grid Margin="2.5,2.5,2.5,0">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+      <ScrollViewer VerticalScrollBarVisibility="Auto"
+                    HorizontalScrollBarVisibility="Disabled"
+                    Margin="1,0,0,2.5">
+         <ItemsControl Grid.Row="1"
+                       ItemsSource="{Binding CurrMachining.CathegoryList}">
+            <ItemsControl.ItemsPanel>
+               <ItemsPanelTemplate>
+                  <StackPanel Orientation="Vertical"/>
+               </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.ItemTemplate>
+               <DataTemplate>
+                  <Expander Header="{Binding sName}"
+                            IsExpanded="{Binding Cathegory_IsExpanded}"
+                            VerticalContentAlignment="Top">
+                     <ItemsControl ItemsSource="{Binding MachiningParamList}">
+                        <ItemsControl.ItemsPanel>
+                           <ItemsPanelTemplate>
+                              <StackPanel Orientation="Vertical"
+                                          Margin="0"/>
+                           </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.Resources>
+                           <DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
+                              <Grid Margin="0,1,2.5,1">
+                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="2*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                 </Grid.ColumnDefinitions>
+                                 <TextBlock Text="{Binding sName}"
+                                            Margin="0,0,2.5,0"
+                                            Style="{StaticResource ParameterList_TextBlock}"/>
+                                 <TextBox Grid.Column="1"
+                                          Text="{Binding sValue}"
+                                          Margin="2.5,0,2.5,0"
+                                          Style="{StaticResource ParameterList_TextBox}"/>
+                                 <Button Grid.Column="2"
+                                         Content="R"
+                                         Command="{Binding ResetParam_Command}"
+                                         IsEnabled="{Binding bIsModifiedFromDb}"
+                                         VerticalContentAlignment="Center"
+                                         HorizontalContentAlignment="Center"
+                                         Margin="2.5,0,0,0"
+                                         Style="{StaticResource ToolBar_SmallButton}"/>
+                              </Grid>
+                           </DataTemplate>
+                           <DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
+                              <Grid Margin="0,1,2.5,1">
+                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                 </Grid.ColumnDefinitions>
+                                 <TextBlock Text="{Binding sName}"
+                                            Margin="0,0,2.5,0"
+                                            Style="{StaticResource ParameterList_TextBlock}"/>
+                                 <ComboBox Grid.Column="1"
+                                           ItemsSource="{Binding ValueList}"
+                                           SelectedItem="{Binding SelValue}"
+                                           HorizontalAlignment="Stretch"
+                                           Margin="2.5,0,2.5,0"
+                                           Style="{StaticResource RightPanel_ComboBox}"/>
+                                 <Button Grid.Column="2"
+                                          Content="R"
+                                          Command="{Binding ResetParam_Command}"
+                                          IsEnabled="{Binding bIsModifiedFromDb}"
+                                          VerticalContentAlignment="Center"
+                                          HorizontalContentAlignment="Center"
+                                          Margin="2.5,0,0,0"
+                                          Style="{StaticResource ToolBar_SmallButton}"/>
+                              </Grid>
+                           </DataTemplate>
+                           <DataTemplate DataType="{x:Type PrintApp:CheckMachiningParam}">
+                              <Grid Height="22"
+                                    Margin="0,1,2.5,1">
+                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="2*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                 </Grid.ColumnDefinitions>
+                                 <TextBlock Text="{Binding sName}"
+                                            Margin="0,0,2.5,0"
+                                            Style="{StaticResource ParameterList_TextBlock}"/>
+                                 <CheckBox Grid.Column="1"
+                                           IsChecked="{Binding bValue}"
+                                           HorizontalAlignment="Center"
+                                           VerticalAlignment="Center"
+                                           Margin="2.5,0,0,0"/>
+                                 <Button Grid.Column="2"
+                                         Content="R"
+                                         Command="{Binding ResetParam_Command}"
+                                         IsEnabled="{Binding bIsModifiedFromDb}"
+                                         VerticalContentAlignment="Center"
+                                         HorizontalContentAlignment="Center"
+                                         Margin="2.5,0,0,0"
+                                         Style="{StaticResource ToolBar_SmallButton}"/>
+                              </Grid>
+                           </DataTemplate>
+                           <DataTemplate DataType="{x:Type PrintApp:MaterialMachiningParam}">
+                              <Grid Height="22"
+                                    Margin="0,1,2.5,1">
+                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="2*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                 </Grid.ColumnDefinitions>
+                                 <TextBlock Text="{Binding sName}"
+                                            Margin="0,0,2.5,0"
+                                            Style="{StaticResource ParameterList_TextBlock}"/>
+                                 <CheckBox Grid.Column="1"
+                                           IsChecked="{Binding bValue}"
+                                           HorizontalAlignment="Center"
+                                           VerticalAlignment="Center"
+                                           Margin="2.5,0,2.5,0"/>
+                                 <Button Grid.Column="2"
+                                          Content="R"
+                                          Command="{Binding ResetParam_Command}"
+                                          IsEnabled="{Binding bIsModifiedFromDb}"
+                                          VerticalContentAlignment="Center"
+                                          HorizontalContentAlignment="Center"
+                                          Margin="2.5,0,0,0"
+                                          Style="{StaticResource ToolBar_SmallButton}"/>
+                              </Grid>
+                           </DataTemplate>
+                        </ItemsControl.Resources>
+                     </ItemsControl>
+                  </Expander>
+               </DataTemplate>
+            </ItemsControl.ItemTemplate>
+         </ItemsControl>
+      </ScrollViewer>
+      <UniformGrid Grid.Row="1" 
+                   Rows="1"
+                   Margin="0,2.5,0,0">
+         <Button Content="Ok"
+                 Command="{Binding Ok_Command}"
+                 Margin="0,0,2.5,0"
+                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
+         <Button Content="Cancel"
+                 Command="{Binding Cancel_Command}"
+                 Margin="0,0,2.5,0"
+                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
+         <Button Content="Save in Db"
+                 Command="{Binding SaveInDb_Command}"
+                 Margin="0,0,2.5,0"
+                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
+      </UniformGrid>
+   </Grid>
+</Border>
diff --git a/Icarus/Icarus.vbproj b/Icarus/Icarus.vbproj
index 45203b0..ca3ff1d 100644
--- a/Icarus/Icarus.vbproj
+++ b/Icarus/Icarus.vbproj
@@ -721,6 +721,9 @@
   <ItemGroup>
     <Resource Include="Resources\InstrumentPanel\GetDist_White.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\MachiningDb\Edit.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR32.exe
diff --git a/Icarus/MachiningDb/MachiningDbV.xaml b/Icarus/MachiningDb/MachiningDbV.xaml
index 40a2d58..56e0bc0 100644
--- a/Icarus/MachiningDb/MachiningDbV.xaml
+++ b/Icarus/MachiningDb/MachiningDbV.xaml
@@ -6,7 +6,7 @@
         Width="310"
         VerticalAlignment="center"
         Style="{StaticResource BottomGrayRow_Border}">
-   <Grid>
+   <Grid Margin="2.5,2.5,2.5,0">
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
@@ -14,7 +14,8 @@
          <RowDefinition Height="1*"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <Grid>
+      <Grid HorizontalAlignment="Center" 
+            Margin="0,2.5,0,2.5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
@@ -23,167 +24,168 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <Button Content="New"
-                  Command="{Binding New_Command}"
-                  IsEnabled="{Binding IsEnabled}"
-                  Style="{StaticResource ToolBar_TextButton}"/>
+                 Command="{Binding New_Command}"
+                 IsEnabled="{Binding IsEnabled}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource RightPanel_Button}"/>
          <Button Content="Save"
-                  Grid.Column="1"
-                  Command="{Binding Save_Command}"
-                  IsEnabled="{Binding IsEnabled}"
-                  Style="{StaticResource ToolBar_TextButton}"/>
+                 Grid.Column="1"
+                 Command="{Binding Save_Command}"
+                 IsEnabled="{Binding IsEnabled}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource RightPanel_Button}"/>
          <Button Content="Delete"
-                  Grid.Column="2"
-                  Command="{Binding Delete_Command}"
-                  IsEnabled="{Binding IsEnabled}"
-                  Style="{StaticResource ToolBar_TextButton}"/>
+                 Grid.Column="2"
+                 Command="{Binding Delete_Command}"
+                 IsEnabled="{Binding IsEnabled}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource RightPanel_Button}"/>
          <Button Grid.Column="3"
-                  Command="{Binding Import_Command}"
-                  ToolTip="{Binding ImportToolTip}"
-                  IsEnabled="{Binding ImpExp_IsEnabled}"
-                  Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/MachiningDB/MachiningImport.png" Stretch="Uniform"/>
+                 Command="{Binding Import_Command}"
+                 ToolTip="{Binding ImportToolTip}"
+                 IsEnabled="{Binding ImpExp_IsEnabled}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/MachiningDB/MachiningImport.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
          <Button Grid.Column="4"
-                  Command="{Binding Export_Command}"
-                  ToolTip="{Binding ImportToolTip}"
-                  IsEnabled="{Binding ImpExp_IsEnabled}"
-                  Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/MachiningDB/MachiningExport.png" Stretch="Uniform"/>
+                 Command="{Binding Export_Command}"
+                 ToolTip="{Binding ImportToolTip}"
+                 IsEnabled="{Binding ImpExp_IsEnabled}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/MachiningDB/MachiningExport.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
       </Grid>
-      <Grid Grid.Row="1">
+      <Grid Grid.Row="1"
+            Margin="0,2.5,0,2.5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <ComboBox Name="MachiningCombo" 
-                     ItemsSource="{Binding MachiningList}"
-                     SelectedItem="{Binding SelMachining}"
-                     DisplayMemberPath="ghName"
-                     Visibility="{Binding Combo_Visibility}"
-                     Style="{StaticResource FeatureComboBox}"/>
+                   ItemsSource="{Binding MachiningList}"
+                   SelectedItem="{Binding SelMachining}"
+                   DisplayMemberPath="ghName"
+                   Visibility="{Binding Combo_Visibility}"
+                   HorizontalAlignment="Stretch"
+                   Margin="2.5,0,2.5,0"
+                   Style="{StaticResource RightPanel_ComboBox}"/>
          <EgtWPFLib5:EgtTextBox Text="{Binding SelectedItem.sName, ElementName=MachiningCombo, UpdateSourceTrigger=Explicit}"
-                                 IsExplicitFocused="{Binding UserShouldEditValueNow}"
-                                 Visibility="{Binding Name_Visibility}"
-                                 Style="{StaticResource OptionTextBox}"/>
+                                IsExplicitFocused="{Binding UserShouldEditValueNow}"
+                                Visibility="{Binding Name_Visibility}"
+                                Margin="2.5,0,2.5,0"
+                                Style="{StaticResource OptionTextBox}"/>
          <Button Grid.Column="1"
-                  Command="{Binding EditName_Command}"
-                  Style="{StaticResource ToolBar_Button}">
-            <Image Source="/Resources/TopPanel/Edit.png"/>
+                 Command="{Binding EditName_Command}"
+                 Margin="2.5,0,2.5,0"
+                 Style="{StaticResource ToolBar_Button}">
+            <Image Source="/Resources/MachiningDB/Edit.png"
+                   Style="{StaticResource Button_Image}"/>
          </Button>
       </Grid>
       <ScrollViewer Grid.Row="3"
-                     VerticalScrollBarVisibility="Auto"
-                     HorizontalScrollBarVisibility="Disabled">
+                    IsEnabled="{Binding IsEnabled}"
+                    VerticalScrollBarVisibility="Auto"
+                    HorizontalScrollBarVisibility="Disabled"
+                    Margin="1,0,0,2.5"
+                    Padding="0"
+                    BorderThickness="0"
+                    Style="{StaticResource RightPanel_ScrollViewer}">
          <ItemsControl Grid.Row="1"
-                        ItemsSource="{Binding SelectedItem.CathegoryList, ElementName=MachiningCombo}"
-                        IsEnabled="{Binding IsEnabled}">
+                       ItemsSource="{Binding SelectedItem.CathegoryList, ElementName=MachiningCombo}"
+                       BorderThickness="0"
+                       Margin="0"
+                       Padding="0">
             <ItemsControl.ItemsPanel>
                <ItemsPanelTemplate>
-                  <StackPanel Orientation="Vertical"/>
+                  <StackPanel Orientation="Vertical"
+                              Margin="0"/>
                </ItemsPanelTemplate>
             </ItemsControl.ItemsPanel>
             <ItemsControl.ItemTemplate>
                <DataTemplate>
                   <Expander Header="{Binding sName}"
-                              IsExpanded="{Binding Cathegory_IsExpanded}"
-                              VerticalContentAlignment="Top">
-                     <ItemsControl ItemsSource="{Binding MachiningParamList}">
+                            FontWeight="Bold"
+                            IsExpanded="{Binding Cathegory_IsExpanded}"
+                            VerticalContentAlignment="Top">
+                     <ItemsControl ItemsSource="{Binding MachiningParamList}"
+                                   BorderThickness="0"
+                                   Margin="0"
+                                   Padding="0">
                         <ItemsControl.ItemsPanel>
                            <ItemsPanelTemplate>
-                              <UniformGrid Columns="1"
-                                             HorizontalAlignment="Stretch"/>
+                              <StackPanel Orientation="Vertical"
+                                          Margin="0"/>
                            </ItemsPanelTemplate>
                         </ItemsControl.ItemsPanel>
                         <ItemsControl.Resources>
                            <DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
-                              <Grid>
+                              <Grid Margin="0,1,2.5,1">
                                  <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="2*"/>
                                     <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="Auto"/>
                                  </Grid.ColumnDefinitions>
-                                 <TextBlock Text="{Binding sName}"/>
+                                 <TextBlock Text="{Binding sName}"
+                                            Margin="0,0,2.5,0"
+                                            Style="{StaticResource ParameterList_TextBlock}"/>
                                  <TextBox Grid.Column="1"
-                                                         Text="{Binding sValue}"/>
-                                 <!--<Button Grid.Column="2"
-                                          Content="R"
-                                          Command="{Binding ResetParam_Command}"
-                                          CommandParameter="dCurrStrandH"
-                                          IsEnabled="{Binding bCurrStrandH_IsModified}"
-                                          VerticalContentAlignment="Center"
-                                          HorizontalContentAlignment="Center"
-                                          Margin="5,0,0,0"
-                                          Style="{StaticResource ToolBar_SmallButton}"/>-->
+                                          Text="{Binding sValue}"
+                                          Margin="2.5,0,0,0"
+                                          Style="{StaticResource ParameterList_TextBox}"/>
                               </Grid>
                            </DataTemplate>
                            <DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
-                              <Grid>
+                              <Grid Margin="0,1,2.5,1">
                                  <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="2*"/>
                                     <ColumnDefinition Width="1*"/>
-                                    <!--<ColumnDefinition Width="Auto"/>-->
+                                    <ColumnDefinition Width="1*"/>
                                  </Grid.ColumnDefinitions>
-                                 <TextBlock Text="{Binding sName}"/>
+                                 <TextBlock Text="{Binding sName}"
+                                            Margin="0,0,2.5,0"
+                                            Style="{StaticResource ParameterList_TextBlock}"/>
                                  <ComboBox Grid.Column="1"
-                                             ItemsSource="{Binding ValueList}"
-                                             SelectedItem="{Binding SelValue}"
-                                             HorizontalAlignment="Stretch"/>
-                                 <!--<Button Grid.Column="1"
-                                          Content="R"
-                                          Command="{Binding ResetParam_Command}"
-                                          CommandParameter="dCurrStrandH"
-                                          IsEnabled="{Binding bCurrStrandH_IsModified}"
-                                          VerticalContentAlignment="Center"
-                                          HorizontalContentAlignment="Center"
-                                          Margin="5,0,0,0"
-                                          Style="{StaticResource ToolBar_SmallButton}"/>-->
+                                           ItemsSource="{Binding ValueList}"
+                                           SelectedItem="{Binding SelValue}"
+                                           HorizontalAlignment="Stretch"
+                                           Margin="2.5,0,0,0"
+                                           Style="{StaticResource RightPanel_ComboBox}"/>
                               </Grid>
                            </DataTemplate>
                            <DataTemplate DataType="{x:Type PrintApp:CheckMachiningParam}">
-                              <Grid>
+                              <Grid Height="22"
+                                    Margin="0,1,2.5,1">
                                  <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="2*"/>
                                     <ColumnDefinition Width="1*"/>
-                                    <!--<ColumnDefinition Width="Auto"/>-->
                                  </Grid.ColumnDefinitions>
-                                 <TextBlock Text="{Binding sName}"/>
+                                 <TextBlock Text="{Binding sName}"
+                                            Margin="0,0,2.5,0"
+                                            Style="{StaticResource ParameterList_TextBlock}"/>
                                  <CheckBox Grid.Column="1"
-                                             IsChecked="{Binding bValue}"
-                                             HorizontalAlignment="Center"
-                                             VerticalAlignment="Center"/>
-                                 <!--<Button Grid.Column="1"
-                                          Content="R"
-                                          Command="{Binding ResetParam_Command}"
-                                          CommandParameter="dCurrStrandH"
-                                          IsEnabled="{Binding bCurrStrandH_IsModified}"
-                                          VerticalContentAlignment="Center"
-                                          HorizontalContentAlignment="Center"
-                                          Margin="5,0,0,0"
-                                          Style="{StaticResource ToolBar_SmallButton}"/>-->
+                                           IsChecked="{Binding bValue}"
+                                           HorizontalAlignment="Center"
+                                           VerticalAlignment="Center"
+                                           Margin="2.5,0,0,0"/>
                               </Grid>
                            </DataTemplate>
                            <DataTemplate DataType="{x:Type PrintApp:MaterialMachiningParam}">
-                              <Grid>
+                              <Grid Height="22"
+                                    Margin="0,1,2.5,1">
                                  <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="2*"/>
                                     <ColumnDefinition Width="1*"/>
-                                    <!--<ColumnDefinition Width="Auto"/>-->
                                  </Grid.ColumnDefinitions>
-                                 <TextBlock Text="{Binding sName}"/>
+                                 <TextBlock Text="{Binding sName}"
+                                            Margin="0,0,2.5,0"
+                                            Style="{StaticResource ParameterList_TextBlock}"/>
                                  <CheckBox Grid.Column="1"
-                                             IsChecked="{Binding bValue}"
-                                             HorizontalAlignment="Center"
-                                             VerticalAlignment="Center"/>
-                                 <!--<Button Grid.Column="1"
-                                          Content="R"
-                                          Command="{Binding ResetParam_Command}"
-                                          CommandParameter="dCurrStrandH"
-                                          IsEnabled="{Binding bCurrStrandH_IsModified}"
-                                          VerticalContentAlignment="Center"
-                                          HorizontalContentAlignment="Center"
-                                          Margin="5,0,0,0"
-                                          Style="{StaticResource ToolBar_SmallButton}"/>-->
+                                           IsChecked="{Binding bValue}"
+                                           HorizontalAlignment="Center"
+                                           VerticalAlignment="Center"
+                                           Margin="2.5,0,0,0"/>
                               </Grid>
                            </DataTemplate>
                         </ItemsControl.Resources>
@@ -193,11 +195,11 @@
             </ItemsControl.ItemTemplate>
          </ItemsControl>
       </ScrollViewer>
-      <UniformGrid Grid.Row="4" Rows="1">
-         <Button Content="Ok"
-                  Command="{Binding Ok_Command}"
-                  IsEnabled="{Binding IsEnabled}"
-                  Style="{StaticResource ToolBar_TextButton}"/>
-      </UniformGrid>
+      <Button Grid.Row="4"
+              Content="Ok"
+              Command="{Binding Ok_Command}"
+              IsEnabled="{Binding IsEnabled}"
+              Margin="0,2.5,0,0"
+              Style="{StaticResource RightPanel_HalfRound_Button}"/>
    </Grid>
 </Border>
diff --git a/Icarus/TSFEditor/TFSEditorV.xaml b/Icarus/TSFEditor/TFSEditorV.xaml
index d7063dd..e9b841d 100644
--- a/Icarus/TSFEditor/TFSEditorV.xaml
+++ b/Icarus/TSFEditor/TFSEditorV.xaml
@@ -241,6 +241,7 @@
             <ComboBox DockPanel.Dock="Left" 
                       ItemsSource="{Binding FilterList}"
                       SelectedIndex="{Binding nSelFilter}"
+                      Width="125"
                       Margin="2.5,0,2.5,0"
                       Style="{StaticResource RightPanel_ComboBox}"/>
             <Button DockPanel.Dock="Right"
diff --git a/Icarus/Utility/Dictionary.xaml b/Icarus/Utility/Dictionary.xaml
index 817926a..f5adf07 100644
--- a/Icarus/Utility/Dictionary.xaml
+++ b/Icarus/Utility/Dictionary.xaml
@@ -90,12 +90,24 @@
    <SolidColorBrush x:Key="EgaltechUltralightGray" Color="#FFF2F2F2" />
    <SolidColorBrush x:Key="EgaltechGreen" Color="#FF00FF00" />
 
-   <SolidColorBrush x:Key="Icarus_Gray" Color="#92908d" />
-   <SolidColorBrush x:Key="Icarus_LightBlue" Color="#3c89c9" />
-   <SolidColorBrush x:Key="Icarus_Blue" Color="#2e5a81" />
-   <SolidColorBrush x:Key="Icarus_Green" Color="#50A388" />
-   <SolidColorBrush x:Key="Icarus_Orange" Color="#bc373e" />
-   <SolidColorBrush x:Key="Icarus_Purple" Color="#A74C77" />
+   <!--#92908d-->
+   <Color x:Key="Icarus_Gray_Color" R="146" G="144" B="141" A="255"/>
+   <SolidColorBrush x:Key="Icarus_Gray" Color="{StaticResource Icarus_Gray_Color}" />
+   <!--#3c89c9-->
+   <Color x:Key="Icarus_LightBlue_Color" R="60" G="137" B="201" A="255"/>
+   <SolidColorBrush x:Key="Icarus_LightBlue" Color="{StaticResource Icarus_LightBlue_Color}" />
+   <!--#2e5a81-->
+   <Color x:Key="Icarus_Blue_Color" R="46" G="90" B="129" A="255"/>
+   <SolidColorBrush x:Key="Icarus_Blue" Color="{StaticResource Icarus_Blue_Color}" />
+   <!--#50A388-->
+   <Color x:Key="Icarus_Green_Color" R="80" G="163" B="136" A="255"/>
+   <SolidColorBrush x:Key="Icarus_Green" Color="{StaticResource Icarus_Green_Color}" />
+   <!--#BC373E-->
+   <Color x:Key="Icarus_Orange_Color" R="188" G="55" B="62" A="255"/>
+   <SolidColorBrush x:Key="Icarus_Orange" Color="{StaticResource Icarus_Orange_Color}" />
+   <!--#A74C77-->
+   <Color x:Key="Icarus_Purple_Color" R="167" G="76" B="119" A="255"/>
+   <SolidColorBrush x:Key="Icarus_Purple" Color="{StaticResource Icarus_Purple_Color}" />
 
    <!--Colori per EgtWPFLib5-->
    <SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3"/>
@@ -358,6 +370,14 @@
       <Setter Property="Template" Value="{StaticResource Button.NoBackgroundButton}"/>
    </Style>
 
+   <Style x:Key="RightPanel_HalfRound_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="24"/>
+      <Setter Property="Width" Value="64"/>
+      <Setter Property="BorderBrush" Value="{StaticResource Icarus_Gray}"/>
+      <Setter Property="BorderThickness" Value="1,1,1,0"/>
+      <Setter Property="Template" Value="{StaticResource Button.HalfRoundButton}"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- ToggleButton Style -->
@@ -677,6 +697,11 @@
       <Setter Property="FontWeight" Value="Normal"/>
       <Setter Property="FontSize" Value="12"/>
       <Setter Property="Foreground" Value="{StaticResource Icarus_Gray}"/>
+      <Style.Triggers>
+         <Trigger Property="IsEnabled" Value="False">
+            <Setter Property="OpacityMask" Value="#54707070"/>
+         </Trigger>
+      </Style.Triggers>
    </Style>
 
    <Style x:Key="ToolsTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
@@ -749,6 +774,11 @@
       <Setter Property="VerticalAlignment" Value="Center"/>
    </Style>
 
+   <Style x:Key="ParameterList_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- TextBox -->
@@ -810,6 +840,10 @@
       <Setter Property="HorizontalContentAlignment" Value="Right"/>
    </Style>
 
+   <Style x:Key="ParameterList_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource BaseTextBox}">
+      <Setter Property="TextAlignment" Value="Center"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- Image -->
@@ -1909,7 +1943,6 @@
       <Setter Property="BorderBrush" Value="{StaticResource Icarus_Gray}"/>
       <Setter Property="BorderThickness" Value="1"/>
       <Setter Property="Height" Value="28"/>
-      <Setter Property="Width" Value="125"/>
       <Setter Property="HorizontalAlignment" Value="Left"/>
    </Style>
 
@@ -3086,4 +3119,382 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+   <!-- Expander -->
+
+   <SolidColorBrush x:Key="Expander.Static.Circle.Stroke" Color="{StaticResource Icarus_Gray_Color}"/>
+   <SolidColorBrush x:Key="Expander.Static.Circle.Fill" Color="White"/>
+   <SolidColorBrush x:Key="Expander.Static.Arrow.Stroke" Color="{StaticResource Icarus_Gray_Color}"/>
+   <SolidColorBrush x:Key="Expander.Static.Foreground" Color="{StaticResource Icarus_Gray_Color}"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Stroke" Color="#FF5593FF"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Circle.Fill" Color="#FFF3F9FF"/>
+   <SolidColorBrush x:Key="Expander.MouseOver.Arrow.Stroke" Color="#FF000000"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Circle.Stroke" Color="#FF3C77DD"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Circle.Fill" Color="#FFD9ECFF"/>
+   <SolidColorBrush x:Key="Expander.Pressed.Arrow.Stroke" Color="#FF000000"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Circle.Stroke" Color="#FFBCBCBC"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Circle.Fill" Color="#FFE6E6E6"/>
+   <SolidColorBrush x:Key="Expander.Disabled.Arrow.Stroke" Color="#FF707070"/>
+   <Style x:Key="ExpanderHeaderFocusVisual">
+      <Setter Property="Control.Template">
+         <Setter.Value>
+            <ControlTemplate>
+               <Border>
+                  <Rectangle Margin="0" StrokeDashArray="1 2" Stroke="Black" SnapsToDevicePixels="true" StrokeThickness="1"/>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="ExpanderDownHeaderStyle" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border Padding="{TemplateBinding Padding}">
+                  <Grid Background="Transparent" SnapsToDevicePixels="False">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="19"/>
+                        <ColumnDefinition Width="*"/>
+                     </Grid.ColumnDefinitions>
+                     <Rectangle x:Name="circle" 
+                                   RadiusX="4"
+                                   RadiusY="4"
+                                   Fill="{StaticResource Expander.Static.Circle.Fill}" 
+                                   HorizontalAlignment="Center" 
+                                   Height="19"
+                                   Width="19"
+                                   Stroke="{StaticResource Expander.Static.Circle.Stroke}" 
+                                   VerticalAlignment="Center"/>
+                     <Path x:Name="arrow" 
+                                 Data="M 6,14 14,6 14,12 Q14,14 12,14 Z"
+                                 Fill="{StaticResource Expander.Static.Arrow.Stroke}"
+                                 HorizontalAlignment="Center"
+                                 Stroke="{StaticResource Expander.Static.Arrow.Stroke}" 
+                                 SnapsToDevicePixels="false" 
+                                 StrokeThickness="2" 
+                                 VerticalAlignment="Center"/>
+                     <ContentPresenter Grid.Column="1" 
+                                       HorizontalAlignment="Left"
+                                       Margin="4,0,0,0" 
+                                       RecognizesAccessKey="True" 
+                                       SnapsToDevicePixels="True" 
+                                       VerticalAlignment="Center"/>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="Data" TargetName="arrow" Value="M 6,-2 14,6 14,0 Q14,-2 12,-2 Z"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                     <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                     <Setter Property="OpacityMask" Value="#54707070"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="ExpanderUpHeaderStyle" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border Padding="{TemplateBinding Padding}">
+                  <Grid Background="Transparent" SnapsToDevicePixels="False">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="19"/>
+                        <ColumnDefinition Width="*"/>
+                     </Grid.ColumnDefinitions>
+                     <Grid>
+                        <Grid.LayoutTransform>
+                           <TransformGroup>
+                              <TransformGroup.Children>
+                                 <TransformCollection>
+                                    <RotateTransform Angle="180"/>
+                                 </TransformCollection>
+                              </TransformGroup.Children>
+                           </TransformGroup>
+                        </Grid.LayoutTransform>
+                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
+                     </Grid>
+                     <ContentPresenter Grid.Column="1" HorizontalAlignment="Left" Margin="4,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                     <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="ExpanderLeftHeaderStyle" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border Padding="{TemplateBinding Padding}">
+                  <Grid Background="Transparent" SnapsToDevicePixels="False">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="19"/>
+                        <RowDefinition Height="*"/>
+                     </Grid.RowDefinitions>
+                     <Grid>
+                        <Grid.LayoutTransform>
+                           <TransformGroup>
+                              <TransformGroup.Children>
+                                 <TransformCollection>
+                                    <RotateTransform Angle="90"/>
+                                 </TransformCollection>
+                              </TransformGroup.Children>
+                           </TransformGroup>
+                        </Grid.LayoutTransform>
+                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
+                     </Grid>
+                     <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" RecognizesAccessKey="True" Grid.Row="1" SnapsToDevicePixels="True" VerticalAlignment="Top"/>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                     <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="ExpanderRightHeaderStyle" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border Padding="{TemplateBinding Padding}">
+                  <Grid Background="Transparent" SnapsToDevicePixels="False">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="19"/>
+                        <RowDefinition Height="*"/>
+                     </Grid.RowDefinitions>
+                     <Grid>
+                        <Grid.LayoutTransform>
+                           <TransformGroup>
+                              <TransformGroup.Children>
+                                 <TransformCollection>
+                                    <RotateTransform Angle="-90"/>
+                                 </TransformCollection>
+                              </TransformGroup.Children>
+                           </TransformGroup>
+                        </Grid.LayoutTransform>
+                        <Ellipse x:Name="circle" Fill="{StaticResource Expander.Static.Circle.Fill}" HorizontalAlignment="Center" Height="19" Stroke="{StaticResource Expander.Static.Circle.Stroke}" VerticalAlignment="Center" Width="19"/>
+                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" Stroke="{StaticResource Expander.Static.Arrow.Stroke}" SnapsToDevicePixels="false" StrokeThickness="2" VerticalAlignment="Center"/>
+                     </Grid>
+                     <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" RecognizesAccessKey="True" Grid.Row="1" SnapsToDevicePixels="True" VerticalAlignment="Top"/>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.MouseOver.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.MouseOver.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsPressed" Value="true">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Stroke}"/>
+                     <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Pressed.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Pressed.Arrow.Stroke}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Stroke" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Stroke}"/>
+                     <Setter Property="Fill" TargetName="circle" Value="{StaticResource Expander.Disabled.Circle.Fill}"/>
+                     <Setter Property="Stroke" TargetName="arrow" Value="{StaticResource Expander.Disabled.Arrow.Stroke}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style TargetType="{x:Type Expander}">
+      <Setter Property="Foreground" Value="{StaticResource Expander.Static.Foreground}"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+      <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+      <Setter Property="BorderBrush" Value="Transparent"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Expander}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3" SnapsToDevicePixels="true">
+                  <DockPanel>
+                     <ToggleButton x:Name="HeaderSite" 
+                                   ContentTemplate="{TemplateBinding HeaderTemplate}" 
+                                   Content="{TemplateBinding Header}" 
+                                   ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" 
+                                   DockPanel.Dock="Top" FontStretch="{TemplateBinding FontStretch}"
+                                   Foreground="{TemplateBinding Foreground}"
+                                   FocusVisualStyle="{StaticResource ExpanderHeaderFocusVisual}" 
+                                   FontStyle="{TemplateBinding FontStyle}" 
+                                   FontFamily="{TemplateBinding FontFamily}"
+                                   FontWeight="{TemplateBinding FontWeight}"
+                                   FontSize="{TemplateBinding FontSize}" 
+                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                                   IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                   Margin="1" 
+                                   MinWidth="0" 
+                                   MinHeight="0" 
+                                   Padding="{TemplateBinding Padding}" 
+                                   Style="{StaticResource ExpanderDownHeaderStyle}"
+                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                     <Grid x:Name="GridSite"
+                           Margin="25,0,0,0"/>
+                     <ContentPresenter x:Name="ExpandSite"
+                                       DockPanel.Dock="Bottom" 
+                                       Focusable="false" 
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                                       Margin="{TemplateBinding Padding}" 
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}" 
+                                       Visibility="Collapsed"/>
+                  </DockPanel>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsExpanded" Value="true">
+                     <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible"/>
+                  </Trigger>
+                  <Trigger Property="ExpandDirection" Value="Right">
+                     <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Right"/>
+                     <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Left"/>
+                     <Setter Property="Margin" TargetName="GridSite" Value="0,0,0,0"/>
+                     <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderRightHeaderStyle}"/>
+                  </Trigger>
+                  <Trigger Property="ExpandDirection" Value="Up">
+                     <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Top"/>
+                     <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Bottom"/>
+                     <Setter Property="Margin" TargetName="GridSite" Value="0,0,0,0"/>
+                     <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderUpHeaderStyle}"/>
+                  </Trigger>
+                  <Trigger Property="ExpandDirection" Value="Left">
+                     <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Left"/>
+                     <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Right"/>
+                     <Setter Property="Margin" TargetName="GridSite" Value="0,0,0,0"/>
+                     <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderLeftHeaderStyle}"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!-- ScrollViewer -->
+
+   <Style x:Key="RightPanel_ScrollViewer" TargetType="{x:Type ScrollViewer}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ScrollViewer}">
+               <Grid x:Name="Grid" Background="{TemplateBinding Background}">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="*"/>
+                     <ColumnDefinition Width="Auto"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="*"/>
+                     <RowDefinition Height="Auto"/>
+                  </Grid.RowDefinitions>
+                  <Rectangle x:Name="Corner"
+                             Grid.Column="1" 
+                             Fill="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" 
+                             Grid.Row="1"/>
+                  <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" 
+                                          CanHorizontallyScroll="False" 
+                                          ContentTemplate="{TemplateBinding ContentTemplate}" 
+                                          CanVerticallyScroll="False"
+                                          Grid.Column="0" 
+                                          Content="{TemplateBinding Content}" 
+                                          CanContentScroll="{TemplateBinding CanContentScroll}"
+                                          Margin="{TemplateBinding Padding}" 
+                                          Grid.Row="0"/>
+                  <ScrollBar x:Name="PART_VerticalScrollBar" 
+                             AutomationProperties.AutomationId="VerticalScrollBar" 
+                             Cursor="Arrow"
+                             Grid.Column="1"
+                             Grid.Row="0" 
+                             Maximum="{TemplateBinding ScrollableHeight}" 
+                             Minimum="0" 
+                             Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" 
+                             ViewportSize="{TemplateBinding ViewportHeight}" 
+                             Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
+                             Margin="2.5,0,2.5,0"/>
+                  <ScrollBar x:Name="PART_HorizontalScrollBar" 
+                             AutomationProperties.AutomationId="HorizontalScrollBar" 
+                             Cursor="Arrow" 
+                             Grid.Column="0" 
+                             Maximum="{TemplateBinding ScrollableWidth}" 
+                             Minimum="0" 
+                             Orientation="Horizontal" 
+                             Grid.Row="1" 
+                             Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
+                             ViewportSize="{TemplateBinding ViewportWidth}"
+                             Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"/>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+      <Style.Triggers>
+         <Trigger Property="IsEnabled" Value="false">
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+   
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
 </ResourceDictionary>