diff --git a/data/resources/image/BitmapResources/BitmapList.txt b/data/resources/image/BitmapResources/BitmapList.txt
index 9e2991aab3..37cb9f3565 100644
--- a/data/resources/image/BitmapResources/BitmapList.txt
+++ b/data/resources/image/BitmapResources/BitmapList.txt
@@ -331,6 +331,8 @@ backendicons\CSharp\file\EmptyFile.png
 backendicons\CSharp\file\Form.png
 backendicons\CSharp\file\FullFile.png
 backendicons\CSharp\file\Interface.png
+backendicons\CSharp\file\MvcRazorFile.png
+backendicons\CSharp\file\MvcRazorFile.Small.png
 backendicons\CSharp\file\NewClass.png
 backendicons\CSharp\file\WPFCustomControl.png
 backendicons\CSharp\file\WPFFlowDocument.png
@@ -347,6 +349,7 @@ backendicons\CSharp\project\EmptyProject.png
 backendicons\CSharp\project\Form.png
 backendicons\CSharp\project\FullProject.png
 backendicons\CSharp\project\Library.png
+backendicons\CSharp\project\MvcRazorProject.png
 backendicons\CSharp\project\ServiceProject.png
 backendicons\CSharp\project\UserControl.png
 backendicons\CSharp\project\WCFServiceProject.png
@@ -414,6 +417,8 @@ backendicons\VBNet\file\EmptyFile.png
 backendicons\VBNet\file\Form.png
 backendicons\VBNet\file\FullFile.png
 backendicons\VBNet\file\NewClass.png
+backendicons\VBNet\file\MvcRazorFile.png
+backendicons\VBNet\file\MvcRazorFile.Small.png
 backendicons\VBNet\file\WPFCustomControl.png
 backendicons\VBNet\file\WPFFlowDocument.png
 backendicons\VBNet\file\WPFPage.png
@@ -429,6 +434,7 @@ backendicons\VBNet\project\EmptyProject.png
 backendicons\VBNet\project\Form.png
 backendicons\VBNet\project\FullProject.png
 backendicons\VBNet\project\Library.png
+backendicons\VBNet\project\MvcRazorProject.png
 backendicons\VBNet\project\ServiceProject.png
 backendicons\VBNet\project\UserControl.png
 backendicons\VBNet\project\WCFServiceProject.png
diff --git a/data/resources/image/BitmapResources/BitmapResources.res b/data/resources/image/BitmapResources/BitmapResources.res
index 4c928b05be..c69f07fc9b 100644
--- a/data/resources/image/BitmapResources/BitmapResources.res
+++ b/data/resources/image/BitmapResources/BitmapResources.res
@@ -381,6 +381,8 @@ C#.File.Form										= backendicons\CSharp\file\Form.png
 C#.File.FullFile									= backendicons\CSharp\file\FullFile.png
 C#.File.NewClass									= backendicons\CSharp\file\NewClass.png
 C#.File.Interface									= backendicons\CSharp\file\Interface.png
+C#.File.MvcRazorFile									= backendicons\CSharp\file\MvcRazorFile.png
+C#.File.MvcRazorFile.Small									= backendicons\CSharp\file\MvcRazorFile.Small.png
 C#.File.WebFile										= backendicons\CSharp\file\WebFile.png
 C#.File.WPFCustomControl							= backendicons\CSharp\file\WPFCustomControl.png
 C#.File.WPFFlowDocument								= backendicons\CSharp\file\WPFFlowDocument.png
@@ -393,6 +395,7 @@ C#.Project.EmptyProject								= backendicons\CSharp\project\EmptyProject.png
 C#.Project.DOSProject								= backendicons\CSharp\project\DOSProject.png
 C#.Project.Form										= backendicons\CSharp\project\Form.png
 C#.Project.FullProject								= backendicons\CSharp\project\FullProject.png
+C#.Project.MvcRazorProject							= backendicons\CSharp\project\MvcRazorProject.png
 C#.Project.ServiceProject							= backendicons\CSharp\project\ServiceProject.png
 C#.Project.UserControl								= backendicons\CSharp\project\UserControl.png
 C#.Project.WebProject								= backendicons\CSharp\project\WebProject.png
@@ -415,6 +418,8 @@ 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.Interface								= backendicons\VBNet.\file\Interface.png
+VBNet.File.MvcRazorFile								= backendicons\VBNet.\file\MvcRazorFile.png
+VBNet.File.MvcRazorFile.Small								= backendicons\VBNet.\file\MvcRazorFile.Small.png
 VBNet.File.WebFile									= backendicons\VBNet\file\WebFile.png
 VBNet.File.WPFCustomControl							= backendicons\VBNet\file\WPFCustomControl.png
 VBNet.File.WPFFlowDocument							= backendicons\VBNet\file\WPFFlowDocument.png
@@ -427,6 +432,7 @@ 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.MvcRazorProject							= backendicons\VBNet\project\MvcRazorProject.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
diff --git a/data/resources/image/BitmapResources/backendicons/BackEndIcons16x16.pdn b/data/resources/image/BitmapResources/backendicons/BackEndIcons16x16.pdn
index efc516afcc..276fbcf03c 100644
Binary files a/data/resources/image/BitmapResources/backendicons/BackEndIcons16x16.pdn and b/data/resources/image/BitmapResources/backendicons/BackEndIcons16x16.pdn differ
diff --git a/data/resources/image/BitmapResources/backendicons/BackEndIcons32x32.pdn b/data/resources/image/BitmapResources/backendicons/BackEndIcons32x32.pdn
index 247c48255a..1f44b3b461 100644
Binary files a/data/resources/image/BitmapResources/backendicons/BackEndIcons32x32.pdn and b/data/resources/image/BitmapResources/backendicons/BackEndIcons32x32.pdn differ
diff --git a/data/resources/image/BitmapResources/backendicons/CSharp/file/MvcRazorFile.Small.png b/data/resources/image/BitmapResources/backendicons/CSharp/file/MvcRazorFile.Small.png
new file mode 100644
index 0000000000..6e0d6518d7
Binary files /dev/null and b/data/resources/image/BitmapResources/backendicons/CSharp/file/MvcRazorFile.Small.png differ
diff --git a/data/resources/image/BitmapResources/backendicons/CSharp/file/MvcRazorFile.png b/data/resources/image/BitmapResources/backendicons/CSharp/file/MvcRazorFile.png
new file mode 100644
index 0000000000..ae2ade2eeb
Binary files /dev/null and b/data/resources/image/BitmapResources/backendicons/CSharp/file/MvcRazorFile.png differ
diff --git a/data/resources/image/BitmapResources/backendicons/CSharp/project/MvcRazorProject.png b/data/resources/image/BitmapResources/backendicons/CSharp/project/MvcRazorProject.png
new file mode 100644
index 0000000000..ccf41fab18
Binary files /dev/null and b/data/resources/image/BitmapResources/backendicons/CSharp/project/MvcRazorProject.png differ
diff --git a/data/resources/image/BitmapResources/backendicons/VBNet/file/MvcRazorFile.Small.png b/data/resources/image/BitmapResources/backendicons/VBNet/file/MvcRazorFile.Small.png
new file mode 100644
index 0000000000..ab3446501e
Binary files /dev/null and b/data/resources/image/BitmapResources/backendicons/VBNet/file/MvcRazorFile.Small.png differ
diff --git a/data/resources/image/BitmapResources/backendicons/VBNet/file/MvcRazorFile.png b/data/resources/image/BitmapResources/backendicons/VBNet/file/MvcRazorFile.png
new file mode 100644
index 0000000000..58d7842964
Binary files /dev/null and b/data/resources/image/BitmapResources/backendicons/VBNet/file/MvcRazorFile.png differ
diff --git a/data/resources/image/BitmapResources/backendicons/VBNet/project/MvcRazorProject.png b/data/resources/image/BitmapResources/backendicons/VBNet/project/MvcRazorProject.png
new file mode 100644
index 0000000000..aadb8b2ea4
Binary files /dev/null and b/data/resources/image/BitmapResources/backendicons/VBNet/project/MvcRazorProject.png differ
diff --git a/data/templates/file/CSharp/CSharp.Mvc.Razor.LayoutPage.xft b/data/templates/file/CSharp/CSharp.Mvc.Razor.LayoutPage.xft
index 08501a8f78..ef913769c6 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.WebFile"
+		icon="C#.File.MvcRazorFile"
 		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 d4a9ea4c01..a607b3e7cc 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.WebFile"
+		icon="C#.File.MvcRazorFile"
 		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 05d922298a..6c69c8acbe 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.WebFile"
+		icon="C#.File.MvcRazorFile"
 		category="C#"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewPage${Number}.cshtml"
diff --git a/data/templates/file/VB/VB.Mvc.Razor.LayoutPage.xft b/data/templates/file/VB/VB.Mvc.Razor.LayoutPage.xft
index ff3760b6d4..0e3477cd29 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.WebFile"
+		icon="VBNet.File.MvcRazorFile"
 		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 d3e7705ea7..4feb2bb642 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.WebFile"
+		icon="VBNet.File.MvcRazorFile"
 		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 827aedb813..4233395719 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.WebFile"
+		icon="VBNet.File.MvcRazorFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewPage${Number}.vbhtml"
diff --git a/data/templates/project/CSharp/MvcRazorProject.xpt b/data/templates/project/CSharp/MvcRazorProject.xpt
index f369248bb0..a3ed7576e4 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.WebProject</Icon>
+		<Icon>C#.Project.MvcRazorProject</Icon>
 		<Description>ASP.NET MVC Application using Razor</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/data/templates/project/VB/MvcRazorProject.xpt b/data/templates/project/VB/MvcRazorProject.xpt
index f3d1e53b24..1a3477cb6d 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.WebProject</Icon>
+		<Icon>VBNet.Project.MvcRazorProject</Icon>
 		<Description>ASP.NET MVC Application using Razor</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/AspNet.Mvc.addin b/src/AddIns/BackendBindings/AspNet.Mvc/Project/AspNet.Mvc.addin
index 90c23e6a5b..f353bfa08a 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/AspNet.Mvc.addin
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/AspNet.Mvc.addin
@@ -66,11 +66,11 @@
 		<Icon
 			id="CSharp.Razor.File"
 			extensions=".cshtml"
-			resource="C#.FileIcon"/>
+			resource="C#.File.MvcRazorFile.Small"/>
 		<Icon
 			id="VisualBasic.Razor.File"
 			extensions=".vbhtml"
-			resource="VBNet.FileIcon"/>
+			resource="VBNet.File.MvcRazorFile.Small"/>
 	</Path>
 
 	<Path name="/SharpDevelop/Workbench/FileFilter">
diff --git a/src/Main/StartUp/Project/Resources/BitmapResources.resources b/src/Main/StartUp/Project/Resources/BitmapResources.resources
index 45b66965c4..09251c3212 100644
Binary files a/src/Main/StartUp/Project/Resources/BitmapResources.resources and b/src/Main/StartUp/Project/Resources/BitmapResources.resources differ