diff --git a/Icon.ico b/Icon.ico
new file mode 100644
index 00000000..38e0ce33
Binary files /dev/null and b/Icon.ico differ
diff --git a/Icon.png b/Icon.png
index a2eb4171..937940ae 100644
Binary files a/Icon.png and b/Icon.png differ
diff --git a/src/Consolonia.Core/Consolonia.Core.csproj b/src/Consolonia.Core/Consolonia.Core.csproj
index 0f7f503b..6660e626 100644
--- a/src/Consolonia.Core/Consolonia.Core.csproj
+++ b/src/Consolonia.Core/Consolonia.Core.csproj
@@ -1,12 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Core.Build.props', '$(MSBuildThisFileDirectory)../'))" />    
-    <ItemGroup>
-        <AvaloniaXaml Remove="Controls\FileOpen\**" />
-        <Compile Remove="Controls\FileOpen\**" />
-        <EmbeddedResource Remove="Controls\FileOpen\**" />
-        <None Remove="Controls\FileOpen\**" />
-    </ItemGroup>   
-        
+
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
diff --git a/src/Consolonia.Gallery/Consolonia.Gallery.csproj b/src/Consolonia.Gallery/Consolonia.Gallery.csproj
index 8394b8a4..e3f51ac4 100644
--- a/src/Consolonia.Gallery/Consolonia.Gallery.csproj
+++ b/src/Consolonia.Gallery/Consolonia.Gallery.csproj
@@ -14,7 +14,6 @@
         <ProjectReference Include="..\Consolonia.PlatformSupport\Consolonia.PlatformSupport.csproj" />
         <ProjectReference Include="..\Consolonia.Themes.TurboVision\Consolonia.Themes.TurboVision.csproj" />
         <ProjectReference Include="..\Consolonia.Designer\Consolonia.Designer.csproj" />
-        <ProjectReference Condition="'$(Configuration)' == 'Debug'" Include="..\Tools\Consolonia.PreviewHost\Consolonia.PreviewHost.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessageBox.axaml
similarity index 100%
rename from src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml
rename to src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessageBox.axaml
diff --git a/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml.cs b/src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessageBox.axaml.cs
similarity index 100%
rename from src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessgeBox.axaml.cs
rename to src/Consolonia.Gallery/Gallery/GalleryViews/GalleryMessageBox.axaml.cs