diff --git a/ILSpy.Core/ILSpy.Core.csproj b/ILSpy.Core/ILSpy.Core.csproj
index 3b2fc4b..0f44423 100644
--- a/ILSpy.Core/ILSpy.Core.csproj
+++ b/ILSpy.Core/ILSpy.Core.csproj
@@ -56,6 +56,8 @@
     <Content Include="Images\*.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <EmbeddedResource Include="Images\ILSpy.png;Images\PrivateInternal.png">
+    </EmbeddedResource>
   </ItemGroup>
 
 
diff --git a/ILSpy.Core/MainWindow.xaml b/ILSpy.Core/MainWindow.xaml
index 545c457..29a8646 100644
--- a/ILSpy.Core/MainWindow.xaml
+++ b/ILSpy.Core/MainWindow.xaml
@@ -7,8 +7,10 @@
 	      MinWidth="250"
 	      MinHeight="200"
 	      UseLayoutRounding="True"
+          Icon="resm:ICSharpCode.ILSpy.Images.ILSpy.png?assembly=ILSpy.Core"
 	      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" d:DesignHeight="500" d:DesignWidth="500"
 	      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
+          x:Class="ICSharpCode.ILSpy.MainWindow"
 >
 <!--	<Window.TaskbarItemInfo>
 		<TaskbarItemInfo />
@@ -47,7 +49,7 @@
 			<Separator />
 			<CheckBox IsChecked="{Binding FilterSettings.ShowInternalApi}"
                 ToolTip.Tip="Show internal types and members">
-				<Image Width="16" Height="16" Source="Images/PrivateInternal.png" />
+				<Image Width="16" Height="16" Source="resm:ICSharpCode.ILSpy.Images.PrivateInternal.png?assembly=ILSpy.Core" />
 			</CheckBox>
 			<Separator />
 			<DropDown Name="languageComboBox" Width="100" 
diff --git a/ILSpy.Core/MainWindow.xaml.cs b/ILSpy.Core/MainWindow.xaml.cs
index 3f5abe0..d7e3099 100644
--- a/ILSpy.Core/MainWindow.xaml.cs
+++ b/ILSpy.Core/MainWindow.xaml.cs
@@ -106,8 +106,6 @@ public MainWindow()
 			this.sessionSettings = new SessionSettings(spySettings);
 			this.assemblyListManager = new AssemblyListManager(spySettings);
 
-            this.Icon = new WindowIcon("Images/ILSpy.png");
-
             this.DataContext = sessionSettings;
 
             InitializeComponent();