Index: Demo/Riskeer/src/Demo.Riskeer/Commands/OpenChartViewCommand.cs
===================================================================
diff -u -ra850be6391b6b7d0ce9a6da4fd61652ab0fe464b -r74d78f3d804c256e15300dcc194202ba3eabbe78
--- Demo/Riskeer/src/Demo.Riskeer/Commands/OpenChartViewCommand.cs	(.../OpenChartViewCommand.cs)	(revision a850be6391b6b7d0ce9a6da4fd61652ab0fe464b)
+++ Demo/Riskeer/src/Demo.Riskeer/Commands/OpenChartViewCommand.cs	(.../OpenChartViewCommand.cs)	(revision 74d78f3d804c256e15300dcc194202ba3eabbe78)
@@ -45,13 +45,7 @@
             this.viewCommands = viewCommands;
         }
 
-        public bool Checked
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public bool Checked => false;
 
         public void Execute()
         {
Index: Demo/Riskeer/src/Demo.Riskeer/Commands/OpenMapViewCommand.cs
===================================================================
diff -u -ra850be6391b6b7d0ce9a6da4fd61652ab0fe464b -r74d78f3d804c256e15300dcc194202ba3eabbe78
--- Demo/Riskeer/src/Demo.Riskeer/Commands/OpenMapViewCommand.cs	(.../OpenMapViewCommand.cs)	(revision a850be6391b6b7d0ce9a6da4fd61652ab0fe464b)
+++ Demo/Riskeer/src/Demo.Riskeer/Commands/OpenMapViewCommand.cs	(.../OpenMapViewCommand.cs)	(revision 74d78f3d804c256e15300dcc194202ba3eabbe78)
@@ -46,13 +46,7 @@
             this.viewCommands = viewCommands;
         }
 
-        public bool Checked
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public bool Checked => false;
 
         public void Execute()
         {
Index: Demo/Riskeer/src/Demo.Riskeer/Commands/OpenPointedTreeGraphViewCommand.cs
===================================================================
diff -u -ra850be6391b6b7d0ce9a6da4fd61652ab0fe464b -r74d78f3d804c256e15300dcc194202ba3eabbe78
--- Demo/Riskeer/src/Demo.Riskeer/Commands/OpenPointedTreeGraphViewCommand.cs	(.../OpenPointedTreeGraphViewCommand.cs)	(revision a850be6391b6b7d0ce9a6da4fd61652ab0fe464b)
+++ Demo/Riskeer/src/Demo.Riskeer/Commands/OpenPointedTreeGraphViewCommand.cs	(.../OpenPointedTreeGraphViewCommand.cs)	(revision 74d78f3d804c256e15300dcc194202ba3eabbe78)
@@ -43,13 +43,7 @@
             this.viewCommands = viewCommands;
         }
 
-        public bool Checked
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public bool Checked => false;
 
         public void Execute()
         {
Index: Demo/Riskeer/src/Demo.Riskeer/Commands/OpenStackChartViewCommand.cs
===================================================================
diff -u -ra850be6391b6b7d0ce9a6da4fd61652ab0fe464b -r74d78f3d804c256e15300dcc194202ba3eabbe78
--- Demo/Riskeer/src/Demo.Riskeer/Commands/OpenStackChartViewCommand.cs	(.../OpenStackChartViewCommand.cs)	(revision a850be6391b6b7d0ce9a6da4fd61652ab0fe464b)
+++ Demo/Riskeer/src/Demo.Riskeer/Commands/OpenStackChartViewCommand.cs	(.../OpenStackChartViewCommand.cs)	(revision 74d78f3d804c256e15300dcc194202ba3eabbe78)
@@ -42,13 +42,7 @@
             this.viewCommands = viewCommands;
         }
 
-        public bool Checked
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public bool Checked => false;
 
         public void Execute()
         {
Index: Demo/Riskeer/src/Demo.Riskeer/Demo.Riskeer.csproj
===================================================================
diff -u -rb9244aa42a3e7ee15849d00ff6a79701548b2a71 -r74d78f3d804c256e15300dcc194202ba3eabbe78
--- Demo/Riskeer/src/Demo.Riskeer/Demo.Riskeer.csproj	(.../Demo.Riskeer.csproj)	(revision b9244aa42a3e7ee15849d00ff6a79701548b2a71)
+++ Demo/Riskeer/src/Demo.Riskeer/Demo.Riskeer.csproj	(.../Demo.Riskeer.csproj)	(revision 74d78f3d804c256e15300dcc194202ba3eabbe78)
@@ -121,8 +121,6 @@
     <None Include="Resources\chart_bar.png" />
     <None Include="Resources\chart_line.png" />
     <None Include="Resources\chart_organisation.png" />
-    <None Include="Resources\folder-horizontal.png" />
-    <None Include="Resources\folder-horizontal_large.png" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
Index: Demo/Riskeer/src/Demo.Riskeer/GUIs/DemoPlugin.cs
===================================================================
diff -u -r5a62f6e5b886c1718edf439415ec77dc76d83207 -r74d78f3d804c256e15300dcc194202ba3eabbe78
--- Demo/Riskeer/src/Demo.Riskeer/GUIs/DemoPlugin.cs	(.../DemoPlugin.cs)	(revision 5a62f6e5b886c1718edf439415ec77dc76d83207)
+++ Demo/Riskeer/src/Demo.Riskeer/GUIs/DemoPlugin.cs	(.../DemoPlugin.cs)	(revision 74d78f3d804c256e15300dcc194202ba3eabbe78)
@@ -39,13 +39,7 @@
     /// </summary>
     public class DemoPlugin : PluginBase
     {
-        public override IRibbonCommandHandler RibbonCommandHandler
-        {
-            get
-            {
-                return new RiskeerDemoRibbon(Gui.ViewCommands);
-            }
-        }
+        public override IRibbonCommandHandler RibbonCommandHandler => new RiskeerDemoRibbon(Gui.ViewCommands);
 
         public override IEnumerable<ViewInfo> GetViewInfos()
         {
Index: Demo/Riskeer/src/Demo.Riskeer/Ribbons/RiskeerDemoRibbon.xaml
===================================================================
diff -u -rb9244aa42a3e7ee15849d00ff6a79701548b2a71 -r74d78f3d804c256e15300dcc194202ba3eabbe78
--- Demo/Riskeer/src/Demo.Riskeer/Ribbons/RiskeerDemoRibbon.xaml	(.../RiskeerDemoRibbon.xaml)	(revision b9244aa42a3e7ee15849d00ff6a79701548b2a71)
+++ Demo/Riskeer/src/Demo.Riskeer/Ribbons/RiskeerDemoRibbon.xaml	(.../RiskeerDemoRibbon.xaml)	(revision 74d78f3d804c256e15300dcc194202ba3eabbe78)
@@ -43,15 +43,15 @@
     <fluent:Ribbon x:Name="RiskeerDemoRibbonControl" x:FieldModifier="private">
         <fluent:RibbonTabItem Header="{x:Static resx:Resources.Demo}" fluent:KeyTip.Keys="D">
             <fluent:RibbonGroupBox Header="{x:Static resx:Resources.General_Map}" fluent:KeyTip.Keys="M" Height="Auto">
-                <fluent:Button x:Name="OpenMapViewButton" Header="{x:Static resx:Resources.General_Map}" ToolTip="{x:Static resx:Resources.OpenMapView_ToolTip}" LargeIcon="{Binding Source={x:Static resx:Resources.map}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenMapView_Click" fluent:KeyTip.Keys="K"/>
-                <fluent:Button x:Name="OpenThematicMapViewButton" Header="{x:Static resx:Resources.General_ThematicMap}" ToolTip="{x:Static resx:Resources.OpenMapView_ToolTip}" LargeIcon="{Binding Source={x:Static resx:Resources.map}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenThematicMapView_Click" fluent:KeyTip.Keys="K"/>
+                <fluent:Button Header="{x:Static resx:Resources.General_Map}" ToolTip="{x:Static resx:Resources.OpenMapView_ToolTip}" LargeIcon="{Binding Source={x:Static resx:Resources.map}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenMapView_Click" fluent:KeyTip.Keys="K"/>
+                <fluent:Button Header="{x:Static resx:Resources.General_ThematicMap}" ToolTip="{x:Static resx:Resources.OpenMapView_ToolTip}" LargeIcon="{Binding Source={x:Static resx:Resources.map}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenThematicMapView_Click" fluent:KeyTip.Keys="K"/>
             </fluent:RibbonGroupBox>
             <fluent:RibbonGroupBox Header="{x:Static resx:Resources.General_Chart}" fluent:KeyTip.Keys="C">
-                <fluent:Button x:Name="OpenChartViewButton" Header="{x:Static resx:Resources.General_Chart}" ToolTip="{x:Static resx:Resources.OpenChartView_ToolTip}" LargeIcon="{Binding Source={x:Static resx:Resources.ChartIcon}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenChartView_Click" fluent:KeyTip.Keys="O"/>
-                <fluent:Button x:Name="OpenStackChartViewButton" Header="{x:Static resx:Resources.Column_Chart}" ToolTip="{x:Static resx:Resources.OpenChartView_ToolTip}" LargeIcon="{Binding Source={x:Static resx:Resources.ColumnChartIcon}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenStackChartView_Click" fluent:KeyTip.Keys="O"/>
+                <fluent:Button Header="{x:Static resx:Resources.General_Chart}" ToolTip="{x:Static resx:Resources.OpenChartView_ToolTip}" LargeIcon="{Binding Source={x:Static resx:Resources.ChartIcon}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenChartView_Click" fluent:KeyTip.Keys="O"/>
+                <fluent:Button Header="{x:Static resx:Resources.Column_Chart}" ToolTip="{x:Static resx:Resources.OpenChartView_ToolTip}" LargeIcon="{Binding Source={x:Static resx:Resources.ColumnChartIcon}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenStackChartView_Click" fluent:KeyTip.Keys="O"/>
             </fluent:RibbonGroupBox>
             <fluent:RibbonGroupBox Header="{x:Static resx:Resources.General_FaultTree}" fluent:KeyTip.Keys="F">
-                <fluent:Button x:Name="OpenPointedTreeGraphViewButton" Header="{x:Static resx:Resources.General_FaultTree}" ToolTip="{x:Static resx:Resources.OpenFaultTree_ToolTip}" LargeIcon="{Binding Source={x:Static resx:Resources.FaultTreeIcon}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="OpenPointedTreeGraphViewButton_OnClick" fluent:KeyTip.Keys="B"/>
+                <fluent:Button Header="{x:Static resx:Resources.General_FaultTree}" ToolTip="{x:Static resx:Resources.OpenFaultTree_ToolTip}" LargeIcon="{Binding Source={x:Static resx:Resources.FaultTreeIcon}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="OpenPointedTreeGraphViewButton_OnClick" fluent:KeyTip.Keys="B"/>
             </fluent:RibbonGroupBox>
         </fluent:RibbonTabItem>
     </fluent:Ribbon>
Index: Demo/Riskeer/src/Demo.Riskeer/Views/ChartDataView.cs
===================================================================
diff -u -ra850be6391b6b7d0ce9a6da4fd61652ab0fe464b -r74d78f3d804c256e15300dcc194202ba3eabbe78
--- Demo/Riskeer/src/Demo.Riskeer/Views/ChartDataView.cs	(.../ChartDataView.cs)	(revision a850be6391b6b7d0ce9a6da4fd61652ab0fe464b)
+++ Demo/Riskeer/src/Demo.Riskeer/Views/ChartDataView.cs	(.../ChartDataView.cs)	(revision 74d78f3d804c256e15300dcc194202ba3eabbe78)
@@ -40,22 +40,10 @@
 
         public object Data
         {
-            get
-            {
-                return Chart.Data;
-            }
-            set
-            {
-                Chart.Data = value as ChartDataCollection;
-            }
+            get => Chart.Data;
+            set => Chart.Data = value as ChartDataCollection;
         }
 
-        public IChartControl Chart
-        {
-            get
-            {
-                return chartControl;
-            }
-        }
+        public IChartControl Chart => chartControl;
     }
 }
\ No newline at end of file
Index: Demo/Riskeer/src/Demo.Riskeer/Views/MapDataView.cs
===================================================================
diff -u -r4d331c6ac153c43daff49c47cfcf321725d4b434 -r74d78f3d804c256e15300dcc194202ba3eabbe78
--- Demo/Riskeer/src/Demo.Riskeer/Views/MapDataView.cs	(.../MapDataView.cs)	(revision 4d331c6ac153c43daff49c47cfcf321725d4b434)
+++ Demo/Riskeer/src/Demo.Riskeer/Views/MapDataView.cs	(.../MapDataView.cs)	(revision 74d78f3d804c256e15300dcc194202ba3eabbe78)
@@ -40,22 +40,10 @@
 
         public object Data
         {
-            get
-            {
-                return Map.Data;
-            }
-            set
-            {
-                mapControl.Data = value as MapDataCollection;
-            }
+            get => Map.Data;
+            set => mapControl.Data = value as MapDataCollection;
         }
 
-        public IMapControl Map
-        {
-            get
-            {
-                return mapControl;
-            }
-        }
+        public IMapControl Map => mapControl;
     }
 }
\ No newline at end of file
Index: Demo/Riskeer/src/Demo.Riskeer/Views/PointedTreeGraphView.cs
===================================================================
diff -u -ra850be6391b6b7d0ce9a6da4fd61652ab0fe464b -r74d78f3d804c256e15300dcc194202ba3eabbe78
--- Demo/Riskeer/src/Demo.Riskeer/Views/PointedTreeGraphView.cs	(.../PointedTreeGraphView.cs)	(revision a850be6391b6b7d0ce9a6da4fd61652ab0fe464b)
+++ Demo/Riskeer/src/Demo.Riskeer/Views/PointedTreeGraphView.cs	(.../PointedTreeGraphView.cs)	(revision 74d78f3d804c256e15300dcc194202ba3eabbe78)
@@ -40,14 +40,8 @@
 
         public object Data
         {
-            get
-            {
-                return pointedTreeGraphControl.Data;
-            }
-            set
-            {
-                pointedTreeGraphControl.Data = value as GraphNode;
-            }
+            get => pointedTreeGraphControl.Data;
+            set => pointedTreeGraphControl.Data = value as GraphNode;
         }
     }
 }
\ No newline at end of file
Index: Demo/Riskeer/src/Demo.Riskeer/Views/StackChartDataView.cs
===================================================================
diff -u -ra850be6391b6b7d0ce9a6da4fd61652ab0fe464b -r74d78f3d804c256e15300dcc194202ba3eabbe78
--- Demo/Riskeer/src/Demo.Riskeer/Views/StackChartDataView.cs	(.../StackChartDataView.cs)	(revision a850be6391b6b7d0ce9a6da4fd61652ab0fe464b)
+++ Demo/Riskeer/src/Demo.Riskeer/Views/StackChartDataView.cs	(.../StackChartDataView.cs)	(revision 74d78f3d804c256e15300dcc194202ba3eabbe78)
@@ -40,14 +40,8 @@
 
         public object Data
         {
-            get
-            {
-                return stackChartControl.Data;
-            }
-            set
-            {
-                stackChartControl.Data = value as StackChartData;
-            }
+            get => stackChartControl.Data;
+            set => stackChartControl.Data = value as StackChartData;
         }
     }
 }
\ No newline at end of file