Index: Core/Gui/src/Core.Gui/Forms/Chart/ChartLegendView.Designer.cs
===================================================================
diff -u -rf869d21f23cf0986db9b2b68fd1aa2b9e7d28c9e -r78b4d18ebe304a6899eb3d71feb52b82d5ff3136
--- Core/Gui/src/Core.Gui/Forms/Chart/ChartLegendView.Designer.cs	(.../ChartLegendView.Designer.cs)	(revision f869d21f23cf0986db9b2b68fd1aa2b9e7d28c9e)
+++ Core/Gui/src/Core.Gui/Forms/Chart/ChartLegendView.Designer.cs	(.../ChartLegendView.Designer.cs)	(revision 78b4d18ebe304a6899eb3d71feb52b82d5ff3136)
@@ -53,7 +53,7 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ChartLegendView));
-            this.treeViewControl = new TreeViewControl();
+            this.treeViewControl = new Core.Common.Controls.TreeView.TreeViewControl();
             this.SuspendLayout();
             // 
             // treeViewControl
Index: Core/Gui/src/Core.Gui/Forms/Chart/ChartLegendView.resx
===================================================================
diff -u -rf869d21f23cf0986db9b2b68fd1aa2b9e7d28c9e -r78b4d18ebe304a6899eb3d71feb52b82d5ff3136
--- Core/Gui/src/Core.Gui/Forms/Chart/ChartLegendView.resx	(.../ChartLegendView.resx)	(revision f869d21f23cf0986db9b2b68fd1aa2b9e7d28c9e)
+++ Core/Gui/src/Core.Gui/Forms/Chart/ChartLegendView.resx	(.../ChartLegendView.resx)	(revision 78b4d18ebe304a6899eb3d71feb52b82d5ff3136)
@@ -121,28 +121,22 @@
   <data name="treeViewControl.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="treeViewControl.ImageIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="treeViewControl.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="treeViewControl.SelectedImageIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
   <data name="treeViewControl.Size" type="System.Drawing.Size, System.Drawing">
     <value>228, 412</value>
   </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="treeViewControl.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
   <data name="&gt;&gt;treeViewControl.Name" xml:space="preserve">
     <value>treeViewControl</value>
   </data>
   <data name="&gt;&gt;treeViewControl.Type" xml:space="preserve">
-    <value>Core.Plugins.Chart.Legend.LegendTreeView, Core.Plugins.Chart, Version=0.5.0.1876, Culture=neutral, PublicKeyToken=null</value>
+    <value>Core.Common.Controls.TreeView.TreeViewControl, Core.Common.Controls.TreeView, Version=21.2.1.1, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;treeViewControl.Parent" xml:space="preserve">
     <value>$this</value>