diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Assets/DotNetPackageIcon.png b/src/Microsoft.DotNet.Arcade.Sdk/tools/Assets/DotNetPackageIcon.png
new file mode 100644
index 00000000000..a0f1fdbf4d5
Binary files /dev/null and b/src/Microsoft.DotNet.Arcade.Sdk/tools/Assets/DotNetPackageIcon.png differ
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props
index 5c15047d5bb..e1942b8bae3 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props
@@ -17,6 +17,9 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
 
+    <PackageIcon>Icon.png</PackageIcon>
+    <PackageIconFullPath>$(MSBuildThisFileDirectory)Assets\DotNetPackageIcon.png</PackageIconFullPath>
+
     <!-- Disable the message indicating we are using a preview SDK. That is understood and by design -->
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
 
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.targets
index 138d595478e..78b40bec288 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.targets
@@ -36,7 +36,14 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(PackageLicenseExpressionInternal)' != '' and '$(IsPackable)' == 'true'">
-    <None Include="$(MSBuildThisFileDirectory)Licenses\$(PackageLicenseExpressionInternal).txt" Pack="true" PackagePath="$(PackageLicenseFile)"/>
+    <None Include="$(MSBuildThisFileDirectory)Licenses\$(PackageLicenseExpressionInternal).txt" Pack="true" PackagePath="$(PackageLicenseFile)" Visible="false" />
+  </ItemGroup>
+
+  <!--
+    Include package icon in the package.
+  -->
+  <ItemGroup Condition="'$(PackageIcon)' != '' and '$(IsPackable)' == 'true'">
+    <None Include="$(PackageIconFullPath)" Pack="true" PackagePath="$(PackageIcon)" Visible="false" />
   </ItemGroup>
 
   <!--
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Workarounds.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Workarounds.targets
index d8a44f82703..04749819bab 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Workarounds.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Workarounds.targets
@@ -90,10 +90,20 @@
       </_TagsElement>
 
       <_IconUrlElement/>
-      <_IconUrlElement Condition="'$(PackageIconUrl)' != ''">
+      <_IconUrlElement Condition="'$(PackageIcon)' == '' and '$(PackageIconUrl)' != ''">
         <iconUrl>$(PackageIconUrl)</iconUrl>
       </_IconUrlElement>
 
+      <_IconElement/>
+      <_IconElement Condition="'$(PackageIcon)' != ''">
+        <icon>$(PackageIcon)</icon>
+      </_IconElement>
+
+      <_IconFileElement/>
+      <_IconFileElement Condition="'$(PackageIcon)' != ''">
+        <file src="$(PackageIconFullPath)" target="$(PackageIcon)" />
+      </_IconFileElement>
+
       <_ReleaseNotesElement/>
       <_ReleaseNotesElement Condition="'$(PackageReleaseNotes)' != ''">
         <releaseNotes>$(PackageReleaseNotes)</releaseNotes>
@@ -107,6 +117,7 @@
         <requireLicenseAcceptance>$(PackageRequireLicenseAcceptance)</requireLicenseAcceptance>
         $(_TagsElement)
         $(_LicenseElement)
+        $(_IconElement)
         $(_IconUrlElement)
         $(_ReleaseNotesElement)
         <projectUrl>$(PackageProjectUrl)</projectUrl>
@@ -115,10 +126,15 @@
         <serviceable>$(Serviceable)</serviceable>
         <repository type="$(RepositoryType)" url="$(RepositoryUrl)" commit="$(RepositoryCommit)" />
       </_CommonMetadataElements>
+
+      <_CommonFileElements>
+        $(_IconFileElement)
+      </_CommonFileElements>
     </PropertyGroup>
 
     <ItemGroup Condition="'$(NuspecFile)' != '' and '$(NuspecProperties)' == ''">
       <NuspecProperty Include="CommonMetadataElements=$(_CommonMetadataElements)"/>
+      <NuspecProperty Include="CommonFileElements=$(_CommonFileElements)"/>
       <NuspecProperty Include="PackageId=$(PackageId)"/>
       <NuspecProperty Include="Version=$(PackageVersion)"/>
       <NuspecProperty Include="ProjectDirectory=$(MSBuildProjectDirectory)"/>