Resolved post-merge issues.

src/Umbraco.Core/Configuration/Models/GlobalSettings.cs

@@ -32,6 +32,8 @@
 
         public string Path { get; set; } = "~/umbraco";
 
+        public string IconsPath { get; set; } = $"~/umbraco/assets/icons";
+
         public string UmbracoCssPath { get; set; } = "~/css";
 
         public string UmbracoScriptsPath { get; set; } = "~/scripts";

src/Umbraco.Infrastructure/Configuration/ConfigModelConversionsFromLegacy.cs

@@ -43,6 +43,7 @@ namespace Umbraco.Infrastructure.Configuration
                 UmbracoMediaPath = globalSettings.UmbracoMediaPath,
                 Path = globalSettings.UmbracoPath,
                 UmbracoScriptsPath = globalSettings.UmbracoScriptsPath,
+                IconsPath = globalSettings.IconsPath,
                 UseHttps = globalSettings.UseHttps,
                 VersionCheckPeriod = globalSettings.VersionCheckPeriod,
             };

src/Umbraco.Infrastructure/Configuration/ConfigModelConversionsToLegacy.cs

@@ -43,6 +43,7 @@ namespace Umbraco.Infrastructure.Configuration
                 UmbracoMediaPath = globalSettings.UmbracoMediaPath,
                 UmbracoPath = globalSettings.Path,
                 UmbracoScriptsPath = globalSettings.UmbracoScriptsPath,
+                IconsPath = globalSettings.IconsPath,
                 UseHttps = globalSettings.UseHttps,
                 VersionCheckPeriod = globalSettings.VersionCheckPeriod,
             };
@@ -109,6 +110,10 @@ namespace Umbraco.Infrastructure.Configuration
             public string MainDomLock { get; set; }
 
             public string NoNodesViewPath { get; set; }
+
+            public string IconsPath { get; set; }
+
+            public string ConfigurationStatus { get; set; }
         }
 
         private class TestSmtpSettings : ISmtpSettings