diff --git a/data/resources/image/BitmapResources/BitmapResources.res b/data/resources/image/BitmapResources/BitmapResources.res
index 018a7eb66e..04e3d0464c 100644
--- a/data/resources/image/BitmapResources/BitmapResources.res
+++ b/data/resources/image/BitmapResources/BitmapResources.res
@@ -308,23 +308,23 @@ C#.Project.WebProject                             = backendicons\CSharp\project\
 C#.Project.Library                                = backendicons\CSharp\project\Library.png
 C#.Project.ControlLibrary                         = backendicons\CSharp\project\ControlLibrary.png
 
-VB.ProjectIcon                                    = backendicons\VBNet\SmallProject.png
-VB.FileIcon                                       = backendicons\VBNet\SmallFile.png
-
-VB.File.EmptyFile                                 = backendicons\VBNet\file\EmptyFile.png
-VB.File.Form                                      = backendicons\VBNet\file\Form.png
-VB.File.FullFile                                  = backendicons\VBNet\file\FullFile.png
-VB.File.NewClass                                  = backendicons\VBNet\file\NewClass.png
-VB.File.WebFile                                   = backendicons\VBNet\file\WebFile.png
-VB.Project.EmptyProject                           = backendicons\VBNet\project\EmptyProject.png
-VB.Project.DOSProject                             = backendicons\VBNet\project\DOSProject.png
-VB.Project.Form                                   = backendicons\VBNet\project\Form.png
-VB.Project.FullProject                            = backendicons\VBNet\project\FullProject.png
-VB.Project.ServiceProject                         = backendicons\VBNet\project\ServiceProject.png
-VB.Project.UserControl                            = backendicons\VBNet\project\UserControl.png
-VB.Project.WebProject                             = backendicons\VBNet\project\WebProject.png
-VB.Project.Library                                = backendicons\VBNet\project\Library.png
-VB.Project.ControlLibrary                         = backendicons\VBNet\project\ControlLibrary.png
+VBNet.ProjectIcon                                    = backendicons\VBNet\SmallProject.png
+VBNet.FileIcon                                       = backendicons\VBNet\SmallFile.png
+
+VBNet.File.EmptyFile                                 = backendicons\VBNet\file\EmptyFile.png
+VBNet.File.Form                                      = backendicons\VBNet\file\Form.png
+VBNet.File.FullFile                                  = backendicons\VBNet\file\FullFile.png
+VBNet.File.NewClass                                  = backendicons\VBNet\file\NewClass.png
+VBNet.File.WebFile                                   = backendicons\VBNet\file\WebFile.png
+VBNet.Project.EmptyProject                           = backendicons\VBNet\project\EmptyProject.png
+VBNet.Project.DOSProject                             = backendicons\VBNet\project\DOSProject.png
+VBNet.Project.Form                                   = backendicons\VBNet\project\Form.png
+VBNet.Project.FullProject                            = backendicons\VBNet\project\FullProject.png
+VBNet.Project.ServiceProject                         = backendicons\VBNet\project\ServiceProject.png
+VBNet.Project.UserControl                            = backendicons\VBNet\project\UserControl.png
+VBNet.Project.WebProject                             = backendicons\VBNet\project\WebProject.png
+VBNet.Project.Library                                = backendicons\VBNet\project\Library.png
+VBNet.Project.ControlLibrary                         = backendicons\VBNet\project\ControlLibrary.png
 
 Java.ProjectIcon                                  = backendicons\Java\SmallProject.png
 Java.FileIcon                                     = backendicons\Java\SmallFile.png
diff --git a/data/resources/image/BitmapResources/ImageResources.build b/data/resources/image/BitmapResources/ImageResources.build
deleted file mode 100644
index 9a4b9e0786..0000000000
--- a/data/resources/image/BitmapResources/ImageResources.build
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SharpDevelop Language Resources" default="build" basedir=".">
-	<!-- Programs -->
-	<property name="resasm"   value="ResAsm.exe"/>
-	
-	<!-- Properties -->
-	<property name="destination.dir" value="..\..\SharpDevelop\Src\Main\StartUp\Resources"/>
-
-	<target name="build" depends="clean">
-		<echo message="Building image resource files"/>
-		<exec program="${resasm}" commandline="BitmapResources.res"/>
-		
-		<echo message="Move compiled resource files"/>
-		<move todir="${destination.dir}">
-			<fileset>
-				<include name="BitmapResources.resources"/>
-			</fileset>
-		</move>
-            
-	</target>
-
-	<target name="clean">
-		<delete>
-			<fileset basedir="${destination.dir}">
-				<include name="BitmapResources.resources"/>
-			</fileset>
-		</delete>
-	</target>
-</project>
diff --git a/data/resources/image/BitmapResources/build.bat b/data/resources/image/BitmapResources/build.bat
index 901e825301..755b5dbd79 100644
--- a/data/resources/image/BitmapResources/build.bat
+++ b/data/resources/image/BitmapResources/build.bat
@@ -1,4 +1,5 @@
 @echo off
-..\..\SharpDevelop\src\Tools\nant\bin\nant
+resasm BitmapResources.res
+move BitmapResources.resources ..\..\SharpDevelop\Src\Main\StartUp\Project\Resources\BitmapResources.resources
 
-pause
\ No newline at end of file
+pause
diff --git a/data/templates/file/VBNet/VBNet.Empty.xft b/data/templates/file/VBNet/VBNet.Empty.xft
index ae3c08159d..9598b5bc22 100644
--- a/data/templates/file/VBNet/VBNet.Empty.xft
+++ b/data/templates/file/VBNet/VBNet.Empty.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.EmptyFile.Name}"
-		  icon        = "VB.File.EmptyFile"
+		  icon        = "VBNet.File.EmptyFile"
 		  category    = "VB"
 		  defaultname = "Empty${Number}.vb"
 		  language    = "VBNET"/>
diff --git a/data/templates/file/VBNet/VBNet.EmptyClass.xft b/data/templates/file/VBNet/VBNet.EmptyClass.xft
index d65467d05a..6c907d6e2e 100644
--- a/data/templates/file/VBNet/VBNet.EmptyClass.xft
+++ b/data/templates/file/VBNet/VBNet.EmptyClass.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.EmptyClass.Name}"
-		icon        = "VB.File.NewClass"
+		icon        = "VBNet.File.NewClass"
 		category    = "VB"
 		defaultname = "Class${Number}.vb"
 		language    = "VBNET"
diff --git a/data/templates/file/VBNet/VBNet.Forms.Form.xft b/data/templates/file/VBNet/VBNet.Forms.Form.xft
index 6d9129d366..aab7811e3f 100644
--- a/data/templates/file/VBNet/VBNet.Forms.Form.xft
+++ b/data/templates/file/VBNet/VBNet.Forms.Form.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.WindowsForm.Name}"
-		icon        = "VB.File.Form"
+		icon        = "VBNet.File.Form"
 		category    = "VB"
 		defaultname = "Form${Number}.vb"
 		language    = "VB"
diff --git a/data/templates/file/VBNet/VBNet.Forms.UserControl.xft b/data/templates/file/VBNet/VBNet.Forms.UserControl.xft
index c553534f3c..2d4fab3e0e 100644
--- a/data/templates/file/VBNet/VBNet.Forms.UserControl.xft
+++ b/data/templates/file/VBNet/VBNet.Forms.UserControl.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.WindowsUserControl.Name}"
-		icon        = "VB.File.Form"
+		icon        = "VBNet.File.Form"
 		category    = "VB"
 		defaultname = "UserControl${Number}.vb"
 		language    = "VBNET"/>
diff --git a/data/templates/file/VBNet/VBNet.Patterns.Singleton.xft b/data/templates/file/VBNet/VBNet.Patterns.Singleton.xft
index c78388a358..c5b9cdeff3 100644
--- a/data/templates/file/VBNet/VBNet.Patterns.Singleton.xft
+++ b/data/templates/file/VBNet/VBNet.Patterns.Singleton.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.SingletonClass.Name}"
-		  icon        = "VB.File.NewClass"
+		  icon        = "VBNet.File.NewClass"
 		  category    = "VB"
 		  defaultname = "SingletonClass${Number}.vb"
 		  language    = "VBNET"/>
diff --git a/data/templates/file/VBNet/VBNet.UnitTest.xft b/data/templates/file/VBNet/VBNet.UnitTest.xft
index 8ad02fba58..3fba0bf68a 100644
--- a/data/templates/file/VBNet/VBNet.UnitTest.xft
+++ b/data/templates/file/VBNet/VBNet.UnitTest.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.UnitTest.Name}"
-		  icon        = "VB.File.FullFile"
+		  icon        = "VBNet.File.FullFile"
 		  category    = "VB"
 		  defaultname = "Test${Number}.vb"
 		  language    = "VBNET"/>
diff --git a/data/templates/file/VBNet/VBNet.Wizards.TypedCollection.xft b/data/templates/file/VBNet/VBNet.Wizards.TypedCollection.xft
index dfec0601f1..807175acfd 100644
--- a/data/templates/file/VBNet/VBNet.Wizards.TypedCollection.xft
+++ b/data/templates/file/VBNet/VBNet.Wizards.TypedCollection.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.TypedCollection.Name}"
-		icon        = "VB.File.FullFile"
+		icon        = "VBNet.File.FullFile"
 		category    = "VB"
 		defaultname = "TypedCollection${Number}.vb"
 		language    = "VBNET"
diff --git a/data/templates/file/VBNet/VBNet.Wizards.TypedHashtable.xft b/data/templates/file/VBNet/VBNet.Wizards.TypedHashtable.xft
index 589576ccc3..7688592a8d 100644
--- a/data/templates/file/VBNet/VBNet.Wizards.TypedHashtable.xft
+++ b/data/templates/file/VBNet/VBNet.Wizards.TypedHashtable.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.TypedHashTable.Name}"
-		icon        = "VB.File.FullFile"
+		icon        = "VBNet.File.FullFile"
 		category    = "VB"
 		defaultname = "Class${Number}.vb"
 		language    = "VBNET"
diff --git a/data/templates/project/CSharp/Direct3DProject.xpt b/data/templates/project/CSharp/Direct3DProject.xpt
index 98292f95a6..1c48247c9f 100644
--- a/data/templates/project/CSharp/Direct3DProject.xpt
+++ b/data/templates/project/CSharp/Direct3DProject.xpt
@@ -27,8 +27,13 @@
 			<Options/>
 			
 			<References>
-				<Reference type="Gac" refto="Microsoft.DirectX, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-				<Reference type="Gac" refto="Microsoft.DirectX.Direct3D, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<Reference type="Gac" refto="System" />
+				<Reference type="Gac" refto="System.Data" />
+				<Reference type="Gac" refto="System.Drawing" />
+				<Reference type="Gac" refto="System.Windows.Forms" />
+				<Reference type="Gac" refto="System.Xml" />
+				<Reference type="Gac" refto="Microsoft.DirectX" />
+				<Reference type="Gac" refto="Microsoft.DirectX.Direct3D" />
 			</References>
 			
 			<Files>
diff --git a/data/templates/project/VBNet/ConsoleProject.xpt b/data/templates/project/VBNet/ConsoleProject.xpt
index 247a0c5615..c56bfce593 100644
--- a/data/templates/project/VBNet/ConsoleProject.xpt
+++ b/data/templates/project/VBNet/ConsoleProject.xpt
@@ -7,7 +7,7 @@
 	<TemplateConfiguration>
 		<Name>${res:Templates.Project.ConsoleProject.Name}</Name>
 		<Category>VBNet</Category>
-		<Icon>VB.Project.DOSProject</Icon>
+		<Icon>VBNet.Project.DOSProject</Icon>
 		<LanguageName>VBNet</LanguageName>
 		<Description>${res:Templates.Project.ConsoleProject.Description}</Description>
 	</TemplateConfiguration>
@@ -17,6 +17,7 @@
 		<Open filename = "Main.vb"/>
 	</Actions>
 	
+
 	<!-- Template Content -->
 	<Combine name = "${ProjectName}" directory = ".">
 		<Options>
@@ -27,6 +28,13 @@
 			
 			<Options Target = "Exe" PauseConsoleOutput = "True"/>
 			
+				<References>
+					<Reference type="Gac" refto="System" />
+					<Reference type="Gac" refto="System.Data" />
+					<Reference type="Gac" refto="System.Drawing" />
+					<Reference type="Gac" refto="System.Xml" />
+				</References>
+				
 			<Files>
 		<File name="Main.vb">
 			<![CDATA[${StandardHeader.VBNET}
diff --git a/data/templates/project/VBNet/ControlLibrary.xpt b/data/templates/project/VBNet/ControlLibrary.xpt
index 4953aa69cf..3915b460bf 100644
--- a/data/templates/project/VBNet/ControlLibrary.xpt
+++ b/data/templates/project/VBNet/ControlLibrary.xpt
@@ -7,7 +7,7 @@
 	<TemplateConfiguration>
 		<Name>${res:Templates.Project.UserControlLibrary.Name}</Name>
 		<Category>VBNet</Category>
-		<Icon>VB.Project.ControlLibrary</Icon>
+		<Icon>VBNet.Project.ControlLibrary</Icon>
 		<LanguageName>VBNet</LanguageName>
 		<Description>${res:Templates.Project.UserControlLibrary.Description}</Description>
 	</TemplateConfiguration>
@@ -24,6 +24,16 @@
 		
 		<Project name = "${ProjectName}" directory = ".">
 			<Options Target = "Library" PauseConsoleOutput = "False"/>	
+			
+
+			<References>
+				<Reference type="Gac" refto="System" />
+				<Reference type="Gac" refto="System.Data" />
+				<Reference type="Gac" refto="System.Drawing" />
+				<Reference type="Gac" refto="System.Windows.Forms" />
+				<Reference type="Gac" refto="System.Xml" />
+			</References>
+			
 			<Files>
 				<File name="UserControl1.vb"><![CDATA[${StandardHeader.VBNET}
 Imports System
diff --git a/data/templates/project/VBNet/Direct3DProject.xpt b/data/templates/project/VBNet/Direct3DProject.xpt
index 67aa5a3adc..840a30577a 100644
--- a/data/templates/project/VBNet/Direct3DProject.xpt
+++ b/data/templates/project/VBNet/Direct3DProject.xpt
@@ -7,7 +7,7 @@
 	<TemplateConfiguration>
 		<Name>${res:Templates.Project.Direct3DApplication.Name}</Name>
 		<Category>VBNet</Category>
-		<Icon>VB.Project.FullProject</Icon>
+		<Icon>VBNet.Project.FullProject</Icon>
 		<LanguageName>VBNet</LanguageName>
 		<Description>${res:Templates.Project.Direct3DApplication.Description}</Description>
 	</TemplateConfiguration>
@@ -27,8 +27,13 @@
 			<Options/>
 			
 			<References>
-				<Reference type="Gac" refto="Microsoft.DirectX, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-				<Reference type="Gac" refto="Microsoft.DirectX.Direct3D, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<Reference type="Gac" refto="System" />
+				<Reference type="Gac" refto="System.Data" />
+				<Reference type="Gac" refto="System.Drawing" />
+				<Reference type="Gac" refto="System.Windows.Forms" />
+				<Reference type="Gac" refto="System.Xml" />
+				<Reference type="Gac" refto="Microsoft.DirectX" />
+				<Reference type="Gac" refto="Microsoft.DirectX.Direct3D" />
 			</References>
 			
 			<Files>
diff --git a/data/templates/project/VBNet/EmptyProject.xpt b/data/templates/project/VBNet/EmptyProject.xpt
index b9456f0093..27bf6fdbcd 100644
--- a/data/templates/project/VBNet/EmptyProject.xpt
+++ b/data/templates/project/VBNet/EmptyProject.xpt
@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.EmptyProject.Name}</Name>
 		<Category>VBNet</Category>
 		<LanguageName>VBNet</LanguageName>
-		<Icon>VB.Project.EmptyProject</Icon>
+		<Icon>VBNet.Project.EmptyProject</Icon>
 		<Description>${res:Templates.Project.EmptyProject.Description}</Description>
 	</TemplateConfiguration>
 	
diff --git a/data/templates/project/VBNet/FormsProject.xpt b/data/templates/project/VBNet/FormsProject.xpt
index 402f006958..8bd50e888d 100644
--- a/data/templates/project/VBNet/FormsProject.xpt
+++ b/data/templates/project/VBNet/FormsProject.xpt
@@ -7,7 +7,7 @@
 	<TemplateConfiguration>
 		<Name>${res:Templates.Project.WindowsApplication.Name}</Name>
 		<Category>VBNet</Category>
-		<Icon>VB.Project.Form</Icon>
+		<Icon>VBNet.Project.Form</Icon>
 		<LanguageName>VBNet</LanguageName>
 		<Description>${res:Templates.Project.WindowsApplication.Description}</Description>
 	</TemplateConfiguration>
@@ -27,6 +27,15 @@
 	
 			<Options Target = "WinExe" PauseConsoleOutput = "False"/>
 			
+			<References>
+				<Reference type="Gac" refto="System" />
+				<Reference type="Gac" refto="System.Data" />
+				<Reference type="Gac" refto="System.Drawing" />
+				<Reference type="Gac" refto="System.Windows.Forms" />
+				<Reference type="Gac" refto="System.Xml" />
+			</References>
+			
+			
 			<Files>
 				<File name="MainForm.vb">
 			<![CDATA[${StandardHeader.VBNET}
diff --git a/data/templates/project/VBNet/Library.xpt b/data/templates/project/VBNet/Library.xpt
index 13e2f7a52a..c4f66d6b34 100644
--- a/data/templates/project/VBNet/Library.xpt
+++ b/data/templates/project/VBNet/Library.xpt
@@ -7,7 +7,7 @@
 	<TemplateConfiguration>
 		<Name>${res:Templates.Project.ClassLibrary.Name}</Name>
 		<Category>VBNet</Category>
-		<Icon>VB.Project.Library</Icon>
+		<Icon>VBNet.Project.Library</Icon>
 		<LanguageName>VBNet</LanguageName>
 		<Description>${res:Templates.Project.ClassLibrary.Description}</Description>
 	</TemplateConfiguration>
@@ -22,8 +22,17 @@
 			<StartupProject>${ProjectName}</StartupProject>
 		</Options>
 		
+		
 		<Project name = "${ProjectName}" directory = ".">
 			<Options Target = "Library" PauseConsoleOutput = "False"/>	
+			
+			<References>
+				<Reference type="Gac" refto="System" />
+				<Reference type="Gac" refto="System.Data" />
+				<Reference type="Gac" refto="System.Drawing" />
+				<Reference type="Gac" refto="System.Xml" />
+			</References>
+			
 			<Files>
 				<File name="NewClass.vb"><![CDATA[${StandardHeader.VBNET}
 Imports System
diff --git a/data/templates/project/VBNet/Service.xpt b/data/templates/project/VBNet/Service.xpt
index 688f426486..73ff6152e9 100644
--- a/data/templates/project/VBNet/Service.xpt
+++ b/data/templates/project/VBNet/Service.xpt
@@ -7,7 +7,7 @@
 	<TemplateConfiguration>
 		<Name>${res:Templates.Project.WindowsService.Name}</Name>
 		<Category>VBNet</Category>
-		<Icon>VB.Project.ServiceProject</Icon>
+		<Icon>VBNet.Project.ServiceProject</Icon>
 		<LanguageName>VBNet</LanguageName>
 		<Description>${res:Templates.Project.WindowsService.Description}</Description>
 	</TemplateConfiguration>
@@ -21,11 +21,19 @@
 		<Options>
 			<StartupProject>${ProjectName}</StartupProject>
 		</Options>
-		
 		<Project name = "${ProjectName}" directory = ".">
 			
 			<Options Target = "Library" PauseConsoleOutput = "False"/>
 			
+						
+			<References>
+				<Reference type="Gac" refto="System" />
+				<Reference type="Gac" refto="System.Data" />
+				<Reference type="Gac" refto="System.Drawing" />
+				<Reference type="Gac" refto="System.Xml" />
+			</References>
+				
+
 			<Files>
 				<File name="MyService.vb"><![CDATA[${StandardHeader.VBNET}
 Imports System
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs
index 8307b22e29..0fdee7cae0 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs
@@ -567,6 +567,7 @@ namespace CSharpBinding
 		{
 			Language = "C#";
 			Create(info);
+			imports.Add(@"$(MSBuildBinPath)\Microsoft.CSHARP.Targets");
 		}
 	}
 }
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs
index 66be445686..a2f200f910 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs
@@ -585,15 +585,16 @@ namespace VBNetBinding
 		public VBNetProject(string fileName, string projectName)
 		{
 			this.Name = projectName;
-			Language = "VB.NET";
+			Language = "VBNet";
 			SetupProject(fileName);
 			IdGuid = BaseConfiguration["ProjectGuid"];
 		}
 		
 		public VBNetProject(ProjectCreateInformation info)
 		{
-			Language = "VB.NET";
+			Language = "VBNet";
 			Create(info);
+			imports.Add(@"$(MSBuildBinPath)\Microsoft.VisualBasic.Targets");
 		}
 	}
 }
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetLanguageBinding.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetLanguageBinding.cs
index 8f97ffbe9f..e87fb4b16d 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetLanguageBinding.cs
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetLanguageBinding.cs
@@ -25,7 +25,7 @@ namespace VBNetBinding
 {
 	public class VBNetLanguageBinding : ILanguageBinding
 	{
-		public const string LanguageName = "C#";
+		public const string LanguageName = "VBNet";
 		
 		public string Language {
 			get {
@@ -42,7 +42,7 @@ namespace VBNetBinding
 			if (ext == null) {
 				return false;
 			}
-			return ext.ToUpper() == ".CS";
+			return ext.ToUpper() == ".VB";
 		}
 		
 		public string GetCompiledOutputName(string fileName)
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
index 9a2cd2c325..f0ca3e4f7f 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
@@ -69,7 +69,7 @@
 	
 	<Path path = "/SharpDevelop/Workbench/LanguageBindings">
 		<LanguageBinding id                   = "VBNet"
-		                 guid                 = "{634FA0F9-5C09-48ec-9E9E-29428AE97251}"
+		                 guid                 = "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}"
 		                 supportedextensions  = ".vb"
 		                 projectfileextension = ".vbproj"
 		                 class                = "VBNetBinding.VBNetLanguageBinding" />
diff --git a/src/Main/Base/Project/Src/Project/MSBuildProject.cs b/src/Main/Base/Project/Src/Project/MSBuildProject.cs
index 2a42f68cde..8ce088576f 100644
--- a/src/Main/Base/Project/Src/Project/MSBuildProject.cs
+++ b/src/Main/Base/Project/Src/Project/MSBuildProject.cs
@@ -20,7 +20,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		{
 		}
 		
-		public void Create(ProjectCreateInformation information)
+		protected void Create(ProjectCreateInformation information)
 		{
 			Name = information.ProjectName;
 			configurations[""] = new PropertyGroup();
@@ -42,8 +42,6 @@ namespace ICSharpCode.SharpDevelop.Project
 			configurations["Release|AnyCPU"]["Optimize"] = @"true";
 			
 			fileName = information.OutputProjectFileName;
-			
-			imports.Add(@"$(MSBuildBinPath)\Microsoft.CSHARP.Targets");
 		}
 		
 		public override bool CanCompile(string fileName)
diff --git a/src/Main/StartUp/Project/Resources/BitmapResources.resources b/src/Main/StartUp/Project/Resources/BitmapResources.resources
index 65af2678a6..08ebde752c 100644
Binary files a/src/Main/StartUp/Project/Resources/BitmapResources.resources and b/src/Main/StartUp/Project/Resources/BitmapResources.resources differ