Index: Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs
===================================================================
diff -u -r704769c89c7aa911a5a9847a8a90022eae2ff2d9 -rcf6a76a5bd319b58990949132b0fbf6fe60a97e4
--- Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs	(.../TreeViewControl.cs)	(revision 704769c89c7aa911a5a9847a8a90022eae2ff2d9)
+++ Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs	(.../TreeViewControl.cs)	(revision cf6a76a5bd319b58990949132b0fbf6fe60a97e4)
@@ -36,6 +36,11 @@
         {
             InitializeComponent();
 
+            treeView.ImageList = new ImageList
+            {
+                ColorDepth = ColorDepth.Depth32Bit
+            };
+
             treeView.StateImageList = new ImageList();
             treeView.StateImageList.Images.Add(CreateCheckBoxGlyph(CheckBoxState.UncheckedNormal));
             treeView.StateImageList.Images.Add(CreateCheckBoxGlyph(CheckBoxState.CheckedNormal));
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.Designer.cs
===================================================================
diff -u -ra49c98841cb7c943ff7abbfef8110b4bf6f52a8b -rcf6a76a5bd319b58990949132b0fbf6fe60a97e4
--- Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.Designer.cs	(.../LegendView.Designer.cs)	(revision a49c98841cb7c943ff7abbfef8110b4bf6f52a8b)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.Designer.cs	(.../LegendView.Designer.cs)	(revision cf6a76a5bd319b58990949132b0fbf6fe60a97e4)
@@ -19,7 +19,6 @@
             {
                 components.Dispose();
             }
-            treeView.Dispose();
             base.Dispose(disposing);
         }
 
@@ -33,29 +32,26 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LegendView));
-            this.treeView = new TreeView();
+            this.treeViewControl = new TreeViewControl();
             this.SuspendLayout();
             // 
-            // treeView
+            // treeViewControl
             // 
-            this.treeView.AllowDrop = true;
-            resources.ApplyResources(this.treeView, "treeView");
-            this.treeView.HideSelection = false;
-            this.treeView.LabelEdit = true;
-            this.treeView.Name = "treeView";
+            resources.ApplyResources(this.treeViewControl, "treeViewControl");
+            this.treeViewControl.Name = "treeViewControl";
             // 
             // LegendView
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.treeView);
+            this.Controls.Add(this.treeViewControl);
             this.Name = "LegendView";
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        private TreeView treeView;
+        private TreeViewControl treeViewControl;
     }
 }
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.cs
===================================================================
diff -u -ra49c98841cb7c943ff7abbfef8110b4bf6f52a8b -rcf6a76a5bd319b58990949132b0fbf6fe60a97e4
--- Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.cs	(.../LegendView.cs)	(revision a49c98841cb7c943ff7abbfef8110b4bf6f52a8b)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.cs	(.../LegendView.cs)	(revision cf6a76a5bd319b58990949132b0fbf6fe60a97e4)
@@ -46,7 +46,7 @@
             InitializeComponent();
             Text = Resources.General_Chart;
 
-            treeView.TreeViewController.RegisterTreeNodeInfo(new TreeNodeInfo<PointData>
+            treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo<PointData>
             {
                 Text = pointData => OxyPlotResources.ChartDataNodePresenter_Point_data_label,
                 Image = pointData => OxyPlotResources.PointsIcon,
@@ -56,7 +56,7 @@
                 OnNodeChecked = PointBasedChartDataOnNodeChecked
             });
 
-            treeView.TreeViewController.RegisterTreeNodeInfo(new TreeNodeInfo<LineData>
+            treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo<LineData>
             {
                 Text = lineData => OxyPlotResources.ChartDataNodePresenter_Line_data_label,
                 Image = lineData => OxyPlotResources.LineIcon,
@@ -66,7 +66,7 @@
                 OnNodeChecked = PointBasedChartDataOnNodeChecked
             });
 
-            treeView.TreeViewController.RegisterTreeNodeInfo(new TreeNodeInfo<AreaData>
+            treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo<AreaData>
             {
                 Text = areaData => OxyPlotResources.ChartDataNodePresenter_Area_data_label,
                 Image = areaData => OxyPlotResources.AreaIcon,
@@ -76,7 +76,7 @@
                 OnNodeChecked = PointBasedChartDataOnNodeChecked
             });
 
-            treeView.TreeViewController.RegisterTreeNodeInfo(new TreeNodeInfo<ChartDataCollection>
+            treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo<ChartDataCollection>
             {
                 Text = baseChart => OxyPlotResources.General_Chart,
                 Image = baseChart => GuiResources.folder,
@@ -91,7 +91,7 @@
         {
             get
             {
-                return (ChartData) treeView.TreeViewController.Data;
+                return (ChartData) treeViewControl.Data;
             }
             set
             {
@@ -100,7 +100,7 @@
                     return;
                 }
 
-                treeView.TreeViewController.Data = (ChartData) value;
+                treeViewControl.Data = (ChartData) value;
             }
         }
 
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.resx
===================================================================
diff -u -ra49c98841cb7c943ff7abbfef8110b4bf6f52a8b -rcf6a76a5bd319b58990949132b0fbf6fe60a97e4
--- Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.resx	(.../LegendView.resx)	(revision a49c98841cb7c943ff7abbfef8110b4bf6f52a8b)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.resx	(.../LegendView.resx)	(revision cf6a76a5bd319b58990949132b0fbf6fe60a97e4)
@@ -118,36 +118,36 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="treeView.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+  <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="treeView.ImageIndex" type="System.Int32, mscorlib">
+  <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="treeView.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="treeViewControl.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="treeView.SelectedImageIndex" type="System.Int32, mscorlib">
+  <data name="treeViewControl.SelectedImageIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="treeView.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="treeViewControl.Size" type="System.Drawing.Size, System.Drawing">
     <value>228, 412</value>
   </data>
-  <data name="treeView.TabIndex" type="System.Int32, mscorlib">
+  <data name="treeViewControl.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
-  <data name="&gt;&gt;treeView.Name" xml:space="preserve">
-    <value>treeView</value>
+  <data name="&gt;&gt;treeViewControl.Name" xml:space="preserve">
+    <value>treeViewControl</value>
   </data>
-  <data name="&gt;&gt;treeView.Type" xml:space="preserve">
+  <data name="&gt;&gt;treeViewControl.Type" xml:space="preserve">
     <value>Core.Plugins.OxyPlot.Legend.LegendTreeView, Core.Plugins.OxyPlot, Version=0.5.0.1876, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="&gt;&gt;treeView.Parent" xml:space="preserve">
+  <data name="&gt;&gt;treeViewControl.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;treeView.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;treeViewControl.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">