diff --git a/DnsService/Service1.Designer.cs b/DnsService/DnsService.Designer.cs
similarity index 100%
rename from DnsService/Service1.Designer.cs
rename to DnsService/DnsService.Designer.cs
diff --git a/DnsService/Service1.cs b/DnsService/DnsService.cs
similarity index 95%
rename from DnsService/Service1.cs
rename to DnsService/DnsService.cs
index 203f588c..92949d4d 100644
--- a/DnsService/Service1.cs
+++ b/DnsService/DnsService.cs
@@ -33,7 +33,7 @@ namespace DnsService
 
         protected override void OnStart(string[] args)
         {
-            _service = new DnsWebService(args[0]);
+            _service = new DnsWebService();
             _service.Start();
         }
 
diff --git a/DnsService/DnsService.csproj b/DnsService/DnsService.csproj
index 31b81866..0c27ae83 100644
--- a/DnsService/DnsService.csproj
+++ b/DnsService/DnsService.csproj
@@ -32,6 +32,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>logo2.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Configuration.Install" />
@@ -51,11 +54,11 @@
     <Compile Include="ProjectInstaller.Designer.cs">
       <DependentUpon>ProjectInstaller.cs</DependentUpon>
     </Compile>
-    <Compile Include="Service1.cs">
+    <Compile Include="DnsService.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Service1.Designer.cs">
-      <DependentUpon>Service1.cs</DependentUpon>
+    <Compile Include="DnsService.Designer.cs">
+      <DependentUpon>DnsService.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -67,8 +70,8 @@
     <EmbeddedResource Include="ProjectInstaller.resx">
       <DependentUpon>ProjectInstaller.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Service1.resx">
-      <DependentUpon>Service1.cs</DependentUpon>
+    <EmbeddedResource Include="DnsService.resx">
+      <DependentUpon>DnsService.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
@@ -77,5 +80,8 @@
       <Name>DnsServerCore</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="logo2.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/DnsService/Service1.resx b/DnsService/DnsService.resx
similarity index 100%
rename from DnsService/Service1.resx
rename to DnsService/DnsService.resx
diff --git a/DnsService/Program.cs b/DnsService/Program.cs
index b894b586..ea9d9d2a 100644
--- a/DnsService/Program.cs
+++ b/DnsService/Program.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.ServiceProcess;
-using System.Text;
-using System.Threading.Tasks;
+using System.ServiceProcess;
 
 namespace DnsService
 {
diff --git a/DnsService/ProjectInstaller.Designer.cs b/DnsService/ProjectInstaller.Designer.cs
index 3de02b84..8ebaa412 100644
--- a/DnsService/ProjectInstaller.Designer.cs
+++ b/DnsService/ProjectInstaller.Designer.cs
@@ -33,7 +33,7 @@
             // 
             // serviceProcessInstaller1
             // 
-            this.serviceProcessInstaller1.Account = System.ServiceProcess.ServiceAccount.NetworkService;
+            this.serviceProcessInstaller1.Account = System.ServiceProcess.ServiceAccount.LocalSystem;
             this.serviceProcessInstaller1.Password = null;
             this.serviceProcessInstaller1.Username = null;
             // 
diff --git a/DnsService/ProjectInstaller.cs b/DnsService/ProjectInstaller.cs
index 42f82e7b..4ef4ef4c 100644
--- a/DnsService/ProjectInstaller.cs
+++ b/DnsService/ProjectInstaller.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.Configuration.Install;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace DnsService
 {
     [RunInstaller(true)]
-    public partial class ProjectInstaller : System.Configuration.Install.Installer
+    public partial class ProjectInstaller : Installer
     {
         public ProjectInstaller()
         {
diff --git a/DnsService/ProjectInstaller.resx b/DnsService/ProjectInstaller.resx
index 5c8b4681..235f1b0b 100644
--- a/DnsService/ProjectInstaller.resx
+++ b/DnsService/ProjectInstaller.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="serviceProcessInstaller1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+    <value>17, 56</value>
   </metadata>
   <metadata name="serviceInstaller1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>196, 17</value>
diff --git a/DnsService/Properties/AssemblyInfo.cs b/DnsService/Properties/AssemblyInfo.cs
index 3b3d0414..5a9de728 100644
--- a/DnsService/Properties/AssemblyInfo.cs
+++ b/DnsService/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("DnsService")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("Technitium DNS Server")]
+[assembly: AssemblyDescription("Technitium DNS Server")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DnsService")]
+[assembly: AssemblyCompany("Technitium")]
+[assembly: AssemblyProduct("Technitium DNS Server")]
 [assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/DnsService/logo2.ico b/DnsService/logo2.ico
new file mode 100644
index 00000000..67432fd8
Binary files /dev/null and b/DnsService/logo2.ico differ