Index: Core/Gui/src/Core.Gui/Forms/ViewHost/AvalonDockViewHost.xaml.cs
===================================================================
diff -u -r54cce925f5a723820f5490293019ef785ae531fd -rc288aa74152c095dc29b2cd516c7cb64dddea97c
--- Core/Gui/src/Core.Gui/Forms/ViewHost/AvalonDockViewHost.xaml.cs	(.../AvalonDockViewHost.xaml.cs)	(revision 54cce925f5a723820f5490293019ef785ae531fd)
+++ Core/Gui/src/Core.Gui/Forms/ViewHost/AvalonDockViewHost.xaml.cs	(.../AvalonDockViewHost.xaml.cs)	(revision c288aa74152c095dc29b2cd516c7cb64dddea97c)
@@ -22,12 +22,10 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using System.Windows.Forms.Integration;
 using Core.Common.Controls.Views;
-using Core.Common.Util.Drawing;
 using Xceed.Wpf.AvalonDock.Layout;
 using FontFamily = System.Windows.Media.FontFamily;
 
@@ -241,15 +239,6 @@
             }
         }
 
-        public void SetImage(IView view, Image image)
-        {
-            var layoutContent = GetLayoutContent<LayoutContent>(view);
-            if (layoutContent != null)
-            {
-                layoutContent.IconSource = image.AsBitmapImage();
-            }
-        }
-
         public void Dispose()
         {
             Dispose(true);
Index: Core/Gui/src/Core.Gui/Forms/ViewHost/IViewHost.cs
===================================================================
diff -u -r54cce925f5a723820f5490293019ef785ae531fd -rc288aa74152c095dc29b2cd516c7cb64dddea97c
--- Core/Gui/src/Core.Gui/Forms/ViewHost/IViewHost.cs	(.../IViewHost.cs)	(revision 54cce925f5a723820f5490293019ef785ae531fd)
+++ Core/Gui/src/Core.Gui/Forms/ViewHost/IViewHost.cs	(.../IViewHost.cs)	(revision c288aa74152c095dc29b2cd516c7cb64dddea97c)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using Core.Common.Controls.Views;
 using FontFamily = System.Windows.Media.FontFamily;
 
@@ -114,12 +113,5 @@
         /// <param name="view">The view to set the title for.</param>
         /// <param name="title">The title.</param>
         void SetTitle(IView view, string title);
-
-        /// <summary>
-        /// Sets the image for a document view or tool view.
-        /// </summary>
-        /// <param name="view">The view to set the image for.</param>
-        /// <param name="image">The image.</param>
-        void SetImage(IView view, Image image);
     }
 }
\ No newline at end of file
Index: Core/Gui/test/Core.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs
===================================================================
diff -u -r54cce925f5a723820f5490293019ef785ae531fd -rc288aa74152c095dc29b2cd516c7cb64dddea97c
--- Core/Gui/test/Core.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs	(.../AvalonDockViewHostTest.cs)	(revision 54cce925f5a723820f5490293019ef785ae531fd)
+++ Core/Gui/test/Core.Gui.Test/Forms/ViewHost/AvalonDockViewHostTest.cs	(.../AvalonDockViewHostTest.cs)	(revision c288aa74152c095dc29b2cd516c7cb64dddea97c)
@@ -22,11 +22,11 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
 using System.Windows.Forms.Integration;
+using System.Windows.Media;
 using Core.Common.Controls.Views;
 using Core.Common.TestUtil;
 using Core.Common.Util.Reflection;
@@ -179,7 +179,7 @@
             {
                 const string title = "Random title";
                 const string symbol = "Random symbol";
-                var fontFamily = new System.Windows.Media.FontFamily();
+                var fontFamily = new FontFamily();
 
                 var testView = new TestView();
 
@@ -496,27 +496,6 @@
             }
         }
 
-        [Test]
-        public void SetImage_DocumentView_ImageSet()
-        {
-            // Setup
-            var testView = new TestView();
-
-            using (var avalonDockViewHost = new AvalonDockViewHost())
-            {
-                avalonDockViewHost.AddDocumentView(testView, string.Empty, string.Empty, null);
-
-                // Precondition
-                Assert.IsFalse(IsImageSet(avalonDockViewHost, testView));
-
-                // Call
-                avalonDockViewHost.SetImage(testView, new Bitmap(16, 16));
-
-                // Assert
-                Assert.IsTrue(IsImageSet(avalonDockViewHost, testView));
-            }
-        }
-
         #endregion
 
         #region Tool views
@@ -876,27 +855,6 @@
             }
         }
 
-        [Test]
-        public void SetImage_ToolView_ImageSet()
-        {
-            // Setup
-            var testView = new TestView();
-
-            using (var avalonDockViewHost = new AvalonDockViewHost())
-            {
-                avalonDockViewHost.AddToolView(testView, ToolViewLocation.Left, string.Empty, string.Empty);
-
-                // Precondition
-                Assert.IsFalse(IsImageSet(avalonDockViewHost, testView));
-
-                // Call
-                avalonDockViewHost.SetImage(testView, new Bitmap(16, 16));
-
-                // Assert
-                Assert.IsTrue(IsImageSet(avalonDockViewHost, testView));
-            }
-        }
-
         #endregion
 
         #region Helper methods
@@ -963,15 +921,6 @@
             return avalonDockViewHost.DockingManager.ActiveContent != null;
         }
 
-        private static bool IsImageSet(AvalonDockViewHost avalonDockViewHost, IView view)
-        {
-            return avalonDockViewHost.DockingManager
-                                     .Layout
-                                     .Descendents()
-                                     .OfType<LayoutContent>()
-                                     .First(lc => ((WindowsFormsHost) lc.Content).Child == view).IconSource != null;
-        }
-
         private static void SetActiveView(AvalonDockViewHost avalonDockViewHost, IView view)
         {
             avalonDockViewHost.DockingManager.Layout.Descendents()