Index: Core/Common/test/Core.Common.Util.Test/Core.Common.Util.Test.csproj
===================================================================
diff -u -r30f8921063b21f87813b991a09893c81c094d6cb -r190abb8cca2b36322c814f24ff94d2a03c71c61a
--- Core/Common/test/Core.Common.Util.Test/Core.Common.Util.Test.csproj	(.../Core.Common.Util.Test.csproj)	(revision 30f8921063b21f87813b991a09893c81c094d6cb)
+++ Core/Common/test/Core.Common.Util.Test/Core.Common.Util.Test.csproj	(.../Core.Common.Util.Test.csproj)	(revision 190abb8cca2b36322c814f24ff94d2a03c71c61a)
@@ -6,9 +6,6 @@
     <None Remove="test-data\**" />
   </ItemGroup>
   <ItemGroup>
-    <None Remove="Resources\ValidFont.ttf" />
-  </ItemGroup>
-  <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
Index: Core/Components/src/Core.Components.DotSpatial.Forms/Core.Components.DotSpatial.Forms.csproj
===================================================================
diff -u -r3b75626e8f322a39e07c03da3ef5f382639eb15c -r190abb8cca2b36322c814f24ff94d2a03c71c61a
--- Core/Components/src/Core.Components.DotSpatial.Forms/Core.Components.DotSpatial.Forms.csproj	(.../Core.Components.DotSpatial.Forms.csproj)	(revision 3b75626e8f322a39e07c03da3ef5f382639eb15c)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/Core.Components.DotSpatial.Forms.csproj	(.../Core.Components.DotSpatial.Forms.csproj)	(revision 190abb8cca2b36322c814f24ff94d2a03c71c61a)
@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(SolutionDir)build\Source.targets" />
   <ItemGroup>
-    <None Remove="Resources\Deltares-Riskeer-Symbols.ttf" />
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="Resources\Symbols.ttf" />
   </ItemGroup>
   <ItemGroup>
Index: Core/Components/src/Core.Components.GraphSharp.Forms/PointedTreeGraphControl.cs
===================================================================
diff -u -r98b126b6d45b128483be32b5d76285ddfbe5655b -r190abb8cca2b36322c814f24ff94d2a03c71c61a
--- Core/Components/src/Core.Components.GraphSharp.Forms/PointedTreeGraphControl.cs	(.../PointedTreeGraphControl.cs)	(revision 98b126b6d45b128483be32b5d76285ddfbe5655b)
+++ Core/Components/src/Core.Components.GraphSharp.Forms/PointedTreeGraphControl.cs	(.../PointedTreeGraphControl.cs)	(revision 190abb8cca2b36322c814f24ff94d2a03c71c61a)
@@ -22,6 +22,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.IO.Packaging;
 using System.Windows;
 using System.Windows.Forms;
 using System.Windows.Input;
@@ -103,7 +104,7 @@
 
             var myResourceDictionary = new ResourceDictionary
             {
-                Source = new Uri("pack://application:,,,/Core.Components.GraphSharp.Forms;component/Templates/PointedTreeGraphTemplate.xaml", UriKind.Absolute)
+                Source = new Uri($"{PackUriHelper.UriSchemePack}://application:,,,/Core.Components.GraphSharp.Forms;component/Templates/PointedTreeGraphTemplate.xaml", UriKind.Absolute)
             };
             zoomControl.Resources.MergedDictionaries.Add(myResourceDictionary);
             wpfElementHost.Child = zoomControl;
@@ -158,8 +159,7 @@
         {
             if (e.PropertyName == nameof(PointedTreeElementVertex.IsSelected))
             {
-                var changedVertex = sender as PointedTreeElementVertex;
-                if (changedVertex != null && changedVertex.IsSelected)
+                if (sender is PointedTreeElementVertex changedVertex && changedVertex.IsSelected)
                 {
                     foreach (DrawnGraphNode drawnGraphNode in drawnGraphNodeList)
                     {
Index: Core/Components/src/Core.Components.OxyPlot.Forms/Core.Components.OxyPlot.Forms.csproj
===================================================================
diff -u -r3b75626e8f322a39e07c03da3ef5f382639eb15c -r190abb8cca2b36322c814f24ff94d2a03c71c61a
--- Core/Components/src/Core.Components.OxyPlot.Forms/Core.Components.OxyPlot.Forms.csproj	(.../Core.Components.OxyPlot.Forms.csproj)	(revision 3b75626e8f322a39e07c03da3ef5f382639eb15c)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/Core.Components.OxyPlot.Forms.csproj	(.../Core.Components.OxyPlot.Forms.csproj)	(revision 190abb8cca2b36322c814f24ff94d2a03c71c61a)
@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(SolutionDir)build\Source.targets" />
   <ItemGroup>
-    <None Remove="Resources\Deltares-Riskeer-Symbols.ttf" />
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="Resources\Symbols.ttf" />
   </ItemGroup>
   <ItemGroup>
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -ra61513bc9e230a29a6611c6c03725f9b747e86ef -r190abb8cca2b36322c814f24ff94d2a03c71c61a
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision a61513bc9e230a29a6611c6c03725f9b747e86ef)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 190abb8cca2b36322c814f24ff94d2a03c71c61a)
@@ -126,6 +126,10 @@
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(PluginBase));
 
+        private static readonly FontFamily fontFamily = new FontFamily(
+            new Uri($"{PackUriHelper.UriSchemePack}://application:,,,/Riskeer.Integration.Plugin;component/Resources/"),
+            "./#Symbols");
+
         #region Failure mechanism associations
 
         private static readonly IEnumerable<FailureMechanismContextAssociation> failureMechanismAssociations = new[]
@@ -242,10 +246,6 @@
 
         #endregion
 
-        private static readonly FontFamily fontFamily = new FontFamily(
-            new Uri($"{PackUriHelper.UriSchemePack}://application:,,,/Riskeer.Integration.Plugin;component/Resources/"),
-            "./#Symbols");
-
         private IHydraulicBoundaryLocationCalculationGuiService hydraulicBoundaryLocationCalculationGuiService;
         private AssessmentSectionMerger assessmentSectionMerger;
 
@@ -479,10 +479,7 @@
                                                                                  context.AssessmentSection,
                                                                                  context.GetNormFunc,
                                                                                  context.CategoryBoundaryName),
-                AfterCreate = (view, context) =>
-                {
-                    view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService;
-                }
+                AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; }
             };
 
             yield return new ViewInfo<WaveHeightCalculationsContext, IObservableEnumerable<HydraulicBoundaryLocationCalculation>, WaveHeightCalculationsView>
@@ -496,10 +493,7 @@
                                                                            context.AssessmentSection,
                                                                            context.GetNormFunc,
                                                                            context.CategoryBoundaryName),
-                AfterCreate = (view, context) =>
-                {
-                    view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService;
-                }
+                AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; }
             };
 
             yield return new ViewInfo<IAssessmentSection, AssessmentSectionView>
@@ -1790,10 +1784,7 @@
                 RiskeerCommonFormsResources.Calculate_All,
                 Resources.AssessmentSection_Calculate_All_ToolTip,
                 RiskeerCommonFormsResources.CalculateAllIcon,
-                (sender, args) =>
-                {
-                    ActivityProgressDialogRunner.Run(Gui.MainWindow, AssessmentSectionCalculationActivityFactory.CreateActivities(nodeData.WrappedData));
-                });
+                (sender, args) => { ActivityProgressDialogRunner.Run(Gui.MainWindow, AssessmentSectionCalculationActivityFactory.CreateActivities(nodeData.WrappedData)); });
 
             return Gui.Get(nodeData, treeViewControl)
                       .AddOpenItem()