Merge remote-tracking branch 'monodevelop/master' into new-project-dialog

Conflicts:
	main/external/fsharpbinding
	main/src/addins/NUnit/templates/NUnitProject.xpt.xml
	main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml
	main/tests/UnitTests/UnitTests.csproj
	version-checks

38 files changed, 65 insertions, 78 deletions

diff --git a/main/src/addins/NUnit/Gui/TestStatusIcon.cs b/main/src/addins/NUnit/Gui/TestStatusIcon.cs
index 4e97f9137e..4dbb85f498 100644
--- a/main/src/addins/NUnit/Gui/TestStatusIcon.cs
+++ b/main/src/addins/NUnit/Gui/TestStatusIcon.cs
@@ -53,14 +53,14 @@ namespace MonoDevelop.NUnit
 		static TestStatusIcon ()
 		{
 			try {
-				Running = Xwt.Drawing.Image.FromResource ("unit-running-light-16.png");
-				Failure = Xwt.Drawing.Image.FromResource ("unit-failed-light-16.png");
-				None = Xwt.Drawing.Image.FromResource ("unit-not-yet-run-light-16.png");
-				NotRun = Xwt.Drawing.Image.FromResource ("unit-skipped-light-16.png");
-				Success = Xwt.Drawing.Image.FromResource ("unit-success-light-16.png");
-				SuccessAndFailure = Xwt.Drawing.Image.FromResource ("unit-mixed-results-light-16.png");
-				Loading = Xwt.Drawing.Image.FromResource ("unit-loading-light-16.png");
-				Inconclusive = Xwt.Drawing.Image.FromResource ("unit-inconclusive-light-16.png");
+				Running = Xwt.Drawing.Image.FromResource ("unit-running-16.png");
+				Failure = Xwt.Drawing.Image.FromResource ("unit-failed-16.png");
+				None = Xwt.Drawing.Image.FromResource ("unit-not-yet-run-16.png");
+				NotRun = Xwt.Drawing.Image.FromResource ("unit-skipped-16.png");
+				Success = Xwt.Drawing.Image.FromResource ("unit-success-16.png");
+				SuccessAndFailure = Xwt.Drawing.Image.FromResource ("unit-mixed-results-16.png");
+				Loading = Xwt.Drawing.Image.FromResource ("unit-loading-16.png");
+				Inconclusive = Xwt.Drawing.Image.FromResource ("unit-inconclusive-16.png");
 				OldFailure = Failure.WithAlpha (0.4);
 				OldSuccess = Success.WithAlpha (0.4);
 				OldSuccessAndFailure = SuccessAndFailure.WithAlpha (0.4);
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-skipped-16.png b/main/src/addins/NUnit/Gui/icons/light/unit-skipped-16.png
deleted file mode 100644
index 4828d24c30..0000000000
--- a/main/src/addins/NUnit/Gui/icons/light/unit-skipped-16.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-skipped-16@2x.png b/main/src/addins/NUnit/Gui/icons/light/unit-skipped-16@2x.png
deleted file mode 100644
index 3ab68cb151..0000000000
--- a/main/src/addins/NUnit/Gui/icons/light/unit-skipped-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/light/pad-unit-test-16.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16.png
index 1c0ac5a7c5..1c0ac5a7c5 100644
--- a/main/src/addins/NUnit/Gui/icons/light/pad-unit-test-16.png
+++ b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/pad-unit-test-16@2x.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16@2x.png
index 973f82c591..973f82c591 100644
--- a/main/src/addins/NUnit/Gui/icons/light/pad-unit-test-16@2x.png
+++ b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16@2x.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/pad-unit-test-results-16.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-results-16.png
index 4be65aa981..4be65aa981 100644
--- a/main/src/addins/NUnit/Gui/icons/light/pad-unit-test-results-16.png
+++ b/main/src/addins/NUnit/Gui/icons/pad-unit-test-results-16.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/pad-unit-test-results-16@2x.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-results-16@2x.png
index a4aa276ed3..a4aa276ed3 100644
--- a/main/src/addins/NUnit/Gui/icons/light/pad-unit-test-results-16@2x.png
+++ b/main/src/addins/NUnit/Gui/icons/pad-unit-test-results-16@2x.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/project-nunit-overlay-32.png b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32.png
index daa6d0d2a5..daa6d0d2a5 100644
--- a/main/src/addins/NUnit/Gui/icons/light/project-nunit-overlay-32.png
+++ b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/project-nunit-overlay-32@2x.png b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32@2x.png
index 664f413a7a..664f413a7a 100644
--- a/main/src/addins/NUnit/Gui/icons/light/project-nunit-overlay-32@2x.png
+++ b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32@2x.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-failed-16.png b/main/src/addins/NUnit/Gui/icons/unit-failed-16.png
index 86e339b5f9..86e339b5f9 100644
--- a/main/src/addins/NUnit/Gui/icons/light/unit-failed-16.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-failed-16.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-failed-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-failed-16@2x.png
index cbc92c6fce..cbc92c6fce 100644
--- a/main/src/addins/NUnit/Gui/icons/light/unit-failed-16@2x.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-failed-16@2x.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-inconclusive-16.png b/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16.png
index 0b58080a9b..0b58080a9b 100644
--- a/main/src/addins/NUnit/Gui/icons/light/unit-inconclusive-16.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-inconclusive-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16@2x.png
index 970c207555..970c207555 100644
--- a/main/src/addins/NUnit/Gui/icons/light/unit-inconclusive-16@2x.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16@2x.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-loading-16.png b/main/src/addins/NUnit/Gui/icons/unit-loading-16.png
index 7863245aba..7863245aba 100644
--- a/main/src/addins/NUnit/Gui/icons/light/unit-loading-16.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-loading-16.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-loading-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-loading-16@2x.png
index 5c7b89a6b2..5c7b89a6b2 100644
--- a/main/src/addins/NUnit/Gui/icons/light/unit-loading-16@2x.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-loading-16@2x.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-mixed-results-16.png b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16.png
index aea522080b..aea522080b 100644
--- a/main/src/addins/NUnit/Gui/icons/light/unit-mixed-results-16.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-mixed-results-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16@2x.png
index 53eb836c07..53eb836c07 100644
--- a/main/src/addins/NUnit/Gui/icons/light/unit-mixed-results-16@2x.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16@2x.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-not-yet-run-16.png b/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16.png
index 6c3109b84c..6c3109b84c 100644
--- a/main/src/addins/NUnit/Gui/icons/light/unit-not-yet-run-16.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-not-yet-run-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16@2x.png
index e9c6f0085d..e9c6f0085d 100644
--- a/main/src/addins/NUnit/Gui/icons/light/unit-not-yet-run-16@2x.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16@2x.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-run-16.png b/main/src/addins/NUnit/Gui/icons/unit-run-16.png
index 6f911a1600..6f911a1600 100644
--- a/main/src/addins/NUnit/Gui/icons/light/unit-run-16.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-run-16.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-run-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-run-16@2x.png
index 59ea4fa20a..59ea4fa20a 100644
--- a/main/src/addins/NUnit/Gui/icons/light/unit-run-16@2x.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-run-16@2x.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-running-16.png b/main/src/addins/NUnit/Gui/icons/unit-running-16.png
index 587de48d85..587de48d85 100644
--- a/main/src/addins/NUnit/Gui/icons/light/unit-running-16.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-running-16.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-running-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-running-16@2x.png
index e61f579a0c..e61f579a0c 100644
--- a/main/src/addins/NUnit/Gui/icons/light/unit-running-16@2x.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-running-16@2x.png
diff --git a/main/src/addins/NUnit/Gui/icons/unit-skipped-16.png b/main/src/addins/NUnit/Gui/icons/unit-skipped-16.png
new file mode 100644
index 0000000000..7b245ca9ee
--- /dev/null
+++ b/main/src/addins/NUnit/Gui/icons/unit-skipped-16.png
diff --git a/main/src/addins/NUnit/Gui/icons/unit-skipped-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-skipped-16@2x.png
new file mode 100644
index 0000000000..12500e3c5c
--- /dev/null
+++ b/main/src/addins/NUnit/Gui/icons/unit-skipped-16@2x.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-success-16.png b/main/src/addins/NUnit/Gui/icons/unit-success-16.png
index 8d9f59c502..8d9f59c502 100644
--- a/main/src/addins/NUnit/Gui/icons/light/unit-success-16.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-success-16.png
diff --git a/main/src/addins/NUnit/Gui/icons/light/unit-success-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-success-16@2x.png
index 12c2cd6515..12c2cd6515 100644
--- a/main/src/addins/NUnit/Gui/icons/light/unit-success-16@2x.png
+++ b/main/src/addins/NUnit/Gui/icons/unit-success-16@2x.png
diff --git a/main/src/addins/NUnit/MonoDevelop.NUnit.csproj b/main/src/addins/NUnit/MonoDevelop.NUnit.csproj
index c4e979a43b..880f3f5a58 100644
--- a/main/src/addins/NUnit/MonoDevelop.NUnit.csproj
+++ b/main/src/addins/NUnit/MonoDevelop.NUnit.csproj
@@ -117,44 +117,44 @@
     <EmbeddedResource Include="templates\NUnitAssemblyGroup.xpt.xml">
       <LogicalName>NUnitAssemblyGroup.xpt.xml</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-running-16.png">
-      <LogicalName>unit-running-light-16.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-running-16.png">
+      <LogicalName>unit-running-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-running-16%402x.png">
-      <LogicalName>unit-running-light-16@2x.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-running-16%402x.png">
+      <LogicalName>unit-running-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-failed-16.png">
-      <LogicalName>unit-failed-light-16.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-failed-16.png">
+      <LogicalName>unit-failed-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-failed-16%402x.png">
-      <LogicalName>unit-failed-light-16@2x.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-failed-16%402x.png">
+      <LogicalName>unit-failed-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-mixed-results-16.png">
-      <LogicalName>unit-mixed-results-light-16.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-mixed-results-16.png">
+      <LogicalName>unit-mixed-results-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-mixed-results-16%402x.png">
-      <LogicalName>unit-mixed-results-light-16@2x.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-mixed-results-16%402x.png">
+      <LogicalName>unit-mixed-results-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-not-yet-run-16.png">
-      <LogicalName>unit-not-yet-run-light-16.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-not-yet-run-16.png">
+      <LogicalName>unit-not-yet-run-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-not-yet-run-16%402x.png">
-      <LogicalName>unit-not-yet-run-light-16@2x.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-not-yet-run-16%402x.png">
+      <LogicalName>unit-not-yet-run-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-skipped-16.png">
-      <LogicalName>unit-skipped-light-16.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-skipped-16.png">
+      <LogicalName>unit-skipped-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-skipped-16%402x.png">
-      <LogicalName>unit-skipped-light-16@2x.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-skipped-16%402x.png">
+      <LogicalName>unit-skipped-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-loading-16.png">
-      <LogicalName>unit-loading-light-16.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-loading-16.png">
+      <LogicalName>unit-loading-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-success-16.png">
-      <LogicalName>unit-success-light-16.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-success-16.png">
+      <LogicalName>unit-success-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-success-16%402x.png">
-      <LogicalName>unit-success-light-16@2x.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-success-16%402x.png">
+      <LogicalName>unit-success-16@2x.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="templates\NUnitTestClass.xft.xml">
       <LogicalName>NUnitTestClass.xft.xml</LogicalName>
@@ -165,38 +165,44 @@
     <EmbeddedResource Include="templates\NUnitProject.xpt.xml">
       <LogicalName>NUnitProject.xpt.xml</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\project-nunit-overlay-32.png">
-      <LogicalName>project-nunit-overlay-light-32.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32.png">
+      <LogicalName>project-nunit-overlay-32.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\project-nunit-overlay-32%402x.png">
-      <LogicalName>project-nunit-overlay-light-32@2x.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32%402x.png">
+      <LogicalName>project-nunit-overlay-32@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32.png">
+      <LogicalName>project-nunit-overlay-light-32.png</LogicalName>
+    </EmbeddedResource><!-- TODO: VV: Duped definition to not break fsharpbinding (https://github.com/fsharp/fsharpbinding/blob/master/monodevelop/MonoDevelop.FSharpBinding/Templates/FSharpNUnitLibraryProject.xpt.xml#L8) -->
+    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32%402x.png">
+      <LogicalName>project-nunit-overlay-light-32@2x.png</LogicalName>
+    </EmbeddedResource><!-- TODO: VV: Duped definition to not break fsharpbinding (https://github.com/fsharp/fsharpbinding/blob/master/monodevelop/MonoDevelop.FSharpBinding/Templates/FSharpNUnitLibraryProject.xpt.xml#L8) -->
     <EmbeddedResource Include="gtk-gui\gui.stetic">
       <LogicalName>gui.stetic</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\pad-unit-test-16.png">
-      <LogicalName>pad-unit-test-light-16.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\pad-unit-test-16.png">
+      <LogicalName>pad-unit-test-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\pad-unit-test-16%402x.png">
-      <LogicalName>pad-unit-test-light-16@2x.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\pad-unit-test-16%402x.png">
+      <LogicalName>pad-unit-test-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\pad-unit-test-results-16.png">
-      <LogicalName>pad-unit-test-results-light-16.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\pad-unit-test-results-16.png">
+      <LogicalName>pad-unit-test-results-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\pad-unit-test-results-16%402x.png">
-      <LogicalName>pad-unit-test-results-light-16@2x.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\pad-unit-test-results-16%402x.png">
+      <LogicalName>pad-unit-test-results-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-inconclusive-16.png">
-      <LogicalName>unit-inconclusive-light-16.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-inconclusive-16.png">
+      <LogicalName>unit-inconclusive-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-inconclusive-16%402x.png">
-      <LogicalName>unit-inconclusive-light-16@2x.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-inconclusive-16%402x.png">
+      <LogicalName>unit-inconclusive-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-run-16.png">
-      <LogicalName>unit-run-light-16.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-run-16.png">
+      <LogicalName>unit-run-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\light\unit-run-16%402x.png">
-      <LogicalName>unit-run-light-16@2x.png</LogicalName>
+    <EmbeddedResource Include="Gui\icons\unit-run-16%402x.png">
+      <LogicalName>unit-run-16@2x.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="templates\NUnitProjectVBNet.xpt.xml">
       <LogicalName>NUnitProjectVBNet.xpt.xml</LogicalName>
diff --git a/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml b/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml
index c5a0f7c910..f5369a2ff1 100644
--- a/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml
+++ b/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml
@@ -178,9 +178,9 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Core/StockIcons">
-		<StockIcon stockid = "nunit-pad-icon" resource = "pad-unit-test-light-16.png" size="Menu" />
-		<StockIcon stockid = "nunit-results-pad-icon" resource = "pad-unit-test-results-light-16.png" size="Menu" />
-		<StockIcon stockid = "nunit-run" resource = "unit-run-light-16.png" size="Menu" />
+		<StockIcon stockid = "nunit-pad-icon" resource = "pad-unit-test-16.png" size="Menu" />
+		<StockIcon stockid = "nunit-results-pad-icon" resource = "pad-unit-test-results-16.png" size="Menu" />
+		<StockIcon stockid = "nunit-run" resource = "unit-run-16.png" size="Menu" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/ProjectModel/ProjectServiceExtensions">
diff --git a/main/src/addins/NUnit/Services/ITestProvider.cs b/main/src/addins/NUnit/Services/ITestProvider.cs
index b9cd72530d..d02a417fb6 100644
--- a/main/src/addins/NUnit/Services/ITestProvider.cs
+++ b/main/src/addins/NUnit/Services/ITestProvider.cs
@@ -29,7 +29,6 @@
 
 using System;
 using MonoDevelop.Projects;
-using NUnit.Core;
 
 namespace MonoDevelop.NUnit
 {
diff --git a/main/src/addins/NUnit/Services/NUnitService.cs b/main/src/addins/NUnit/Services/NUnitService.cs
index c5a2407532..cdcbfdbe3f 100644
--- a/main/src/addins/NUnit/Services/NUnitService.cs
+++ b/main/src/addins/NUnit/Services/NUnitService.cs
@@ -35,7 +35,6 @@ using MonoDevelop.Core;
 using MonoDevelop.Core.Execution;
 using Mono.Addins;
 using MonoDevelop.Projects;
-using NUnit.Core;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide;
 
diff --git a/main/src/addins/NUnit/Services/NUnitTestCase.cs b/main/src/addins/NUnit/Services/NUnitTestCase.cs
index 6130166d0e..1a774892fc 100644
--- a/main/src/addins/NUnit/Services/NUnitTestCase.cs
+++ b/main/src/addins/NUnit/Services/NUnitTestCase.cs
@@ -27,11 +27,7 @@
 //
 
 
-using System;
-using System.Collections;
 
-using MonoDevelop.Core;
-using NUnit.Core;
 using MonoDevelop.NUnit.External;
 
 namespace MonoDevelop.NUnit
diff --git a/main/src/addins/NUnit/Services/NUnitTestSuite.cs b/main/src/addins/NUnit/Services/NUnitTestSuite.cs
index f04d4b1fd9..74d3a26e4b 100644
--- a/main/src/addins/NUnit/Services/NUnitTestSuite.cs
+++ b/main/src/addins/NUnit/Services/NUnitTestSuite.cs
@@ -27,11 +27,6 @@
 //
 
 
-using System;
-using System.IO;
-using System.Collections;
-using MonoDevelop.Core;
-using NUnit.Core;
 using MonoDevelop.NUnit.External;
 
 namespace MonoDevelop.NUnit
diff --git a/main/src/addins/NUnit/Services/SolutionFolderTestGroup.cs b/main/src/addins/NUnit/Services/SolutionFolderTestGroup.cs
index c961b9c7e8..96911c672b 100644
--- a/main/src/addins/NUnit/Services/SolutionFolderTestGroup.cs
+++ b/main/src/addins/NUnit/Services/SolutionFolderTestGroup.cs
@@ -32,7 +32,6 @@ using System.Collections;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
 
-using NUnit.Core;
 using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.NUnit
diff --git a/main/src/addins/NUnit/Services/SystemTestProvider.cs b/main/src/addins/NUnit/Services/SystemTestProvider.cs
index 9e60f7767a..311926ae21 100644
--- a/main/src/addins/NUnit/Services/SystemTestProvider.cs
+++ b/main/src/addins/NUnit/Services/SystemTestProvider.cs
@@ -28,7 +28,6 @@
 
 using System;
 using MonoDevelop.Projects;
-using NUnit.Core;
 
 namespace MonoDevelop.NUnit
 {
diff --git a/main/src/addins/NUnit/Services/WorkspaceTestGroup.cs b/main/src/addins/NUnit/Services/WorkspaceTestGroup.cs
index adc4edac8a..0c7713f524 100644
--- a/main/src/addins/NUnit/Services/WorkspaceTestGroup.cs
+++ b/main/src/addins/NUnit/Services/WorkspaceTestGroup.cs
@@ -26,14 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.IO;
-using System.Collections;
-using MonoDevelop.Core;
 using MonoDevelop.Projects;
 
-using NUnit.Core;
-using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.NUnit
 {
diff --git a/main/src/addins/NUnit/templates/NUnitAssemblyGroup.xpt.xml b/main/src/addins/NUnit/templates/NUnitAssemblyGroup.xpt.xml
index 5bb647d314..ab95772034 100644
--- a/main/src/addins/NUnit/templates/NUnitAssemblyGroup.xpt.xml
+++ b/main/src/addins/NUnit/templates/NUnitAssemblyGroup.xpt.xml
@@ -7,7 +7,7 @@
 	<TemplateConfiguration>
 		<_Name>NUnit assembly test collection</_Name>
 		<_Category>NUnit</_Category>
-		<Icon>md-project|res:project-nunit-overlay-light-32.png</Icon>
+		<Icon>md-project|res:project-nunit-overlay-32.png</Icon>
 		<_Description>Create an NUnit assembly test collection</_Description>
 		<DefaultFilename>NUnitAssemblyGroup</DefaultFilename>
 	</TemplateConfiguration>
diff --git a/main/src/addins/NUnit/templates/NUnitProject.xpt.xml b/main/src/addins/NUnit/templates/NUnitProject.xpt.xml
index 934d69e4ff..7fc96d9e76 100644
--- a/main/src/addins/NUnit/templates/NUnitProject.xpt.xml
+++ b/main/src/addins/NUnit/templates/NUnitProject.xpt.xml
@@ -5,7 +5,7 @@
 	<TemplateConfiguration>
 		<_Name>NUnit Library Project</_Name>
 		<Category>other/net/general</Category>
-		<Icon>md-project|res:project-nunit-overlay-light-32.png</Icon>
+		<Icon>md-project|res:project-nunit-overlay-32.png</Icon>
 		<Image id="md-nunit-library-project" />
 		<_Description>Creates an NUnit library</_Description>
 		<LanguageName>C#</LanguageName>