Index: Application/Riskeer/src/Application.Riskeer/Properties/AssemblyInfo.cs
===================================================================
diff -u -r2a9f400ad1b68758d9b7d28a4ca84e6532e20ca1 -rfbbd4feb149f1ff0eac7b02aa8bc2b0d734fff30
--- Application/Riskeer/src/Application.Riskeer/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 2a9f400ad1b68758d9b7d28a4ca84e6532e20ca1)
+++ Application/Riskeer/src/Application.Riskeer/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision fbbd4feb149f1ff0eac7b02aa8bc2b0d734fff30)
@@ -20,8 +20,6 @@
 // All rights reserved.
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 
 [assembly: AssemblyTitle("Riskeer")]
-[assembly: AssemblyProduct("Riskeer")]
-[assembly: InternalsVisibleTo("Application.Riskeer.Integration.Test")]
\ No newline at end of file
+[assembly: AssemblyProduct("Riskeer")]
\ No newline at end of file
Index: Application/Riskeer/test/Application.Riskeer.Integration.Test/StorageMigrationIntegrationTest.cs
===================================================================
diff -u -r770d15b5d6fbbb7cd41a61b68a25ebbd69a11526 -rfbbd4feb149f1ff0eac7b02aa8bc2b0d734fff30
--- Application/Riskeer/test/Application.Riskeer.Integration.Test/StorageMigrationIntegrationTest.cs	(.../StorageMigrationIntegrationTest.cs)	(revision 770d15b5d6fbbb7cd41a61b68a25ebbd69a11526)
+++ Application/Riskeer/test/Application.Riskeer.Integration.Test/StorageMigrationIntegrationTest.cs	(.../StorageMigrationIntegrationTest.cs)	(revision fbbd4feb149f1ff0eac7b02aa8bc2b0d734fff30)
@@ -20,9 +20,9 @@
 // All rights reserved.
 
 using System;
+using System.Drawing;
 using System.IO;
 using System.Threading;
-using Application.Riskeer.Properties;
 using Core.Common.TestUtil;
 using Core.Gui;
 using Core.Gui.Forms.Main;
@@ -63,7 +63,7 @@
             var projectMigrator = new ProjectMigrator(inquiryHelper);
             var guiCoreSettings = new GuiCoreSettings
             {
-                 ApplicationIcon = Resources.Riskeer
+                 ApplicationIcon = SystemIcons.Application
             };
 
             using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(() => null), guiCoreSettings))
@@ -106,7 +106,7 @@
             var projectMigrator = new ProjectMigrator(inquiryHelper);
             var guiCoreSettings = new GuiCoreSettings
             {
-                ApplicationIcon = Resources.Riskeer
+                ApplicationIcon = SystemIcons.Application
             };
 
             using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(() => null), guiCoreSettings))