diff --git a/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs b/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs
index 53d6c8ba6c09..c532d4ee68d5 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs
@@ -382,16 +382,16 @@ public Task<PagedModel<InstalledPackage>> GetInstalledPackagesFromMigrationPlans
             _keyValueService.FindByKeyPrefix(Constants.Conventions.Migrations.KeyValuePrefix);
 
         InstalledPackage[] installedPackages = _packageMigrationPlans
-            .GroupBy(plan => plan.PackageName)
+            .GroupBy(plan => (plan.PackageName, plan.PackageId))
             .Select(group =>
             {
                 var package = new InstalledPackage
                 {
-                    PackageName = group.Key,
+                    PackageName = group.Key.PackageName,
                 };
 
                 var currentState = keyValues?
-                    .GetValueOrDefault(Constants.Conventions.Migrations.KeyValuePrefix + package.PackageName);
+                    .GetValueOrDefault(Constants.Conventions.Migrations.KeyValuePrefix + group.Key.PackageId);
 
                 package.PackageMigrationPlans = group
                     .Select(plan => new InstalledPackageMigrationPlans
diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client
index f0ad1c6f434f..29583d3d34f5 160000
--- a/src/Umbraco.Web.UI.Client
+++ b/src/Umbraco.Web.UI.Client
@@ -1 +1 @@
-Subproject commit f0ad1c6f434ffeb54aebcea995dcfb5437c10b5e
+Subproject commit 29583d3d34f57e98052450128435fcb06a0c1984
diff --git a/templates/UmbracoProject/wwwroot/favicon.ico b/templates/UmbracoProject/wwwroot/favicon.ico
new file mode 100644
index 000000000000..63e859b476ef
Binary files /dev/null and b/templates/UmbracoProject/wwwroot/favicon.ico differ