diff --git a/source/Octopus.Cli/Commands/Deployment/DeploymentCommandBase.cs b/source/Octopus.Cli/Commands/Deployment/DeploymentCommandBase.cs
index 31e5e591af..09a3b6fe23 100644
--- a/source/Octopus.Cli/Commands/Deployment/DeploymentCommandBase.cs
+++ b/source/Octopus.Cli/Commands/Deployment/DeploymentCommandBase.cs
@@ -56,8 +56,8 @@ protected DeploymentCommandBase(
             options.Add<string>("v|variable=", "[Optional] Values for any prompted variables in the format Label:Value. For JSON values, embedded quotation marks should be escaped with a backslash. Specify this argument multiple times to add multiple variables.", ParseVariable);
             options.Add<DateTimeOffset>("deployAt=", "[Optional] Time at which deployment should start (scheduled deployment), specified as any valid DateTimeOffset format, and assuming the time zone is the current local time zone.", v => DeployAt = v);
             options.Add<DateTimeOffset>("noDeployAfter=", "[Optional] Time at which scheduled deployment should expire, specified as any valid DateTimeOffset format, and assuming the time zone is the current local time zone.", v => NoDeployAfter = v);
-            options.Add<string>("tenant=", "Create a deployment for the tenant with this name or ID; specify this argument multiple times to add multiple tenants or use `*` wildcard to deploy to all tenants who are ready for this release (according to lifecycle).", t => Tenants.Add(t));
-            options.Add<string>("tenantTag=", "Create a deployment for tenants matching this tag; specify this argument multiple times to build a query/filter with multiple tags, just like you can in the user interface.", tt => TenantTags.Add(tt));
+            options.Add<string>("tenant=", "[Optional] Create a deployment for the tenant with this name or ID; specify this argument multiple times to add multiple tenants or use `*` wildcard to deploy to all tenants who are ready for this release (according to lifecycle).", t => Tenants.Add(t));
+            options.Add<string>("tenantTag=", "[Optional] Create a deployment for tenants matching this tag; specify this argument multiple times to build a query/filter with multiple tags, just like you can in the user interface.", tt => TenantTags.Add(tt));
 
         }
 
diff --git a/source/Octopus.Cli/Octopus.Cli.csproj b/source/Octopus.Cli/Octopus.Cli.csproj
index 4af0b35ab6..d16fbad0e2 100644
--- a/source/Octopus.Cli/Octopus.Cli.csproj
+++ b/source/Octopus.Cli/Octopus.Cli.csproj
@@ -5,6 +5,10 @@
     <TargetFrameworks Condition="$([MSBuild]::IsOSUnixLike())">netstandard2.0</TargetFrameworks>
     <Authors>Octopus Deploy</Authors>
     <Copyright>Octopus Deploy Pty Ltd</Copyright>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageIcon>icon.png</PackageIcon>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/OctopusDeploy/OctopusCli</RepositoryUrl>
     <Description>Octopus Deploy is an automated release management tool for modern developers and DevOps teams.
 
       This package contains the .NET CLI library for interacting with the HTTP API in Octopus.</Description>
@@ -40,5 +44,7 @@
   <PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^net\d'))">
   	<DefineConstants>NETFRAMEWORK</DefineConstants>
   </PropertyGroup>
-
+  <ItemGroup>
+    <None Include="icon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
 </Project>
diff --git a/source/Octopus.Cli/icon.png b/source/Octopus.Cli/icon.png
new file mode 100644
index 0000000000..e3fc9adcad
Binary files /dev/null and b/source/Octopus.Cli/icon.png differ
diff --git a/source/Octopus.DotNet.Cli/Octopus.DotNet.Cli.csproj b/source/Octopus.DotNet.Cli/Octopus.DotNet.Cli.csproj
index 5024e420d3..04b94c8028 100644
--- a/source/Octopus.DotNet.Cli/Octopus.DotNet.Cli.csproj
+++ b/source/Octopus.DotNet.Cli/Octopus.DotNet.Cli.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <!-- 
-    We include all possible targets here so that no matter what framework version 
+    <!--
+    We include all possible targets here so that no matter what framework version
     the user has installed, there is an appropriate build in the tools package
     -->
     <TargetFrameworks>netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
@@ -12,14 +12,14 @@
     <PackageId>Octopus.DotNet.Cli</PackageId>
     <Authors>Octopus Deploy</Authors>
     <Copyright>Octopus Deploy Pty Ltd</Copyright>
-    <PackageIconUrl>http://i.octopusdeploy.com/resources/Avatar3-32x32.png</PackageIconUrl>
+    <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>http://octopusdeploy.com/</PackageProjectUrl>
-    <PackageLicenseUrl>http://octopusdeploy.com/pricing</PackageLicenseUrl>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/OctopusDeploy/OctopusCli</RepositoryUrl>
     <Description>Octopus Deploy is an automated release management tool for modern developers and DevOps teams.
 
-      This package contains the client library for the HTTP API in Octopus.</Description>
+      This package contains the dotnet tool version of the CLI library for interacting with the HTTP API in Octopus.</Description>
 
     <PackageType>DotnetCliTool</PackageType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -35,5 +35,8 @@
   <ItemGroup>
     <ProjectReference Include="..\Octopus.Cli\Octopus.Cli.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="icon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
 
 </Project>
diff --git a/source/Octopus.DotNet.Cli/icon.png b/source/Octopus.DotNet.Cli/icon.png
new file mode 100644
index 0000000000..e3fc9adcad
Binary files /dev/null and b/source/Octopus.DotNet.Cli/icon.png differ