diff --git a/Installer/Resources/gherkin.ico b/Installer/Resources/gherkin.ico
new file mode 100644
index 000000000..a1911fce9
Binary files /dev/null and b/Installer/Resources/gherkin.ico differ
diff --git a/Installer/Resources/specflowsetup.ico b/Installer/Resources/specflowsetup.ico
new file mode 100644
index 000000000..8c20e31c8
Binary files /dev/null and b/Installer/Resources/specflowsetup.ico differ
diff --git a/Installer/SpecFlowInstaller/CoreFiles.wxs b/Installer/SpecFlowInstaller/CoreFiles.wxs
index f95238a72..b7c564791 100644
--- a/Installer/SpecFlowInstaller/CoreFiles.wxs
+++ b/Installer/SpecFlowInstaller/CoreFiles.wxs
@@ -6,6 +6,7 @@
 	<Fragment>
     <ComponentGroup Id="CompGroup_CoreFiles">
       <ComponentRef Id="Comp_CoreFiles" />
+      <ComponentRef Id="Comp_AssociateGherkinFiles" />
     </ComponentGroup>
 
     <DirectoryRef Id="INSTALLLOCATION">
@@ -19,6 +20,16 @@
         <File Name="IKVM.Runtime.dll" Source="$(var.SolutionDir)\lib\gherkin\IKVM.Runtime.dll" />
         <File Name="IKVM.OpenJDK.Core.dll" Source="$(var.SolutionDir)\lib\gherkin\IKVM.OpenJDK.Core.dll" />
         <File Name="IKVM.OpenJDK.Text.dll" Source="$(var.SolutionDir)\lib\gherkin\IKVM.OpenJDK.Text.dll" />
+        <File Name="gherkin.ico" Source="$(var.SetupResourcesDir)\gherkin.ico" />
+      </Component>
+
+      <!-- Gherkin file associations -->
+      <Component Id="Comp_AssociateGherkinFiles" Guid="2AE052A2-F932-4282-BF38-021CC54FC441">
+        <ProgId Id="GherkinFile" Description="Gherkin Specification File" Icon="[INSTALLLOCATION]gherkin.ico">
+          <Extension Id="feature" ContentType='application/text'>
+            <!--<Verb Id="open" TargetProperty="VS90DEVENV" Command="Open" Argument='/edit "%1"' />-->
+          </Extension>
+        </ProgId>
       </Component>
     </DirectoryRef>
 	</Fragment>
diff --git a/Installer/SpecFlowInstaller/Product.wxs b/Installer/SpecFlowInstaller/Product.wxs
index a45de154b..d08cdd297 100644
--- a/Installer/SpecFlowInstaller/Product.wxs
+++ b/Installer/SpecFlowInstaller/Product.wxs
@@ -78,6 +78,10 @@
     <CustomActionRef Id="VS90InstallVSTemplates" />
     <CustomActionRef Id="VS2010InstallVSTemplates" />
 
+    <!-- icons -->
+    <Icon Id="specflowsetup.ico" SourceFile="$(var.SetupResourcesDir)\specflowsetup.ico"/>
+    <Property Id="ARPPRODUCTICON" Value="specflowsetup.ico" />
+
     <!-- Sequences -->
     <InstallExecuteSequence>
       <RemoveExistingProducts After="InstallValidate" />