diff --git a/data/templates/file/CSharp/CSharp.Interface.xft b/data/templates/file/CSharp/CSharp.Interface.xft
index a709259f21..a03558c907 100644
--- a/data/templates/file/CSharp/CSharp.Interface.xft
+++ b/data/templates/file/CSharp/CSharp.Interface.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.Interface.Name}"
-		  icon        = "C#.File.NewClass"
+		  icon        = "C#.File.Interface"
 		  category    = "C#"
 		  defaultname = "Interface${Number}.cs"
 		  language    = "C#"/>
diff --git a/data/templates/file/CSharp/CSharp.Mvc.Razor.LayoutPage.xft b/data/templates/file/CSharp/CSharp.Mvc.Razor.LayoutPage.xft
index 3cc369f1a3..08501a8f78 100644
--- a/data/templates/file/CSharp/CSharp.Mvc.Razor.LayoutPage.xft
+++ b/data/templates/file/CSharp/CSharp.Mvc.Razor.LayoutPage.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name="Razor Layout Page"
-		icon="C#.File.NewClass"
+		icon="C#.File.WebFile"
 		category="C#"
 		subcategory="ASP.NET MVC"
 		defaultname="_LayoutPage${Number}.cshtml"
diff --git a/data/templates/file/CSharp/CSharp.Mvc.Razor.PartialPage.xft b/data/templates/file/CSharp/CSharp.Mvc.Razor.PartialPage.xft
index e286018115..d4a9ea4c01 100644
--- a/data/templates/file/CSharp/CSharp.Mvc.Razor.PartialPage.xft
+++ b/data/templates/file/CSharp/CSharp.Mvc.Razor.PartialPage.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name="Razor Partial Page"
-		icon="C#.File.NewClass"
+		icon="C#.File.WebFile"
 		category="C#"
 		subcategory="ASP.NET MVC"
 		defaultname="_PartialPage${Number}.cshtml"
diff --git a/data/templates/file/CSharp/CSharp.Mvc.Razor.ViewPage.xft b/data/templates/file/CSharp/CSharp.Mvc.Razor.ViewPage.xft
index cfc520dff3..05d922298a 100644
--- a/data/templates/file/CSharp/CSharp.Mvc.Razor.ViewPage.xft
+++ b/data/templates/file/CSharp/CSharp.Mvc.Razor.ViewPage.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name="Razor View Page"
-		icon="C#.File.NewClass"
+		icon="C#.File.WebFile"
 		category="C#"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewPage${Number}.cshtml"
diff --git a/data/templates/file/CSharp/CSharp.Mvc.ViewContentPage.xft b/data/templates/file/CSharp/CSharp.Mvc.ViewContentPage.xft
index 0dac282f5f..42a9a24a4f 100644
--- a/data/templates/file/CSharp/CSharp.Mvc.ViewContentPage.xft
+++ b/data/templates/file/CSharp/CSharp.Mvc.ViewContentPage.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name="MVC View Content Page"
-		icon="C#.File.NewClass"
+		icon="C#.File.WebFile"
 		category="C#"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewContentPage${Number}.aspx"
diff --git a/data/templates/file/CSharp/CSharp.Mvc.ViewMasterPage.xft b/data/templates/file/CSharp/CSharp.Mvc.ViewMasterPage.xft
index 83cc07f0be..468d206042 100644
--- a/data/templates/file/CSharp/CSharp.Mvc.ViewMasterPage.xft
+++ b/data/templates/file/CSharp/CSharp.Mvc.ViewMasterPage.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name="MVC View Master Page"
-		icon="C#.File.NewClass"
+		icon="C#.File.WebFile"
 		category="C#"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewMasterPage${Number}.master"
diff --git a/data/templates/file/CSharp/CSharp.Mvc.ViewPage.xft b/data/templates/file/CSharp/CSharp.Mvc.ViewPage.xft
index 467e0d3f20..6e00f44656 100644
--- a/data/templates/file/CSharp/CSharp.Mvc.ViewPage.xft
+++ b/data/templates/file/CSharp/CSharp.Mvc.ViewPage.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name="MVC View Page"
-		icon="C#.File.NewClass"
+		icon="C#.File.WebFile"
 		category="C#"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewPage${Number}.aspx"
diff --git a/data/templates/file/CSharp/CSharp.Mvc.ViewUserControl.xft b/data/templates/file/CSharp/CSharp.Mvc.ViewUserControl.xft
index e3a91e714c..f0a2f3b307 100644
--- a/data/templates/file/CSharp/CSharp.Mvc.ViewUserControl.xft
+++ b/data/templates/file/CSharp/CSharp.Mvc.ViewUserControl.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		name="MVC View User Control"
-		icon="C#.File.NewClass"
+		icon="C#.File.WebFile"
 		category="C#"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewUserControl${Number}.ascx"
diff --git a/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft b/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft
index 2a85fbd699..0521ae6b62 100644
--- a/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft
+++ b/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXFlowDocument.Name}"
-		  icon        = "Icons.32x32.XMLFileIcon"
+		  icon        = "C#.File.WPFFlowDocument"
 		  category    = "C#"
 		  subcategory = "WPF"
 		  defaultname = "FlowDocument${Number}.xaml"
diff --git a/data/templates/file/CSharp/CSharp.WPFPage.xft b/data/templates/file/CSharp/CSharp.WPFPage.xft
index 857ac4c451..6f048735b3 100644
--- a/data/templates/file/CSharp/CSharp.WPFPage.xft
+++ b/data/templates/file/CSharp/CSharp.WPFPage.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXPage.Name}"
-		  icon        = "Icons.32x32.XMLFileIcon"
+		  icon        = "C#.File.WPFPage"
 		  category    = "C#"
 		  subcategory = "WPF"
 		  defaultname = "Page${Number}.xaml"
diff --git a/data/templates/file/CSharp/CSharp.WPFPageFunction.xft b/data/templates/file/CSharp/CSharp.WPFPageFunction.xft
index 7fd3f1156c..8f94eb05a3 100644
--- a/data/templates/file/CSharp/CSharp.WPFPageFunction.xft
+++ b/data/templates/file/CSharp/CSharp.WPFPageFunction.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXPageFunction.Name}"
-		  icon        = "Icons.32x32.XMLFileIcon"
+		  icon        = "C#.File.WPFPageFunction"
 		  category    = "C#"
 		  subcategory = "WPF"
 		  defaultname = "PageFunction${Number}.xaml"
diff --git a/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft b/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft
index 8c6ff7adf6..6259e1bb69 100644
--- a/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft
+++ b/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXResourceDictionary.Name}"
-		  icon        = "Icons.32x32.XMLFileIcon"
+		  icon        = "C#.File.WPFResourceDictionary"
 		  subcategory = "WPF"
 		  category    = "C#"
 		  defaultname = "Dictionary${Number}.xaml"
diff --git a/data/templates/file/CSharp/CSharp.WPFUserControl.xft b/data/templates/file/CSharp/CSharp.WPFUserControl.xft
index adc0aaacc4..405e1c0512 100644
--- a/data/templates/file/CSharp/CSharp.WPFUserControl.xft
+++ b/data/templates/file/CSharp/CSharp.WPFUserControl.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXUserControl.Name}"
-		  icon        = "Icons.32x32.XMLFileIcon"
+		  icon        = "C#.File.WPFUserControl"
 		  category    = "C#"
 		  subcategory = "WPF"
 		  defaultname = "UserControl${Number}.xaml"
diff --git a/data/templates/file/CSharp/CSharp.WPFWindow.xft b/data/templates/file/CSharp/CSharp.WPFWindow.xft
index 2e86644073..dd1e5ae7bd 100644
--- a/data/templates/file/CSharp/CSharp.WPFWindow.xft
+++ b/data/templates/file/CSharp/CSharp.WPFWindow.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXWindow.Name}"
-		  icon        = "Icons.32x32.XMLFileIcon"
+		  icon        = "C#.File.WPFWindow"
 		  category    = "C#"
 		  subcategory = "WPF"
 		  defaultname = "Window${Number}.xaml"
diff --git a/data/templates/file/CSharp/CSharp.Web.WebControl.xft b/data/templates/file/CSharp/CSharp.Web.WebControl.xft
index c7332b8483..593afb8645 100644
--- a/data/templates/file/CSharp/CSharp.Web.WebControl.xft
+++ b/data/templates/file/CSharp/CSharp.Web.WebControl.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name        = "${res:Templates.File.WebControl.Name}"
-		icon        = "C#.File.NewClass"
+		icon        = "C#.File.WebFile"
 		category    = "C#"
 		subcategory = "ASP.NET"
 		defaultname = "WebControl${Number}"
diff --git a/data/templates/file/CSharp/CSharp.Web.WebForm.xft b/data/templates/file/CSharp/CSharp.Web.WebForm.xft
index da3f713353..d453899a31 100644
--- a/data/templates/file/CSharp/CSharp.Web.WebForm.xft
+++ b/data/templates/file/CSharp/CSharp.Web.WebForm.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name        = "${res:Templates.File.WebForm.Name}"
-		icon        = "C#.File.NewClass"
+		icon        = "C#.File.WebFile"
 		category    = "C#"
 		subcategory = "ASP.NET"
 		defaultname = "WebForm${Number}.aspx"
diff --git a/data/templates/file/CSharp/CSharp.Web.WebHandler.xft b/data/templates/file/CSharp/CSharp.Web.WebHandler.xft
index be0bc37fa4..2fa5468093 100644
--- a/data/templates/file/CSharp/CSharp.Web.WebHandler.xft
+++ b/data/templates/file/CSharp/CSharp.Web.WebHandler.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name        = "${res:Templates.File.WebHandler.Name}"
-		icon        = "C#.File.NewClass"
+		icon        = "C#.File.WebFile"
 		category    = "C#"
 		subcategory = "ASP.NET"
 		defaultname = "WebHandler${Number}.ashx"
diff --git a/data/templates/file/CSharp/CSharp.Web.WebService.xft b/data/templates/file/CSharp/CSharp.Web.WebService.xft
index 9ae31263ef..272199e324 100644
--- a/data/templates/file/CSharp/CSharp.Web.WebService.xft
+++ b/data/templates/file/CSharp/CSharp.Web.WebService.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name        = "${res:Templates.File.WebService.Name}"
-		icon        = "C#.File.NewClass"
+		icon        = "C#.File.WebFile"
 		category    = "C#"
 		subcategory = "ASP.NET"
 		defaultname = "WebService${Number}.asmx"
diff --git a/data/templates/file/VB/VB.Mvc.Razor.LayoutPage.xft b/data/templates/file/VB/VB.Mvc.Razor.LayoutPage.xft
index 604dcdb021..ff3760b6d4 100644
--- a/data/templates/file/VB/VB.Mvc.Razor.LayoutPage.xft
+++ b/data/templates/file/VB/VB.Mvc.Razor.LayoutPage.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name="Razor Layout Page"
-		icon="VBNet.File.NewClass"
+		icon="VBNet.File.WebFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="_LayoutPage${Number}.vbhtml"
diff --git a/data/templates/file/VB/VB.Mvc.Razor.PartialPage.xft b/data/templates/file/VB/VB.Mvc.Razor.PartialPage.xft
index bf41e33a54..d3e7705ea7 100644
--- a/data/templates/file/VB/VB.Mvc.Razor.PartialPage.xft
+++ b/data/templates/file/VB/VB.Mvc.Razor.PartialPage.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name="Razor Partial Page"
-		icon="VBNet.File.NewClass"
+		icon="VBNet.File.WebFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="_PartialPage${Number}.vbhtml"
diff --git a/data/templates/file/VB/VB.Mvc.Razor.ViewPage.xft b/data/templates/file/VB/VB.Mvc.Razor.ViewPage.xft
index d68a9470de..827aedb813 100644
--- a/data/templates/file/VB/VB.Mvc.Razor.ViewPage.xft
+++ b/data/templates/file/VB/VB.Mvc.Razor.ViewPage.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name="Razor View Page"
-		icon="VBNet.File.NewClass"
+		icon="VBNet.File.WebFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewPage${Number}.vbhtml"
diff --git a/data/templates/file/VB/VB.Mvc.ViewContentPage.xft b/data/templates/file/VB/VB.Mvc.ViewContentPage.xft
index 02a4e39312..c728328281 100644
--- a/data/templates/file/VB/VB.Mvc.ViewContentPage.xft
+++ b/data/templates/file/VB/VB.Mvc.ViewContentPage.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name="MVC View Content Page"
-		icon="VBNet.File.NewClass"
+		icon="VBNet.File.WebFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewContentPage${Number}.aspx"
diff --git a/data/templates/file/VB/VB.Mvc.ViewMasterPage.xft b/data/templates/file/VB/VB.Mvc.ViewMasterPage.xft
index d81008970d..9e7d865cb9 100644
--- a/data/templates/file/VB/VB.Mvc.ViewMasterPage.xft
+++ b/data/templates/file/VB/VB.Mvc.ViewMasterPage.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name="MVC View Master Page"
-		icon="VBNet.File.NewClass"
+		icon="VBNet.File.WebFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewMasterPage${Number}.master"
diff --git a/data/templates/file/VB/VB.Mvc.ViewPage.xft b/data/templates/file/VB/VB.Mvc.ViewPage.xft
index 8a4fab7c9e..6d8b4fbb58 100644
--- a/data/templates/file/VB/VB.Mvc.ViewPage.xft
+++ b/data/templates/file/VB/VB.Mvc.ViewPage.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name="MVC View Page"
-		icon="VBNet.File.NewClass"
+		icon="VBNet.File.WebFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewPage${Number}.aspx"
diff --git a/data/templates/file/VB/VB.Mvc.ViewUserControl.xft b/data/templates/file/VB/VB.Mvc.ViewUserControl.xft
index 01159a9782..bc22c008fc 100644
--- a/data/templates/file/VB/VB.Mvc.ViewUserControl.xft
+++ b/data/templates/file/VB/VB.Mvc.ViewUserControl.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name="MVC View User Control"
-		icon="VBNet.File.NewClass"
+		icon="VBNet.File.WebFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewUserControl${Number}.ascx"
diff --git a/data/templates/file/VB/VB.WPFFlowDocument.xft b/data/templates/file/VB/VB.WPFFlowDocument.xft
index 0ee6f60cbd..5e970e1a02 100644
--- a/data/templates/file/VB/VB.WPFFlowDocument.xft
+++ b/data/templates/file/VB/VB.WPFFlowDocument.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXFlowDocument.Name}"
-		  icon        = "Icons.32x32.XMLFileIcon"
+		  icon        = "VBNet.File.WPFFlowDocument"
 		  category    = "VB"
 		  subcategory = "WPF"
 		  defaultname = "FlowDocument${Number}.xaml"
diff --git a/data/templates/file/VB/VB.WPFPage.xft b/data/templates/file/VB/VB.WPFPage.xft
index 9d1801fac5..d99b625884 100644
--- a/data/templates/file/VB/VB.WPFPage.xft
+++ b/data/templates/file/VB/VB.WPFPage.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXPage.Name}"
-		  icon        = "Icons.32x32.XMLFileIcon"
+		  icon        = "VBNet.File.WPFPage"
 		  category    = "VB"
 		  subcategory = "WPF"
 		  defaultname = "Page${Number}.xaml"
diff --git a/data/templates/file/VB/VB.WPFPageFunction.xft b/data/templates/file/VB/VB.WPFPageFunction.xft
index 89dab45de5..513ced2e9f 100644
--- a/data/templates/file/VB/VB.WPFPageFunction.xft
+++ b/data/templates/file/VB/VB.WPFPageFunction.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXPageFunction.Name}"
-		  icon        = "Icons.32x32.XMLFileIcon"
+		  icon        = "VBNet.File.WPFPageFunction"
 		  category    = "VB"
 		  subcategory = "WPF"
 		  defaultname = "PageFunction${Number}.xaml"
diff --git a/data/templates/file/VB/VB.WPFResourceDictionary.xft b/data/templates/file/VB/VB.WPFResourceDictionary.xft
index 188c662202..2a2f7ae403 100644
--- a/data/templates/file/VB/VB.WPFResourceDictionary.xft
+++ b/data/templates/file/VB/VB.WPFResourceDictionary.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXResourceDictionary.Name}"
-		  icon        = "Icons.32x32.XMLFileIcon"
+		  icon        = "VBNet.File.WPFResourceDictionary"
 		  subcategory = "WPF"
 		  category    = "VB"
 		  defaultname = "Dictionary${Number}.xaml"
diff --git a/data/templates/file/VB/VB.WPFUserControl.xft b/data/templates/file/VB/VB.WPFUserControl.xft
index 890627bcbc..7c92973c91 100644
--- a/data/templates/file/VB/VB.WPFUserControl.xft
+++ b/data/templates/file/VB/VB.WPFUserControl.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXUserControl.Name}"
-		  icon        = "Icons.32x32.XMLFileIcon"
+		  icon        = "VBNet.File.WPFUserControl"
 		  category    = "VB"
 		  subcategory = "WPF"
 		  defaultname = "UserControl${Number}.xaml"
diff --git a/data/templates/file/VB/VB.WPFWindow.xft b/data/templates/file/VB/VB.WPFWindow.xft
index ecb0daedb8..0c806e0879 100644
--- a/data/templates/file/VB/VB.WPFWindow.xft
+++ b/data/templates/file/VB/VB.WPFWindow.xft
@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXWindow.Name}"
-		  icon        = "Icons.32x32.XMLFileIcon"
+		  icon        = "VBNet.File.WPFWindow"
 		  category    = "VB"
 		  subcategory = "WPF"
 		  defaultname = "Window${Number}.xaml"
diff --git a/data/templates/file/VB/VB.Web.WebControl.xft b/data/templates/file/VB/VB.Web.WebControl.xft
index 01b77996f0..10b6085f23 100644
--- a/data/templates/file/VB/VB.Web.WebControl.xft
+++ b/data/templates/file/VB/VB.Web.WebControl.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name        = "${res:Templates.File.WebControl.Name}"
-		icon        = "VBNet.File.NewClass"
+		icon        = "VBNet.File.WebFile"
 		category    = "VB"
 		subcategory = "ASP.NET"
 		defaultname = "WebControl${Number}"
diff --git a/data/templates/file/VB/VB.Web.WebForm.xft b/data/templates/file/VB/VB.Web.WebForm.xft
index 76a761a629..54d80baad4 100644
--- a/data/templates/file/VB/VB.Web.WebForm.xft
+++ b/data/templates/file/VB/VB.Web.WebForm.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name        = "${res:Templates.File.WebForm.Name}"
-		icon        = "VBNet.File.NewClass"
+		icon        = "VBNet.File.WebFile"
 		category    = "VB"
 		subcategory = "ASP.NET"
 		defaultname = "WebForm${Number}.aspx"
diff --git a/data/templates/file/VB/VB.Web.WebHandler.xft b/data/templates/file/VB/VB.Web.WebHandler.xft
index 1e06fc3f6d..a4f249e50e 100644
--- a/data/templates/file/VB/VB.Web.WebHandler.xft
+++ b/data/templates/file/VB/VB.Web.WebHandler.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name        = "${res:Templates.File.WebHandler.Name}"
-		icon        = "VBNet.File.NewClass"
+		icon        = "VBNet.File.WebFile"
 		category    = "VB"
 		subcategory = "ASP.NET"
 		defaultname = "WebHandler${Number}.ashx"
diff --git a/data/templates/file/VB/VB.Web.WebService.xft b/data/templates/file/VB/VB.Web.WebService.xft
index 7bbd469ad5..59a9f19251 100644
--- a/data/templates/file/VB/VB.Web.WebService.xft
+++ b/data/templates/file/VB/VB.Web.WebService.xft
@@ -3,7 +3,7 @@
 
 	<Config
 		name        = "${res:Templates.File.WebService.Name}"
-		icon        = "VBNet.File.NewClass"
+		icon        = "VBNet.File.WebFile"
 		category    = "VB"
 		subcategory = "ASP.NET"
 		defaultname = "WebService${Number}.asmx"
diff --git a/data/templates/project/CSharp/CSharp.WcfRestServiceProject.xpt b/data/templates/project/CSharp/CSharp.WcfRestServiceProject.xpt
index 5755f10a79..598d6b7a5a 100644
--- a/data/templates/project/CSharp/CSharp.WcfRestServiceProject.xpt
+++ b/data/templates/project/CSharp/CSharp.WcfRestServiceProject.xpt
@@ -10,7 +10,7 @@
 		<Name>WCF REST Service</Name>
 		<Category>C#</Category>
 		<Subcategory>WCF</Subcategory>
-		<Icon>C#.Project.Form</Icon>
+		<Icon>C#.Project.WCFServiceProject</Icon>
 		<Description>WCF REST Service</Description>
 		<SupportedTargetFrameworks>v3.5</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/CSharp/CSharp.WcfServiceProject.xpt b/data/templates/project/CSharp/CSharp.WcfServiceProject.xpt
index 76e7ddd7e3..34a2618542 100644
--- a/data/templates/project/CSharp/CSharp.WcfServiceProject.xpt
+++ b/data/templates/project/CSharp/CSharp.WcfServiceProject.xpt
@@ -10,7 +10,7 @@
 		<Name>WCF Service</Name>
 		<Category>C#</Category>
 		<Subcategory>WCF</Subcategory>
-		<Icon>C#.Project.Form</Icon>
+		<Icon>C#.Project.WCFServiceProject</Icon>
 		<Description>WCF Service</Description>
 		<SupportedTargetFrameworks>v3.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/CSharp/EmptyMvcWebProject.xpt b/data/templates/project/CSharp/EmptyMvcWebProject.xpt
index 8a5cd10b91..0f14adf185 100644
--- a/data/templates/project/CSharp/EmptyMvcWebProject.xpt
+++ b/data/templates/project/CSharp/EmptyMvcWebProject.xpt
@@ -8,7 +8,7 @@
 		<Name>Empty MVC Application</Name>
 		<Category>C#</Category>
 		<Subcategory>ASP.NET MVC</Subcategory>
-		<Icon>C#.Project.Form</Icon>
+		<Icon>C#.Project.WebProject</Icon>
 		<Description>Empty ASP.NET MVC Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/CSharp/MvcRazorProject.xpt b/data/templates/project/CSharp/MvcRazorProject.xpt
index 2fe69ac479..f369248bb0 100644
--- a/data/templates/project/CSharp/MvcRazorProject.xpt
+++ b/data/templates/project/CSharp/MvcRazorProject.xpt
@@ -8,7 +8,7 @@
 		<Name>Razor MVC Application</Name>
 		<Category>C#</Category>
 		<Subcategory>ASP.NET MVC</Subcategory>
-		<Icon>C#.Project.Form</Icon>
+		<Icon>C#.Project.WebProject</Icon>
 		<Description>ASP.NET MVC Application using Razor</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/CSharp/MvcWebProject.xpt b/data/templates/project/CSharp/MvcWebProject.xpt
index fa2518c5ad..0af9e210ff 100644
--- a/data/templates/project/CSharp/MvcWebProject.xpt
+++ b/data/templates/project/CSharp/MvcWebProject.xpt
@@ -8,7 +8,7 @@
 		<Name>MVC Application</Name>
 		<Category>C#</Category>
 		<Subcategory>ASP.NET MVC</Subcategory>
-		<Icon>C#.Project.Form</Icon>
+		<Icon>C#.Project.WebProject</Icon>
 		<Description>ASP.NET MVC Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/CSharp/SilverlightApplication.xpt b/data/templates/project/CSharp/SilverlightApplication.xpt
index 240e34f7b2..441db16cae 100644
--- a/data/templates/project/CSharp/SilverlightApplication.xpt
+++ b/data/templates/project/CSharp/SilverlightApplication.xpt
@@ -5,7 +5,7 @@
 		<Name>Silverlight Application</Name>
 		<Category>C#</Category>
 		<Subcategory>Silverlight</Subcategory>
-		<Icon>C#.Project.Form</Icon>
+		<Icon>C#.Project.WebProject</Icon>
 		<Description>Default Silverlight Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/CSharp/WPFApplication.xpt b/data/templates/project/CSharp/WPFApplication.xpt
index 34e0719b4b..290e13a564 100644
--- a/data/templates/project/CSharp/WPFApplication.xpt
+++ b/data/templates/project/CSharp/WPFApplication.xpt
@@ -6,7 +6,7 @@
 		<Name>${res:Templates.Project.WinFXApplication.Name}</Name>
 		<Category>C#</Category>
 		<Subcategory>WPF</Subcategory>
-		<Icon>C#.Project.Form</Icon>
+		<Icon>C#.Project.WPFProject</Icon>
 		<Description>${res:Templates.Project.WinFXApplication.Description}</Description>
 		<SupportedTargetFrameworks>v3.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/CSharp/WPFNavigationApplication.xpt b/data/templates/project/CSharp/WPFNavigationApplication.xpt
index 51065291bf..10d399d9b1 100644
--- a/data/templates/project/CSharp/WPFNavigationApplication.xpt
+++ b/data/templates/project/CSharp/WPFNavigationApplication.xpt
@@ -6,7 +6,7 @@
 		<Name>${res:Templates.Project.WinFXNavigationApplication.Name}</Name>
 		<Category>C#</Category>
 		<Subcategory>WPF</Subcategory>
-		<Icon>C#.Project.Form</Icon>
+		<Icon>C#.Project.WPFNavigationProject</Icon>
 		<Description>${res:Templates.Project.WinFXNavigationApplication.Description}</Description>
 		<SupportedTargetFrameworks>v3.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/CSharp/WebService.xpt b/data/templates/project/CSharp/WebService.xpt
index 8858bc19aa..99da9b1854 100644
--- a/data/templates/project/CSharp/WebService.xpt
+++ b/data/templates/project/CSharp/WebService.xpt
@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.WebService.Name}</Name>
 		<Category>C#</Category>
 		<Subcategory>ASP.NET</Subcategory>
-		<Icon>C#.Project.Form</Icon>
+		<Icon>C#.Project.WebService</Icon>
 		<Description>${res:Templates.Project.WebService.Description}</Description>
 	</TemplateConfiguration>
 
diff --git a/data/templates/project/CSharp/WebpageProject.xpt b/data/templates/project/CSharp/WebpageProject.xpt
index c08f4dbb75..31fc93d938 100644
--- a/data/templates/project/CSharp/WebpageProject.xpt
+++ b/data/templates/project/CSharp/WebpageProject.xpt
@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.WebPage.Name}</Name>
 		<Category>C#</Category>
 		<Subcategory>ASP.NET</Subcategory>
-		<Icon>C#.Project.Form</Icon>
+		<Icon>C#.Project.WebProject</Icon>
 		<Description>${res:Templates.Project.WebPage.Description}</Description>
 		<SupportedTargetFrameworks>v2.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/EmptyMvcWebProject.xpt b/data/templates/project/VB/EmptyMvcWebProject.xpt
index a68b97e873..23b8f77e5e 100644
--- a/data/templates/project/VB/EmptyMvcWebProject.xpt
+++ b/data/templates/project/VB/EmptyMvcWebProject.xpt
@@ -8,7 +8,7 @@
 		<Name>Empty MVC Application</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET MVC</Subcategory>
-		<Icon>VBNet.Project.Form</Icon>
+		<Icon>VBNet.Project.WebProject</Icon>
 		<Description>Empty ASP.NET MVC Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/MvcRazorProject.xpt b/data/templates/project/VB/MvcRazorProject.xpt
index 2f3411ddc6..f3d1e53b24 100644
--- a/data/templates/project/VB/MvcRazorProject.xpt
+++ b/data/templates/project/VB/MvcRazorProject.xpt
@@ -8,7 +8,7 @@
 		<Name>Razor MVC Application</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET MVC</Subcategory>
-		<Icon>VBNet.Project.Form</Icon>
+		<Icon>VBNet.Project.WebProject</Icon>
 		<Description>ASP.NET MVC Application using Razor</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/MvcWebProject.xpt b/data/templates/project/VB/MvcWebProject.xpt
index 38dae26dbc..c517c124b6 100644
--- a/data/templates/project/VB/MvcWebProject.xpt
+++ b/data/templates/project/VB/MvcWebProject.xpt
@@ -8,7 +8,7 @@
 		<Name>MVC Application</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET MVC</Subcategory>
-		<Icon>VBNet.Project.Form</Icon>
+		<Icon>VBNet.Project.WebProject</Icon>
 		<Description>ASP.NET MVC Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/VB.WcfRestServiceProject.xpt b/data/templates/project/VB/VB.WcfRestServiceProject.xpt
index 8242a82b2b..3650809eb1 100644
--- a/data/templates/project/VB/VB.WcfRestServiceProject.xpt
+++ b/data/templates/project/VB/VB.WcfRestServiceProject.xpt
@@ -10,7 +10,7 @@
 		<Name>WCF REST Service</Name>
 		<Category>VB</Category>
 		<Subcategory>WCF</Subcategory>
-		<Icon>VBNet.Project.Form</Icon>
+		<Icon>VBNet.Project.WCFServiceProject</Icon>
 		<Description>WCF REST Service</Description>
 		<SupportedTargetFrameworks>v3.5</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/VB.WcfServiceProject.xpt b/data/templates/project/VB/VB.WcfServiceProject.xpt
index edddb53089..134b966f17 100644
--- a/data/templates/project/VB/VB.WcfServiceProject.xpt
+++ b/data/templates/project/VB/VB.WcfServiceProject.xpt
@@ -10,7 +10,7 @@
 		<Name>WCF Service</Name>
 		<Category>VB</Category>
 		<Subcategory>WCF</Subcategory>
-		<Icon>VBNet.Project.Form</Icon>
+		<Icon>VBNet.Project.WCFServiceProject</Icon>
 		<Description>WCF Service</Description>
 		<SupportedTargetFrameworks>v3.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/WPFApplication.xpt b/data/templates/project/VB/WPFApplication.xpt
index e1b9df2129..17f5f1ad73 100644
--- a/data/templates/project/VB/WPFApplication.xpt
+++ b/data/templates/project/VB/WPFApplication.xpt
@@ -6,7 +6,7 @@
 		<Name>${res:Templates.Project.WinFXApplication.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>WPF</Subcategory>
-		<Icon>VBNet.Project.Form</Icon>
+		<Icon>VBNet.Project.WPFProject</Icon>
 		<Description>${res:Templates.Project.WinFXApplication.Description}</Description>
 		<SupportedTargetFrameworks>v3.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/WPFNavigationApplication.xpt b/data/templates/project/VB/WPFNavigationApplication.xpt
index 4993b4f838..c646f45b0a 100644
--- a/data/templates/project/VB/WPFNavigationApplication.xpt
+++ b/data/templates/project/VB/WPFNavigationApplication.xpt
@@ -6,7 +6,7 @@
 		<Name>${res:Templates.Project.WinFXNavigationApplication.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>WPF</Subcategory>
-		<Icon>VBNet.Project.Form</Icon>
+		<Icon>VBNet.Project.WPFNavigationProject</Icon>
 		<Description>${res:Templates.Project.WinFXNavigationApplication.Description}</Description>
 		<SupportedTargetFrameworks>v3.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/WebService.xpt b/data/templates/project/VB/WebService.xpt
index 26511ce571..076364d0b4 100644
--- a/data/templates/project/VB/WebService.xpt
+++ b/data/templates/project/VB/WebService.xpt
@@ -6,7 +6,7 @@
 		<Name>${res:Templates.Project.WebService.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET</Subcategory>
-		<Icon>VBNet.Project.Form</Icon>
+		<Icon>VBNet.Project.WebService</Icon>
 		<Description>${res:Templates.Project.WebService.Description}</Description>
 	</TemplateConfiguration>
 
diff --git a/data/templates/project/VB/WebpageProject.xpt b/data/templates/project/VB/WebpageProject.xpt
index 0f24cb37db..7eed175e25 100644
--- a/data/templates/project/VB/WebpageProject.xpt
+++ b/data/templates/project/VB/WebpageProject.xpt
@@ -6,7 +6,7 @@
 		<Name>${res:Templates.Project.WebPage.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET</Subcategory>
-		<Icon>VBNet.Project.Form</Icon>
+		<Icon>VBNet.Project.WebProject</Icon>
 		<Description>${res:Templates.Project.WebPage.Description}</Description>
 		<SupportedTargetFrameworks>v2.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>