Index: Core/Common/src/Core.Common.Controls.Swf/Charting/ChartView.cs
===================================================================
diff -u -r2da9b71bbdefaeed62c47b673671b7d76502a363 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/src/Core.Common.Controls.Swf/Charting/ChartView.cs	(.../ChartView.cs)	(revision 2da9b71bbdefaeed62c47b673671b7d76502a363)
+++ Core/Common/src/Core.Common.Controls.Swf/Charting/ChartView.cs	(.../ChartView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -8,7 +8,6 @@
 using Core.Common.Controls.Swf.Charting.Customized;
 using Core.Common.Controls.Swf.Charting.Tools;
 using Core.Common.Controls.Swf.Properties;
-using Core.Common.Utils.Collections;
 using Core.Common.Utils.Collections.Generic;
 
 using Steema.TeeChart;
@@ -217,11 +216,6 @@
             }
         }
 
-        /// <summary>
-        /// The icon of the view used as identifier for a ChartView.
-        /// </summary>
-        public Image Image { get; set; }
-
         [Browsable(false)]
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public IEnumerable<IChartViewTool> Tools
Index: Core/Common/src/Core.Common.Controls.Swf/HtmlPageView.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/src/Core.Common.Controls.Swf/HtmlPageView.cs	(.../HtmlPageView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Common/src/Core.Common.Controls.Swf/HtmlPageView.cs	(.../HtmlPageView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -1,4 +1,3 @@
-using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Controls.Views;
 using Core.Common.Utils;
@@ -39,8 +38,6 @@
 
         public override string Text { get; set; }
 
-        public Image Image { get; set; }
-
         public ViewInfo ViewInfo { get; set; }
 
         public void EnsureVisible(object item) {}
Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs	(.../TableView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs	(.../TableView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -1125,10 +1125,6 @@
 
         [Browsable(false)]
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-        public Image Image { get; set; }
-
-        [Browsable(false)]
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public TableViewPasteController PasteController { get; set; }
 
         [Browsable(false)]
Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeView.cs
===================================================================
diff -u -ref35125104cc8b0201f9c961049cc6c8a30fb74d -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeView.cs	(.../TreeView.cs)	(revision ef35125104cc8b0201f9c961049cc6c8a30fb74d)
+++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeView.cs	(.../TreeView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -125,10 +125,6 @@
 
         [Browsable(false)]
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-        public Image Image { get; set; }
-
-        [Browsable(false)]
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public IEnumerable<ITreeNode> AllLoadedNodes
         {
             get
Index: Core/Common/src/Core.Common.Controls.Swf/WizardDialog.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/src/Core.Common.Controls.Swf/WizardDialog.cs	(.../WizardDialog.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Common/src/Core.Common.Controls.Swf/WizardDialog.cs	(.../WizardDialog.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -36,7 +36,6 @@
 
         public virtual object Data { get; set; }
 
-        public Image Image { get; set; }
         public ViewInfo ViewInfo { get; set; }
 
         public IEnumerable<IComponent> Pages
Index: Core/Common/src/Core.Common.Controls/Views/IView.cs
===================================================================
diff -u -rcff3810225268135255996e7a2e86de4733b03e8 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/src/Core.Common.Controls/Views/IView.cs	(.../IView.cs)	(revision cff3810225268135255996e7a2e86de4733b03e8)
+++ Core/Common/src/Core.Common.Controls/Views/IView.cs	(.../IView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 
 namespace Core.Common.Controls.Views
 {
@@ -22,11 +21,6 @@
         string Text { get; set; }
 
         /// <summary>
-        /// Sets or gets image set on the title of the view.
-        /// </summary>
-        Image Image { get; set; }
-
-        /// <summary>
         /// True when view is visible.
         /// </summary>
         bool Visible { get; }
Index: Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs	(.../ValidationReportControl.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs	(.../ValidationReportControl.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -71,8 +71,6 @@
             }
         }
 
-        public Image Image { get; set; }
-
         public ViewInfo ViewInfo { get; set; }
 
         public static Image GetImageForSeverity(bool isCategory, ValidationSeverity severity)
Index: Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.Designer.cs
===================================================================
diff -u -rcb7a9111257cd55736eb8eb4d41c85a6d646077b -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.Designer.cs	(.../ValidationView.Designer.cs)	(revision cb7a9111257cd55736eb8eb4d41c85a6d646077b)
+++ Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.Designer.cs	(.../ValidationView.Designer.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -69,7 +69,6 @@
             // 
             this.validationReportControl.Data = null;
             resources.ApplyResources(this.validationReportControl, "validationReportControl");
-            this.validationReportControl.Image = null;
             this.validationReportControl.Name = "validationReportControl";
             this.validationReportControl.ViewInfo = null;
             // 
Index: Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs	(.../ValidationView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs	(.../ValidationView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -35,7 +35,6 @@
         }
 
         public IGui Gui { get; set; }
-        public Image Image { get; set; }
 
         public object Data
         {
@@ -75,7 +74,6 @@
             if (!validationReport.Equals(oldValidationReport)) //only set if changed
             {
                 validationReportControl.Data = validationReport;
-                Image = ValidationReportControl.GetImageForSeverity(false, validationReport.Severity);
             }
 
             stopwatch.Stop();
Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs
===================================================================
diff -u -rd80205891b2350b00c02a87833da74bfdf1228b7 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs	(.../MessageWindow.cs)	(revision d80205891b2350b00c02a87833da74bfdf1228b7)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs	(.../MessageWindow.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -55,8 +55,6 @@
             ApplyFilter();
             messagesDataGridView.CellFormatting += MessagesDataGridViewCellFormatting;
 
-            Image = Resources.application_view_list;
-
             // fixes DPI problem
             messagesDataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             messagesDataGridView.RowsAdded += messagesDataGridView_RowsAdded;
@@ -265,8 +263,6 @@
             set {}
         }
 
-        public Image Image { get; set; }
-
         public void EnsureVisible(object item) {}
         public ViewInfo ViewInfo { get; set; }
 
Index: Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyGridView.cs
===================================================================
diff -u -r8d069bd17ce1b0f7ec017385f9f4e5fd84ed1f6f -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyGridView.cs	(.../PropertyGridView.cs)	(revision 8d069bd17ce1b0f7ec017385f9f4e5fd84ed1f6f)
+++ Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyGridView.cs	(.../PropertyGridView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -1,6 +1,5 @@
 using System;
 using System.Collections;
-using System.Drawing;
 using System.Linq;
 using System.Reflection;
 using System.Security.Permissions;
@@ -120,15 +119,6 @@
             }
         }
 
-        public Image Image
-        {
-            get
-            {
-                return Resources.PropertiesHS;
-            }
-            set {}
-        }
-
         public void EnsureVisible(object item) {}
 
         /// <summary>
Index: Core/Common/src/Core.Common.Gui/Forms/RichTextView.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/src/Core.Common.Gui/Forms/RichTextView.cs	(.../RichTextView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Common/src/Core.Common.Gui/Forms/RichTextView.cs	(.../RichTextView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -1,4 +1,3 @@
-using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 using Core.Common.Controls;
@@ -37,8 +36,6 @@
             }
         }
 
-        public Image Image { get; set; }
-
         public void EnsureVisible(object item) {}
 
         public ViewInfo ViewInfo { get; set; }
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/AvalonDockDockingManager.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/AvalonDockDockingManager.cs	(.../AvalonDockDockingManager.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/AvalonDockDockingManager.cs	(.../AvalonDockDockingManager.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -12,7 +12,6 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using Core.Common.Controls;
 using Core.Common.Controls.Views;
 using Core.Common.Gui.Properties;
 using Core.Common.Utils.Reflection;
@@ -653,7 +652,7 @@
         {
             var reusable = view as IReusableView;
             var isLocked = reusable != null && reusable.Locked;
-            return BitmapImageFromBitmap(isLocked ? LockImage : view.Image);
+            return BitmapImageFromBitmap(isLocked ? LockImage : view.ViewInfo.Image);
         }
 
         private LayoutContent GetLayoutContent(IView view)
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs	(.../ViewResolver.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs	(.../ViewResolver.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -333,7 +333,6 @@
             var view = (IView) Activator.CreateInstance(viewInfo.ViewType);
 
             view.Data = viewInfo.GetViewData(data);
-            view.Image = viewInfo.Image;
             view.ViewInfo = viewInfo;
 
             viewInfo.AfterCreate(view, data);
Index: Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.cs	(.../ToolWindowTestControl.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.cs	(.../ToolWindowTestControl.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -1,4 +1,3 @@
-using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Controls;
 using Core.Common.Controls.Views;
@@ -22,9 +21,8 @@
 
         public object Data { get; set; }
 
-        public Image Image { get; set; }
-
         public void EnsureVisible(object item) {}
+
         public ViewInfo ViewInfo { get; set; }
 
         #endregion
Index: Core/Common/test/Core.Common.Test/TestObjects/TestReusableView.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/test/Core.Common.Test/TestObjects/TestReusableView.cs	(.../TestReusableView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Common/test/Core.Common.Test/TestObjects/TestReusableView.cs	(.../TestReusableView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Controls;
 using Core.Common.Controls.Views;
@@ -18,7 +17,7 @@
         }
 
         public object Data { get; set; }
-        public Image Image { get; set; }
+
         public ViewInfo ViewInfo { get; set; }
 
         public bool Locked
Index: Core/Common/test/Core.Common.Test/TestObjects/TestView.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Common/test/Core.Common.Test/TestObjects/TestView.cs	(.../TestView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Common/test/Core.Common.Test/TestObjects/TestView.cs	(.../TestView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Controls;
 using Core.Common.Controls.Views;
@@ -14,8 +13,9 @@
         }
 
         public object Data { get; set; }
-        public Image Image { get; set; }
+
         public ViewInfo ViewInfo { get; set; }
+
         public void EnsureVisible(object item) {}
     }
 
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs	(.../CommonToolsGuiPlugin.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs	(.../CommonToolsGuiPlugin.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -89,6 +89,7 @@
 
             yield return new ViewInfo<TextDocument, TextDocumentView>
             {
+                Image = Resources.TextDocument,
                 Description = Resources.CommonToolsGuiPlugin_GetViewInfoObjects_Text_editor, GetViewName = (v, o) => o != null ? o.Name : ""
             };
             yield return new ViewInfo<Url, HtmlPageView>
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartLegendView.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Controls;
@@ -49,7 +48,6 @@
             }
         }
 
-        public Image Image { get; set; }
         public ViewInfo ViewInfo { get; set; }
 
         public void EnsureVisible(object item) {}
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/TextDocumentView.cs
===================================================================
diff -u -rcff3810225268135255996e7a2e86de4733b03e8 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/TextDocumentView.cs	(.../TextDocumentView.cs)	(revision cff3810225268135255996e7a2e86de4733b03e8)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/TextDocumentView.cs	(.../TextDocumentView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -1,10 +1,8 @@
 using System;
-using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Controls;
 using Core.Common.Controls.Views;
 using Core.Common.Utils;
-using Core.Plugins.CommonTools.Gui.Properties;
 
 namespace Core.Plugins.CommonTools.Gui.Forms
 {
@@ -55,12 +53,6 @@
             }
         }
 
-        public Image Image
-        {
-            get { return Resources.TextDocument; }
-            set {}
-        }
-
         public ViewInfo ViewInfo { get; set; }
 
         public void EnsureVisible(object item)
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs
===================================================================
diff -u -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs	(.../ProjectExplorer.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs	(.../ProjectExplorer.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.TreeViewControls;
@@ -57,7 +56,6 @@
             }
         }
 
-        public Image Image { get; set; }
         public ViewInfo ViewInfo { get; set; }
 
         public new void Dispose()
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs
===================================================================
diff -u -ref35125104cc8b0201f9c961049cc6c8a30fb74d -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs	(.../ProjectExplorerGuiPlugin.cs)	(revision ef35125104cc8b0201f9c961049cc6c8a30fb74d)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs	(.../ProjectExplorerGuiPlugin.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -53,10 +53,7 @@
         {
             if ((ProjectExplorer == null) || (ProjectExplorer.IsDisposed))
             {
-                ProjectExplorer = new ProjectExplorer(this)
-                {
-                    Image = Properties.Resources.Project
-                };
+                ProjectExplorer = new ProjectExplorer(this);
 
                 UpdateProjectTreeViewWithRegisteredNodePresenters();
 
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs	(.../ProjectTreeView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs	(.../ProjectTreeView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Base.Data;
 using Core.Common.Base.Plugin;
@@ -109,7 +108,6 @@
             }
         }
 
-        public Image Image { get; set; }
         public ViewInfo ViewInfo { get; set; }
         
         public new void Dispose()
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs	(.../MapLegendView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs	(.../MapLegendView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -49,8 +49,6 @@
             TreeView.NodeMouseClick += TreeViewNodeMouseClick;
             TreeView.DoubleClick += TreeViewDoubleClick;
             UpdateButtonsVisibility();
-
-            Image = Resources.Map;
         }
 
         public Map Map
@@ -93,8 +91,6 @@
             }
         }
 
-        public Image Image { get; set; }
-
         public ViewInfo ViewInfo { get; set; }
 
         public ContextMenuStrip GetContextMenu(object nodeTag)
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs
===================================================================
diff -u -rcff3810225268135255996e7a2e86de4733b03e8 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs	(.../MapView.cs)	(revision cff3810225268135255996e7a2e86de4733b03e8)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs	(.../MapView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Drawing;
 using System.Linq;
@@ -19,7 +18,6 @@
 using Core.GIS.SharpMap.Map;
 using Core.GIS.SharpMap.UI.Forms;
 using Core.GIS.SharpMap.UI.Tools;
-using Core.Plugins.SharpMapGis.Gui.Properties;
 using Core.Plugins.SharpMapGis.Tools;
 
 namespace Core.Plugins.SharpMapGis.Gui.Forms
@@ -307,15 +305,6 @@
             }
         }
 
-        public Image Image
-        {
-            get
-            {
-                return Resources.Map;
-            }
-            set {}
-        }
-
         public IEventedList<IView> ChildViews
         {
             get
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs
===================================================================
diff -u -r5e8f24c2eade934e5e8ff0f4f510eb5fbd40ac67 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs	(.../VectorLayerAttributeTableView.cs)	(revision 5e8f24c2eade934e5e8ff0f4f510eb5fbd40ac67)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs	(.../VectorLayerAttributeTableView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -128,9 +128,8 @@
             }
         }
 
-        public Image Image { get; set; }
-
         public ViewInfo ViewInfo { get; set; }
+
         public ILayer Layer { set; get; }
 
         /// <summary>
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs	(.../SharpMapGisGuiPlugin.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs	(.../SharpMapGisGuiPlugin.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -5,7 +5,6 @@
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
-using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.Table;
@@ -29,8 +28,8 @@
 using Core.Plugins.SharpMapGis.Gui.Forms.GridProperties;
 using Core.Plugins.SharpMapGis.Gui.Forms.MapLegendView;
 using Core.Plugins.SharpMapGis.Gui.NodePresenters;
+using Core.Plugins.SharpMapGis.Gui.Properties;
 using PropertyInfo = Core.Common.Gui.PropertyInfo;
-using TreeNode = System.Windows.Forms.TreeNode;
 
 namespace Core.Plugins.SharpMapGis.Gui
 {
@@ -249,6 +248,7 @@
         {
             yield return new ViewInfo<Map, MapView>
             {
+                Image = Resources.Map,
                 Description = "Map",
                 AfterCreate = (view, map) => view.Owner = gui.MainWindow
             };
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTabControlTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTabControlTest.cs	(.../MapViewTabControlTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTabControlTest.cs	(.../MapViewTabControlTest.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Controls;
 using Core.Common.Gui;
@@ -173,7 +172,6 @@
             public event EventHandler OnDeactivatedCalled;
             public object Data { get; set; }
             public string Text { get; set; }
-            public Image Image { get; set; }
 
             public bool Visible { get; private set; }
             public ViewInfo ViewInfo { get; set; }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r65c12731b5bc4f7dd185b779c801b9ee319e4e3a
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision 65c12731b5bc4f7dd185b779c801b9ee319e4e3a)
@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Common.Controls;
@@ -41,7 +40,6 @@
             }
         }
 
-        public Image Image { get; set; }
         public ViewInfo ViewInfo { get; set; }
         public void EnsureVisible(object item) { }