diff --git a/Agent/Agent.csproj b/Agent/Agent.csproj
index cd4207dd..a86cb34e 100644
--- a/Agent/Agent.csproj
+++ b/Agent/Agent.csproj
@@ -15,11 +15,15 @@
     <Platforms>AnyCPU;x86;x64</Platforms>
     <AssemblyName>Remotely_Agent</AssemblyName>
     <RootNamespace>Remotely.Agent</RootNamespace>
-    <ApplicationIcon>favicon.ico</ApplicationIcon>
+    <ApplicationIcon>Assets\favicon.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="favicon.ico" />
+    <None Remove="Assets\favicon.ico" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="Assets\favicon.ico" />
   </ItemGroup>
 
   <ItemGroup>
@@ -46,10 +50,6 @@
     <ProjectReference Include="..\Shared\Shared.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Resource Include="favicon.ico" />
-  </ItemGroup>
-
 
   <ItemGroup>
     <Compile Update="Services\WindowsService.cs" />
diff --git a/Agent/favicon.ico b/Agent/Assets/favicon.ico
similarity index 100%
rename from Agent/favicon.ico
rename to Agent/Assets/favicon.ico
diff --git a/Desktop.Win/Controls/HostNamePrompt.xaml b/Desktop.Win/Controls/HostNamePrompt.xaml
index 9e9f2de8..12cd8878 100644
--- a/Desktop.Win/Controls/HostNamePrompt.xaml
+++ b/Desktop.Win/Controls/HostNamePrompt.xaml
@@ -7,7 +7,7 @@
         xmlns:local="clr-namespace:Remotely.Desktop.Win.Controls"
         xmlns:ViewModels="clr-namespace:Remotely.Desktop.Win.ViewModels" x:Name="PromptWindow"
         mc:Ignorable="d"
-        Title="Remotely Host Name" Height="150" Width="350" WindowStartupLocation="CenterOwner" Icon="/Remotely_Icon.png">
+        Title="Remotely Host Name" Height="150" Width="350" WindowStartupLocation="CenterOwner" Icon="/Assets/Remotely_Icon.png">
     <Window.DataContext>
         <ViewModels:HostNamePromptViewModel/>
     </Window.DataContext>
diff --git a/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml b/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml
index 5a343396..06414b5f 100644
--- a/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml
+++ b/Server/Areas/Identity/Pages/Account/Manage/ServerConfig.cshtml
@@ -1,4 +1,6 @@
 @page
+@using Remotely.Server.Hubs
+@inject Remotely.Server.Services.DataService DataService
 @model ServerConfigModel
 @{
     ViewData["Title"] = "Server Config";
@@ -8,18 +10,41 @@
 
 @if (Model.IsServerAdmin)
 {
-    <partial name="_StatusMessage" for="StatusMessage" />
+    <h5 class="mt-3">Server Info</h5>
+
+    <div class="row">
+        <div class="col-md-6">
+            <div class="mb-4" style="display:flex; justify-content: space-evenly">
+                <div class="d-inline-block text-center mr-2">
+                    <label>Devices Online</label>
+                    <br />
+                    <span class="badge badge-primary p-2">@AgentHub.ServiceConnections.Count</span>
+                </div>
+                <div class="d-inline-block text-center mr-2">
+                    <label>Devices Total</label>
+                    <br />
+                    <span class="badge badge-primary p-2">@DataService.GetTotalDevices()</span>
+                </div>
+                <div class="d-inline-block text-center">
+                    <label>Environment</label>
+                    <br />
+                    <span class="badge badge-primary p-2">@Model.Environment</span>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
     <div class="row">
         <div class="col-md-6">
             <form id="serverConfigForm" method="post" autocomplete="off">
-                <div class="text-right">
-                    <span class="badge badge-info p-2">Environment: @Model.Environment</span>
-                </div>
+
+                <h5>Application Settings</h5>
+
+                <partial name="_StatusMessage" for="StatusMessage" />
+
                 <div asp-validation-summary="All" class="text-danger"></div>
 
-                <h4>Application Settings</h4>
-
-
                 <div class="form-group">
                     <label asp-for="AppSettingsInput.AllowApiLogin"></label>
                     <br />
diff --git a/Server/Services/DataService.cs b/Server/Services/DataService.cs
index 37a918c5..644d99f2 100644
--- a/Server/Services/DataService.cs
+++ b/Server/Services/DataService.cs
@@ -772,6 +772,11 @@ namespace Remotely.Server.Services
             return RemotelyContext.SharedFiles.Find(fileID);
         }
 
+        public int GetTotalDevices()
+        {
+            return RemotelyContext.Devices.Count();
+        }
+
         public RemotelyUser GetUserByID(string userID)
         {
             if (userID == null)