diff --git a/yggdrasil/tools/chocolateyinstall.ps1 b/yggdrasil/tools/chocolateyinstall.ps1
index e10c154..d520961 100644
--- a/yggdrasil/tools/chocolateyinstall.ps1
+++ b/yggdrasil/tools/chocolateyinstall.ps1
@@ -44,9 +44,15 @@ if (-not (Test-Path -Path $startMenuDir)) {
   New-Item -Path $startMenuDir -ItemType Directory
 }
 
+# Get PowerShell executable path
+$psPath = (Get-Command powershell.exe).Path
+
 Install-ChocolateyShortcut -shortcutFilePath "$startMenuDir\Start service.lnk" `
-  -targetPath "$toolsDir\service-start.bat" -workDirectory "$appDir" -description "Start yggdrasil service" -RunAsAdmin
+  -targetPath $psPath -Arguments "Start-Service -name 'Yggdrasil'" `
+  -workDirectory "$appDir" -description "Start yggdrasil service" -IconLocation "$toolsDir\yggdrasil.ico" -RunAsAdmin
 Install-ChocolateyShortcut -shortcutFilePath "$startMenuDir\Restart service.lnk" `
-  -targetPath "$toolsDir\service-restart.bat" -workDirectory "$appDir" -description "Restart yggdrasil service" -RunAsAdmin
+  -targetPath $psPath -Arguments "Restart-Service -name 'Yggdrasil'" `
+  -workDirectory "$appDir" -description "Restart yggdrasil service" -IconLocation "$toolsDir\yggdrasil.ico" -RunAsAdmin
 Install-ChocolateyShortcut -shortcutFilePath "$startMenuDir\Stop service.lnk" `
-  -targetPath "$toolsDir\service-stop.bat" -workDirectory "$appDir" -description "Stop yggdrasil service" -RunAsAdmin
+  -targetPath $psPath -Arguments "Stop-Service -name 'Yggdrasil'" `
+  -workDirectory "$appDir" -description "Stop yggdrasil service" -IconLocation "$toolsDir\yggdrasil.ico" -RunAsAdmin
diff --git a/yggdrasil/tools/chocolateyuninstall.ps1 b/yggdrasil/tools/chocolateyuninstall.ps1
index 7d96e16..e11a9ae 100644
--- a/yggdrasil/tools/chocolateyuninstall.ps1
+++ b/yggdrasil/tools/chocolateyuninstall.ps1
@@ -7,7 +7,7 @@ $startMenuDir    = "$([Environment]::GetFolderPath('CommonStartMenu'))\Programs\
 $softwareName   = 'Yggdrasil Network*'
 
 # Remove package, it don't touch configs
-Write-Host "We removing package, but doesn't touch your configs. You can still find them in '$confDir' directory"
+Write-Host "Package is being uninstalled, but configs are preserved. You can still find them in '$confDir' directory"
 
 [array]$key = Get-UninstallRegistryKey -SoftwareName $softwareName
 
diff --git a/yggdrasil/tools/service-restart.bat b/yggdrasil/tools/service-restart.bat
deleted file mode 100644
index d76384f..0000000
--- a/yggdrasil/tools/service-restart.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@set @_cmd=1 /*
-@echo off
-setlocal EnableExtensions
-title Yggdrasil
-
-whoami /groups | findstr "S-1-16-12288" >nul && goto :admin
-if "%~1"=="RunAsAdmin" goto :error
-
-echo Requesting privileges elevation for managing the dnscrypt-proxy service . . .
-cscript /nologo /e:javascript "%~f0" || goto :error
-exit /b
-
-:error
-echo.
-echo Error: Administrator privileges elevation failed,
-echo        please manually run this script as administrator.
-echo.
-goto :end
-
-:admin
-sc stop "Yggdrasil"
-sc start "Yggdrasil"
-
-:end
-set /p =Press [Enter] to exit . . .
-exit /b */
-
-// JScript, restart batch script as administrator
-var objShell = WScript.CreateObject('Shell.Application');
-var ComSpec = WScript.CreateObject('WScript.Shell').ExpandEnvironmentStrings('%ComSpec%');
-objShell.ShellExecute(ComSpec, '/c ""' + WScript.ScriptFullName + '" RunAsAdmin"', '', 'runas', 1);
diff --git a/yggdrasil/tools/service-start.bat b/yggdrasil/tools/service-start.bat
deleted file mode 100644
index ecd78f9..0000000
--- a/yggdrasil/tools/service-start.bat
+++ /dev/null
@@ -1,30 +0,0 @@
-@set @_cmd=1 /*
-@echo off
-setlocal EnableExtensions
-title Yggdrasil
-
-whoami /groups | findstr "S-1-16-12288" >nul && goto :admin
-if "%~1"=="RunAsAdmin" goto :error
-
-echo Requesting privileges elevation for managing the dnscrypt-proxy service . . .
-cscript /nologo /e:javascript "%~f0" || goto :error
-exit /b
-
-:error
-echo.
-echo Error: Administrator privileges elevation failed,
-echo        please manually run this script as administrator.
-echo.
-goto :end
-
-:admin
-sc start "Yggdrasil"
-
-:end
-set /p =Press [Enter] to exit . . .
-exit /b */
-
-// JScript, restart batch script as administrator
-var objShell = WScript.CreateObject('Shell.Application');
-var ComSpec = WScript.CreateObject('WScript.Shell').ExpandEnvironmentStrings('%ComSpec%');
-objShell.ShellExecute(ComSpec, '/c ""' + WScript.ScriptFullName + '" RunAsAdmin"', '', 'runas', 1);
diff --git a/yggdrasil/tools/service-stop.bat b/yggdrasil/tools/service-stop.bat
deleted file mode 100644
index 39966bb..0000000
--- a/yggdrasil/tools/service-stop.bat
+++ /dev/null
@@ -1,30 +0,0 @@
-@set @_cmd=1 /*
-@echo off
-setlocal EnableExtensions
-title Yggdrasil
-
-whoami /groups | findstr "S-1-16-12288" >nul && goto :admin
-if "%~1"=="RunAsAdmin" goto :error
-
-echo Requesting privileges elevation for managing the dnscrypt-proxy service . . .
-cscript /nologo /e:javascript "%~f0" || goto :error
-exit /b
-
-:error
-echo.
-echo Error: Administrator privileges elevation failed,
-echo        please manually run this script as administrator.
-echo.
-goto :end
-
-:admin
-sc stop "Yggdrasil"
-
-:end
-set /p =Press [Enter] to exit . . .
-exit /b */
-
-// JScript, restart batch script as administrator
-var objShell = WScript.CreateObject('Shell.Application');
-var ComSpec = WScript.CreateObject('WScript.Shell').ExpandEnvironmentStrings('%ComSpec%');
-objShell.ShellExecute(ComSpec, '/c ""' + WScript.ScriptFullName + '" RunAsAdmin"', '', 'runas', 1);
diff --git a/yggdrasil/tools/yggdrasil.ico b/yggdrasil/tools/yggdrasil.ico
new file mode 100644
index 0000000..5433a38
Binary files /dev/null and b/yggdrasil/tools/yggdrasil.ico differ