diff --git a/build/BuildNugets.ps1 b/build/BuildNugets.ps1
index c59e7d9816..d398eb4dc6 100644
--- a/build/BuildNugets.ps1
+++ b/build/BuildNugets.ps1
@@ -8,31 +8,6 @@ $year = [System.DateTime]::Now.ToString("yyyy")
 $copyright = "Copyright $year James Willock/Mulholland Software Ltd"
 $configuration = "Release"
 
-function Update-Icon {
-  param (
-    [string]$Path
-  )
-  $Path = Resolve-Path $Path
-  [xml] $xml = Get-Content $Path
-  [string] $iconUrl = $xml.package.metadata.iconUrl;
-  if (![string]::IsNullOrWhiteSpace($iconUrl) -and [string]::IsNullOrWhiteSpace($xml.package.metadata.icon)) {
-    $nugetIconFile = "$($xml.package.metadata.id).Icon.png";
-    $nugetIconPath = Join-Path (Split-Path $Path -Parent) $nugetIconFile
-    Write-Host "Downloading icon from $iconUrl to $nugetIconPath"
-    Invoke-WebRequest $iconUrl -OutFile "$nugetIconPath"
-    $files = $xml.SelectSingleNode("/package/files")
-    $iconFile = $xml.CreateElement("file")
-    $iconFile.SetAttribute("src", "$nugetIconFile")
-    $iconFile.SetAttribute("target", "images\")
-    $files.AppendChild($iconFile) | Out-Null
-
-    $iconElement = $xml.CreateElement("icon")
-    $iconElement.InnerText = "images\$nugetIconFile"
-    $xml.package.metadata.AppendChild($iconElement) | Out-Null
-  }
-  $xml.Save($Path)
-}
-
 function Update-Versions {
   param (
     [string]$Path
@@ -58,7 +33,6 @@ function New-Nuget {
   )
 
   $NuSpecPath = Resolve-Path $NuSpecPath
-  Update-Icon "$NuSpecPath" 
   nuget pack "$NuSpecPath" -version "$Version" -Properties "Configuration=$configuration;Copyright=$copyright"
 }
 
diff --git a/build/MaterialDesign.Icon.png b/build/MaterialDesign.Icon.png
new file mode 100644
index 0000000000..6050e05cf7
Binary files /dev/null and b/build/MaterialDesign.Icon.png differ
diff --git a/src/MaterialDesignColors.Wpf/MaterialDesignColors.nuspec b/src/MaterialDesignColors.Wpf/MaterialDesignColors.nuspec
index 008e852af7..793af343d9 100644
--- a/src/MaterialDesignColors.Wpf/MaterialDesignColors.nuspec
+++ b/src/MaterialDesignColors.Wpf/MaterialDesignColors.nuspec
@@ -8,7 +8,7 @@
     <owners>James Willock</owners>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit</projectUrl>
-    <iconUrl>http://materialdesigninxaml.net/images/MD4XAML32.png</iconUrl>
+    <icon>images\MaterialDesign.Icon.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>ResourceDictionary instances containing standard Google Material Design swatches,
       for inclusion in a XAML application.</description>
@@ -23,6 +23,7 @@
     </dependencies>
   </metadata>
   <files>
+    <file src="..\..\build\MaterialDesign.Icon.png" target="images\" />
     <file src="..\..\README.md" target="docs\" />
     <file src="bin\$configuration$\net462\MaterialDesignColors.*" target="lib\net462"
       exclude="**\*.json" />
diff --git a/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.nuspec b/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.nuspec
index bdd981bb4a..59de5d8666 100644
--- a/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.nuspec
+++ b/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.nuspec
@@ -8,7 +8,7 @@
     <owners>James Willock</owners>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit</projectUrl>
-    <iconUrl>http://materialdesigninxaml.net/images/MD4XAML32.png</iconUrl>
+    <icon>images\MaterialDesign.Icon.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>ResourceDictionary instances containing Material Design templates and styles for
       WPF controls in the MahApps library.</description>
@@ -30,6 +30,7 @@
     </dependencies>
   </metadata>
   <files>
+    <file src="..\..\build\MaterialDesign.Icon.png" target="images\" />
     <file src="..\..\README.md" target="docs\" />
     <file src="bin\$configuration$\net462\MaterialDesignThemes.MahApps.*" target="lib\net462"
       exclude="**\*.json" />
diff --git a/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.nuspec b/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.nuspec
index 6dac8e637c..3a13eb86e8 100644
--- a/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.nuspec
+++ b/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.nuspec
@@ -8,7 +8,7 @@
     <owners>James Willock</owners>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit</projectUrl>
-    <iconUrl>http://materialdesigninxaml.net/images/MD4XAML32.png</iconUrl>
+    <icon>images\MaterialDesign.Icon.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>ResourceDictionary instances containing Material Design templates and styles for
       WPF controls in .NET.</description>
@@ -28,6 +28,7 @@
     </dependencies>
   </metadata>
   <files>
+    <file src="..\..\build\MaterialDesign.Icon.png" target="images\" />
     <file src="..\..\README.md" target="docs\" />
     <file src="bin\$configuration$\net462\MaterialDesignThemes.Wpf.*"
       target="lib\net462" exclude="**\*.json" />