diff --git a/AjaxControlToolkit.HtmlEditor.Sanitizer/Properties/AssemblyInfo.cs b/AjaxControlToolkit.HtmlEditor.Sanitizer/Properties/AssemblyInfo.cs
index 42c2302e4..f295a1d4a 100644
--- a/AjaxControlToolkit.HtmlEditor.Sanitizer/Properties/AssemblyInfo.cs
+++ b/AjaxControlToolkit.HtmlEditor.Sanitizer/Properties/AssemblyInfo.cs
@@ -1,5 +1,5 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("Ajax Control Toolkit HtmlEditor Sanitizer")]
+[assembly: AssemblyTitle("ASP.NET AJAX Control Toolkit HtmlEditor Sanitizer")]
 [assembly: ComVisible(false)]
diff --git a/AjaxControlToolkit.LinkStaticResources/Program.cs b/AjaxControlToolkit.LinkStaticResources/Program.cs
index 68f8433ec..149d6a29a 100644
--- a/AjaxControlToolkit.LinkStaticResources/Program.cs
+++ b/AjaxControlToolkit.LinkStaticResources/Program.cs
@@ -5,40 +5,41 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Reflection;
 
 namespace AjaxControlToolkit.LinkStaticResources {
 
     class Program {
 
         static void Main(string[] args) {
-            // NOTE paths are relative to Bin 
+            string solutionDirPath = Directory.GetParent(Directory.GetParent(Assembly.GetEntryAssembly().Location).FullName).FullName;
 
-            const string
-                outputDir = "../AjaxControlToolkit.StaticResources/",
+            string
+                outputDir = Path.Combine(solutionDirPath, @"AjaxControlToolkit.StaticResources\"),
                 scriptsDir = outputDir + "Scripts",
                 stylesDir = outputDir + "Styles",
                 imagesDir = outputDir + "Images",
-                samplesDir = "../AjaxControlToolkit.SampleSite/",
-                samplesScriptsDir = samplesDir + "Scripts/AjaxControlToolkit/",
-                samplesStylesDir = samplesDir + "Content/AjaxControlToolkit/Styles/",
-                samplesImagesDir = samplesDir + "Content/AjaxControlToolkit/Images/";
+                samplesDir = Path.Combine(solutionDirPath, @"AjaxControlToolkit.SampleSite\"),
+                samplesScriptsDir = samplesDir + @"Scripts\AjaxControlToolkit\",
+                samplesStylesDir = samplesDir + @"Content\AjaxControlToolkit\Styles\",
+                samplesImagesDir = samplesDir + @"Content\AjaxControlToolkit\Images\";
 
-            foreach(var path in Directory.EnumerateFiles("../AjaxControlToolkit/Scripts", "*.js")) {
+            foreach(var path in Directory.EnumerateFiles(Path.Combine(solutionDirPath, @"AjaxControlToolkit\Scripts"), "*.js")) {
                 LinkScript(scriptsDir, path);
                 LinkScript(samplesScriptsDir, path);
             }
 
-            foreach(var path in Directory.EnumerateFiles("../AjaxControlToolkit/Scripts/Localization", "*.js")) {
+            foreach(var path in Directory.EnumerateFiles(Path.Combine(solutionDirPath, @"AjaxControlToolkit\Scripts\Localization"), "*.js")) {
                 LinkScript(scriptsDir, path, TransformLocalizationScriptName);
                 LinkScript(samplesScriptsDir, path, TransformLocalizationScriptName);
             }
 
-            foreach(var path in Directory.EnumerateFiles("../AjaxControlToolkit/Styles", "*.css")) {
+            foreach(var path in Directory.EnumerateFiles(Path.Combine(solutionDirPath, @"AjaxControlToolkit\Styles"), "*.css")) {
                 LinkStyle(stylesDir, path);
                 LinkStyle(samplesStylesDir, path);
             }
 
-            foreach(var path in Directory.EnumerateFiles("../AjaxControlToolkit/Images")) {
+            foreach(var path in Directory.EnumerateFiles(Path.Combine(solutionDirPath, @"AjaxControlToolkit\Images"))) {
                 if(Regex.IsMatch(path, @"\.(gif|jpg|png)$")) {
                     LinkStyle(imagesDir, path);
                     LinkStyle(samplesImagesDir, path);
diff --git a/AjaxControlToolkit.SampleSite/HtmlEditorExtender/HtmlEditorExtender.aspx b/AjaxControlToolkit.SampleSite/HtmlEditorExtender/HtmlEditorExtender.aspx
index d7aaed48d..392a3006c 100644
--- a/AjaxControlToolkit.SampleSite/HtmlEditorExtender/HtmlEditorExtender.aspx
+++ b/AjaxControlToolkit.SampleSite/HtmlEditorExtender/HtmlEditorExtender.aspx
@@ -150,7 +150,7 @@
             </p>
             <br />
             <p>
-                To use AjaxControlToolkit Sanitizer, install the AjaxControlToolkit.HtmlEditor.Sanitizer NuGet package.
+                To use the Toolkit Sanitizer, install the AjaxControlToolkit.HtmlEditor.Sanitizer NuGet package.
             </p>
             <br />
             <p>
diff --git a/AjaxControlToolkit.SampleSite/Twitter/Twitter.aspx b/AjaxControlToolkit.SampleSite/Twitter/Twitter.aspx
index 1571b1e6e..6891351e6 100644
--- a/AjaxControlToolkit.SampleSite/Twitter/Twitter.aspx
+++ b/AjaxControlToolkit.SampleSite/Twitter/Twitter.aspx
@@ -143,7 +143,7 @@
         <Header><span id="twitterAPI">Twitter API</span></Header>
         <Content>
             <p>
-                AjaxControlToolkit Twitter Control using Twitter API v1.1. The Twitter API v1.1 requiring us to provide API keys which are <b>Consumer Key</b>, <b>Consumer Secret</b>, <b>Access token</b> and <b>Access token secret</b>. 
+                The Toolkit Twitter Control uses Twitter API v1.1. The Twitter API v1.1 which is required to provide API keys which are <b>Consumer Key</b>, <b>Consumer Secret</b>, <b>Access token</b> and <b>Access token secret</b>. 
                 You will need to create those keys through <a href="https://dev.twitter.com/apps/new">https://dev.twitter.com/apps/new</a> and supply those information into 
                 your web config under <b>appSettings</b> tag. It should looks like this:
             </p>
diff --git a/AjaxControlToolkit.SampleSite/Web.config b/AjaxControlToolkit.SampleSite/Web.config
index 813cd7921..7474692df 100644
--- a/AjaxControlToolkit.SampleSite/Web.config
+++ b/AjaxControlToolkit.SampleSite/Web.config
@@ -7,7 +7,7 @@
     <configSections>
         <section name="ajaxControlToolkit" type="AjaxControlToolkit.AjaxControlToolkitConfigSection, AjaxControlToolkit" />                
     </configSections>
-    <ajaxControlToolkit useStaticResources="true" renderStyleLinks="false" htmlSanitizer="AjaxControlToolkit.HtmlEditor.Sanitizer.DefaultHtmlSanitizer, AjaxControlToolkit.HtmlEditor.Sanitizer"/>
+    <ajaxControlToolkit useStaticResources="true" renderStyleLinks="false" htmlSanitizer="AjaxControlToolkit.HtmlEditor.Sanitizer.DefaultHtmlSanitizer, AjaxControlToolkit.HtmlEditor.Sanitizer" />
     <system.web>
         <compilation debug="true" targetFramework="4.0">
             <assemblies>
@@ -21,14 +21,14 @@
         </siteMap>
         <pages>
             <controls>
-                <add assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" tagPrefix="ajaxToolkit"/>
-                <add namespace="InfoBlock" tagPrefix="samples"/>
+                <add assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" tagPrefix="ajaxToolkit" />
+                <add namespace="InfoBlock" tagPrefix="samples" />
             </controls>
         </pages>
     </system.web>
     <system.webServer>
         <handlers>
-            <add name="AjaxFileUploadHandler" verb="*" path="AjaxFileUploadHandler.axd" type="AjaxControlToolkit.AjaxFileUploadHandler, AjaxControlToolkit"/>
+            <add name="AjaxFileUploadHandler" verb="*" path="AjaxFileUploadHandler.axd" type="AjaxControlToolkit.AjaxFileUploadHandler, AjaxControlToolkit" />
         </handlers>
     </system.webServer>
     <runtime>
diff --git a/AjaxControlToolkit.SampleSite/bin/HtmlAgilityPack.dll.refresh b/AjaxControlToolkit.SampleSite/bin/HtmlAgilityPack.dll.refresh
new file mode 100644
index 000000000..c4117599e
--- /dev/null
+++ b/AjaxControlToolkit.SampleSite/bin/HtmlAgilityPack.dll.refresh
@@ -0,0 +1 @@
+..\packages\HtmlAgilityPack.1.4.9\lib\Net40\HtmlAgilityPack.dll
\ No newline at end of file
diff --git a/AjaxControlToolkit.SampleSite/packages.config b/AjaxControlToolkit.SampleSite/packages.config
index a569e0ce9..58f219266 100644
--- a/AjaxControlToolkit.SampleSite/packages.config
+++ b/AjaxControlToolkit.SampleSite/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Antlr" version="3.4.1.9004" targetFramework="net40" />
+  <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net40" />
   <package id="Microsoft.AspNet.ScriptManager.MSAjax" version="5.0.0" targetFramework="net40" />
   <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net40" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
diff --git a/AjaxControlToolkit.StaticResources/Properties/AssemblyInfo.cs b/AjaxControlToolkit.StaticResources/Properties/AssemblyInfo.cs
index f4a984821..26682648d 100644
--- a/AjaxControlToolkit.StaticResources/Properties/AssemblyInfo.cs
+++ b/AjaxControlToolkit.StaticResources/Properties/AssemblyInfo.cs
@@ -2,6 +2,6 @@
 using System.Runtime.InteropServices;
 using System.Web;
 
-[assembly: AssemblyTitle("Ajax Control Toolkit Static Resources")]
+[assembly: AssemblyTitle("ASP.NET AJAX Control Toolkit Static Resources")]
 [assembly: ComVisible(false)]
 [assembly: PreApplicationStartMethod(typeof(AjaxControlToolkit.StaticResources.PreApplicationStartCode), "Start")]
\ No newline at end of file
diff --git a/AjaxControlToolkit/AjaxControlToolkit.csproj b/AjaxControlToolkit/AjaxControlToolkit.csproj
index d15da2a55..cd2ff5579 100644
--- a/AjaxControlToolkit/AjaxControlToolkit.csproj
+++ b/AjaxControlToolkit/AjaxControlToolkit.csproj
@@ -389,6 +389,14 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Styles\README.txt" />
+    <EmbeddedResource Include="ToolboxIcons\AjaxFileUpload.ico" />
+    <EmbeddedResource Include="ToolboxIcons\AreaChart.ico" />
+    <EmbeddedResource Include="ToolboxIcons\AsyncFileUpload.ico" />
+    <EmbeddedResource Include="ToolboxIcons\BarChart.ico" />
+    <EmbeddedResource Include="ToolboxIcons\BubbleChart.ico" />
+    <EmbeddedResource Include="ToolboxIcons\LineChart.ico" />
+    <EmbeddedResource Include="ToolboxIcons\PieChart.ico" />
+    <EmbeddedResource Include="ToolboxIcons\Seadragon.ico" />
     <EmbeddedResource Include="Images\AsyncFileUpload.Button.png" />
     <EmbeddedResource Include="Images\BalloonPopup.CloudSprite.gif" />
     <EmbeddedResource Include="Images\BalloonPopup.CloudSprite.png" />
@@ -1354,7 +1362,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>$(OutDir)LinkStaticResources</PostBuildEvent>
+    <PostBuildEvent>$(TargetDir)LinkStaticResources</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/AjaxControlToolkit/AjaxFileUpload/AjaxFileUpload.cs b/AjaxControlToolkit/AjaxFileUpload/AjaxFileUpload.cs
index 447a672f8..4d3746cf0 100644
--- a/AjaxControlToolkit/AjaxFileUpload/AjaxFileUpload.cs
+++ b/AjaxControlToolkit/AjaxFileUpload/AjaxFileUpload.cs
@@ -8,6 +8,7 @@
 using System.Web.Script.Serialization;
 using System.Web.UI;
 using System.Web.UI.HtmlControls;
+using System.Drawing;
 
 namespace AjaxControlToolkit {
 
@@ -15,6 +16,7 @@ namespace AjaxControlToolkit {
     [RequiredScript(typeof(CommonToolkitScripts))]
     [ClientCssResource(Constants.AjaxFileUploadName)]
     [ClientScriptResource("Sys.Extended.UI.AjaxFileUpload.Control", Constants.AjaxFileUploadName)]
+    [ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.AjaxFileUploadName + Constants.IconPostfix)]
     public class AjaxFileUpload : ScriptControlBase {
         internal const string ContextKey = "{DA8BEDC8-B952-4d5d-8CC2-59FE922E2923}";
         const string TemporaryUploadFolderName = "_AjaxFileUpload";
diff --git a/AjaxControlToolkit/AreaChart/AreaChart.cs b/AjaxControlToolkit/AreaChart/AreaChart.cs
index c5e7ab087..bacddfa53 100644
--- a/AjaxControlToolkit/AreaChart/AreaChart.cs
+++ b/AjaxControlToolkit/AreaChart/AreaChart.cs
@@ -5,11 +5,13 @@
 using System.Drawing.Design;
 using System.Linq;
 using System.Web.UI;
+using System.Drawing;
 
 namespace AjaxControlToolkit {
 
     [ClientCssResource(Constants.AreaChartName)]
     [ClientScriptResource("Sys.Extended.UI.AreaChart", Constants.AreaChartName)]
+    [ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.AreaChartName + Constants.IconPostfix)]
     public class AreaChart : ChartBase {
         List<AreaChartSeries> _series = new List<AreaChartSeries>();
 
diff --git a/AjaxControlToolkit/AsyncFileUpload/AsyncFileUpload.cs b/AjaxControlToolkit/AsyncFileUpload/AsyncFileUpload.cs
index 36a0e9629..67a299366 100644
--- a/AjaxControlToolkit/AsyncFileUpload/AsyncFileUpload.cs
+++ b/AjaxControlToolkit/AsyncFileUpload/AsyncFileUpload.cs
@@ -15,6 +15,7 @@ namespace AjaxControlToolkit {
     [Designer(typeof(AsyncFileUploadDesigner))]
     [RequiredScript(typeof(CommonToolkitScripts))]
     [ClientScriptResource("Sys.Extended.UI.AsyncFileUpload", AjaxControlToolkit.Constants.AsyncFileUploadName)]
+    [ToolboxBitmap(typeof(ToolboxIcons.Accessor), AjaxControlToolkit.Constants.AsyncFileUploadName + AjaxControlToolkit.Constants.IconPostfix)]
     public class AsyncFileUpload : ScriptControlBase {
 
         public static class Constants {
diff --git a/AjaxControlToolkit/BalloonPopup/BalloonPopupExtender.cs b/AjaxControlToolkit/BalloonPopup/BalloonPopupExtender.cs
index 17459fece..146e66e4f 100644
--- a/AjaxControlToolkit/BalloonPopup/BalloonPopupExtender.cs
+++ b/AjaxControlToolkit/BalloonPopup/BalloonPopupExtender.cs
@@ -15,7 +15,7 @@ namespace AjaxControlToolkit {
     [ClientCssResource(Constants.BalloonPopupName + ".Cloud")]
     [ClientCssResource(Constants.BalloonPopupName + ".Rectangle")]
     [Designer(typeof(BalloonPopupExtenderDesigner))]
-    [ToolboxBitmap(typeof(BalloonPopupExtender), Constants.BalloonPopupName + Constants.IconPostfix)]
+    [ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.BalloonPopupName + Constants.IconPostfix)]
     public class BalloonPopupExtender : DynamicPopulateExtenderControlBase {
         Animation _onHide;
         Animation _onShow;
diff --git a/AjaxControlToolkit/BarChart/BarChart.cs b/AjaxControlToolkit/BarChart/BarChart.cs
index da90215bd..6670b1975 100644
--- a/AjaxControlToolkit/BarChart/BarChart.cs
+++ b/AjaxControlToolkit/BarChart/BarChart.cs
@@ -5,11 +5,13 @@
 using System.Web.UI;
 using System.Drawing.Design;
 using AjaxControlToolkit.Design;
+using System.Drawing;
 
 namespace AjaxControlToolkit {
 
     [ClientCssResource(Constants.BarChartName)]
     [ClientScriptResource("Sys.Extended.UI.BarChart", Constants.BarChartName)]
+    [ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.BarChartName + Constants.IconPostfix)]
     public class BarChart : ChartBase {
         List<BarChartSeries> _series = new List<BarChartSeries>();
 
diff --git a/AjaxControlToolkit/BubbleChart/BubbleChart.cs b/AjaxControlToolkit/BubbleChart/BubbleChart.cs
index c99588dea..f67aad899 100644
--- a/AjaxControlToolkit/BubbleChart/BubbleChart.cs
+++ b/AjaxControlToolkit/BubbleChart/BubbleChart.cs
@@ -7,11 +7,13 @@
 using System.Text;
 using System.Web.UI;
 using System.Web.UI.HtmlControls;
+using System.Drawing;
 
 namespace AjaxControlToolkit {
 
     [ClientCssResource(Constants.BubbleChartName)]
     [ClientScriptResource("Sys.Extended.UI.BubbleChart", Constants.BubbleChartName)]
+    [ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.BubbleChartName + Constants.IconPostfix)]
     public class BubbleChart : ChartBase {
         List<BubbleChartValue> _values = new List<BubbleChartValue>();
 
diff --git a/AjaxControlToolkit/ColorPicker/ColorPickerExtender.cs b/AjaxControlToolkit/ColorPicker/ColorPickerExtender.cs
index 3119cf374..13271aaad 100644
--- a/AjaxControlToolkit/ColorPicker/ColorPickerExtender.cs
+++ b/AjaxControlToolkit/ColorPicker/ColorPickerExtender.cs
@@ -1,5 +1,4 @@
 using AjaxControlToolkit.Design;
-using AjaxControlToolkit.ToolboxIcons;
 using System;
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
@@ -15,7 +14,7 @@ namespace AjaxControlToolkit {
     [TargetControlType(typeof(TextBox))]
     [ClientCssResource(Constants.ColorPickerName)]
     [ClientScriptResource("Sys.Extended.UI.ColorPickerBehavior", Constants.ColorPickerName)]
-    [ToolboxBitmap(typeof(Accessor), Constants.ColorPickerName + Constants.IconPostfix)]
+    [ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.ColorPickerName + Constants.IconPostfix)]
     [Designer(typeof(ColorPickerExtenderDesigner))]
     public class ColorPickerExtender : ExtenderControlBase {
         [DefaultValue(true)]
diff --git a/AjaxControlToolkit/ComboBox/ComboBox.cs b/AjaxControlToolkit/ComboBox/ComboBox.cs
index 5793103dc..6ef0a05d4 100644
--- a/AjaxControlToolkit/ComboBox/ComboBox.cs
+++ b/AjaxControlToolkit/ComboBox/ComboBox.cs
@@ -34,7 +34,7 @@ namespace AjaxControlToolkit {
     [RequiredScript(typeof(ScriptControlBase), 2)]
     [RequiredScript(typeof(PopupExtender), 3)]
     [RequiredScript(typeof(CommonToolkitScripts), 4)]
-    [ToolboxBitmap(typeof(ComboBox), Constants.ComboBoxName + Constants.IconPostfix)]
+    [ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.ComboBoxName + Constants.IconPostfix)]
     public class ComboBox : ListControl, IScriptControl, IPostBackDataHandler, INamingContainer, IControlResolver {
         TextBox _textBoxControl;
         ScriptManager _scriptManager;
diff --git a/AjaxControlToolkit/ExtenderBase/Constants.cs b/AjaxControlToolkit/ExtenderBase/Constants.cs
index a1a09471e..82cbad2c2 100644
--- a/AjaxControlToolkit/ExtenderBase/Constants.cs
+++ b/AjaxControlToolkit/ExtenderBase/Constants.cs
@@ -1,7 +1,11 @@
 namespace AjaxControlToolkit {
-    internal static class Constants {
+
+    public static class Constants {
+
+        public const string
+            CdnPrefix = "http://ajax.aspnetcdn.com/ajax/act/15.1.1/";
+
         internal const string
-            CdnPrefix = "http://ajax.aspnetcdn.com/ajax/act/15_1/",
             CdnScriptDebugPrefix = CdnPrefix + "Scripts/AjaxControlToolkit/Debug/",
             CdnScriptReleasePrefix = CdnPrefix + "Scripts/AjaxControlToolkit/Release/",
 
@@ -350,4 +354,5 @@ internal const string
             ValidatorCalloutAlertSmallImage = ValidatorCalloutName + ".Alert-Small.gif",
             ValidatorCalloutCloseImage = ValidatorCalloutName + ".Close.gif";
     }
+
 }
diff --git a/AjaxControlToolkit/Gravatar/Gravatar.cs b/AjaxControlToolkit/Gravatar/Gravatar.cs
index 877afc4c0..4eaa676c9 100644
--- a/AjaxControlToolkit/Gravatar/Gravatar.cs
+++ b/AjaxControlToolkit/Gravatar/Gravatar.cs
@@ -16,7 +16,7 @@ namespace AjaxControlToolkit {
     [ToolboxData("<{0}:Gravatar runat=\"server\"></{0}:Gravatar>")]
     [RequiredScript(typeof(ScriptControlBase), 1)]
     [RequiredScript(typeof(CommonToolkitScripts), 2)]
-    [ToolboxBitmap(typeof(Gravatar), Constants.GravatarName + Constants.IconPostfix)]
+    [ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.GravatarName + Constants.IconPostfix)]
     public class Gravatar : WebControl {
         
         public Gravatar() : base(HtmlTextWriterTag.Img) {
diff --git a/AjaxControlToolkit/HtmlEditor/Editor.cs b/AjaxControlToolkit/HtmlEditor/Editor.cs
index 2999c5f08..0a2f618d6 100644
--- a/AjaxControlToolkit/HtmlEditor/Editor.cs
+++ b/AjaxControlToolkit/HtmlEditor/Editor.cs
@@ -86,7 +86,7 @@ namespace AjaxControlToolkit.HtmlEditor {
     [RequiredScript(typeof(AjaxControlToolkit.HtmlEditor.Popups.RegisteredField))]
 
     [ClientScriptResource("Sys.Extended.UI.HtmlEditor.Editor", Constants.HtmlEditorEditorName)]
-    [ToolboxBitmap(typeof(AjaxControlToolkit.HtmlEditor.Editor), Constants.HtmlEditorName + Constants.IconPostfix)]
+    [ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.HtmlEditorName + Constants.IconPostfix)]
 
     public class Editor : ScriptControlBase {
         internal Toolbar _bottomToolbar;
diff --git a/AjaxControlToolkit/HtmlEditorExtender/HtmlEditorExtender.cs b/AjaxControlToolkit/HtmlEditorExtender/HtmlEditorExtender.cs
index 4003a2cf8..dde6cbdd7 100644
--- a/AjaxControlToolkit/HtmlEditorExtender/HtmlEditorExtender.cs
+++ b/AjaxControlToolkit/HtmlEditorExtender/HtmlEditorExtender.cs
@@ -21,7 +21,7 @@ namespace AjaxControlToolkit {
     [RequiredScript(typeof(ColorPickerExtender), 1)]
     [ClientScriptResource("Sys.Extended.UI.HtmlEditorExtenderBehavior", Constants.HtmlEditorExtenderName)]
     [ClientCssResource(Constants.HtmlEditorExtenderName)]
-    [ToolboxBitmap(typeof(HtmlEditorExtender), Constants.HtmlEditorExtenderName + Constants.IconPostfix)]
+    [ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.HtmlEditorExtenderName + Constants.IconPostfix)]
     public class HtmlEditorExtender : ExtenderControlBase {
         internal const int ButtonWidthDef = 23;
         internal const int ButtonHeightDef = 21;
diff --git a/AjaxControlToolkit/LineChart/LineChart.cs b/AjaxControlToolkit/LineChart/LineChart.cs
index b6dd8dfbc..0ab6e3c41 100644
--- a/AjaxControlToolkit/LineChart/LineChart.cs
+++ b/AjaxControlToolkit/LineChart/LineChart.cs
@@ -7,11 +7,13 @@
 using System.Text;
 using System.Web.UI;
 using System.Web.UI.HtmlControls;
+using System.Drawing;
 
 namespace AjaxControlToolkit {
 
     [ClientCssResource(Constants.LineChartName)]
     [ClientScriptResource("Sys.Extended.UI.LineChart", Constants.LineChartName)]
+    [ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.LineChartName + Constants.IconPostfix)]
     public class LineChart : ChartBase {
         List<LineChartSeries> _series = new List<LineChartSeries>();
 
diff --git a/AjaxControlToolkit/PieChart/PieChart.cs b/AjaxControlToolkit/PieChart/PieChart.cs
index 0240b9ff0..a2cf55eed 100644
--- a/AjaxControlToolkit/PieChart/PieChart.cs
+++ b/AjaxControlToolkit/PieChart/PieChart.cs
@@ -5,11 +5,13 @@
 using System.Web.UI;
 using System.Drawing.Design;
 using AjaxControlToolkit.Design;
+using System.Drawing;
 
 namespace AjaxControlToolkit {
 
     [ClientCssResource(Constants.PieChartName)]
     [ClientScriptResource("Sys.Extended.UI.PieChart", Constants.PieChartName)]
+    [ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.PieChartName + Constants.IconPostfix)]
     public class PieChart : ChartBase {
         List<PieChartValue> _values = new List<PieChartValue>();
 
diff --git a/AjaxControlToolkit/Properties/AssemblyInfo.cs b/AjaxControlToolkit/Properties/AssemblyInfo.cs
index d814491c1..12a4115d7 100644
--- a/AjaxControlToolkit/Properties/AssemblyInfo.cs
+++ b/AjaxControlToolkit/Properties/AssemblyInfo.cs
@@ -6,12 +6,11 @@
 using System.Security;
 using System.Web.UI;
 
-[assembly: AssemblyTitle("Ajax Control Toolkit")]
+[assembly: AssemblyTitle("ASP.NET AJAX Control Toolkit")]
 
 [assembly: AllowPartiallyTrustedCallers]
 [assembly: ComVisible(false)]
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
-[assembly: InternalsVisibleTo("AjaxControlToolkit.StaticResources, PublicKey=00240000048000009400000006020000002400005253413100040000010001008f2bd4c3c90ec88546137e913600741fdddd929f05d032d52fd1606b88609899b3f737a0e6881c5f3bba0a18fc60528790f652e64a418687fb538c3c86d325866d6db0721e16df48b1b7c6ebb07bc883d4a119e85eace1110842f59712385ebe6ae2a0229e205ef8e284cec0a217ce1eecbd63c1bf47478555fc9e36af1ef1b3")]
 
 [assembly: WebResource(Constants.AccordionName + Constants.DebugJsPostfix, "text/javascript", CdnPath = Constants.CdnScriptDebugPrefix + Constants.AccordionName + Constants.DebugJsPostfix, CdnSupportsSecureConnection = true)]
 [assembly: WebResource(Constants.AccordionName + Constants.JsPostfix, "text/javascript", CdnPath = Constants.CdnScriptReleasePrefix + Constants.AccordionName + Constants.JsPostfix, CdnSupportsSecureConnection = true)]
diff --git a/AjaxControlToolkit/Seadragon/Seadragon.cs b/AjaxControlToolkit/Seadragon/Seadragon.cs
index 8f71f5015..7c4e90ff0 100644
--- a/AjaxControlToolkit/Seadragon/Seadragon.cs
+++ b/AjaxControlToolkit/Seadragon/Seadragon.cs
@@ -4,11 +4,13 @@
 using System.Drawing.Design;
 using System.Collections;
 using System;
+using System.Drawing;
 
 namespace AjaxControlToolkit {
 
     [ClientScriptResource("Sys.Extended.UI.Seadragon.Viewer", Constants.SeadragonName)]
     [ToolboxData("<{0}:Seadragon runat=server></{0}:Seadragon>")]
+    [ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.SeadragonName + Constants.IconPostfix)]
     public class Seadragon : ScriptControlBase {
         List<SeadragonControl> _controls;
         List<SeadragonOverlay> _overlays;
diff --git a/AjaxControlToolkit/Tabs/TabContainer.cs b/AjaxControlToolkit/Tabs/TabContainer.cs
index 73a1efdae..59e7e3f77 100644
--- a/AjaxControlToolkit/Tabs/TabContainer.cs
+++ b/AjaxControlToolkit/Tabs/TabContainer.cs
@@ -18,7 +18,7 @@ namespace AjaxControlToolkit {
     [RequiredScript(typeof(CommonToolkitScripts))]
     [ClientCssResource(Constants.TabsName)]
     [ClientScriptResource("Sys.Extended.UI.TabContainer", Constants.TabsName)]
-    [ToolboxBitmap(typeof(TabContainer), Constants.TabsName + Constants.IconPostfix)]
+    [ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.TabsName + Constants.IconPostfix)]
     public class TabContainer : ScriptControlBase, IPostBackEventHandler {
         static readonly object EventActiveTabChanged = new object();
 
diff --git a/AjaxControlToolkit/ToolboxIcons/Accordion.ico b/AjaxControlToolkit/ToolboxIcons/Accordion.ico
index cc6da4c88..84c788e13 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/Accordion.ico and b/AjaxControlToolkit/ToolboxIcons/Accordion.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/AjaxFileUpload.ico b/AjaxControlToolkit/ToolboxIcons/AjaxFileUpload.ico
new file mode 100644
index 000000000..7dbefa513
Binary files /dev/null and b/AjaxControlToolkit/ToolboxIcons/AjaxFileUpload.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/AlwaysVisibleControl.ico b/AjaxControlToolkit/ToolboxIcons/AlwaysVisibleControl.ico
index d21449c82..515adc331 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/AlwaysVisibleControl.ico and b/AjaxControlToolkit/ToolboxIcons/AlwaysVisibleControl.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/Animation.ico b/AjaxControlToolkit/ToolboxIcons/Animation.ico
index b9878b17c..58cb67d07 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/Animation.ico and b/AjaxControlToolkit/ToolboxIcons/Animation.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/AreaChart.ico b/AjaxControlToolkit/ToolboxIcons/AreaChart.ico
new file mode 100644
index 000000000..d0c50f91c
Binary files /dev/null and b/AjaxControlToolkit/ToolboxIcons/AreaChart.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/AsyncFileUpload.ico b/AjaxControlToolkit/ToolboxIcons/AsyncFileUpload.ico
new file mode 100644
index 000000000..8e4e76e15
Binary files /dev/null and b/AjaxControlToolkit/ToolboxIcons/AsyncFileUpload.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/AutoComplete.ico b/AjaxControlToolkit/ToolboxIcons/AutoComplete.ico
index 1c4cc66b3..5c93857e0 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/AutoComplete.ico and b/AjaxControlToolkit/ToolboxIcons/AutoComplete.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/BalloonPopup.ico b/AjaxControlToolkit/ToolboxIcons/BalloonPopup.ico
index 419ef5da4..6ce820323 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/BalloonPopup.ico and b/AjaxControlToolkit/ToolboxIcons/BalloonPopup.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/BarChart.ico b/AjaxControlToolkit/ToolboxIcons/BarChart.ico
new file mode 100644
index 000000000..38bd4c597
Binary files /dev/null and b/AjaxControlToolkit/ToolboxIcons/BarChart.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/BubbleChart.ico b/AjaxControlToolkit/ToolboxIcons/BubbleChart.ico
new file mode 100644
index 000000000..124cb4f6c
Binary files /dev/null and b/AjaxControlToolkit/ToolboxIcons/BubbleChart.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/Calendar.ico b/AjaxControlToolkit/ToolboxIcons/Calendar.ico
index 43d6829c1..64c2f9cf8 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/Calendar.ico and b/AjaxControlToolkit/ToolboxIcons/Calendar.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/CascadingDropDown.ico b/AjaxControlToolkit/ToolboxIcons/CascadingDropDown.ico
index 50d4f081f..0d5fc45ed 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/CascadingDropDown.ico and b/AjaxControlToolkit/ToolboxIcons/CascadingDropDown.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/CollapsiblePanel.ico b/AjaxControlToolkit/ToolboxIcons/CollapsiblePanel.ico
index 2afe15cd8..89b35dce2 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/CollapsiblePanel.ico and b/AjaxControlToolkit/ToolboxIcons/CollapsiblePanel.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/ColorPicker.ico b/AjaxControlToolkit/ToolboxIcons/ColorPicker.ico
index fa8474c6b..b5bb7d713 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/ColorPicker.ico and b/AjaxControlToolkit/ToolboxIcons/ColorPicker.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/ComboBox.ico b/AjaxControlToolkit/ToolboxIcons/ComboBox.ico
index 532f118cc..822956edf 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/ComboBox.ico and b/AjaxControlToolkit/ToolboxIcons/ComboBox.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/ConfirmButton.ico b/AjaxControlToolkit/ToolboxIcons/ConfirmButton.ico
index 7e54529e6..2f4620b8b 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/ConfirmButton.ico and b/AjaxControlToolkit/ToolboxIcons/ConfirmButton.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/DragPanel.ico b/AjaxControlToolkit/ToolboxIcons/DragPanel.ico
index cb4cbd003..dd7d63e50 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/DragPanel.ico and b/AjaxControlToolkit/ToolboxIcons/DragPanel.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/DropDown.ico b/AjaxControlToolkit/ToolboxIcons/DropDown.ico
index 6364095e5..90b7130c9 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/DropDown.ico and b/AjaxControlToolkit/ToolboxIcons/DropDown.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/DropShadow.ico b/AjaxControlToolkit/ToolboxIcons/DropShadow.ico
index b22e3f02b..99461bd26 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/DropShadow.ico and b/AjaxControlToolkit/ToolboxIcons/DropShadow.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/DynamicPopulate.ico b/AjaxControlToolkit/ToolboxIcons/DynamicPopulate.ico
index dd82d7d64..4237ff4f4 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/DynamicPopulate.ico and b/AjaxControlToolkit/ToolboxIcons/DynamicPopulate.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/FilteredTextBox.ico b/AjaxControlToolkit/ToolboxIcons/FilteredTextBox.ico
index 8b03142af..d97890f32 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/FilteredTextBox.ico and b/AjaxControlToolkit/ToolboxIcons/FilteredTextBox.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/Gravatar.ico b/AjaxControlToolkit/ToolboxIcons/Gravatar.ico
index 65daf1d06..cd1330898 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/Gravatar.ico and b/AjaxControlToolkit/ToolboxIcons/Gravatar.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/HoverMenu.ico b/AjaxControlToolkit/ToolboxIcons/HoverMenu.ico
index 3d9ef3dda..e4713ce8b 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/HoverMenu.ico and b/AjaxControlToolkit/ToolboxIcons/HoverMenu.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/HtmlEditor.ico b/AjaxControlToolkit/ToolboxIcons/HtmlEditor.ico
index a56ff6acc..ef247f4df 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/HtmlEditor.ico and b/AjaxControlToolkit/ToolboxIcons/HtmlEditor.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/HtmlEditorExtender.ico b/AjaxControlToolkit/ToolboxIcons/HtmlEditorExtender.ico
index b7cfb3a64..a2b8736b4 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/HtmlEditorExtender.ico and b/AjaxControlToolkit/ToolboxIcons/HtmlEditorExtender.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/LineChart.ico b/AjaxControlToolkit/ToolboxIcons/LineChart.ico
new file mode 100644
index 000000000..c2e9ac017
Binary files /dev/null and b/AjaxControlToolkit/ToolboxIcons/LineChart.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/ListSearch.ico b/AjaxControlToolkit/ToolboxIcons/ListSearch.ico
index 08f806ac7..c2f34518a 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/ListSearch.ico and b/AjaxControlToolkit/ToolboxIcons/ListSearch.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/MaskedEdit.ico b/AjaxControlToolkit/ToolboxIcons/MaskedEdit.ico
index 5648bcaa3..2df778d3d 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/MaskedEdit.ico and b/AjaxControlToolkit/ToolboxIcons/MaskedEdit.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/ModalPopup.ico b/AjaxControlToolkit/ToolboxIcons/ModalPopup.ico
index ff7e558f1..5293933cf 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/ModalPopup.ico and b/AjaxControlToolkit/ToolboxIcons/ModalPopup.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/MultiHandleSlider.ico b/AjaxControlToolkit/ToolboxIcons/MultiHandleSlider.ico
index 350f287ef..9e7429f00 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/MultiHandleSlider.ico and b/AjaxControlToolkit/ToolboxIcons/MultiHandleSlider.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/MutuallyExclusiveCheckBox.ico b/AjaxControlToolkit/ToolboxIcons/MutuallyExclusiveCheckBox.ico
index 0508bfe9c..63f62dc84 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/MutuallyExclusiveCheckBox.ico and b/AjaxControlToolkit/ToolboxIcons/MutuallyExclusiveCheckBox.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/NoBot.ico b/AjaxControlToolkit/ToolboxIcons/NoBot.ico
index 67daf3bf6..86b5cc9a0 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/NoBot.ico and b/AjaxControlToolkit/ToolboxIcons/NoBot.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/NumericUpDown.ico b/AjaxControlToolkit/ToolboxIcons/NumericUpDown.ico
index b525b6dab..a049b1d59 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/NumericUpDown.ico and b/AjaxControlToolkit/ToolboxIcons/NumericUpDown.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/PagingBulletedList.ico b/AjaxControlToolkit/ToolboxIcons/PagingBulletedList.ico
index 83e45d81c..bf9fff8db 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/PagingBulletedList.ico and b/AjaxControlToolkit/ToolboxIcons/PagingBulletedList.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/PasswordStrength.ico b/AjaxControlToolkit/ToolboxIcons/PasswordStrength.ico
index 5d576cc88..c97e4052b 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/PasswordStrength.ico and b/AjaxControlToolkit/ToolboxIcons/PasswordStrength.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/PieChart.ico b/AjaxControlToolkit/ToolboxIcons/PieChart.ico
new file mode 100644
index 000000000..1bb4105c1
Binary files /dev/null and b/AjaxControlToolkit/ToolboxIcons/PieChart.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/PopupControl.ico b/AjaxControlToolkit/ToolboxIcons/PopupControl.ico
index 8e9a5583f..c68a6fcf6 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/PopupControl.ico and b/AjaxControlToolkit/ToolboxIcons/PopupControl.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/Rating.ico b/AjaxControlToolkit/ToolboxIcons/Rating.ico
index 67f9b0959..e51f5a7f5 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/Rating.ico and b/AjaxControlToolkit/ToolboxIcons/Rating.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/ReorderList.ico b/AjaxControlToolkit/ToolboxIcons/ReorderList.ico
index 38e7e84e3..287513132 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/ReorderList.ico and b/AjaxControlToolkit/ToolboxIcons/ReorderList.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/ResizableControl.ico b/AjaxControlToolkit/ToolboxIcons/ResizableControl.ico
index 33ad93ddc..9a70df176 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/ResizableControl.ico and b/AjaxControlToolkit/ToolboxIcons/ResizableControl.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/RoundedCorners.ico b/AjaxControlToolkit/ToolboxIcons/RoundedCorners.ico
index 420feed27..c1d65f170 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/RoundedCorners.ico and b/AjaxControlToolkit/ToolboxIcons/RoundedCorners.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/Seadragon.ico b/AjaxControlToolkit/ToolboxIcons/Seadragon.ico
new file mode 100644
index 000000000..48f83442f
Binary files /dev/null and b/AjaxControlToolkit/ToolboxIcons/Seadragon.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/SlideShow.ico b/AjaxControlToolkit/ToolboxIcons/SlideShow.ico
index 8dde47286..5ea3460fd 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/SlideShow.ico and b/AjaxControlToolkit/ToolboxIcons/SlideShow.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/Slider.ico b/AjaxControlToolkit/ToolboxIcons/Slider.ico
index 30158508b..55e8765b3 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/Slider.ico and b/AjaxControlToolkit/ToolboxIcons/Slider.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/Tabs.ico b/AjaxControlToolkit/ToolboxIcons/Tabs.ico
index 1aedac8ac..d02208aaf 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/Tabs.ico and b/AjaxControlToolkit/ToolboxIcons/Tabs.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/TextboxWatermark.ico b/AjaxControlToolkit/ToolboxIcons/TextboxWatermark.ico
index 096a53628..c832f03f0 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/TextboxWatermark.ico and b/AjaxControlToolkit/ToolboxIcons/TextboxWatermark.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/ToggleButton.ico b/AjaxControlToolkit/ToolboxIcons/ToggleButton.ico
index 2d91fa9ed..8784785a1 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/ToggleButton.ico and b/AjaxControlToolkit/ToolboxIcons/ToggleButton.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/Twitter.ico b/AjaxControlToolkit/ToolboxIcons/Twitter.ico
index 41bea1854..6549ddefc 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/Twitter.ico and b/AjaxControlToolkit/ToolboxIcons/Twitter.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/UpdatePanelAnimation.ico b/AjaxControlToolkit/ToolboxIcons/UpdatePanelAnimation.ico
index ed5d07d2d..d131cecba 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/UpdatePanelAnimation.ico and b/AjaxControlToolkit/ToolboxIcons/UpdatePanelAnimation.ico differ
diff --git a/AjaxControlToolkit/ToolboxIcons/ValidatorCallout.ico b/AjaxControlToolkit/ToolboxIcons/ValidatorCallout.ico
index d3fb8782c..f6a2546bb 100644
Binary files a/AjaxControlToolkit/ToolboxIcons/ValidatorCallout.ico and b/AjaxControlToolkit/ToolboxIcons/ValidatorCallout.ico differ
diff --git a/AjaxControlToolkit/Twitter/Twitter.cs b/AjaxControlToolkit/Twitter/Twitter.cs
index d01594b3e..1742f1b4a 100644
--- a/AjaxControlToolkit/Twitter/Twitter.cs
+++ b/AjaxControlToolkit/Twitter/Twitter.cs
@@ -17,7 +17,7 @@ namespace AjaxControlToolkit {
     // search string.
     [ClientCssResource(Constants.TwitterName)]
     [Designer(typeof(TwitterDesigner))]
-    [System.Drawing.ToolboxBitmap(typeof(Accessor), Constants.TwitterName + Constants.IconPostfix)]
+    [System.Drawing.ToolboxBitmap(typeof(ToolboxIcons.Accessor), Constants.TwitterName + Constants.IconPostfix)]
     public class Twitter : CompositeControl {
 
         ListView _listView;
diff --git a/AjaxControlToolkitVsPackage/VSPackage.resx b/AjaxControlToolkitVsPackage/VSPackage.resx
index 5c626fb87..357cc8e43 100644
--- a/AjaxControlToolkitVsPackage/VSPackage.resx
+++ b/AjaxControlToolkitVsPackage/VSPackage.resx
@@ -118,9 +118,9 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="110" xml:space="preserve">
-    <value>AjaxControlToolkit</value>
+    <value>ASP.NET AJAX Control Toolkit</value>
   </data>
   <data name="112" xml:space="preserve">
-    <value>AjaxControlToolkit Visual Studio integration package</value>
+    <value>ASP.NET AJAX Control Toolkit Visual Studio integration package</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/AjaxControlToolkitVsPackage/source.extension.vsixmanifest b/AjaxControlToolkitVsPackage/source.extension.vsixmanifest
index 4fa59a523..2988579d6 100644
--- a/AjaxControlToolkitVsPackage/source.extension.vsixmanifest
+++ b/AjaxControlToolkitVsPackage/source.extension.vsixmanifest
@@ -6,10 +6,10 @@
     Version="1.0.0">
     
     <Identifier Id="e79bade7-6755-466f-9788-3d8243bdcc5f">
-        <Name>AjaxControlToolkit</Name>
+        <Name>ASP.NET AJAX Control Toolkit</Name>
         <Author>CodePlex Foundation</Author>
         <Version>15.1</Version>
-        <Description xml:space="preserve">AjaxControlToolkit Visual Studio integration package</Description>
+        <Description xml:space="preserve">ASP.NET AJAX Control Toolkit Visual Studio integration package</Description>
         <License>LICENSE.txt</License>
         <Locale>1033</Locale>
         <InstalledByMsi>false</InstalledByMsi>
@@ -32,14 +32,8 @@
         </SupportedProducts>
         <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.5" />    
     </Identifier>
-    
-    <References>
-        <Reference Id="Microsoft.VisualStudio.MPF" MinVersion="10.0">
-            <Name>Visual Studio MPF</Name>
-        </Reference>
-    </References>
-    
+        
     <Content>
-        <VsPackage>|%CurrentProject%;PkgdefProjectOutputGroup|</VsPackage>
+        <ToolboxControl>|%CurrentProject%;PkgdefProjectOutputGroup|</ToolboxControl>
     </Content>
 </Vsix>
diff --git a/LICENSE.txt b/LICENSE.txt
index 4f3c35a0b..beb6c4080 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014, CodePlex Foundation
+Copyright (c) 2012-2015, CodePlex Foundation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
index ae046f79d..db00ebc11 100644
--- a/SharedAssemblyInfo.cs
+++ b/SharedAssemblyInfo.cs
@@ -3,10 +3,10 @@
 
 // WARNING this file is shared accross multiple projects
 
-[assembly: AssemblyProduct("AjaxControlToolkit")]
+[assembly: AssemblyProduct("ASP.NET AJAX Control Toolkit")]
 [assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2012-2015")]
 
-[assembly: AssemblyVersion("15.1")]
-[assembly: AssemblyFileVersion("15.1")]
+[assembly: AssemblyVersion("15.1.1.0")]
+[assembly: AssemblyFileVersion("15.1.1.0")]
 
 [assembly: NeutralResourcesLanguage("en-US")]
\ No newline at end of file