New Icons and Zoom of graph were added

StructureHelper/App.xaml

@@ -16,6 +16,7 @@
                 <ResourceDictionary Source="Infrastructure/UI/Resources/PrimitiveToolTips.xaml"/>
                 <ResourceDictionary Source="Infrastructure/UI/Resources/ITemEditPanels.xaml"/>
                 <ResourceDictionary Source="Infrastructure/UI/Resources/ForceTemplates.xaml"/>
+                <ResourceDictionary Source="Infrastructure/UI/Resources/IconDictionary.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

StructureHelper/Infrastructure/UI/Resources/ButtonStyles.xaml

@@ -49,10 +49,22 @@
             <Setter Property="Margin" Value="5"/>
         </Style.Setters>
     </Style>
+
+    <Style x:Key="ButtonImage16" TargetType="Image">
+        <Setter Property="Height" Value="16"/>
+        <Setter Property="Width" Value="16"/>
+    </Style>
+    <Style x:Key="ButtonImage32" TargetType="Image">
+        <Setter Property="Height" Value="32"/>
+        <Setter Property="Width" Value="32"/>
+    </Style>
+
     <DataTemplate x:Key="OkCancelButtons">
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Style="{StaticResource CancelButton}" Command="{Binding CancelCommand}"/>
             <Button Style="{StaticResource OkButton}" Command="{Binding OkCommand}"/>
         </StackPanel>
     </DataTemplate>
+    
+    
 </ResourceDictionary>

StructureHelper/Infrastructure/UI/Resources/IconDictionary.xaml

@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:System="clr-namespace:System;assembly=System.Runtime">
+    <!-- Define bitmap resources -->
+
+    
+    <!-- Primitive templates -->
+    <BitmapImage x:Key="Beam32" CacheOption="OnLoad" UriSource="/Infrastructure/UI/Icons/Objects/Beam32.png"/>
+</ResourceDictionary>

StructureHelper/Properties/Resources.Designer.cs

@@ -22,7 +22,7 @@ namespace StructureHelper.Properties {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
+    public class Resources {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
@@ -36,7 +36,7 @@ namespace StructureHelper.Properties {
         ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
+        public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("StructureHelper.Properties.Resources", typeof(Resources).Assembly);
@@ -51,7 +51,7 @@ namespace StructureHelper.Properties {
         ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
+        public static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }

StructureHelper/StructureHelper.csproj

@@ -23,30 +23,37 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Remove="Windows\MainWindow\Add_Circle.png" />
+    <None Remove="Windows\MainWindow\Analysis32.png" />
-    <None Remove="Windows\MainWindow\Add_Rebar.png" />
+    <None Remove="Windows\MainWindow\Beam32.png" />
-    <None Remove="Windows\MainWindow\Calculator.png" />
+    <None Remove="Windows\MainWindow\Calculator32.png" />
-    <None Remove="Windows\MainWindow\Circle.png" />
+    <None Remove="Windows\MainWindow\Circle32.png" />
+    <None Remove="Windows\MainWindow\CircleColumn32.png" />
+    <None Remove="Windows\MainWindow\ConMaterial32.png" />
     <None Remove="Windows\MainWindow\Copy.png" />
     <None Remove="Windows\MainWindow\Delete.png" />
     <None Remove="Windows\MainWindow\Edit.png" />
-    <None Remove="Windows\MainWindow\Edit_Circle_RC.png" />
+    <None Remove="Windows\MainWindow\ElasticMaterial32.png" />
-    <None Remove="Windows\MainWindow\Edit_Concrete beam.png" />
+    <None Remove="Windows\MainWindow\GlassMaterial32.png" />
-    <None Remove="Windows\MainWindow\Edit_Concrete column.png" />
+    <None Remove="Windows\MainWindow\Materials32.png" />
-    <None Remove="Windows\MainWindow\Edit_Concrete slab.png" />
-    <None Remove="Windows\MainWindow\Materials.png" />
     <None Remove="Windows\MainWindow\MovePrimitivesToCenter.png" />
-    <None Remove="Windows\MainWindow\Point_Primitive.png" />
+    <None Remove="Windows\MainWindow\Point32.png" />
-    <None Remove="Windows\MainWindow\Rectangle_Primitive.png" />
+    <None Remove="Windows\MainWindow\Rebar32.png" />
+    <None Remove="Windows\MainWindow\Rectangle32.png" />
+    <None Remove="Windows\MainWindow\RectangleColumn32.png" />
+    <None Remove="Windows\MainWindow\RFMaterial32.png" />
     <None Remove="Windows\MainWindow\Run.png" />
+    <None Remove="Windows\MainWindow\Slab32.png" />
     <None Remove="Windows\MainWindow\ToBackground.png" />
     <None Remove="Windows\MainWindow\ToForeground.png" />
     <None Remove="Windows\MainWindow\Tools_Settings.png" />
+    <None Remove="Windows\MainWindow\СarbonMaterial32.png" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Autofac" Version="6.5.0" />
     <PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
+    <PackageReference Include="LiveCharts.Wpf.Core" Version="0.9.8" />
+    <PackageReference Include="LiveCharts.Wpf.NetCore3" Version="0.9.7" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
@@ -73,34 +80,34 @@
   <ItemGroup>
     <Folder Include="Documentation\Manuals\" />
     <Folder Include="Infrastructure\UI\DataContexts\Logics\" />
-    <Folder Include="Infrastructure\UI\Icons\" />
     <Folder Include="Resources\" />
   </ItemGroup>
 
   <ItemGroup>
-    <Resource Include="Windows\MainWindow\Add_Circle.png" />
+    <Resource Include="Windows\MainWindow\Analysis32.png" />
-    <Resource Include="Windows\MainWindow\Add_Rebar.png" />
+    <Resource Include="Windows\MainWindow\Beam32.png" />
-    <Resource Include="Windows\MainWindow\Calculator.png" />
+    <Resource Include="Windows\MainWindow\Calculator32.png" />
-    <Resource Include="Windows\MainWindow\Circle.png" />
+    <Resource Include="Windows\MainWindow\Circle32.png" />
+    <Resource Include="Windows\MainWindow\CircleColumn32.png" />
+    <Resource Include="Windows\MainWindow\ConMaterial32.png" />
     <Resource Include="Windows\MainWindow\Copy.png" />
     <Resource Include="Windows\MainWindow\Delete.png" />
     <Resource Include="Windows\MainWindow\Edit.png" />
+    <Resource Include="Windows\MainWindow\ElasticMaterial32.png" />
+    <Resource Include="Windows\MainWindow\GlassMaterial32.png" />
+    <Resource Include="Windows\MainWindow\Materials32.png" />
     <Resource Include="Windows\MainWindow\MovePrimitivesToCenter.png" />
-    <Resource Include="Windows\MainWindow\Point_Primitive.png">
+    <Resource Include="Windows\MainWindow\Point32.png" />
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <Resource Include="Windows\MainWindow\Rebar32.png" />
-    </Resource>
+    <Resource Include="Windows\MainWindow\Rectangle32.png" />
-    <Resource Include="Windows\MainWindow\Rectangle_Primitive.png">
+    <Resource Include="Windows\MainWindow\RectangleColumn32.png" />
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <Resource Include="Windows\MainWindow\RFMaterial32.png" />
-    </Resource>
-    <Resource Include="Windows\MainWindow\Edit_Circle_RC.png" />
-    <Resource Include="Windows\MainWindow\Edit_Concrete beam.png" />
-    <Resource Include="Windows\MainWindow\Edit_Concrete column.png" />
-    <Resource Include="Windows\MainWindow\Edit_Concrete slab.png" />
-    <Resource Include="Windows\MainWindow\Materials.png" />
     <Resource Include="Windows\MainWindow\Run.png" />
+    <Resource Include="Windows\MainWindow\Slab32.png" />
     <Resource Include="Windows\MainWindow\ToBackground.png" />
     <Resource Include="Windows\MainWindow\ToForeground.png" />
     <Resource Include="Windows\MainWindow\Tools_Settings.png" />
+    <Resource Include="Windows\MainWindow\СarbonMaterial32.png" />
   </ItemGroup>
 
   <ItemGroup>
@@ -113,7 +120,7 @@
 
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>

StructureHelper/StructureHelper.csproj.user

@@ -38,6 +38,9 @@
     <Page Update="Infrastructure\UI\Resources\ForceTemplates.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="Infrastructure\UI\Resources\IconDictionary.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="Infrastructure\UI\Resources\Materials.xaml">
       <SubType>Designer</SubType>
     </Page>

StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsView.xaml

@@ -48,6 +48,7 @@
             <Button Margin="3" Content="Anchorage" ToolTip="Set strains as auto prestrain" Command="{Binding ShowAnchorageCommand}"/>
             <Button Margin="3" Content="Geometry" ToolTip="Show Geometry Properties" Command="{Binding ShowGeometryResultCommand}"/>
             <Button Margin="3" Content="Fcrc" ToolTip="Show crack force" Command="{Binding ShowCrackResultCommand}"/>
+            <Button Margin="3" Content="Acrc" ToolTip="Show crack width" Command="{Binding ShowCrackWidthResultCommand}"/>
         </StackPanel>
     </Grid>
 </Window>

StructureHelper/Windows/Graphs/GraphView.xaml

@@ -9,65 +9,84 @@
         d:DataContext="{d:DesignInstance vm:GraphViewModel}"
         mc:Ignorable="d"
         Title="Graph" Height="450" Width="800" MinHeight="300" MinWidth="400" WindowStartupLocation="CenterScreen">
-    <Grid>
+    <DockPanel>
-        <Grid.ColumnDefinitions>
+        <!--<ToolBarTray DockPanel.Dock="Top">
-            <ColumnDefinition Width="250"/>
+            <ToolBar>
-            <ColumnDefinition/>
+                <Button Command="{Binding SaveAsImage}">
-        </Grid.ColumnDefinitions>
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/ConMaterial32.png"/>
+                </Button>
+            </ToolBar>
+        </ToolBarTray>-->
         <Grid>
-            <Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
-                <RowDefinition/>
+                <ColumnDefinition Width="250"/>
-                <RowDefinition Height="40"/>
+                <ColumnDefinition/>
-            </Grid.RowDefinitions>
+            </Grid.ColumnDefinitions>
-            <StackPanel>
+            <Grid>
-                <GroupBox Header="X-axis values">
+                <Grid.RowDefinitions>
-                    <StackPanel>
+                    <RowDefinition/>
-                        <ComboBox ItemsSource="{Binding XItems.Collection}" SelectedItem="{Binding XItems.SelectedItem}">
+                    <RowDefinition Height="40"/>
-                            <ComboBox.ItemTemplate>
+                </Grid.RowDefinitions>
-                                <DataTemplate>
+                <StackPanel>
-                                    <Grid>
+                    <GroupBox Header="X-axis values">
-                                        <Grid.ColumnDefinitions>
+                        <StackPanel>
-                                            <ColumnDefinition Width="20"/>
+                            <ComboBox ItemsSource="{Binding XItems.Collection}" SelectedItem="{Binding XItems.SelectedItem}">
-                                            <ColumnDefinition/>
+                                <ComboBox.ItemTemplate>
-                                        </Grid.ColumnDefinitions>
+                                    <DataTemplate>
-                                        <Rectangle Grid.Column="0" Margin="3">
+                                        <Grid>
-                                            <Rectangle.Fill>
+                                            <Grid.ColumnDefinitions>
-                                                <SolidColorBrush Color="{Binding Color}"/>
+                                                <ColumnDefinition Width="20"/>
-                                            </Rectangle.Fill>
+                                                <ColumnDefinition/>
-                                        </Rectangle>
+                                            </Grid.ColumnDefinitions>
-                                        <TextBlock Grid.Column="1" Text="{Binding Name}"/>
+                                            <Rectangle Grid.Column="0" Margin="3">
-                                    </Grid>
+                                                <Rectangle.Fill>
-                                </DataTemplate>
+                                                    <SolidColorBrush Color="{Binding Color}"/>
-                            </ComboBox.ItemTemplate>
+                                                </Rectangle.Fill>
-                        </ComboBox>
+                                            </Rectangle>
-                        <CheckBox Margin="5" Content="Invert Values" IsChecked="{Binding InvertXValues}"/>
+                                            <TextBlock Grid.Column="1" Text="{Binding Name}"/>
-                    </StackPanel>
+                                        </Grid>
+                                    </DataTemplate>
+                                </ComboBox.ItemTemplate>
+                            </ComboBox>
+                            <CheckBox Margin="5" Content="Invert Values" IsChecked="{Binding InvertXValues}"/>
+                        </StackPanel>
 
-                </GroupBox>
+                    </GroupBox>
-                <GroupBox Header="Y-axis values">
+                    <GroupBox Header="Y-axis values">
-                    <StackPanel>
+                        <StackPanel>
-                        <ContentControl ContentTemplate="{StaticResource ResourceKey=SelectItems}" Content="{Binding YItems}"/>
+                            <ContentControl ContentTemplate="{StaticResource ResourceKey=SelectItems}" Content="{Binding YItems}"/>
-                        <CheckBox Margin="5" Content="Invert Values" IsChecked="{Binding InvertYValues}"/>
+                            <CheckBox Margin="5" Content="Invert Values" IsChecked="{Binding InvertYValues}"/>
-                    </StackPanel>
+                        </StackPanel>
-                </GroupBox>
+                    </GroupBox>
-                <GroupBox Header="Line smoothness">
+                    <GroupBox Header="Line properties" DataContext="{Binding VisualProps}">
-                    <StackPanel Orientation="Horizontal">
+                        <StackPanel>
-                        <Slider x:Name="slider" Width="195" Minimum="0" Maximum="1" Value="{Binding LineSmoothness}"/>
+                            <TextBlock Text="Line smoothness" Margin="0,5,0,5"/>
-                        <TextBox Width="40" Text="{Binding LineSmoothness,Converter={StaticResource PlainDouble}, ValidatesOnDataErrors=True}"/>
+                            <StackPanel Orientation="Horizontal">
-                    </StackPanel>
+                                <Slider x:Name="slider" Width="195" Minimum="0" Maximum="{Binding MaxLineSmoothness}" Value="{Binding LineSmoothness}"/>
-                </GroupBox>
+                                <TextBox Width="40" Text="{Binding LineSmoothness,Converter={StaticResource PlainDouble}, ValidatesOnDataErrors=True}"/>
-            </StackPanel>
+                            </StackPanel>
-            <StackPanel Grid.Row="1">
+                            <TextBlock Text="Stroke thickness" Margin="0,5,0,5"/>
-                <Button Margin="3" Content="Draw Lines" ToolTip="Draw Lines" Command="{Binding RedrawLinesCommand}"/>
+                            <StackPanel Orientation="Horizontal">
-            </StackPanel>
+                                <Slider x:Name="StrokeSlider" Width="195" Minimum="0" Maximum="{Binding MaxStrokeSize}" Value="{Binding StrokeSize}"/>
+                                <TextBox Width="40" Text="{Binding StrokeSize,Converter={StaticResource PlainDouble}, ValidatesOnDataErrors=True}"/>
+                            </StackPanel>
+                        </StackPanel>
+                    </GroupBox>
+
+                </StackPanel>
+                <StackPanel Grid.Row="1">
+                    <Button Margin="3" Content="Draw Lines" ToolTip="Draw Lines" Command="{Binding RedrawLinesCommand}"/>
+                </StackPanel>
+            </Grid>
+            <lvc:CartesianChart Name="MainChart" Grid.Column="1" Series="{Binding SeriesCollection}" LegendLocation="Bottom" Zoom="Xy">
+                <lvc:CartesianChart.AxisY>
+                    <lvc:Axis Title="y-value"></lvc:Axis>
+                </lvc:CartesianChart.AxisY>
+                <lvc:CartesianChart.AxisX>
+                    <lvc:Axis Title="x-value"></lvc:Axis>
+                </lvc:CartesianChart.AxisX>
+            </lvc:CartesianChart>
         </Grid>
-        <lvc:CartesianChart Grid.Column="1" Series="{Binding SeriesCollection}" LegendLocation="Bottom" >
+    </DockPanel>
-            <lvc:CartesianChart.AxisY>
+    
-                <lvc:Axis Title="y-value"></lvc:Axis>
-            </lvc:CartesianChart.AxisY>
-            <lvc:CartesianChart.AxisX>
-                <lvc:Axis Title="x-value"></lvc:Axis>
-            </lvc:CartesianChart.AxisX>
-        </lvc:CartesianChart>
-    </Grid>
 </Window>

StructureHelper/Windows/Graphs/GraphView.xaml.cs

@@ -1,4 +1,5 @@
-using StructureHelper.Windows.ViewModels.Graphs;
+using LiveCharts.Wpf;
+using StructureHelper.Windows.ViewModels.Graphs;
 using StructureHelperCommon.Models.Parameters;
 using System;
 using System.Collections.Generic;
@@ -28,6 +29,9 @@ namespace StructureHelper.Windows.Graphs
             this.vm = vm;
             InitializeComponent();
             DataContext = vm;
+
+            var cartesianChart = (CartesianChart)FindName("MainChart");
+            vm.MainChart = cartesianChart;
         }
         public GraphView(ArrayParameter<double> arrayParameter) : this(new GraphViewModel(arrayParameter))
         {

StructureHelper/Windows/MainWindow/MainView.xaml

@@ -103,7 +103,7 @@
         </ContextMenu>
     </Window.Resources>
     <DockPanel>
-        <Menu DockPanel.Dock="Top" x:Name="menu">
+        <!--<Menu DockPanel.Dock="Top" x:Name="menu">
             <MenuItem Header="File">
             </MenuItem>
             <MenuItem Header="Edit">
@@ -132,7 +132,7 @@
             <MenuItem Header="Help">
                 <Button Content="About..." Command="{Binding HelpLogic.ShowAbout}"/>
             </MenuItem>
-        </Menu>
+        </Menu>-->
         <ToolBarTray DockPanel.Dock="Top">
             <ToolBar DataContext="{Binding CombinationsLogic}" ToolTip="Actions">
                 <Button Style="{StaticResource ToolButton}" 
@@ -145,52 +145,59 @@
                         Content="Fact" ToolTip="Add Factored Combination"/>
             </ToolBar>
             <ToolBar DataContext="{Binding MaterialsLogic}" ToolTip="Materials">
-                <Button Style="{StaticResource ToolButton}" 
+                <Button Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Concrete}">
-                        Command="{Binding Add}"
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/ConMaterial32.png"/>
-                        CommandParameter="{x:Static enums:MaterialType.Concrete}"
+                </Button>
-                        Content="Con" ToolTip="Add Concrete Material"/>
+                <Button Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Reinforcement}" ToolTip="Add Reinforcement Material">
-                <Button Style="{StaticResource ToolButton}"  Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Reinforcement}" Content="RF" ToolTip="Add Reinforcement Material"/>
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/RFMaterial32.png"/>
-                <Button Style="{StaticResource ToolButton}"  Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Elastic}" Content="Elast" ToolTip="Add Elastic Material"/>
+                </Button>
-                <Button Style="{StaticResource ToolButton}" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.CarbonFiber}" Content="CFR" ToolTip="Add Carbon Fiber Material"/>
+                <Button Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Elastic}" ToolTip="Add Elastic Material">
-                <Button Style="{StaticResource ToolButton}"  Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.GlassFiber}" Content="GFR"  ToolTip="Add Glass Fiber Material"/>
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/ElasticMaterial32.png"/>
+                </Button>
+                <Button Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.CarbonFiber}" ToolTip="Add Carbon Fiber Material">
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/СarbonMaterial32.png"/>
+                </Button>
+                <Button Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.GlassFiber}" ToolTip="Add Glass Fiber Material">
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/GlassMaterial32.png"/>
+                </Button>
                 <Button Command="{Binding EditMaterialsCommand}" ToolTip="Show Materials">
-                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Materials.png"/>
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/Materials32.png"/>
                 </Button>
             </ToolBar>
             <ToolBar ToolTip="Base Primitives" DataContext="{Binding PrimitiveLogic}">
                 <Button Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Rectangle}" ToolTip="Add Rectangle Primitive">
-                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Rectangle_Primitive.png"/>
+                    <Image Style="{StaticResource ButtonImage32}"  Source="/Windows/MainWindow/Rectangle32.png"/>
                 </Button>
                 <Button Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Circle}" ToolTip="Add Circle Primitive">
-                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Add_Circle.png"/>
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/Circle32.png"/>
                 </Button>
                 <Button Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Reinforcement}" ToolTip="Add Rebar Primitive">
-                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Add_Rebar.png"/>
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/Rebar32.png"/>
                 </Button>
                 <Button Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Point}" ToolTip="Add Point Primitive">
-                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Point_primitive.png"/>
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/Point32.png"/>
                 </Button>
             </ToolBar>
             <ToolBar ToolTip="RC Templates">
                 <Button Command="{Binding AddColumnCase}" ToolTip="Add Rectangle RC Column">
-                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Edit_Concrete column.png"/>
+                    <Image Width="32" Height="32" Source="/Windows/MainWindow/RectangleColumn32.png"/>
                 </Button>
                 <Button Command="{Binding AddRCCircleCase}" ToolTip="Add Circle RC Column">
-                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Circle.png"/>
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/CircleColumn32.png"/>
                 </Button>
                 <Button Command="{Binding AddBeamCase}" ToolTip="Add RC Beam">
-                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Edit_Concrete beam.png"/>
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/Beam32.png"/>
                 </Button>
                 <Button Command="{Binding AddSlabCase}" ToolTip="Add RC Slab">
-                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Edit_Concrete slab.png"/>
+                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Slab32.png"/>
                 </Button>
             </ToolBar>
             <ToolBar ToolTip="Analises" DataContext="{Binding CalculatorsLogic}">
                 <Button Command="{Binding Add}" ToolTip="Add Force Calculator">
-                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Calculator.png"/>
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/Calculator32.png"/>
                 </Button>
                 <Button Command="{Binding Run}" ToolTip="Run Calculations">
-                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Run.png"/>
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/Analysis32.png"/>
                 </Button>
             </ToolBar>
             <ToolBar ToolTip="Tools">
@@ -236,16 +243,46 @@
                                 </ListBox.ItemTemplate>
                             </ListBox>
                         </Expander>
-                        <Expander Header="Materials" MinWidth="20" DataContext="{Binding MaterialsLogic}">
+                        <Expander MinWidth="20" DataContext="{Binding MaterialsLogic}">
+                            <Expander.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Materials32.png"/>
+                                    <TextBlock Text="Materials" Margin="5,0,0,0"/>
+                                </StackPanel>
+                            </Expander.Header>
                             <Expander.ContextMenu>
                                 <ContextMenu>
-                                    <Button Content="Materials" Command="{Binding EditMaterialsCommand}"/>
+                                    <MenuItem Header="Materials" Command="{Binding EditMaterialsCommand}">
+                                        <MenuItem.Icon>
+                                            <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Materials32.png" />
+                                        </MenuItem.Icon>
+                                    </MenuItem>
                                     <MenuItem Header="Add">
-                                        <Button Content="Concrete" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Concrete}"/>
+                                        <MenuItem Header="Concrete" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Concrete}">
-                                        <Button Content="Reinforcement" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Reinforcement}"/>
+                                            <MenuItem.Icon>
-                                        <Button Content="Elastic" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Elastic}"/>
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/ConMaterial32.png" />
-                                        <Button Content="CarbonFiber" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.CarbonFiber}"/>
+                                            </MenuItem.Icon>
-                                        <Button Content="GlassFiber" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.GlassFiber}"/>
+                                        </MenuItem>
+                                        <MenuItem Header="Reinforcement" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Reinforcement}">
+                                            <MenuItem.Icon>
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/RFMaterial32.png" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem Header="Elastic" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Elastic}">
+                                            <MenuItem.Icon>
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/ElasticMaterial32.png" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem Header="CarbonFiber" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.CarbonFiber}">
+                                            <MenuItem.Icon>
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/СarbonMaterial32.png" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem Header="GlassFiber" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.GlassFiber}">
+                                            <MenuItem.Icon>
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/GlassMaterial32.png" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
                                     </MenuItem>
                                 </ContextMenu>
                             </Expander.ContextMenu>
@@ -260,22 +297,22 @@
                                     <MenuItem Header="Add" DataContext="{Binding PrimitiveLogic}">
                                         <MenuItem Header="Rectangle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Rectangle}">
                                             <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Rectangle_Primitive.png" />
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Rectangle32.png" />
                                             </MenuItem.Icon>
                                         </MenuItem>
                                         <MenuItem Header="Circle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Circle}">
                                             <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Add_Circle.png" />
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Circle32.png" />
                                             </MenuItem.Icon>
                                         </MenuItem>
                                         <MenuItem Header="Rebar" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Reinforcement}">
                                             <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Add_Rebar.png" />
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Rebar32.png" />
                                             </MenuItem.Icon>
                                         </MenuItem>
                                         <MenuItem Header="Point" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Point}">
                                             <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Point_primitive.png" />
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Point32.png" />
                                             </MenuItem.Icon>
                                         </MenuItem>
                                     </MenuItem>
@@ -286,12 +323,18 @@
                                      ItemTemplate="{StaticResource ColoredItemTemplate}" ContextMenu="{StaticResource PrimitiveCRUD}">
                             </ListBox>
                         </Expander>
-                        <Expander Header="Analyses" MinWidth="20" DataContext="{Binding CalculatorsLogic}">
+                        <Expander MinWidth="20" DataContext="{Binding CalculatorsLogic}">
+                            <Expander.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Analysis32.png" />
+                                    <TextBlock Text="Analisis" Margin="5,0,0,0"/>
+                                </StackPanel>
+                            </Expander.Header>
                             <Expander.ContextMenu>
                                 <ContextMenu>
                                     <MenuItem Header="Add" Command="{Binding Add}">
                                         <MenuItem.Icon>
-                                            <Image Width="16" Height="16" Source="/Windows/MainWindow/Calculator.png" />
+                                            <Image Width="16" Height="16" Source="/Windows/MainWindow/Calculator32.png" />
                                         </MenuItem.Icon>
                                     </MenuItem>
                                 </ContextMenu>
@@ -321,44 +364,44 @@
                                     <MenuItem Header="Add" DataContext="{Binding PrimitiveLogic}">
                                         <MenuItem Header="Rectangle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Rectangle}">
                                             <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Rectangle_Primitive.png" />
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Rectangle32.png" />
                                             </MenuItem.Icon>
                                         </MenuItem>
                                         <MenuItem Header="Circle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Circle}">
                                             <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Add_Circle.png" />
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Circle32.png" />
                                             </MenuItem.Icon>
                                         </MenuItem>
                                         <MenuItem Header="Rebar" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Reinforcement}">
                                             <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Add_Rebar.png" />
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Rebar32.png" />
                                             </MenuItem.Icon>
                                         </MenuItem>
                                         <MenuItem Header="Point" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Point}">
                                             <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Point_primitive.png" />
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Point.png" />
                                             </MenuItem.Icon>
                                         </MenuItem>
                                     </MenuItem>
                                     <MenuItem Header="Templates" DataContext="{Binding}">
                                         <MenuItem Header="Add Rectangle RC Column" Command="{Binding AddColumnCase}">
                                             <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Concrete column.png" />
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/RectangleColumn32.png" />
                                             </MenuItem.Icon>
                                         </MenuItem>
                                         <MenuItem Header="Add Circle RC Column" Command="{Binding AddRCCircleCase}">
                                             <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Circle_RC.png" />
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/CircleColumn32.png" />
                                             </MenuItem.Icon>
                                         </MenuItem>
                                         <MenuItem Header="Add RC Beam" Command="{Binding AddBeamCase}">
                                             <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Concrete beam.png" />
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Beam32.png" />
                                             </MenuItem.Icon>
                                         </MenuItem>
                                         <MenuItem Header="Add RC slab" Command="{Binding AddSlabCase}">
                                             <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Concrete slab.png" />
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Slab32.png" />
                                             </MenuItem.Icon>
                                         </MenuItem>
                                     </MenuItem>