diff --git a/Whut.AttachTo/AttachTo.vsct b/Whut.AttachTo/AttachTo.vsct
index 3bde0b6..c0bd8ce 100755
--- a/Whut.AttachTo/AttachTo.vsct
+++ b/Whut.AttachTo/AttachTo.vsct
@@ -57,7 +57,7 @@
           If you do not want an image next to your command, remove the Icon node or set it to <Icon guid="guidOfficeIcon" id="msotcidNoIcon" /> -->
       <Button guid="guidAttachToCmdSet" id="cmdidWhutAttachToIIS" priority="0x0100" type="Button">
         <Parent guid="guidAttachToCmdSet" id="WhutAttachToMenuGroup" />
-        <Icon guid="guidImages" id="bmpPic1" />
+        <Icon guid="guidImages" id="imgIIS" />
         <CommandFlag>DynamicVisibility</CommandFlag>
         <Strings>
           <CommandName>cmdidWhutAttachToIIS</CommandName>
@@ -67,7 +67,7 @@
       
       <Button guid="guidAttachToCmdSet" id="cmdidWhutAttachToIISExpress" priority="0x0100" type="Button">
         <Parent guid="guidAttachToCmdSet" id="WhutAttachToMenuGroup" />
-        <Icon guid="guidImages" id="bmpPic1" />
+        <Icon guid="guidImages" id="imgIISExpress" />
         <CommandFlag>DynamicVisibility</CommandFlag>
         <Strings>
           <CommandName>cmdidWhutAttachToIISExpress</CommandName>
@@ -77,7 +77,7 @@
       
       <Button guid="guidAttachToCmdSet" id="cmdidWhutAttachToNUnit" priority="0x0100" type="Button">
         <Parent guid="guidAttachToCmdSet" id="WhutAttachToMenuGroup" />
-        <Icon guid="guidImages" id="bmpPic1" />
+        <Icon guid="guidImages" id="imgNUnit" />
         <CommandFlag>DynamicVisibility</CommandFlag>
         <Strings>
           <CommandName>cmdidWhutAttachToNUnit</CommandName>
@@ -93,7 +93,7 @@
             bitmap strip containing the bitmaps and then there are the numeric ids of the elements used 
             inside a button definition. An important aspect of this declaration is that the element id 
             must be the actual index (1-based) of the bitmap inside the bitmap strip. -->
-      <Bitmap guid="guidImages" href="Resources\Images_32bit.bmp" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows"/>
+      <Bitmap guid="guidImages" href="Resources\Images.png" usedList="imgIIS, imgIISExpress, imgNUnit"/>
     </Bitmaps>
   </Commands>
 
@@ -110,11 +110,9 @@
     </GuidSymbol>
     
     <GuidSymbol name="guidImages" value="{7cecfc21-6262-422a-93dd-223db26a763c}" >
-      <IDSymbol name="bmpPic1" value="1" />
-      <IDSymbol name="bmpPic2" value="2" />
-      <IDSymbol name="bmpPicSearch" value="3" />
-      <IDSymbol name="bmpPicX" value="4" />
-      <IDSymbol name="bmpPicArrows" value="5" />
+      <IDSymbol name="imgIIS" value="1" />
+      <IDSymbol name="imgIISExpress" value="2" />
+      <IDSymbol name="imgNUnit" value="3" />
     </GuidSymbol>
   </Symbols>
 </CommandTable>
diff --git a/Whut.AttachTo/Resources/Images.pdn b/Whut.AttachTo/Resources/Images.pdn
new file mode 100644
index 0000000..a90dae2
Binary files /dev/null and b/Whut.AttachTo/Resources/Images.pdn differ
diff --git a/Whut.AttachTo/Resources/Images.png b/Whut.AttachTo/Resources/Images.png
new file mode 100644
index 0000000..009a46c
Binary files /dev/null and b/Whut.AttachTo/Resources/Images.png differ
diff --git a/Whut.AttachTo/Resources/Images_32bit.bmp b/Whut.AttachTo/Resources/Images_32bit.bmp
deleted file mode 100755
index 2fa7ab0..0000000
Binary files a/Whut.AttachTo/Resources/Images_32bit.bmp and /dev/null differ
diff --git a/Whut.AttachTo/Resources/Package.ico b/Whut.AttachTo/Resources/Package.ico
index 8ece2cf..b00c42d 100755
Binary files a/Whut.AttachTo/Resources/Package.ico and b/Whut.AttachTo/Resources/Package.ico differ
diff --git a/Whut.AttachTo/Resources/Package.pdn b/Whut.AttachTo/Resources/Package.pdn
new file mode 100644
index 0000000..0c33b2f
Binary files /dev/null and b/Whut.AttachTo/Resources/Package.pdn differ
diff --git a/Whut.AttachTo/Whut.AttachTo.csproj b/Whut.AttachTo/Whut.AttachTo.csproj
index e007f33..4805d7a 100755
--- a/Whut.AttachTo/Whut.AttachTo.csproj
+++ b/Whut.AttachTo/Whut.AttachTo.csproj
@@ -135,6 +135,8 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\Images.pdn" />
+    <None Include="Resources\Package.pdn" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
@@ -148,19 +150,19 @@
     </VSCTCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\Images_32bit.bmp" />
-  </ItemGroup>
-  <ItemGroup>
+    <Content Include="icon.png">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="preview.png">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Resource Include="Resources\Images.png" />
     <Content Include="Resources\Package.ico" />
     <Content Include="..\license.txt">
       <Link>license.txt</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="preview.jpg">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <PropertyGroup>
     <UseCodebase>true</UseCodebase>
diff --git a/Whut.AttachTo/icon.png b/Whut.AttachTo/icon.png
new file mode 100644
index 0000000..41beb8f
Binary files /dev/null and b/Whut.AttachTo/icon.png differ
diff --git a/Whut.AttachTo/preview.jpg b/Whut.AttachTo/preview.jpg
deleted file mode 100644
index ddff88d..0000000
Binary files a/Whut.AttachTo/preview.jpg and /dev/null differ
diff --git a/Whut.AttachTo/preview.png b/Whut.AttachTo/preview.png
new file mode 100644
index 0000000..3b8cd5d
Binary files /dev/null and b/Whut.AttachTo/preview.png differ
diff --git a/Whut.AttachTo/source.extension.vsixmanifest b/Whut.AttachTo/source.extension.vsixmanifest
index 26ed8b6..e8cad6f 100755
--- a/Whut.AttachTo/source.extension.vsixmanifest
+++ b/Whut.AttachTo/source.extension.vsixmanifest
@@ -9,7 +9,8 @@
     <MoreInfoUrl>https://github.com/whut/AttachTo</MoreInfoUrl>
     <License>license.txt</License>
     <GettingStartedGuide>http://visualstudiogallery.msdn.microsoft.com/d0265ab0-df51-4100-8e10-1f84403c4cd0</GettingStartedGuide>
-    <PreviewImage>preview.jpg</PreviewImage>
+    <PreviewImage>preview.png</PreviewImage>
+    <Icon>icon.png</Icon>
     <InstalledByMsi>false</InstalledByMsi>
     <SupportedProducts>
       <VisualStudio Version="10.0">