Index: src/Common/DelftTools.Shell.Gui/Forms/IMainWindow.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rb301f31bca6957a9326b4b0ab912bd7b5da60195
--- src/Common/DelftTools.Shell.Gui/Forms/IMainWindow.cs	(.../IMainWindow.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/DelftTools.Shell.Gui/Forms/IMainWindow.cs	(.../IMainWindow.cs)	(revision b301f31bca6957a9326b4b0ab912bd7b5da60195)
@@ -22,11 +22,6 @@
         /// </summary>
         IMessageWindow MessageWindow { get; }
 
-        /// <summary>
-        /// The icon to show in the top left
-        /// </summary>
-        Icon Icon { get; set; }
-
         //TODO: This is  inconsistent with the form title which is called .Text
         /// <summary>
         /// The window title
Index: src/DeltaShell/DeltaShell.Gui/DeltaShellGui.cs
===================================================================
diff -u -rda0e4ce0541bc755152f9948a66d9060f8496109 -rb301f31bca6957a9326b4b0ab912bd7b5da60195
--- src/DeltaShell/DeltaShell.Gui/DeltaShellGui.cs	(.../DeltaShellGui.cs)	(revision da0e4ce0541bc755152f9948a66d9060f8496109)
+++ src/DeltaShell/DeltaShell.Gui/DeltaShellGui.cs	(.../DeltaShellGui.cs)	(revision b301f31bca6957a9326b4b0ab912bd7b5da60195)
@@ -849,29 +849,8 @@
                 e.Cancel = true; //cancel closing: let Exit handle it
                 Exit();
             };
-
-            UpdateMainWindowIcon();
         }
 
-        private void UpdateMainWindowIcon()
-        {
-            //update icon if a valid icon is in app.config
-            string iconPath = Application.Settings["applicationIcon"];
-            if (iconPath != null)
-            {
-                if (iconPath.Trim().Length > 0 &&
-                    (Path.GetDirectoryName(iconPath).Length == 0 || iconPath.StartsWith("..", StringComparison.Ordinal)))
-                {
-                    iconPath = Path.Combine(System.Windows.Forms.Application.StartupPath, iconPath);
-                }
-
-                if (File.Exists(iconPath))
-                {
-                    mainWindow.Icon = new Icon(iconPath);
-                }
-            }
-        }
-
         private void InitializeWindows()
         {
             log.Info(Resources.DeltaShellGui_InitializeWindows_Initializing_windows____);
Index: src/DeltaShell/DeltaShell.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r2847355147abf2f1ff11b75ea7f696779196fbc6 -rb301f31bca6957a9326b4b0ab912bd7b5da60195
--- src/DeltaShell/DeltaShell.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 2847355147abf2f1ff11b75ea7f696779196fbc6)
+++ src/DeltaShell/DeltaShell.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision b301f31bca6957a9326b4b0ab912bd7b5da60195)
@@ -140,8 +140,6 @@
             }
         }
 
-        public new Icon Icon { get; set; }
-
         public bool Visible
         {
             get