diff --git a/StructureHelper/App.xaml b/StructureHelper/App.xaml
index df63f54..e5b28d8 100644
--- a/StructureHelper/App.xaml
+++ b/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>
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Add point.png b/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Add point.png
deleted file mode 100644
index 82726a0..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Add point.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Add rectangle.png b/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Add rectangle.png
deleted file mode 100644
index 58157a3..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Add rectangle.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Concrete beam.png b/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Concrete beam.png
deleted file mode 100644
index 647dc86..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Concrete beam.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Concrete column.png b/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Concrete column.png
deleted file mode 100644
index 60604c6..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Concrete column.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Concrete slab.png b/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Concrete slab.png
deleted file mode 100644
index 2988be3..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Concrete slab.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Delete primitive.png b/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Delete primitive.png
deleted file mode 100644
index d841698..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Delete primitive.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Edit primitive.png b/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Edit primitive.png
deleted file mode 100644
index f1ba002..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Edit primitive.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Materials.png b/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Materials.png
deleted file mode 100644
index ffea5ac..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Materials.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Move primitives to center.png b/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Move primitives to center.png
deleted file mode 100644
index 6b90ede..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32/Edit_Move primitives to center.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32/Tools_Settings.png b/StructureHelper/Infrastructure/UI/Icons/32х32/Tools_Settings.png
deleted file mode 100644
index 42ba7e6..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32/Tools_Settings.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Calculator.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Calculator.png
deleted file mode 100644
index 33374c6..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Calculator.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Circle.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Circle.png
deleted file mode 100644
index 5b22c6e..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Circle.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Copy.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Copy.png
deleted file mode 100644
index 1284fd4..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Copy.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Delete.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Delete.png
deleted file mode 100644
index 44a634b..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Delete.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit.png
deleted file mode 100644
index acd82e7..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Add rectangle.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Add rectangle.png
deleted file mode 100644
index 7b80f5e..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Add rectangle.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Circle_RC.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Circle_RC.png
deleted file mode 100644
index 588f2d1..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Circle_RC.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Concrete slab.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Concrete slab.png
deleted file mode 100644
index 690717c..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Concrete slab.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Materials.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Materials.png
deleted file mode 100644
index bba6546..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Materials.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/MovePrimitivesToCenter.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/MovePrimitivesToCenter.png
deleted file mode 100644
index 85d4e1c..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/MovePrimitivesToCenter.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Point.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Point.png
deleted file mode 100644
index 141055f..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Point.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/RC_Beam.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/RC_Beam.png
deleted file mode 100644
index 49a5abe..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/RC_Beam.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/RC_Column.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/RC_Column.png
deleted file mode 100644
index 7ab8673..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/RC_Column.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Rebar.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Rebar.png
deleted file mode 100644
index 12fa188..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Rebar.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Run.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Run.png
deleted file mode 100644
index d1d50e4..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Run.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/ToBackground.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/ToBackground.png
deleted file mode 100644
index afaf6ca..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/ToBackground.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/ToForeground.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/ToForeground.png
deleted file mode 100644
index b75f7e9..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/ToForeground.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Tools_Settings.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Tools_Settings.png
deleted file mode 100644
index f94e364..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Tools_Settings.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Add point.png b/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Add point.png
deleted file mode 100644
index 64b5048..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Add point.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Add rectangle.png b/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Add rectangle.png
deleted file mode 100644
index 8671fcd..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Add rectangle.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Concrete beam.png b/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Concrete beam.png
deleted file mode 100644
index 1313cf3..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Concrete beam.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Concrete column.png b/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Concrete column.png
deleted file mode 100644
index feb6683..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Concrete column.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Concrete slab.png b/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Concrete slab.png
deleted file mode 100644
index 2913216..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Concrete slab.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Delete primitive.png b/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Delete primitive.png
deleted file mode 100644
index afe9f09..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Delete primitive.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Edit primitive.png b/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Edit primitive.png
deleted file mode 100644
index cf52c2e..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Edit primitive.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Materials.png b/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Materials.png
deleted file mode 100644
index 4411c12..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Materials.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Move primitives to center.png b/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Move primitives to center.png
deleted file mode 100644
index 4c1c0fa..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/500х500/Edit_Move primitives to center.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/500х500/Tools_Settings.png b/StructureHelper/Infrastructure/UI/Icons/500х500/Tools_Settings.png
deleted file mode 100644
index 566184e..0000000
Binary files a/StructureHelper/Infrastructure/UI/Icons/500х500/Tools_Settings.png and /dev/null differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/Objects/Beam32.png b/StructureHelper/Infrastructure/UI/Icons/Objects/Beam32.png
new file mode 100644
index 0000000..151fd5f
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/Objects/Beam32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/Objects/CircleColumn32.png b/StructureHelper/Infrastructure/UI/Icons/Objects/CircleColumn32.png
new file mode 100644
index 0000000..aab72db
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/Objects/CircleColumn32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/Objects/RectangleColumn32.png b/StructureHelper/Infrastructure/UI/Icons/Objects/RectangleColumn32.png
new file mode 100644
index 0000000..cdbd253
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/Objects/RectangleColumn32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/Objects/Slab32.png b/StructureHelper/Infrastructure/UI/Icons/Objects/Slab32.png
new file mode 100644
index 0000000..be1aa1e
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/Objects/Slab32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/actions/32px_delete.png b/StructureHelper/Infrastructure/UI/Icons/actions/32px_delete.png
new file mode 100644
index 0000000..3f5bdd7
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/actions/32px_delete.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/actions/32px_edit.png b/StructureHelper/Infrastructure/UI/Icons/actions/32px_edit.png
new file mode 100644
index 0000000..2e582bb
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/actions/32px_edit.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/actions/32px_move to the center.png b/StructureHelper/Infrastructure/UI/Icons/actions/32px_move to the center.png
new file mode 100644
index 0000000..9789578
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/actions/32px_move to the center.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/analysis/Analysis32.png b/StructureHelper/Infrastructure/UI/Icons/analysis/Analysis32.png
new file mode 100644
index 0000000..9d479ae
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/analysis/Analysis32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/analysis/Calculator32.png b/StructureHelper/Infrastructure/UI/Icons/analysis/Calculator32.png
new file mode 100644
index 0000000..ffcb39a
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/analysis/Calculator32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/combination/32px_factored combination.png b/StructureHelper/Infrastructure/UI/Icons/combination/32px_factored combination.png
new file mode 100644
index 0000000..123c4ee
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/combination/32px_factored combination.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/combination/32px_full combination.png b/StructureHelper/Infrastructure/UI/Icons/combination/32px_full combination.png
new file mode 100644
index 0000000..28bcf81
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/combination/32px_full combination.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/geometry/Circle32.png b/StructureHelper/Infrastructure/UI/Icons/geometry/Circle32.png
new file mode 100644
index 0000000..0a5eb2e
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/geometry/Circle32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/geometry/Point32.png b/StructureHelper/Infrastructure/UI/Icons/geometry/Point32.png
new file mode 100644
index 0000000..523a79a
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/geometry/Point32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/geometry/Rebar32.png b/StructureHelper/Infrastructure/UI/Icons/geometry/Rebar32.png
new file mode 100644
index 0000000..fe44fad
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/geometry/Rebar32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/geometry/Rectangle32.png b/StructureHelper/Infrastructure/UI/Icons/geometry/Rectangle32.png
new file mode 100644
index 0000000..f32c3ae
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/geometry/Rectangle32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/materials/ConMaterial32.png b/StructureHelper/Infrastructure/UI/Icons/materials/ConMaterial32.png
new file mode 100644
index 0000000..d5fcce3
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/materials/ConMaterial32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/materials/ElasticMaterial32.png b/StructureHelper/Infrastructure/UI/Icons/materials/ElasticMaterial32.png
new file mode 100644
index 0000000..e32435d
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/materials/ElasticMaterial32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/materials/GlassMaterial32.png b/StructureHelper/Infrastructure/UI/Icons/materials/GlassMaterial32.png
new file mode 100644
index 0000000..70e2773
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/materials/GlassMaterial32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/materials/Materials32.png b/StructureHelper/Infrastructure/UI/Icons/materials/Materials32.png
new file mode 100644
index 0000000..67b64bf
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/materials/Materials32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/materials/RFMaterial32.png b/StructureHelper/Infrastructure/UI/Icons/materials/RFMaterial32.png
new file mode 100644
index 0000000..bd3b7c7
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/materials/RFMaterial32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/materials/СarbonMaterial32.png b/StructureHelper/Infrastructure/UI/Icons/materials/СarbonMaterial32.png
new file mode 100644
index 0000000..726db7c
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/materials/СarbonMaterial32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/settings/32px_tools.png b/StructureHelper/Infrastructure/UI/Icons/settings/32px_tools.png
new file mode 100644
index 0000000..e5dd0d7
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/settings/32px_tools.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/settings/32px_visual settings.png b/StructureHelper/Infrastructure/UI/Icons/settings/32px_visual settings.png
new file mode 100644
index 0000000..25a94c5
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/settings/32px_visual settings.png differ
diff --git a/StructureHelper/Infrastructure/UI/Resources/32px_add beam.png b/StructureHelper/Infrastructure/UI/Resources/32px_add beam.png
new file mode 100644
index 0000000..151fd5f
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Resources/32px_add beam.png differ
diff --git a/StructureHelper/Infrastructure/UI/Resources/32px_add circle column.png b/StructureHelper/Infrastructure/UI/Resources/32px_add circle column.png
new file mode 100644
index 0000000..aab72db
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Resources/32px_add circle column.png differ
diff --git a/StructureHelper/Infrastructure/UI/Resources/32px_edit.png b/StructureHelper/Infrastructure/UI/Resources/32px_edit.png
new file mode 100644
index 0000000..2e582bb
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Resources/32px_edit.png differ
diff --git a/StructureHelper/Infrastructure/UI/Resources/Beam32.png b/StructureHelper/Infrastructure/UI/Resources/Beam32.png
new file mode 100644
index 0000000..151fd5f
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Resources/Beam32.png differ
diff --git a/StructureHelper/Infrastructure/UI/Resources/ButtonStyles.xaml b/StructureHelper/Infrastructure/UI/Resources/ButtonStyles.xaml
index 43d2ac8..48f8196 100644
--- a/StructureHelper/Infrastructure/UI/Resources/ButtonStyles.xaml
+++ b/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>
\ No newline at end of file
diff --git a/StructureHelper/Infrastructure/UI/Resources/IconDictionary.xaml b/StructureHelper/Infrastructure/UI/Resources/IconDictionary.xaml
new file mode 100644
index 0000000..c82c837
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/StructureHelper/Libraries/LoaderCalculator.dll b/StructureHelper/Libraries/LoaderCalculator.dll
index aa14427..a080846 100644
Binary files a/StructureHelper/Libraries/LoaderCalculator.dll and b/StructureHelper/Libraries/LoaderCalculator.dll differ
diff --git a/StructureHelper/Properties/Resources.Designer.cs b/StructureHelper/Properties/Resources.Designer.cs
index 2eae76d..b74bb6d 100644
--- a/StructureHelper/Properties/Resources.Designer.cs
+++ b/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;
             }
diff --git a/StructureHelper/StructureHelper.csproj b/StructureHelper/StructureHelper.csproj
index 71ec422..7d616ac 100644
--- a/StructureHelper/StructureHelper.csproj
+++ b/StructureHelper/StructureHelper.csproj
@@ -23,30 +23,37 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Remove="Windows\MainWindow\Add_Circle.png" />
-    <None Remove="Windows\MainWindow\Add_Rebar.png" />
-    <None Remove="Windows\MainWindow\Calculator.png" />
-    <None Remove="Windows\MainWindow\Circle.png" />
+    <None Remove="Windows\MainWindow\Analysis32.png" />
+    <None Remove="Windows\MainWindow\Beam32.png" />
+    <None Remove="Windows\MainWindow\Calculator32.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\Edit_Concrete beam.png" />
-    <None Remove="Windows\MainWindow\Edit_Concrete column.png" />
-    <None Remove="Windows\MainWindow\Edit_Concrete slab.png" />
-    <None Remove="Windows\MainWindow\Materials.png" />
+    <None Remove="Windows\MainWindow\ElasticMaterial32.png" />
+    <None Remove="Windows\MainWindow\GlassMaterial32.png" />
+    <None Remove="Windows\MainWindow\Materials32.png" />
     <None Remove="Windows\MainWindow\MovePrimitivesToCenter.png" />
-    <None Remove="Windows\MainWindow\Point_Primitive.png" />
-    <None Remove="Windows\MainWindow\Rectangle_Primitive.png" />
+    <None Remove="Windows\MainWindow\Point32.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\Add_Rebar.png" />
-    <Resource Include="Windows\MainWindow\Calculator.png" />
-    <Resource Include="Windows\MainWindow\Circle.png" />
+    <Resource Include="Windows\MainWindow\Analysis32.png" />
+    <Resource Include="Windows\MainWindow\Beam32.png" />
+    <Resource Include="Windows\MainWindow\Calculator32.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">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Windows\MainWindow\Rectangle_Primitive.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </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\Point32.png" />
+    <Resource Include="Windows\MainWindow\Rebar32.png" />
+    <Resource Include="Windows\MainWindow\Rectangle32.png" />
+    <Resource Include="Windows\MainWindow\RectangleColumn32.png" />
+    <Resource Include="Windows\MainWindow\RFMaterial32.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>
diff --git a/StructureHelper/StructureHelper.csproj.user b/StructureHelper/StructureHelper.csproj.user
index 5b22347..b8b7bbb 100644
--- a/StructureHelper/StructureHelper.csproj.user
+++ b/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>
diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsView.xaml b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsView.xaml
index 78151ce..98dd379 100644
--- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsView.xaml
+++ b/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>
diff --git a/StructureHelper/Windows/Graphs/GraphView.xaml b/StructureHelper/Windows/Graphs/GraphView.xaml
index f6955a7..ba5c938 100644
--- a/StructureHelper/Windows/Graphs/GraphView.xaml
+++ b/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>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="250"/>
-            <ColumnDefinition/>
-        </Grid.ColumnDefinitions>
+    <DockPanel>
+        <!--<ToolBarTray DockPanel.Dock="Top">
+            <ToolBar>
+                <Button Command="{Binding SaveAsImage}">
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/ConMaterial32.png"/>
+                </Button>
+            </ToolBar>
+        </ToolBarTray>-->
         <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition/>
-                <RowDefinition Height="40"/>
-            </Grid.RowDefinitions>
-            <StackPanel>
-                <GroupBox Header="X-axis values">
-                    <StackPanel>
-                        <ComboBox ItemsSource="{Binding XItems.Collection}" SelectedItem="{Binding XItems.SelectedItem}">
-                            <ComboBox.ItemTemplate>
-                                <DataTemplate>
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="20"/>
-                                            <ColumnDefinition/>
-                                        </Grid.ColumnDefinitions>
-                                        <Rectangle Grid.Column="0" Margin="3">
-                                            <Rectangle.Fill>
-                                                <SolidColorBrush Color="{Binding Color}"/>
-                                            </Rectangle.Fill>
-                                        </Rectangle>
-                                        <TextBlock Grid.Column="1" Text="{Binding Name}"/>
-                                    </Grid>
-                                </DataTemplate>
-                            </ComboBox.ItemTemplate>
-                        </ComboBox>
-                        <CheckBox Margin="5" Content="Invert Values" IsChecked="{Binding InvertXValues}"/>
-                    </StackPanel>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="250"/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition/>
+                    <RowDefinition Height="40"/>
+                </Grid.RowDefinitions>
+                <StackPanel>
+                    <GroupBox Header="X-axis values">
+                        <StackPanel>
+                            <ComboBox ItemsSource="{Binding XItems.Collection}" SelectedItem="{Binding XItems.SelectedItem}">
+                                <ComboBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="20"/>
+                                                <ColumnDefinition/>
+                                            </Grid.ColumnDefinitions>
+                                            <Rectangle Grid.Column="0" Margin="3">
+                                                <Rectangle.Fill>
+                                                    <SolidColorBrush Color="{Binding Color}"/>
+                                                </Rectangle.Fill>
+                                            </Rectangle>
+                                            <TextBlock Grid.Column="1" Text="{Binding Name}"/>
+                                        </Grid>
+                                    </DataTemplate>
+                                </ComboBox.ItemTemplate>
+                            </ComboBox>
+                            <CheckBox Margin="5" Content="Invert Values" IsChecked="{Binding InvertXValues}"/>
+                        </StackPanel>
 
-                </GroupBox>
-                <GroupBox Header="Y-axis values">
-                    <StackPanel>
-                        <ContentControl ContentTemplate="{StaticResource ResourceKey=SelectItems}" Content="{Binding YItems}"/>
-                        <CheckBox Margin="5" Content="Invert Values" IsChecked="{Binding InvertYValues}"/>
-                    </StackPanel>
-                </GroupBox>
-                <GroupBox Header="Line smoothness">
-                    <StackPanel Orientation="Horizontal">
-                        <Slider x:Name="slider" Width="195" Minimum="0" Maximum="1" Value="{Binding LineSmoothness}"/>
-                        <TextBox Width="40" Text="{Binding LineSmoothness,Converter={StaticResource PlainDouble}, ValidatesOnDataErrors=True}"/>
-                    </StackPanel>
-                </GroupBox>
-            </StackPanel>
-            <StackPanel Grid.Row="1">
-                <Button Margin="3" Content="Draw Lines" ToolTip="Draw Lines" Command="{Binding RedrawLinesCommand}"/>
-            </StackPanel>
+                    </GroupBox>
+                    <GroupBox Header="Y-axis values">
+                        <StackPanel>
+                            <ContentControl ContentTemplate="{StaticResource ResourceKey=SelectItems}" Content="{Binding YItems}"/>
+                            <CheckBox Margin="5" Content="Invert Values" IsChecked="{Binding InvertYValues}"/>
+                        </StackPanel>
+                    </GroupBox>
+                    <GroupBox Header="Line properties" DataContext="{Binding VisualProps}">
+                        <StackPanel>
+                            <TextBlock Text="Line smoothness" Margin="0,5,0,5"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Slider x:Name="slider" Width="195" Minimum="0" Maximum="{Binding MaxLineSmoothness}" Value="{Binding LineSmoothness}"/>
+                                <TextBox Width="40" Text="{Binding LineSmoothness,Converter={StaticResource PlainDouble}, ValidatesOnDataErrors=True}"/>
+                            </StackPanel>
+                            <TextBlock Text="Stroke thickness" Margin="0,5,0,5"/>
+                            <StackPanel Orientation="Horizontal">
+                                <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" >
-            <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>
+    </DockPanel>
+    
 </Window>
diff --git a/StructureHelper/Windows/Graphs/GraphView.xaml.cs b/StructureHelper/Windows/Graphs/GraphView.xaml.cs
index f95b9b3..92d706c 100644
--- a/StructureHelper/Windows/Graphs/GraphView.xaml.cs
+++ b/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))
         {
diff --git a/StructureHelper/Windows/MainWindow/Add_Circle.png b/StructureHelper/Windows/MainWindow/Add_Circle.png
deleted file mode 100644
index 5b22c6e..0000000
Binary files a/StructureHelper/Windows/MainWindow/Add_Circle.png and /dev/null differ
diff --git a/StructureHelper/Windows/MainWindow/Add_Rebar.png b/StructureHelper/Windows/MainWindow/Add_Rebar.png
deleted file mode 100644
index 12fa188..0000000
Binary files a/StructureHelper/Windows/MainWindow/Add_Rebar.png and /dev/null differ
diff --git a/StructureHelper/Windows/MainWindow/Analysis32.png b/StructureHelper/Windows/MainWindow/Analysis32.png
new file mode 100644
index 0000000..9d479ae
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/Analysis32.png differ
diff --git a/StructureHelper/Windows/MainWindow/Beam32.png b/StructureHelper/Windows/MainWindow/Beam32.png
new file mode 100644
index 0000000..151fd5f
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/Beam32.png differ
diff --git a/StructureHelper/Windows/MainWindow/Calculator.png b/StructureHelper/Windows/MainWindow/Calculator.png
deleted file mode 100644
index 33374c6..0000000
Binary files a/StructureHelper/Windows/MainWindow/Calculator.png and /dev/null differ
diff --git a/StructureHelper/Windows/MainWindow/Calculator32.png b/StructureHelper/Windows/MainWindow/Calculator32.png
new file mode 100644
index 0000000..ffcb39a
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/Calculator32.png differ
diff --git a/StructureHelper/Windows/MainWindow/Circle.png b/StructureHelper/Windows/MainWindow/Circle.png
deleted file mode 100644
index 5b22c6e..0000000
Binary files a/StructureHelper/Windows/MainWindow/Circle.png and /dev/null differ
diff --git a/StructureHelper/Windows/MainWindow/Circle32.png b/StructureHelper/Windows/MainWindow/Circle32.png
new file mode 100644
index 0000000..0a5eb2e
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/Circle32.png differ
diff --git a/StructureHelper/Windows/MainWindow/CircleColumn32.png b/StructureHelper/Windows/MainWindow/CircleColumn32.png
new file mode 100644
index 0000000..aab72db
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/CircleColumn32.png differ
diff --git a/StructureHelper/Windows/MainWindow/ConMaterial32.png b/StructureHelper/Windows/MainWindow/ConMaterial32.png
new file mode 100644
index 0000000..d5fcce3
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/ConMaterial32.png differ
diff --git a/StructureHelper/Windows/MainWindow/Edit_Circle_RC.png b/StructureHelper/Windows/MainWindow/Edit_Circle_RC.png
deleted file mode 100644
index 588f2d1..0000000
Binary files a/StructureHelper/Windows/MainWindow/Edit_Circle_RC.png and /dev/null differ
diff --git a/StructureHelper/Windows/MainWindow/Edit_Concrete beam.png b/StructureHelper/Windows/MainWindow/Edit_Concrete beam.png
deleted file mode 100644
index 49a5abe..0000000
Binary files a/StructureHelper/Windows/MainWindow/Edit_Concrete beam.png and /dev/null differ
diff --git a/StructureHelper/Windows/MainWindow/Edit_Concrete column.png b/StructureHelper/Windows/MainWindow/Edit_Concrete column.png
deleted file mode 100644
index 7ab8673..0000000
Binary files a/StructureHelper/Windows/MainWindow/Edit_Concrete column.png and /dev/null differ
diff --git a/StructureHelper/Windows/MainWindow/Edit_Concrete slab.png b/StructureHelper/Windows/MainWindow/Edit_Concrete slab.png
deleted file mode 100644
index 690717c..0000000
Binary files a/StructureHelper/Windows/MainWindow/Edit_Concrete slab.png and /dev/null differ
diff --git a/StructureHelper/Windows/MainWindow/ElasticMaterial32.png b/StructureHelper/Windows/MainWindow/ElasticMaterial32.png
new file mode 100644
index 0000000..e32435d
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/ElasticMaterial32.png differ
diff --git a/StructureHelper/Windows/MainWindow/GlassMaterial32.png b/StructureHelper/Windows/MainWindow/GlassMaterial32.png
new file mode 100644
index 0000000..70e2773
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/GlassMaterial32.png differ
diff --git a/StructureHelper/Windows/MainWindow/MainView.xaml b/StructureHelper/Windows/MainWindow/MainView.xaml
index c9e1d42..2f85e73 100644
--- a/StructureHelper/Windows/MainWindow/MainView.xaml
+++ b/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}" 
-                        Command="{Binding Add}"
-                        CommandParameter="{x:Static enums:MaterialType.Concrete}"
-                        Content="Con" ToolTip="Add Concrete Material"/>
-                <Button Style="{StaticResource ToolButton}"  Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Reinforcement}" Content="RF" ToolTip="Add Reinforcement Material"/>
-                <Button Style="{StaticResource ToolButton}"  Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Elastic}" Content="Elast" ToolTip="Add Elastic Material"/>
-                <Button Style="{StaticResource ToolButton}" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.CarbonFiber}" Content="CFR" ToolTip="Add Carbon Fiber Material"/>
-                <Button Style="{StaticResource ToolButton}"  Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.GlassFiber}" Content="GFR"  ToolTip="Add Glass Fiber Material"/>
+                <Button Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Concrete}">
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/ConMaterial32.png"/>
+                </Button>
+                <Button Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Reinforcement}" ToolTip="Add Reinforcement Material">
+                    <Image Style="{StaticResource ButtonImage32}" Source="/Windows/MainWindow/RFMaterial32.png"/>
+                </Button>
+                <Button Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Elastic}" ToolTip="Add Elastic 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}"/>
-                                        <Button Content="Reinforcement" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Reinforcement}"/>
-                                        <Button Content="Elastic" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Elastic}"/>
-                                        <Button Content="CarbonFiber" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.CarbonFiber}"/>
-                                        <Button Content="GlassFiber" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.GlassFiber}"/>
+                                        <MenuItem Header="Concrete" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Concrete}">
+                                            <MenuItem.Icon>
+                                                <Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/ConMaterial32.png" />
+                                            </MenuItem.Icon>
+                                        </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>
diff --git a/StructureHelper/Windows/MainWindow/Materials.png b/StructureHelper/Windows/MainWindow/Materials.png
deleted file mode 100644
index bba6546..0000000
Binary files a/StructureHelper/Windows/MainWindow/Materials.png and /dev/null differ
diff --git a/StructureHelper/Windows/MainWindow/Materials32.png b/StructureHelper/Windows/MainWindow/Materials32.png
new file mode 100644
index 0000000..67b64bf
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/Materials32.png differ
diff --git a/StructureHelper/Windows/MainWindow/Point32.png b/StructureHelper/Windows/MainWindow/Point32.png
new file mode 100644
index 0000000..523a79a
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/Point32.png differ
diff --git a/StructureHelper/Windows/MainWindow/Point_Primitive.png b/StructureHelper/Windows/MainWindow/Point_Primitive.png
deleted file mode 100644
index 141055f..0000000
Binary files a/StructureHelper/Windows/MainWindow/Point_Primitive.png and /dev/null differ
diff --git a/StructureHelper/Windows/MainWindow/RFMaterial32.png b/StructureHelper/Windows/MainWindow/RFMaterial32.png
new file mode 100644
index 0000000..bd3b7c7
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/RFMaterial32.png differ
diff --git a/StructureHelper/Windows/MainWindow/Rebar32.png b/StructureHelper/Windows/MainWindow/Rebar32.png
new file mode 100644
index 0000000..fe44fad
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/Rebar32.png differ
diff --git a/StructureHelper/Windows/MainWindow/Rectangle32.png b/StructureHelper/Windows/MainWindow/Rectangle32.png
new file mode 100644
index 0000000..f32c3ae
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/Rectangle32.png differ
diff --git a/StructureHelper/Windows/MainWindow/RectangleColumn32.png b/StructureHelper/Windows/MainWindow/RectangleColumn32.png
new file mode 100644
index 0000000..cdbd253
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/RectangleColumn32.png differ
diff --git a/StructureHelper/Windows/MainWindow/Rectangle_Primitive.png b/StructureHelper/Windows/MainWindow/Rectangle_Primitive.png
deleted file mode 100644
index 7b80f5e..0000000
Binary files a/StructureHelper/Windows/MainWindow/Rectangle_Primitive.png and /dev/null differ
diff --git a/StructureHelper/Windows/MainWindow/Slab32.png b/StructureHelper/Windows/MainWindow/Slab32.png
new file mode 100644
index 0000000..be1aa1e
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/Slab32.png differ
diff --git a/StructureHelper/Windows/MainWindow/СarbonMaterial32.png b/StructureHelper/Windows/MainWindow/СarbonMaterial32.png
new file mode 100644
index 0000000..726db7c
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/СarbonMaterial32.png differ
diff --git a/StructureHelper/Windows/ViewModels/Calculations/Calculators/ForceResultLogic/ShowCrackWidthLogic.cs b/StructureHelper/Windows/ViewModels/Calculations/Calculators/ForceResultLogic/ShowCrackWidthLogic.cs
new file mode 100644
index 0000000..6c901cf
--- /dev/null
+++ b/StructureHelper/Windows/ViewModels/Calculations/Calculators/ForceResultLogic/ShowCrackWidthLogic.cs
@@ -0,0 +1,35 @@
+using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelperCommon.Models.Forces;
+using StructureHelperLogics.NdmCalculations.Cracking;
+using StructureHelperLogics.NdmCalculations.Primitives;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
+{
+    internal class ShowCrackWidthLogic
+    {
+        public List<INdmPrimitive> ndmPrimitives { get; set; }
+        public LimitStates LimitState { get; set; }
+        public CalcTerms CalcTerm { get; set; }
+        public ForceTuple ForceTuple { get; set; }
+
+        internal void Show()
+        {
+            var inputData = new CrackWidthCalculatorInputData()
+            {
+                LimitState = LimitState,
+                CalcTerm = CalcTerm,
+                ForceTuple = ForceTuple,
+                NdmPrimitives = ndmPrimitives
+            };
+            var calculator = new CrackWidthCalculator() { InputData = inputData };
+            calculator.Run();
+            var result = calculator.Result;
+
+        }
+    }
+}
diff --git a/StructureHelper/Windows/ViewModels/Calculations/Calculators/ForcesResultsViewModel.cs b/StructureHelper/Windows/ViewModels/Calculations/Calculators/ForcesResultsViewModel.cs
index a5ca4cc..1f1078b 100644
--- a/StructureHelper/Windows/ViewModels/Calculations/Calculators/ForcesResultsViewModel.cs
+++ b/StructureHelper/Windows/ViewModels/Calculations/Calculators/ForcesResultsViewModel.cs
@@ -6,38 +6,27 @@ using StructureHelper.Services.Reports;
 using StructureHelper.Services.Reports.CalculationReports;
 using StructureHelper.Services.ResultViewers;
 using StructureHelper.Windows.CalculationWindows.CalculatorsViews;
-using StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalculatorViews;
 using StructureHelper.Windows.CalculationWindows.CalculatorsViews.GeometryCalculatorViews;
 using StructureHelper.Windows.Errors;
-using StructureHelper.Windows.Forces;
-using StructureHelper.Windows.Graphs;
 using StructureHelper.Windows.PrimitivePropertiesWindow;
 using StructureHelper.Windows.ViewModels.Calculations.Calculators.ForceResultLogic;
 using StructureHelper.Windows.ViewModels.Errors;
-using StructureHelper.Windows.ViewModels.Forces;
-using StructureHelper.Windows.ViewModels.Graphs;
 using StructureHelper.Windows.ViewModels.PrimitiveProperties;
 using StructureHelperCommon.Infrastructures.Enums;
 using StructureHelperCommon.Infrastructures.Settings;
 using StructureHelperCommon.Models.Forces;
-using StructureHelperCommon.Models.Parameters;
 using StructureHelperCommon.Models.Shapes;
 using StructureHelperCommon.Services.Forces;
-using StructureHelperCommon.Services.Units;
 using StructureHelperLogics.NdmCalculations.Analyses;
 using StructureHelperLogics.NdmCalculations.Analyses.ByForces;
 using StructureHelperLogics.NdmCalculations.Analyses.Geometry;
-using StructureHelperLogics.NdmCalculations.Cracking;
 using StructureHelperLogics.NdmCalculations.Primitives;
 using StructureHelperLogics.NdmCalculations.Triangulations;
-using StructureHelperLogics.Services.NdmCalculations;
 using StructureHelperLogics.Services.NdmPrimitives;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Windows.Forms;
 using System.Windows.Input;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window;
 
 namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
 {
@@ -46,6 +35,7 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
         private static readonly ShowDiagramLogic showDiagramLogic = new();
         private static readonly InterpolateLogic interpolateLogic = new();
         private static readonly ShowCrackResultLogic showCrackResultLogic = new();
+        private static readonly ShowCrackWidthLogic showCrackWidthLogic = new();
         private IForceCalculator forceCalculator;
         private IForcesResults forcesResults;
         private IEnumerable<INdmPrimitive> ndmPrimitives;
@@ -65,6 +55,7 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
         private ICommand showGraphsCommand;
         private ICommand showCrackResult;
         private ICommand showCrackGraphsCommand;
+        private RelayCommand showCrackWidthResult;
 
         public IForcesResults ForcesResults
         {
@@ -137,6 +128,23 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
             showCrackResultLogic.ndmPrimitives = ndmPrimitives;
             showCrackResultLogic.Show();
         }
+
+        public ICommand ShowCrackWidthResultCommand
+        {
+            get => showCrackWidthResult ??= new RelayCommand(o =>
+            {
+                SafetyProcessor.RunSafeProcess(ShowCrackWidthResult);
+            }, o => (SelectedResult != null) && SelectedResult.IsValid);
+        }
+
+        private void ShowCrackWidthResult()
+        {
+            showCrackWidthLogic.LimitState = SelectedResult.DesignForceTuple.LimitState;
+            showCrackWidthLogic.CalcTerm = SelectedResult.DesignForceTuple.CalcTerm;
+            showCrackWidthLogic.ForceTuple = SelectedResult.DesignForceTuple.ForceTuple;
+            showCrackWidthLogic.ndmPrimitives = ndmPrimitives.ToList();
+            showCrackWidthLogic.Show();
+        }
         public ICommand InterpolateCommand
         {
             get
@@ -163,7 +171,7 @@ namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
         }
         private void SetPrestrain()
         {
-            var source = StrainTupleService.ConvertToStrainTuple(SelectedResult.LoaderResults.StrainMatrix);
+            var source = TupleConverter.ConvertToStrainTuple(SelectedResult.LoaderResults.StrainMatrix);
             var vm = new SetPrestrainViewModel(source);
             var wnd = new SetPrestrainView(vm);
             wnd.ShowDialog();
diff --git a/StructureHelper/Windows/ViewModels/Graphs/GraphViewModel.cs b/StructureHelper/Windows/ViewModels/Graphs/GraphViewModel.cs
index 6b69efb..8a850f8 100644
--- a/StructureHelper/Windows/ViewModels/Graphs/GraphViewModel.cs
+++ b/StructureHelper/Windows/ViewModels/Graphs/GraphViewModel.cs
@@ -1,20 +1,24 @@
 using LiveCharts;
 using LiveCharts.Configurations;
+using LiveCharts.Definitions.Charts;
 using LiveCharts.Wpf;
+using LiveCharts.Wpf.Charts.Base;
 using StructureHelper.Infrastructure;
-using StructureHelper.Infrastructure.UI.Converters.Units;
-using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelper.Services.Exports;
 using StructureHelperCommon.Models.Parameters;
 using StructureHelperCommon.Models.Shapes;
 using StructureHelperCommon.Services.ColorServices;
+using StructureHelperLogics.NdmCalculations.Analyses;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
 
 namespace StructureHelper.Windows.ViewModels.Graphs
 {
@@ -33,6 +37,7 @@ namespace StructureHelper.Windows.ViewModels.Graphs
         private RelayCommand redrawLinesCommand;
         private bool invertXValues;
         private bool invertYValues;
+        private RelayCommand saveImageCommand;
 
         public SelectedItemViewModel<IValueParameter<double>> XItems { get; private set; }
         public SelectItemsViewModel<IValueParameter<double>> YItems { get; set; }
@@ -58,21 +63,7 @@ namespace StructureHelper.Windows.ViewModels.Graphs
             }
         }
 
-        private double lineSmoothness;
-
-        public double LineSmoothness
-        {
-            get { return lineSmoothness; }
-            set
-            {
-                value = Math.Max(value, 0d);
-                value = Math.Min(value, 1d);
-                value = Math.Round(value, 2);
-                lineSmoothness = value;
-                OnPropertyChanged(nameof(LineSmoothness));
-            }
-        }
-
+        public GraphVisualProps VisualProps { get; }
 
         public SeriesCollection SeriesCollection { get; set; }
         public List<string> Labels { get; set; }
@@ -83,6 +74,36 @@ namespace StructureHelper.Windows.ViewModels.Graphs
             get => redrawLinesCommand ??= new RelayCommand(o => DrawLines());
         }
 
+        public ICommand SaveAsImage
+        {
+            get => saveImageCommand ??= new RelayCommand(o => SaveImage());
+        }
+        public CartesianChart MainChart { get; set; }
+
+        private void SaveImage()
+        {
+            var inputData = new ExportToFileInputData();
+            inputData.FileName = "New File";
+            inputData.Filter = "png |*.png";
+            inputData.Title = "Save in png File";
+
+            //var viewbox = new Viewbox();
+            //viewbox.Child = MainChart;
+            //viewbox.Measure(MainChart.RenderSize);
+            //viewbox.Arrange(new Rect(new Point(0, 0), MainChart.RenderSize));
+            //MainChart.Update(true, true); //force chart redraw
+            //viewbox.UpdateLayout();
+
+            var logic = new ExportFrameWorkElementLogic(MainChart);
+            var exportService = new ExportToFileService(inputData, logic);
+            exportService.Export();
+        }
+
+
+        private void CopyImageToClipboard(BitmapImage bitmapImage)
+        {
+            Clipboard.SetImage(bitmapImage);
+        }
 
         public GraphViewModel(IArrayParameter<double> arrayParameter)
         {
@@ -93,7 +114,8 @@ namespace StructureHelper.Windows.ViewModels.Graphs
             YItems.ShowButtons = true;
             XItems.SelectedItem = XItems.Collection[0];
             YItems.UnSelectAllCommand.Execute(null);
-            lineSmoothness = 0.3d;
+
+            VisualProps = new();
         }
 
         private List<IValueParameter<double>> GetParameters()
@@ -146,16 +168,19 @@ namespace StructureHelper.Windows.ViewModels.Graphs
                     .X(point => point.X)
                     .Y(point => point.Y),
                     Title = yParameter.Name,
-                    PointGeometry = null,
+                    //PointGeometry = null,
                     Stroke = new SolidColorBrush(yParameter.Color),
                     Fill = Brushes.Transparent,
-                    LineSmoothness = lineSmoothness
+                    LineSmoothness = VisualProps.LineSmoothness,
+                    PointGeometry = DefaultGeometries.Circle,
+                    PointGeometrySize = VisualProps.StrokeSize
                 };
                 _ = valueList.TryGetValue(xParameter, out double[] xValues);
                 _ = valueList.TryGetValue(yParameter, out double[] yValues);
                 var chartValues = new ChartValues<Point2D>();
                 for (int i = 0; i < yValues.Count(); i++)
                 {
+                    
                     double diagramValue = yValues[i] * yFactor;
                     var x = xValues[i] * xFactor;
                     var y = yValues[i] * yFactor;
@@ -163,6 +188,7 @@ namespace StructureHelper.Windows.ViewModels.Graphs
                     chartValues.Add(point);
                     labels.Add(x);
                     localLabels.Add(x);
+
                 }
                 lineSeries.Values = chartValues;
                 //lineSeries.LabelPoint = point => localLabels[(int)point.X].ToString();
diff --git a/StructureHelper/Windows/ViewModels/Graphs/GraphVisualProps.cs b/StructureHelper/Windows/ViewModels/Graphs/GraphVisualProps.cs
new file mode 100644
index 0000000..f1d1381
--- /dev/null
+++ b/StructureHelper/Windows/ViewModels/Graphs/GraphVisualProps.cs
@@ -0,0 +1,53 @@
+using StructureHelper.Infrastructure;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelper.Windows.ViewModels.Graphs
+{
+    public class GraphVisualProps : ViewModelBase
+    {       
+        private double lineSmoothness;
+        private double strokeSize;
+
+        public double LineSmoothness
+        {
+            get { return lineSmoothness; }
+            set
+            {
+                value = Math.Max(value, 0d);
+                value = Math.Min(value, MaxLineSmoothness);
+                value = Math.Round(value, 2);
+                lineSmoothness = value;
+                OnPropertyChanged(nameof(LineSmoothness));
+            }
+        }
+
+        public double StrokeSize
+        {
+            get { return strokeSize; }
+            set
+            {
+                value = Math.Max(value, 0d);
+                value = Math.Min(value, MaxStrokeSize);
+                value = Math.Round(value);
+                strokeSize = value;
+                OnPropertyChanged(nameof(StrokeSize));
+            }
+        }
+
+        public double MaxLineSmoothness { get;}
+        public double MaxStrokeSize { get; }
+
+        public GraphVisualProps()
+        {
+            MaxLineSmoothness = 1d;
+            MaxStrokeSize = 20d;
+
+            lineSmoothness = 0.3;
+            strokeSize = 0;
+        }
+    }
+}
diff --git a/StructureHelperCommon/Services/Forces/StrainTupleService.cs b/StructureHelperCommon/Services/Forces/StrainTupleService.cs
deleted file mode 100644
index 4e2a909..0000000
--- a/StructureHelperCommon/Services/Forces/StrainTupleService.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using LoaderCalculator.Data.Matrix;
-using StructureHelperCommon.Models.Forces;
-
-namespace StructureHelperCommon.Services.Forces
-{
-    public static class StrainTupleService
-    {
-        public static IStrainMatrix ConvertToLoaderStrainMatrix(StrainTuple strainTuple)
-        {
-            IStrainMatrix strainMatrix = new StrainMatrix() { Kx = strainTuple.Mx, Ky = strainTuple.My, EpsZ = strainTuple.Nz };
-            return strainMatrix;
-        }
-
-        public static StrainTuple ConvertToStrainTuple(IStrainMatrix strainMatrix)
-        {
-            StrainTuple strainTuple = new StrainTuple() { Mx = strainMatrix.Kx, My = strainMatrix.Ky, Nz = strainMatrix.EpsZ };
-            return strainTuple;
-        }
-    }
-}
diff --git a/StructureHelperCommon/Services/Forces/TupleConverter.cs b/StructureHelperCommon/Services/Forces/TupleConverter.cs
new file mode 100644
index 0000000..deae1c8
--- /dev/null
+++ b/StructureHelperCommon/Services/Forces/TupleConverter.cs
@@ -0,0 +1,45 @@
+using LoaderCalculator.Data.Matrix;
+using LoaderCalculator.Data.Ndms;
+using LoaderCalculator.Logics;
+using StructureHelperCommon.Models.Forces;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace StructureHelperCommon.Services.Forces
+{
+    public static class TupleConverter
+    {
+        static readonly IStressLogic stressLogic = new StressLogic();
+        public static StrainMatrix ConvertToLoaderStrainMatrix(StrainTuple strainTuple)
+        {
+            var strainMatrix = new StrainMatrix() { Kx = strainTuple.Mx, Ky = strainTuple.My, EpsZ = strainTuple.Nz };
+            return strainMatrix;
+        }
+
+        public static StrainTuple ConvertToStrainTuple(IStrainMatrix strainMatrix)
+        {
+            StrainTuple strainTuple = new StrainTuple() { Mx = strainMatrix.Kx, My = strainMatrix.Ky, Nz = strainMatrix.EpsZ };
+            return strainTuple;
+        }
+
+        public static ForceTuple ConvertToForceTuple(IEnumerable<INdm> ndms, StrainTuple strainTuple)
+        {
+            var strainMatrix = ConvertToLoaderStrainMatrix(strainTuple);
+            var forceMatrix = stressLogic.GetForceMatrix(ndms, strainMatrix);
+            var forceTuple = ConvertToForceTuple(forceMatrix);
+            return forceTuple;
+        }
+
+        public static ForceTuple ConvertToForceTuple(IForceMatrix forceMatrix)
+        {
+            ForceTuple forceTuple = new()
+            {
+                Mx = forceMatrix.Mx,
+                My = forceMatrix.My,
+                Nz = forceMatrix.Nz
+            };
+            return forceTuple;
+        }
+    }
+}
diff --git a/StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs b/StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs
index b754396..4133e1e 100644
--- a/StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs
@@ -4,6 +4,7 @@ using StructureHelperCommon.Models.Materials.Libraries;
 using LMBuilders = LoaderCalculator.Data.Materials.MaterialBuilders;
 using LMLogic = LoaderCalculator.Data.Materials.MaterialBuilders.MaterialLogics;
 using LM = LoaderCalculator.Data.Materials;
+using LoaderCalculator.Data.Materials;
 
 namespace StructureHelperLogics.Models.Materials
 {
@@ -40,16 +41,27 @@ namespace StructureHelperLogics.Models.Materials
 
         public LM.IMaterial GetLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
         {
-            optionLogic = new MaterialCommonOptionLogic(MaterialEntity, limitState, calcTerm);
-            optionLogic.SetMaterialOptions(lmOptions);
-            optionLogic = new ConcreteMaterialOptionLogic(this, limitState);
-            optionLogic.SetMaterialOptions(lmOptions);
+            GetOptions(limitState, calcTerm, false);
+            LMBuilders.IBuilderDirector director = GetMaterial(limitState, calcTerm);
+            return director.BuildMaterial();
+        }
+
+        private LMBuilders.IBuilderDirector GetMaterial(LimitStates limitState, CalcTerms calcTerm)
+        {
             var strength = factorLogic.GetTotalFactor(limitState, calcTerm);
             lmOptions.ExternalFactor.Compressive = strength.Compressive;
             lmOptions.ExternalFactor.Tensile = strength.Tensile;
             LMBuilders.IMaterialBuilder builder = new LMBuilders.ConcreteBuilder(lmOptions);
             LMBuilders.IBuilderDirector director = new LMBuilders.BuilderDirector(builder);
-            return director.BuildMaterial();
+            return director;
+        }
+
+        private void GetOptions(LimitStates limitState, CalcTerms calcTerm, bool isSectionCracked)
+        {
+            optionLogic = new MaterialCommonOptionLogic(MaterialEntity, limitState, calcTerm);
+            optionLogic.SetMaterialOptions(lmOptions);
+            optionLogic = new ConcreteMaterialOptionLogic(this, limitState, isSectionCracked);
+            optionLogic.SetMaterialOptions(lmOptions);
         }
 
         public (double Compressive, double Tensile) GetStrength(LimitStates limitState, CalcTerms calcTerm)
@@ -68,5 +80,12 @@ namespace StructureHelperLogics.Models.Materials
             }
             return (strength.Compressive * compressionFactor, strength.Tensile * tensionFactor);
         }
+
+        public IMaterial GetCrackedLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
+        {
+            GetOptions(limitState, calcTerm, true);
+            LMBuilders.IBuilderDirector director = GetMaterial(limitState, calcTerm);
+            return director.BuildMaterial();
+        }
     }
 }
diff --git a/StructureHelperLogics/Models/Materials/ElasticMaterial.cs b/StructureHelperLogics/Models/Materials/ElasticMaterial.cs
index 72a09d3..48373fd 100644
--- a/StructureHelperLogics/Models/Materials/ElasticMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/ElasticMaterial.cs
@@ -36,5 +36,10 @@ namespace StructureHelperLogics.Models.Materials
             updateStrategy.Update(newItem, this);
             return newItem;
         }
+
+        public IMaterial GetCrackedLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
+        {
+            return GetLoaderMaterial(limitState, calcTerm);
+        }
     }
 }
diff --git a/StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs b/StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs
index b3dd2b0..1a5d6b3 100644
--- a/StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs
@@ -64,5 +64,10 @@ namespace StructureHelperLogics.Models.Materials
             var material = elasticMaterialLogic.GetLoaderMaterial(this, limitState, calcTerm, factor);
             return material;
         }
+
+        public IMaterial GetCrackedLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
+        {
+            return GetLoaderMaterial(limitState, calcTerm);
+        }
     }
 }
diff --git a/StructureHelperLogics/Models/Materials/HeadMaterial.cs b/StructureHelperLogics/Models/Materials/HeadMaterial.cs
index bff8015..6e9b568 100644
--- a/StructureHelperLogics/Models/Materials/HeadMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/HeadMaterial.cs
@@ -61,5 +61,10 @@ namespace StructureHelper.Models.Materials
         {
             throw new NotImplementedException();
         }
+
+        public IMaterial GetCrackedLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
+        {
+            return HelperMaterial.GetCrackedLoaderMaterial(limitState, calcTerm);
+        }
     }
 }
diff --git a/StructureHelperLogics/Models/Materials/IHeadMaterial.cs b/StructureHelperLogics/Models/Materials/IHeadMaterial.cs
index 670eb4a..ee4639d 100644
--- a/StructureHelperLogics/Models/Materials/IHeadMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/IHeadMaterial.cs
@@ -17,5 +17,6 @@ namespace StructureHelper.Models.Materials
         Color Color { get; set; }
         IHelperMaterial HelperMaterial { get; set; }
         IMaterial GetLoaderMaterial(LimitStates limitState, CalcTerms calcTerm);
+        IMaterial GetCrackedLoaderMaterial(LimitStates limitState, CalcTerms calcTerm);
     }
 }
diff --git a/StructureHelperLogics/Models/Materials/IHelperMaterial.cs b/StructureHelperLogics/Models/Materials/IHelperMaterial.cs
index a119393..bcfdfe6 100644
--- a/StructureHelperLogics/Models/Materials/IHelperMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/IHelperMaterial.cs
@@ -10,5 +10,6 @@ namespace StructureHelperLogics.Models.Materials
     public interface IHelperMaterial : ICloneable
     {
         IMaterial GetLoaderMaterial(LimitStates limitState, CalcTerms calcTerm);
+        IMaterial GetCrackedLoaderMaterial(LimitStates limitState, CalcTerms calcTerm);
     }
 }
diff --git a/StructureHelperLogics/Models/Materials/LibMaterial.cs b/StructureHelperLogics/Models/Materials/LibMaterial.cs
index e1f41f7..b41c421 100644
--- a/StructureHelperLogics/Models/Materials/LibMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/LibMaterial.cs
@@ -1,4 +1,5 @@
-using StructureHelperCommon.Infrastructures.Enums;
+using LoaderCalculator.Data.Materials;
+using StructureHelperCommon.Infrastructures.Enums;
 using StructureHelperCommon.Infrastructures.Exceptions;
 using StructureHelperCommon.Models.Materials.Libraries;
 using System.Collections.Generic;
@@ -91,5 +92,10 @@ namespace StructureHelperLogics.Models.Materials
         {
             throw new NotImplementedException();
         }
+
+        public IMaterial GetCrackedLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/StructureHelperLogics/Models/Materials/Logics/ConcreteMaterialOptionLogic.cs b/StructureHelperLogics/Models/Materials/Logics/ConcreteMaterialOptionLogic.cs
index a508648..fcd0035 100644
--- a/StructureHelperLogics/Models/Materials/Logics/ConcreteMaterialOptionLogic.cs
+++ b/StructureHelperLogics/Models/Materials/Logics/ConcreteMaterialOptionLogic.cs
@@ -14,16 +14,23 @@ namespace StructureHelperLogics.Models.Materials
     {
         private IConcreteLibMaterial material;
         private LimitStates limitState;
-        public ConcreteMaterialOptionLogic(IConcreteLibMaterial material, LimitStates limitState)
+        bool IsMaterialCracked;
+        public ConcreteMaterialOptionLogic(IConcreteLibMaterial material, LimitStates limitState, bool IsMaterialCracked)
         {
             this.material = material;
             this.limitState = limitState;
+            this.IsMaterialCracked = IsMaterialCracked;
         }
         public void SetMaterialOptions(LCMB.IMaterialOptions materialOptions)
         {
             Check(materialOptions);
             var concreteOptions = materialOptions as LCMB.ConcreteOptions;
             concreteOptions.WorkInTension = false;
+            if (IsMaterialCracked)
+            {
+                concreteOptions.WorkInTension = true;
+                return;
+            }
             if (limitState == LimitStates.ULS & material.TensionForULS == true)
             {
                 concreteOptions.WorkInTension = true;
diff --git a/StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs b/StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs
index ac8e069..9b75058 100644
--- a/StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using Loadermaterials = LoaderCalculator.Data.Materials;
 using LMBuilders = LoaderCalculator.Data.Materials.MaterialBuilders;
 using LoaderMaterialLogics = LoaderCalculator.Data.Materials.MaterialBuilders.MaterialLogics;
-
+using LoaderCalculator.Data.Materials;
 
 namespace StructureHelperLogics.Models.Materials
 {
@@ -76,5 +76,10 @@ namespace StructureHelperLogics.Models.Materials
             var tensileStrength = strength.Tensile * tensionFactor;
             return (compressiveStrength, tensileStrength);
         }
+
+        public IMaterial GetCrackedLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
+        {
+            return GetLoaderMaterial(limitState, calcTerm);
+        }
     }
 }
diff --git a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/Logics/SofteningFactorLogic.cs b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/Logics/SofteningFactorLogic.cs
index 1e6688b..03fa77b 100644
--- a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/Logics/SofteningFactorLogic.cs
+++ b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/Logics/SofteningFactorLogic.cs
@@ -19,7 +19,7 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces.Logics
         public StrainTuple GetSofteningFactors()
         {
             var strainTuple = new StrainTuple();
-            var loaderStainMatrix = StrainTupleService.ConvertToLoaderStrainMatrix(StrainTuple);
+            var loaderStainMatrix = TupleConverter.ConvertToLoaderStrainMatrix(StrainTuple);
             var (MxFactor, MyFactor, NzFactor) = GeometryOperations.GetSofteningsFactors(NdmCollection, loaderStainMatrix);
             strainTuple.Mx = MxFactor;
             strainTuple.My = MyFactor;
diff --git a/StructureHelperLogics/NdmCalculations/Analyses/ExportFrameWorkElementLogic.cs b/StructureHelperLogics/NdmCalculations/Analyses/ExportFrameWorkElementLogic.cs
new file mode 100644
index 0000000..8c75b7c
--- /dev/null
+++ b/StructureHelperLogics/NdmCalculations/Analyses/ExportFrameWorkElementLogic.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace StructureHelperLogics.NdmCalculations.Analyses
+{
+    public class ExportFrameWorkElementLogic : IExportResultLogic
+    {
+        private FrameworkElement visual;
+        public string FileName { get; set; }
+
+        public void Export()
+        {
+            var encoder = new PngBitmapEncoder();
+            EncodeVisual(visual, FileName, encoder);
+        }
+
+        public ExportFrameWorkElementLogic(FrameworkElement visual)
+        {
+            this.visual = visual;
+        }
+
+        private static void EncodeVisual(FrameworkElement visual, string fileName, BitmapEncoder encoder)
+        {
+            var bitmap = new RenderTargetBitmap((int)visual.ActualWidth, (int)visual.ActualHeight, 96, 96, PixelFormats.Pbgra32);
+
+            bitmap.Render(visual);
+            var frame = BitmapFrame.Create(bitmap);
+            encoder.Frames.Add(frame);
+            using (var stream = File.Create(fileName)) encoder.Save(stream);
+        }
+    }
+}
diff --git a/StructureHelperLogics/NdmCalculations/Analyses/ExportResultToBitmapLogic.cs b/StructureHelperLogics/NdmCalculations/Analyses/ExportResultToBitmapLogic.cs
new file mode 100644
index 0000000..6e6da3d
--- /dev/null
+++ b/StructureHelperLogics/NdmCalculations/Analyses/ExportResultToBitmapLogic.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media.Imaging;
+
+namespace StructureHelperLogics.NdmCalculations.Analyses
+{
+    public class ExportResultToBitmapLogic : IExportResultLogic
+    {
+        private BitmapImage bitmapImage;
+
+        public ExportResultToBitmapLogic(BitmapImage bitmapImage)
+        {
+            this.bitmapImage = bitmapImage;
+        }
+
+        public string FileName { get; set; }
+
+        public void Export()
+        {
+            using (var fileStream = new FileStream(FileName, FileMode.Create))
+            {
+                BitmapEncoder encoder = new BmpBitmapEncoder();
+                encoder.Frames.Add(BitmapFrame.Create(bitmapImage));
+                encoder.Save(fileStream);
+            }
+        }
+    }
+}
diff --git a/StructureHelperLogics/NdmCalculations/Cracking/CrackForceCalculator.cs b/StructureHelperLogics/NdmCalculations/Cracking/CrackForceCalculator.cs
index 39fb065..fa43312 100644
--- a/StructureHelperLogics/NdmCalculations/Cracking/CrackForceCalculator.cs
+++ b/StructureHelperLogics/NdmCalculations/Cracking/CrackForceCalculator.cs
@@ -151,7 +151,7 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
             forceTupleCalculator.Run();
             var result = forceTupleCalculator.Result as IForcesTupleResult;
             var loaderStrainMatrix = result.LoaderResults.ForceStrainPair.StrainMatrix;
-            StrainTuple strainTuple = StrainTupleService.ConvertToStrainTuple(loaderStrainMatrix);
+            StrainTuple strainTuple = TupleConverter.ConvertToStrainTuple(loaderStrainMatrix);
             return strainTuple;
         }
         private void Check()
diff --git a/StructureHelperLogics/NdmCalculations/Cracking/CrackWidthCalculator.cs b/StructureHelperLogics/NdmCalculations/Cracking/CrackWidthCalculator.cs
index 4b8cd2e..5d2f58e 100644
--- a/StructureHelperLogics/NdmCalculations/Cracking/CrackWidthCalculator.cs
+++ b/StructureHelperLogics/NdmCalculations/Cracking/CrackWidthCalculator.cs
@@ -1,23 +1,122 @@
-using StructureHelperCommon.Models.Calculators;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using LoaderCalculator.Data.Ndms;
+using StructureHelperCommon.Infrastructures.Exceptions;
+using StructureHelperCommon.Models.Calculators;
+using StructureHelperCommon.Models.Forces;
+using StructureHelperCommon.Services.Forces;
+using StructureHelperLogics.NdmCalculations.Analyses.ByForces;
+using StructureHelperLogics.NdmCalculations.Primitives;
+using StructureHelperLogics.NdmCalculations.Triangulations;
 
 namespace StructureHelperLogics.NdmCalculations.Cracking
 {
     public class CrackWidthCalculator : ICalculator
     {
+        static readonly ILengthBetweenCracksLogic lengthLogic = new LengthBetweenCracksLogicSP63();
         CrackWidthCalculatorResult result;
+        private IEnumerable<INdmPrimitive> ndmPrimitives;
+        private List<RebarPrimitive>? rebarPrimitives;
+        private IEnumerable<INdm> ndmCollection;
+        private CrackForceResult crackForceResult;
+        private StrainTuple strainTuple;
+
         public string Name { get; set; }
-        public ICrackWidthCalculatorInputData InputData { get; set; }
+        public CrackWidthCalculatorInputData InputData { get; set; }
         public IResult Result => result;
 
         public void Run()
         {
-            throw new NotImplementedException();
+            result = new() { IsValid = true, Description = ""};
+            try
+            {
+                ProcessCalculations();
+            }
+            catch (Exception ex)
+            {
+                result.IsValid = false;
+                result.Description += ex;
+            }
+
         }
+
+        private void ProcessCalculations()
+        {
+            CheckInputData();
+            Triangulate();
+            CalcStrainMatrix();
+            CalcCrackForce();
+            var crackInputData = GetCrackInputData();
+            var calculator = new CrackWidthSimpleCalculator { InputData = crackInputData };
+            foreach (var item in rebarPrimitives)
+            {
+                crackInputData.RebarPrimitive = item;
+                calculator.Run();
+                var rebarResult = calculator.Result as CrackWidthSimpleCalculatorResult;
+                if (crackForceResult.IsSectionCracked == false)
+                {
+                    rebarResult.CrackWidth = 0d;
+                }
+                result.RebarResults.Add(rebarResult);
+            }
+        }
+
+        private void CalcStrainMatrix()
+        {
+            IForceTupleInputData inputData = new ForceTupleInputData() { NdmCollection = ndmCollection, Tuple = InputData.ForceTuple};
+            IForceTupleCalculator calculator = new ForceTupleCalculator(inputData);
+            calculator.Run();
+            var forceResult = calculator.Result as IForcesTupleResult;
+            strainTuple = TupleConverter.ConvertToStrainTuple(forceResult.LoaderResults.StrainMatrix);
+        }
+
+        private CrackWidthSimpleCalculatorInputData GetCrackInputData()
+        {
+            lengthLogic.NdmCollection = ndmCollection;
+            lengthLogic.StrainMatrix = TupleConverter.ConvertToLoaderStrainMatrix(strainTuple);
+            var length = lengthLogic.GetLength();
+            var crackInputData = new CrackWidthSimpleCalculatorInputData
+            {
+                PsiSFactor = crackForceResult.PsiS,
+                Length = length,
+                LimitState = InputData.LimitState,
+                StrainTuple = strainTuple
+            };
+            return crackInputData;
+        }
+
+        private void Triangulate()
+        {
+            ndmPrimitives = InputData.NdmPrimitives;
+            rebarPrimitives = new List<RebarPrimitive>();
+            foreach (var item in ndmPrimitives)
+            {
+                if (item is RebarPrimitive)
+                {
+                    rebarPrimitives.Add(item as RebarPrimitive);
+                }
+            }
+            //rebarPrimitives = ndmPrimitives
+            //    .Select(x => x is RebarPrimitive) as IEnumerable<RebarPrimitive>;
+            var options = new TriangulationOptions() { LimiteState = InputData.LimitState, CalcTerm = InputData.CalcTerm };
+            ndmCollection = ndmPrimitives.SelectMany(x => x.GetNdms(options));
+        }
+
+        private void CalcCrackForce()
+        {
+            var calculator = new CrackForceCalculator();
+            calculator.EndTuple = InputData.ForceTuple;
+            calculator.NdmCollection = ndmCollection;
+            calculator.Run();
+            crackForceResult = calculator.Result as CrackForceResult;
+        }
+
+        private void CheckInputData()
+        {
+            if (InputData.NdmPrimitives is null || InputData.NdmPrimitives.Count == 0)
+            {
+                throw new StructureHelperException(ErrorStrings.DataIsInCorrect + ": input data doesn't have any primitives");
+            }    
+        }
+
         public object Clone()
         {
             throw new NotImplementedException();
diff --git a/StructureHelperLogics/NdmCalculations/Cracking/ICrackWidthCalculatorInputData.cs b/StructureHelperLogics/NdmCalculations/Cracking/CrackWidthCalculatorInputData.cs
similarity index 57%
rename from StructureHelperLogics/NdmCalculations/Cracking/ICrackWidthCalculatorInputData.cs
rename to StructureHelperLogics/NdmCalculations/Cracking/CrackWidthCalculatorInputData.cs
index 72fbf78..4f0c346 100644
--- a/StructureHelperLogics/NdmCalculations/Cracking/ICrackWidthCalculatorInputData.cs
+++ b/StructureHelperLogics/NdmCalculations/Cracking/CrackWidthCalculatorInputData.cs
@@ -9,11 +9,11 @@ using System.Threading.Tasks;
 
 namespace StructureHelperLogics.NdmCalculations.Cracking
 {
-    public interface ICrackWidthCalculatorInputData
+    public class CrackWidthCalculatorInputData
     {
-        LimitStates LimitState { get; set; }
-        CalcTerms CalcTerm { get; set; }
-        StrainTuple StrainTuple { get; set; }
-        IEnumerable<INdmPrimitive> NdmPrimitives {get;set;}
+        public LimitStates LimitState { get; set; }
+        public CalcTerms CalcTerm { get; set; }
+        public ForceTuple ForceTuple { get; set; }
+        public List<INdmPrimitive> NdmPrimitives {get;set;}
     }
 }
diff --git a/StructureHelperLogics/NdmCalculations/Cracking/CrackWidthCalculatorResult.cs b/StructureHelperLogics/NdmCalculations/Cracking/CrackWidthCalculatorResult.cs
index fd0204b..0afdafe 100644
--- a/StructureHelperLogics/NdmCalculations/Cracking/CrackWidthCalculatorResult.cs
+++ b/StructureHelperLogics/NdmCalculations/Cracking/CrackWidthCalculatorResult.cs
@@ -11,6 +11,11 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
     {
         public bool IsValid { get; set; }
         public string Description { get; set; }
-        IEnumerable<CrackWidthSimpleCalculatorResult>  RebarResults { get; set; }
+        public List<CrackWidthSimpleCalculatorResult>  RebarResults { get; set; }
+
+        public CrackWidthCalculatorResult()
+        {
+            RebarResults = new List<CrackWidthSimpleCalculatorResult>();
+        }
     }
 }
diff --git a/StructureHelperLogics/NdmCalculations/Cracking/CrackWidthSimpleCalculatorInputData.cs b/StructureHelperLogics/NdmCalculations/Cracking/CrackWidthSimpleCalculatorInputData.cs
new file mode 100644
index 0000000..73980a6
--- /dev/null
+++ b/StructureHelperLogics/NdmCalculations/Cracking/CrackWidthSimpleCalculatorInputData.cs
@@ -0,0 +1,22 @@
+using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelperCommon.Models.Forces;
+using StructureHelperLogics.NdmCalculations.Primitives;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperLogics.NdmCalculations.Cracking
+{
+    public class CrackWidthSimpleCalculatorInputData : ICrackWidthSimpleCalculatorInputData
+    {
+        public LimitStates LimitState { get; set; }
+        public CalcTerms CalcTerm { get; set; }
+        public StrainTuple StrainTuple { get; set; }
+        public double PsiSFactor { get; set; }
+        public double Length { get; set; }
+        public SectionStressStates StressState { get; set; }
+        public RebarPrimitive RebarPrimitive { get; set; }
+    }
+}
diff --git a/StructureHelperLogics/NdmCalculations/Cracking/Factories/CrackWidthLogicInputDataFactory.cs b/StructureHelperLogics/NdmCalculations/Cracking/Factories/CrackWidthLogicInputDataFactory.cs
index 079e63f..a3d8b7a 100644
--- a/StructureHelperLogics/NdmCalculations/Cracking/Factories/CrackWidthLogicInputDataFactory.cs
+++ b/StructureHelperLogics/NdmCalculations/Cracking/Factories/CrackWidthLogicInputDataFactory.cs
@@ -28,6 +28,7 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
                 else { data.TermFactor = 1d; }
                 data.PsiSFactor = inputData.PsiSFactor;
                 data.StressStateFactor = inputData.StressState is SectionStressStates.Tension ? 1.2d : 1.0d;
+                data.BondFactor = 0.5;
                 return data;
             }
             else
@@ -39,12 +40,12 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
 
         private static void ProcessBaseProps(ICrackWidthSimpleCalculatorInputData inputData, ICrackWidthLogicInputData data)
         {
-            var strainMatrix = StrainTupleService.ConvertToLoaderStrainMatrix(inputData.StrainTuple);
+            var strainMatrix = TupleConverter.ConvertToLoaderStrainMatrix(inputData.StrainTuple);
             var triangulationOptions = new TriangulationOptions { LimiteState = inputData.LimitState, CalcTerm = inputData.CalcTerm };
             var ndms = inputData.RebarPrimitive.GetNdms(triangulationOptions).ToArray();
             var concreteNdm = ndms[0];
             var rebarNdm = ndms[1];
-            data.ConcreteStrain = stressLogic.GetTotalStrainWithPresrain(strainMatrix, concreteNdm);
+            data.ConcreteStrain = concreteNdm.Prestrain;// stressLogic.GetTotalStrain(strainMatrix, concreteNdm) - stressLogic.GetTotalStrainWithPresrain(strainMatrix, concreteNdm);
             data.RebarStrain = stressLogic.GetTotalStrainWithPresrain(strainMatrix, rebarNdm);
             data.Length = inputData.Length;
         }
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogic.cs b/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogic.cs
index 77501a0..49a3fc5 100644
--- a/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogic.cs
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogic.cs
@@ -25,7 +25,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
                 Material = options.HeadMaterial.GetLoaderMaterial(options.triangulationOptions.LimiteState, options.triangulationOptions.CalcTerm)
             };
             List<INdm> ndmCollection = new () { ndm};
-            NdmTransform.SetPrestrain(ndmCollection, StrainTupleService.ConvertToLoaderStrainMatrix(options.Prestrain));
+            NdmTransform.SetPrestrain(ndmCollection, TupleConverter.ConvertToLoaderStrainMatrix(options.Prestrain));
             return ndmCollection;
         }
 
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/RebarTriangulationLogic.cs b/StructureHelperLogics/NdmCalculations/Triangulations/RebarTriangulationLogic.cs
index 851db78..b63607c 100644
--- a/StructureHelperLogics/NdmCalculations/Triangulations/RebarTriangulationLogic.cs
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/RebarTriangulationLogic.cs
@@ -39,7 +39,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
                 Material = options.HeadMaterial.GetLoaderMaterial(options.triangulationOptions.LimiteState, options.triangulationOptions.CalcTerm)
             };
             List<INdm> ndmCollection = new() { concreteNdm, rebarNdm};
-            NdmTransform.SetPrestrain(ndmCollection, StrainTupleService.ConvertToLoaderStrainMatrix(options.Prestrain));
+            NdmTransform.SetPrestrain(ndmCollection, TupleConverter.ConvertToLoaderStrainMatrix(options.Prestrain));
             return ndmCollection;
         }
 
diff --git a/StructureHelperTests/FunctionalTests/Ndms/Calculators/ForceCalculatorTests/RCSectionsTest.cs b/StructureHelperTests/FunctionalTests/Ndms/Calculators/ForceCalculatorTests/RCSectionsTest.cs
index 2429e64..0e9600a 100644
--- a/StructureHelperTests/FunctionalTests/Ndms/Calculators/ForceCalculatorTests/RCSectionsTest.cs
+++ b/StructureHelperTests/FunctionalTests/Ndms/Calculators/ForceCalculatorTests/RCSectionsTest.cs
@@ -70,7 +70,7 @@ namespace StructureHelperTests.FunctionalTests.Ndms.Calculators.ForceCalculatorT
             var ndmPrimitives = newSection.SectionRepository.Primitives;
             var result = calculator.Result as IForcesResults;
             var strainMatrix = result.ForcesResultList[0].LoaderResults.StrainMatrix;
-            var source = StrainTupleService.ConvertToStrainTuple(strainMatrix);
+            var source = TupleConverter.ConvertToStrainTuple(strainMatrix);
             //Act
             foreach (var item in ndmPrimitives)
             {
diff --git a/StructureHelperTests/UnitTests/Ndms/Cracks/CrackWidthLogicTest.cs b/StructureHelperTests/UnitTests/Ndms/Cracks/CrackWidthLogicTest.cs
index 3fec330..8aaec8c 100644
--- a/StructureHelperTests/UnitTests/Ndms/Cracks/CrackWidthLogicTest.cs
+++ b/StructureHelperTests/UnitTests/Ndms/Cracks/CrackWidthLogicTest.cs
@@ -15,7 +15,7 @@ namespace StructureHelperTests.UnitTests.Ndms.Cracks
         public void Run_ShouldPass(double termFactor, double rebarStrain, double concreteStrain, double length, double expectedWidth)
         {
             //Arrange
-            var logic = new CrackWidthLogicSP63()
+            var inputData = new CrackWidthLogicInputDataSP63()
             {
                 TermFactor = termFactor,
                 BondFactor = 0.5d,
@@ -25,6 +25,8 @@ namespace StructureHelperTests.UnitTests.Ndms.Cracks
                 ConcreteStrain = concreteStrain,
                 Length = length
             };
+            var logic = new CrackWidthLogicSP63() { InputData = inputData };
+
             //Act
             var width = logic.GetCrackWidth();
             //Assert