Index: Core/Components/src/Core.Components.GraphSharp.Forms/PointedTreeGraphControl.cs
===================================================================
diff -u -r6dd9d30bf2f7b740320718ceea5513f39741fa95 -r1fb18822ebf5a2e3dae6eb2dc3c4687e4d1d0e62
--- Core/Components/src/Core.Components.GraphSharp.Forms/PointedTreeGraphControl.cs	(.../PointedTreeGraphControl.cs)	(revision 6dd9d30bf2f7b740320718ceea5513f39741fa95)
+++ Core/Components/src/Core.Components.GraphSharp.Forms/PointedTreeGraphControl.cs	(.../PointedTreeGraphControl.cs)	(revision 1fb18822ebf5a2e3dae6eb2dc3c4687e4d1d0e62)
@@ -24,6 +24,7 @@
 using System.Windows.Forms;
 using System.Windows.Media;
 using Core.Common.Utils.Extensions;
+using Core.Components.GraphSharp.Converters;
 using Core.Components.GraphSharp.Data;
 using Core.Components.GraphSharp.Forms.Layout;
 using Core.Components.PointedTree.Data;
@@ -95,18 +96,7 @@
 
         private void DrawNode(GraphNode node, PointedTreeElementVertex parentVertex = null)
         {
-            var vertex = new PointedTreeElementVertex(node.Title,
-                                                      new SolidColorBrush(Color.FromArgb(node.Style.FillColor.A,
-                                                                                         node.Style.FillColor.R,
-                                                                                         node.Style.FillColor.G,
-                                                                                         node.Style.FillColor.B)),
-                                                      new SolidColorBrush(Color.FromArgb(node.Style.LineColor.A,
-                                                                                         node.Style.LineColor.R,
-                                                                                         node.Style.LineColor.G,
-                                                                                         node.Style.LineColor.B)),
-                                                      node.Style.LineWidth,
-                                                      PointedTreeVertexType.Rectangle,
-                                                      node.IsSelectable);
+            PointedTreeElementVertex vertex = GraphNodeConverter.Convert(node);
 
             graph.AddVertex(vertex);
 
Index: Core/Components/src/Core.Components.GraphSharp/Converters/GraphNodeConverter.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.GraphSharp/Converters/GraphNodeConverter.cs	(revision 0)
+++ Core/Components/src/Core.Components.GraphSharp/Converters/GraphNodeConverter.cs	(revision 1fb18822ebf5a2e3dae6eb2dc3c4687e4d1d0e62)
@@ -0,0 +1,85 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.ComponentModel;
+using System.Windows.Media;
+using Core.Components.GraphSharp.Data;
+using Core.Components.PointedTree.Data;
+
+namespace Core.Components.GraphSharp.Converters
+{
+    /// <summary>
+    /// Converter to change a <see cref="GraphNode"/> to <see cref="PointedTreeElementVertex"/>.
+    /// </summary>
+    public static class GraphNodeConverter
+    {
+        /// <summary>
+        /// Converts a <see cref="GraphNode"/> to a <see cref="PointedTreeElementVertex"/>.
+        /// </summary>
+        /// <param name="graphNode">The graph node to convert.</param>
+        /// <returns>The created <see cref="PointedTreeElementVertex"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="graphNode"/>
+        /// is <c>null</c>.</exception>
+        public static PointedTreeElementVertex Convert(GraphNode graphNode)
+        {
+            if (graphNode == null)
+            {
+                throw new ArgumentNullException(nameof(graphNode));
+            }
+
+            GraphNodeStyle style = graphNode.Style;
+
+            return new PointedTreeElementVertex(
+                graphNode.Title,
+                ConvertColor(style.FillColor),
+                ConvertColor(style.LineColor),
+                style.LineWidth,
+                ConvertType(style.Shape),
+                graphNode.IsSelectable);
+        }
+
+        private static SolidColorBrush ConvertColor(System.Drawing.Color color)
+        {
+            return new SolidColorBrush(
+                Color.FromArgb(
+                    color.A,
+                    color.R,
+                    color.G,
+                    color.B));
+        }
+
+        private static PointedTreeVertexType ConvertType(GraphNodeShape shape)
+        {
+            switch(shape)
+            {
+                case GraphNodeShape.Rectangle:
+                    return PointedTreeVertexType.Rectangle;
+                case GraphNodeShape.Diamond:
+                    return PointedTreeVertexType.Diamond;
+                default:
+                    throw new InvalidEnumArgumentException(nameof(shape),
+                                                           (int) shape,
+                                                           typeof(GraphNodeShape));
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.GraphSharp/Core.Components.GraphSharp.csproj
===================================================================
diff -u -r83a3d88b3df8452281d5f020060e8cfb2b6fb85e -r1fb18822ebf5a2e3dae6eb2dc3c4687e4d1d0e62
--- Core/Components/src/Core.Components.GraphSharp/Core.Components.GraphSharp.csproj	(.../Core.Components.GraphSharp.csproj)	(revision 83a3d88b3df8452281d5f020060e8cfb2b6fb85e)
+++ Core/Components/src/Core.Components.GraphSharp/Core.Components.GraphSharp.csproj	(.../Core.Components.GraphSharp.csproj)	(revision 1fb18822ebf5a2e3dae6eb2dc3c4687e4d1d0e62)
@@ -61,6 +61,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
     <Reference Include="WindowsBase" />
     <Reference Include="WPFExtensions, Version=1.0.3437.34043, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\WPFExtensions.1.0.0\lib\WPFExtensions.dll</HintPath>
@@ -71,6 +72,7 @@
     <Compile Include="..\..\..\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="Converters\GraphNodeConverter.cs" />
     <Compile Include="Data\PointedTreeEdge.cs" />
     <Compile Include="Data\PointedTreeGraph.cs" />
     <Compile Include="Data\PointedTreeElementVertex.cs" />
@@ -83,6 +85,14 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\Core.Components.PointedTree\Core.Components.PointedTree.csproj">
+      <Project>{ad3b1634-c435-4618-9971-2ea0817f5de2}</Project>
+      <Name>Core.Components.PointedTree</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Core/Components/test/Core.Components.GraphSharp.Forms.Test/PointedTreeGraphControlTest.cs
===================================================================
diff -u -r6dd9d30bf2f7b740320718ceea5513f39741fa95 -r1fb18822ebf5a2e3dae6eb2dc3c4687e4d1d0e62
--- Core/Components/test/Core.Components.GraphSharp.Forms.Test/PointedTreeGraphControlTest.cs	(.../PointedTreeGraphControlTest.cs)	(revision 6dd9d30bf2f7b740320718ceea5513f39741fa95)
+++ Core/Components/test/Core.Components.GraphSharp.Forms.Test/PointedTreeGraphControlTest.cs	(.../PointedTreeGraphControlTest.cs)	(revision 1fb18822ebf5a2e3dae6eb2dc3c4687e4d1d0e62)
@@ -72,11 +72,11 @@
                 var doubleUsedNode = new GraphNode("Double used", new GraphNode[0], false);
                 var node = new GraphNode("Root", new[]
                 {
-                    new GraphNode("Child 1", new []
+                    new GraphNode("Child 1", new[]
                     {
                         doubleUsedNode
-                    }, false), 
-                    new GraphNode("Child 2", new []
+                    }, false),
+                    new GraphNode("Child 2", new[]
                     {
                         doubleUsedNode
                     }, false)
@@ -90,7 +90,7 @@
                 var zoomControl = (ZoomControl) elementHost.Child;
                 var graphLayout = (PointedTreeGraphLayout) zoomControl.Content;
                 PointedTreeGraph graph = graphLayout.Graph;
-                
+
                 Assert.AreEqual(5, graph.VertexCount);
                 Assert.AreEqual(4, graph.EdgeCount);
             }
@@ -111,14 +111,14 @@
             })
             {
                 var elementHost = graphControl.Controls[0] as ElementHost;
-                var zoomControl = (ZoomControl)elementHost.Child;
-                var graphLayout = (PointedTreeGraphLayout)zoomControl.Content;
+                var zoomControl = (ZoomControl) elementHost.Child;
+                var graphLayout = (PointedTreeGraphLayout) zoomControl.Content;
                 PointedTreeGraph graph = graphLayout.Graph;
 
                 // Precondition
                 Assert.AreEqual(2, graph.VertexCount);
                 Assert.AreEqual(1, graph.EdgeCount);
-                
+
                 // When
                 graphControl.Data = new GraphNode("Double used", new GraphNode[0], false);
 
@@ -143,8 +143,8 @@
             })
             {
                 var elementHost = graphControl.Controls[0] as ElementHost;
-                var zoomControl = (ZoomControl)elementHost.Child;
-                var graphLayout = (PointedTreeGraphLayout)zoomControl.Content;
+                var zoomControl = (ZoomControl) elementHost.Child;
+                var graphLayout = (PointedTreeGraphLayout) zoomControl.Content;
                 PointedTreeGraph graph = graphLayout.Graph;
 
                 // Precondition
Index: Core/Components/test/Core.Components.GraphSharp.Test/Converters/GraphNodeConverterTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.GraphSharp.Test/Converters/GraphNodeConverterTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.GraphSharp.Test/Converters/GraphNodeConverterTest.cs	(revision 1fb18822ebf5a2e3dae6eb2dc3c4687e4d1d0e62)
@@ -0,0 +1,99 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.ComponentModel;
+using System.Windows.Media;
+using Core.Common.TestUtil;
+using Core.Components.GraphSharp.Converters;
+using Core.Components.GraphSharp.Data;
+using Core.Components.PointedTree.Data;
+using NUnit.Framework;
+using Color = System.Drawing.Color;
+using wpfColor = System.Windows.Media.Color;
+
+namespace Core.Components.GraphSharp.Test.Converters
+{
+    [TestFixture]
+    public class GraphNodeConverterTest
+    {
+        [Test]
+        public void Convert_GraphNodeNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => GraphNodeConverter.Convert(null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("graphNode", exception.ParamName);
+        }
+
+        [Test]
+        public void Convert_InvalidShapeType_ThrowsInvalidEnumArgumentException()
+        {
+            // Setup
+            var graphNode = new GraphNode("test", new GraphNode[0], false,
+                                          new GraphNodeStyle((GraphNodeShape) 99, Color.AliceBlue,
+                                                             Color.AntiqueWhite, 2));
+
+            // Call
+            TestDelegate test = () => GraphNodeConverter.Convert(graphNode);
+
+            // Assert
+            const string message = "The value of argument 'shape' (99) is invalid for Enum type 'GraphNodeShape'.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(test, message);
+        }
+
+        [Test]
+        [TestCase(GraphNodeShape.Diamond, PointedTreeVertexType.Diamond)]
+        [TestCase(GraphNodeShape.Rectangle, PointedTreeVertexType.Rectangle)]
+        public void Convert_WithGraphNode_ReturnPointedTreeElementVertex(GraphNodeShape graphNodeShape,
+                                                                         PointedTreeVertexType expectedVertexType)
+        {
+            // Setup
+            const string content = "Node";
+            const bool isSelectable = false;
+            const int lineWidth = 3;
+            Color fillColor = Color.Aquamarine;
+            Color lineColor = Color.Coral;
+
+            var graphNode = new GraphNode(content, new GraphNode[0], isSelectable,
+                                          new GraphNodeStyle(graphNodeShape, fillColor,
+                                                             lineColor, lineWidth));
+
+            // Call
+            PointedTreeElementVertex vertex = GraphNodeConverter.Convert(graphNode);
+
+            // Assert
+            Assert.AreEqual(content, vertex.Content);
+            Assert.AreEqual(isSelectable, vertex.IsSelectable);
+            Assert.AreEqual(expectedVertexType, vertex.Type);
+            Assert.AreEqual(lineWidth, vertex.LineWidth);
+            AssertColors(fillColor, vertex.FillColor);
+            AssertColors(lineColor, vertex.LineColor);
+        }
+
+        private static void AssertColors(Color color, Brush brushColor)
+        {
+            Assert.AreEqual(new SolidColorBrush(wpfColor.FromArgb(color.A, color.R, color.G, color.B)).ToString(), brushColor.ToString());
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.GraphSharp.Test/Core.Components.GraphSharp.Test.csproj
===================================================================
diff -u -r83a3d88b3df8452281d5f020060e8cfb2b6fb85e -r1fb18822ebf5a2e3dae6eb2dc3c4687e4d1d0e62
--- Core/Components/test/Core.Components.GraphSharp.Test/Core.Components.GraphSharp.Test.csproj	(.../Core.Components.GraphSharp.Test.csproj)	(revision 83a3d88b3df8452281d5f020060e8cfb2b6fb85e)
+++ Core/Components/test/Core.Components.GraphSharp.Test/Core.Components.GraphSharp.Test.csproj	(.../Core.Components.GraphSharp.Test.csproj)	(revision 1fb18822ebf5a2e3dae6eb2dc3c4687e4d1d0e62)
@@ -70,6 +70,8 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="WindowsBase" />
     <Reference Include="WPFExtensions, Version=1.0.3437.34043, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\WPFExtensions.1.0.0\lib\WPFExtensions.dll</HintPath>
       <Private>True</Private>
@@ -79,6 +81,7 @@
     <Compile Include="..\..\..\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="Converters\GraphNodeConverterTest.cs" />
     <Compile Include="Data\PointedTreeEdgeTest.cs" />
     <Compile Include="Data\PointedTreeGraphTest.cs" />
     <Compile Include="Data\PointedTreeElementVertexTest.cs" />
@@ -91,10 +94,18 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Core.Components.GraphSharp\Core.Components.GraphSharp.csproj">
       <Project>{32358941-77c5-48a7-ad8b-dfb4f23b12a5}</Project>
       <Name>Core.Components.GraphSharp</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Components.PointedTree\Core.Components.PointedTree.csproj">
+      <Project>{ad3b1634-c435-4618-9971-2ea0817f5de2}</Project>
+      <Name>Core.Components.PointedTree</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.