diff --git a/SkyNX-Streamer/Build.bat b/SkyNX-Streamer/Build.bat
index 04ca53c..0d725b3 100644
--- a/SkyNX-Streamer/Build.bat
+++ b/SkyNX-Streamer/Build.bat
@@ -1,4 +1,4 @@
 @echo off
 cls
-electron-packager . SkyNXStreamer --platform=win32 --arch=ia32
+electron-packager . SkyNXStreamer --platform=win32 --arch=ia32 --icon=./icon.ico
 pause
\ No newline at end of file
diff --git a/SkyNX-Streamer/icon.ico b/SkyNX-Streamer/icon.ico
new file mode 100644
index 0000000..7bbd3bc
Binary files /dev/null and b/SkyNX-Streamer/icon.ico differ
diff --git a/SkyNX-Streamer/main.js b/SkyNX-Streamer/main.js
index 4fba4b9..365ac2d 100644
--- a/SkyNX-Streamer/main.js
+++ b/SkyNX-Streamer/main.js
@@ -4,6 +4,7 @@ const elevate = require("windows-elevate");
 const windowStateKeeper = require('electron-window-state');
 const fs = require('fs');
 const DB = require('./Devlord_modules/DB.js');
+const isDev = require('electron-is-dev');
 var AU = require('ansi_up');
 var ansi_up = new AU.default;
 // Modules to control application life and create native browser window
@@ -81,11 +82,16 @@ app.on('browser-window-created', function (e, window) {
 });
 var streamerProcess;
 var clientSender;
+
 function startStreamer(arg) {
+  var cwd = './NxStreamingService/';
+  if (!isDev) {
+    cwd = "./resources/app/NxStreamingService"
+  }
   streamerProcess = spawn(
     "./NxStreamingService.exe",
     ["/ip", arg.ip, "/q", arg.q],
-    { cwd: './NxStreamingService/', stdio: "pipe" }
+    { cwd: cwd, stdio: "pipe" }
   );
   streamerProcess.stdout.on("data", data => {
     log(`${data}`);
@@ -114,6 +120,9 @@ ipcMain.on('kill', (event, arg) => {
 ipcMain.on('installScpVBus', (event, arg) => {
   log("Installing ScpVBus driver..")
   var df = __dirname + "\\NxStreamingService\\lib\\"
+  if (!isDev) {
+    df = __dirname + ".\\resources\\app\\NxStreamingService\\lib\\"
+  }
   elevate.exec(df + "devcon.exe", ["install", df + "ScpVBus.inf", "Root\\ScpVBus"],
     function (error, stdout, stderr) {
       log(`${stdout}`);
@@ -128,6 +137,9 @@ ipcMain.on('installScpVBus', (event, arg) => {
 ipcMain.on('unInstallScpVBus', (event, arg) => {
   log("Un-Installing ScpVBus driver..")
   var df = __dirname + "\\NxStreamingService\\lib\\"
+  if (!isDev) {
+    df = __dirname + ".\\resources\\app\\NxStreamingService\\lib\\"
+  }
   elevate.exec(df + "devcon.exe", ["remove", "Root\\ScpVBus"],
     function (error, stdout, stderr) {
       if (error !== null) {
@@ -142,6 +154,9 @@ ipcMain.on('unInstallScpVBus', (event, arg) => {
 ipcMain.on('installAudioDriver', (event, arg) => {
   log("Installing audio driver..")
   var df = __dirname + "\\NxStreamingService\\lib\\"
+  if (!isDev) {
+    df = __dirname + ".\\resources\\app\\NxStreamingService\\lib\\"
+  }
   elevate.exec("regsvr32", [df + "audio_sniffer.dll"],
     function (error, stdout, stderr) {
       if (error !== null) {
@@ -154,6 +169,9 @@ ipcMain.on('installAudioDriver', (event, arg) => {
 ipcMain.on('unInstallAudioDriver', (event, arg) => {
   log("Un-Installing audio driver..")
   var df = __dirname + "\\NxStreamingService\\lib\\"
+  if (!isDev) {
+    df = __dirname + ".\\resources\\app\\NxStreamingService\\lib\\"
+  }
   elevate.exec("regsvr32", ["/u", df + "audio_sniffer.dll"],
     function (error, stdout, stderr) {
       if (error !== null) {
diff --git a/SkyNX-Streamer/package-lock.json b/SkyNX-Streamer/package-lock.json
index d6ede23..e114216 100644
--- a/SkyNX-Streamer/package-lock.json
+++ b/SkyNX-Streamer/package-lock.json
@@ -183,6 +183,11 @@
         "extract-zip": "^1.0.3"
       }
     },
+    "electron-is-dev": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-1.2.0.tgz",
+      "integrity": "sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw=="
+    },
     "electron-window-state": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/electron-window-state/-/electron-window-state-5.0.3.tgz",
diff --git a/SkyNX-Streamer/package.json b/SkyNX-Streamer/package.json
index fe90cfe..bb39d5d 100644
--- a/SkyNX-Streamer/package.json
+++ b/SkyNX-Streamer/package.json
@@ -14,6 +14,7 @@
     "ansi_up": "^4.0.4",
     "bootstrap": "latest",
     "electron": "latest",
+    "electron-is-dev": "^1.2.0",
     "electron-window-state": "latest",
     "formidable": "latest",
     "jquery": "latest",
diff --git a/icon.png b/icon.png
deleted file mode 100644
index c850d7c..0000000
Binary files a/icon.png and /dev/null differ