diff --git a/Tools/TechTalk.SpecFlow.Tools.csproj b/Tools/TechTalk.SpecFlow.Tools.csproj
index ff0e1e879..ecd6fe2ee 100644
--- a/Tools/TechTalk.SpecFlow.Tools.csproj
+++ b/Tools/TechTalk.SpecFlow.Tools.csproj
@@ -32,6 +32,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>..\specflow.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Utilities.v3.5">
diff --git a/VsIntegration/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinitionIcon.ico b/VsIntegration/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinitionIcon.ico
index 7ab089ad0..7b3ce5b62 100644
Binary files a/VsIntegration/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinitionIcon.ico and b/VsIntegration/ItemTemplates/SpecFlowEventDefinition/SpecFlowEventDefinitionIcon.ico differ
diff --git a/VsIntegration/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinitionIcon.ico b/VsIntegration/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinitionIcon.ico
index 7ab089ad0..7b3ce5b62 100644
Binary files a/VsIntegration/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinitionIcon.ico and b/VsIntegration/ItemTemplates/SpecFlowEventDefinition_VB/SpecFlowEventDefinitionIcon.ico differ
diff --git a/VsIntegration/ItemTemplates/SpecFlowFeature/SpecFlowFeatureIcon.ico b/VsIntegration/ItemTemplates/SpecFlowFeature/SpecFlowFeatureIcon.ico
index 7ab089ad0..85da89898 100644
Binary files a/VsIntegration/ItemTemplates/SpecFlowFeature/SpecFlowFeatureIcon.ico and b/VsIntegration/ItemTemplates/SpecFlowFeature/SpecFlowFeatureIcon.ico differ
diff --git a/VsIntegration/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeatureIcon.ico b/VsIntegration/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeatureIcon.ico
index 7ab089ad0..85da89898 100644
Binary files a/VsIntegration/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeatureIcon.ico and b/VsIntegration/ItemTemplates/SpecFlowFeature_VB/SpecFlowFeatureIcon.ico differ
diff --git a/VsIntegration/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinitionIcon.ico b/VsIntegration/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinitionIcon.ico
index 7ab089ad0..7b3ce5b62 100644
Binary files a/VsIntegration/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinitionIcon.ico and b/VsIntegration/ItemTemplates/SpecFlowStepDefinition/SpecFlowStepDefinitionIcon.ico differ
diff --git a/VsIntegration/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinitionIcon.ico b/VsIntegration/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinitionIcon.ico
index 7ab089ad0..7b3ce5b62 100644
Binary files a/VsIntegration/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinitionIcon.ico and b/VsIntegration/ItemTemplates/SpecFlowStepDefinition_VB/SpecFlowStepDefinitionIcon.ico differ
diff --git a/specflow.ico b/specflow.ico
new file mode 100644
index 000000000..8c20e31c8
Binary files /dev/null and b/specflow.ico differ