diff --git a/assets/icons/agama_app_icon.icns b/assets/icons/agama_app_icon.icns
new file mode 100644
index 0000000..2e3903e
Binary files /dev/null and b/assets/icons/agama_app_icon.icns differ
diff --git a/assets/icons/agama_app_icon.ico b/assets/icons/agama_app_icon.ico
new file mode 100644
index 0000000..f554e98
Binary files /dev/null and b/assets/icons/agama_app_icon.ico differ
diff --git a/assets/icons/agama_icons/128x128.png b/assets/icons/agama_icons/128x128.png
old mode 100755
new mode 100644
index a321a61..979ea4f
Binary files a/assets/icons/agama_icons/128x128.png and b/assets/icons/agama_icons/128x128.png differ
diff --git a/assets/icons/agama_icons/16x16.png b/assets/icons/agama_icons/16x16.png
old mode 100755
new mode 100644
index 5a024d2..8f5a5ff
Binary files a/assets/icons/agama_icons/16x16.png and b/assets/icons/agama_icons/16x16.png differ
diff --git a/assets/icons/agama_icons/24x24.png b/assets/icons/agama_icons/24x24.png
old mode 100755
new mode 100644
index a8eac51..4e14476
Binary files a/assets/icons/agama_icons/24x24.png and b/assets/icons/agama_icons/24x24.png differ
diff --git a/assets/icons/agama_icons/256x256.png b/assets/icons/agama_icons/256x256.png
old mode 100755
new mode 100644
index 13b83f3..8f2cfbc
Binary files a/assets/icons/agama_icons/256x256.png and b/assets/icons/agama_icons/256x256.png differ
diff --git a/assets/icons/agama_icons/32x32.png b/assets/icons/agama_icons/32x32.png
old mode 100755
new mode 100644
index 436aa99..e5c57ee
Binary files a/assets/icons/agama_icons/32x32.png and b/assets/icons/agama_icons/32x32.png differ
diff --git a/assets/icons/agama_icons/48x48.png b/assets/icons/agama_icons/48x48.png
old mode 100755
new mode 100644
index 83fab1b..2cca485
Binary files a/assets/icons/agama_icons/48x48.png and b/assets/icons/agama_icons/48x48.png differ
diff --git a/assets/icons/agama_icons/64x64.png b/assets/icons/agama_icons/64x64.png
old mode 100755
new mode 100644
index d6ff190..d1b7f11
Binary files a/assets/icons/agama_icons/64x64.png and b/assets/icons/agama_icons/64x64.png differ
diff --git a/assets/icons/agama_icons/96x96.png b/assets/icons/agama_icons/96x96.png
old mode 100755
new mode 100644
index faeedb0..d6fc45f
Binary files a/assets/icons/agama_icons/96x96.png and b/assets/icons/agama_icons/96x96.png differ
diff --git a/assets/icons/agama_icons/agama_app_icon.icns b/assets/icons/agama_icons/agama_app_icon.icns
index f2f956f..2e3903e 100644
Binary files a/assets/icons/agama_icons/agama_app_icon.icns and b/assets/icons/agama_icons/agama_app_icon.icns differ
diff --git a/assets/icons/agama_icons/agama_app_icon.ico b/assets/icons/agama_icons/agama_app_icon.ico
index a34d763..f554e98 100644
Binary files a/assets/icons/agama_icons/agama_app_icon.ico and b/assets/icons/agama_icons/agama_app_icon.ico differ
diff --git a/assets/icons/iguana_app_icon.icns b/assets/icons/iguana_app_icon.icns
deleted file mode 100644
index 938d792..0000000
Binary files a/assets/icons/iguana_app_icon.icns and /dev/null differ
diff --git a/assets/icons/iguana_app_icon.ico b/assets/icons/iguana_app_icon.ico
deleted file mode 100644
index a8c3c6f..0000000
Binary files a/assets/icons/iguana_app_icon.ico and /dev/null differ
diff --git a/assets/icons/iguana_app_icon_png/128x128.png b/assets/icons/iguana_app_icon_png/128x128.png
deleted file mode 100755
index 9c7234c..0000000
Binary files a/assets/icons/iguana_app_icon_png/128x128.png and /dev/null differ
diff --git a/assets/icons/iguana_app_icon_png/16x16.png b/assets/icons/iguana_app_icon_png/16x16.png
deleted file mode 100755
index 5ae1883..0000000
Binary files a/assets/icons/iguana_app_icon_png/16x16.png and /dev/null differ
diff --git a/assets/icons/iguana_app_icon_png/24x24.png b/assets/icons/iguana_app_icon_png/24x24.png
deleted file mode 100755
index 5380b4e..0000000
Binary files a/assets/icons/iguana_app_icon_png/24x24.png and /dev/null differ
diff --git a/assets/icons/iguana_app_icon_png/256x256.png b/assets/icons/iguana_app_icon_png/256x256.png
deleted file mode 100755
index 0665623..0000000
Binary files a/assets/icons/iguana_app_icon_png/256x256.png and /dev/null differ
diff --git a/assets/icons/iguana_app_icon_png/32x32.png b/assets/icons/iguana_app_icon_png/32x32.png
deleted file mode 100755
index c194e0d..0000000
Binary files a/assets/icons/iguana_app_icon_png/32x32.png and /dev/null differ
diff --git a/assets/icons/iguana_app_icon_png/48x48.png b/assets/icons/iguana_app_icon_png/48x48.png
deleted file mode 100755
index ce19068..0000000
Binary files a/assets/icons/iguana_app_icon_png/48x48.png and /dev/null differ
diff --git a/assets/icons/iguana_app_icon_png/512x512.png b/assets/icons/iguana_app_icon_png/512x512.png
deleted file mode 100755
index c5b8a62..0000000
Binary files a/assets/icons/iguana_app_icon_png/512x512.png and /dev/null differ
diff --git a/assets/icons/iguana_app_icon_png/64x64.png b/assets/icons/iguana_app_icon_png/64x64.png
deleted file mode 100755
index e177a97..0000000
Binary files a/assets/icons/iguana_app_icon_png/64x64.png and /dev/null differ
diff --git a/assets/icons/iguana_app_icon_png/96x96.png b/assets/icons/iguana_app_icon_png/96x96.png
deleted file mode 100755
index 8c63c19..0000000
Binary files a/assets/icons/iguana_app_icon_png/96x96.png and /dev/null differ
diff --git a/assets/icons/komodo.icns b/assets/icons/komodo.icns
deleted file mode 100644
index 5cde045..0000000
Binary files a/assets/icons/komodo.icns and /dev/null differ
diff --git a/assets/icons/komodo.ico b/assets/icons/komodo.ico
deleted file mode 100644
index 438df3f..0000000
Binary files a/assets/icons/komodo.ico and /dev/null differ
diff --git a/assets/icons/komodo_png/128x128.png b/assets/icons/komodo_png/128x128.png
deleted file mode 100755
index 9ab8bff..0000000
Binary files a/assets/icons/komodo_png/128x128.png and /dev/null differ
diff --git a/assets/icons/komodo_png/16x16.png b/assets/icons/komodo_png/16x16.png
deleted file mode 100755
index 21d6a09..0000000
Binary files a/assets/icons/komodo_png/16x16.png and /dev/null differ
diff --git a/assets/icons/komodo_png/24x24.png b/assets/icons/komodo_png/24x24.png
deleted file mode 100755
index 673f7d2..0000000
Binary files a/assets/icons/komodo_png/24x24.png and /dev/null differ
diff --git a/assets/icons/komodo_png/256x256.png b/assets/icons/komodo_png/256x256.png
deleted file mode 100755
index 87f2ac9..0000000
Binary files a/assets/icons/komodo_png/256x256.png and /dev/null differ
diff --git a/assets/icons/komodo_png/32x32.png b/assets/icons/komodo_png/32x32.png
deleted file mode 100755
index d4aaf7e..0000000
Binary files a/assets/icons/komodo_png/32x32.png and /dev/null differ
diff --git a/assets/icons/komodo_png/48x48.png b/assets/icons/komodo_png/48x48.png
deleted file mode 100755
index f57f113..0000000
Binary files a/assets/icons/komodo_png/48x48.png and /dev/null differ
diff --git a/assets/icons/komodo_png/512x512.png b/assets/icons/komodo_png/512x512.png
deleted file mode 100755
index f91569f..0000000
Binary files a/assets/icons/komodo_png/512x512.png and /dev/null differ
diff --git a/assets/icons/komodo_png/64x64.png b/assets/icons/komodo_png/64x64.png
deleted file mode 100755
index 0e863bc..0000000
Binary files a/assets/icons/komodo_png/64x64.png and /dev/null differ
diff --git a/assets/icons/komodo_png/96x96.png b/assets/icons/komodo_png/96x96.png
deleted file mode 100755
index 78ca144..0000000
Binary files a/assets/icons/komodo_png/96x96.png and /dev/null differ
diff --git a/gui/startup/index.html b/gui/startup/index.html
index 8c1aa06..559e12f 100644
--- a/gui/startup/index.html
+++ b/gui/startup/index.html
@@ -13,7 +13,7 @@
     <script type="text/javascript" src="../EasyDEX-GUI/assets/mainWindow/js/jRoll.min.js"></script>
     <script>if (window.module) module = window.module;</script>
   </head>
-  <body class="agamaMode">
+  <body class="agamaMode loading-window">
     <div class="text-center">
       <div id="agamaMode">
         <div
@@ -47,6 +47,9 @@
           <li onClick="closeMainWindow(null, true)">
             <a>Custom</a>
           </li>
+          <li onClick="startKMDPassive()">
+            <a>KMD (passive)</a>
+          </li>
         </ul>
         <button
           id="normalStartBtn"
diff --git a/main.js b/main.js
index 858e5c3..5dfdec0 100644
--- a/main.js
+++ b/main.js
@@ -148,7 +148,7 @@ if (os.platform() === 'linux') {
 	iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/128x128.png');
 }
 if (os.platform() === 'win32') {
-	iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/agama_app_icon.ico');
+	iguanaIcon = path.join(__dirname, '/assets/icons/agama_app_icon.ico');
 }
 
 function createLoadingWindow() {
@@ -158,7 +158,7 @@ function createLoadingWindow() {
 	try {
 		loadingWindow = new BrowserWindow({
 			width: 500,
-			height: 335,
+			height: 355,
 			frame: false,
 			icon: iguanaIcon,
 			show: false,
diff --git a/routes/shepherd.js b/routes/shepherd.js
index f54c33d..94d155d 100644
--- a/routes/shepherd.js
+++ b/routes/shepherd.js
@@ -98,14 +98,15 @@ shepherd.defaultAppConfig = Object.assign({}, shepherd.appConfig);
 
 shepherd.coindInstanceRegistry = coindInstanceRegistry;
 
-shepherd.startKMDNative = function(selection) {
+shepherd.startKMDNative = function(selection, isManual) {
   if (selection === 'KMD') {
     const herdData = {
       'ac_name': 'komodod',
       'ac_options': [
         '-daemon=0',
         '-addnode=78.47.196.146',
-      ]
+      ],
+      'manualStart': isManual,
     };
 
     const options = {
@@ -1568,7 +1569,7 @@ shepherd.quitKomodod = function(timeout = 100) {
 }
 
 shepherd.getConf = function(chain) {
-  const _confLocation = chain === 'komodod' ? (os.platform() === 'darwin' ? `${komodoDir}/Komodo.conf` : `${komodoDir}/komodo.conf`) : `${komodoDir}/${chain}/${chain}.conf`;
+  const _confLocation = chain === 'komodod' ? `${komodoDir}/komodo.conf` : `${komodoDir}/${chain}/${chain}.conf`;
   // komodoDir
 
   if (fs.existsSync(_confLocation)) {
@@ -2312,48 +2313,59 @@ shepherd.post('/herd', function(req, res) {
   console.log('======= req.body =======');
   console.log(req.body);
 
-  function testCoindPort() {
-    if (!lockDownAddCoin) {
-      const _port = assetChainPorts[req.body.options.ac_name];
+  if (!req.body.options.manualStart) {
+    function testCoindPort() {
+      if (!lockDownAddCoin) {
+        const _port = assetChainPorts[req.body.options.ac_name];
 
-      portscanner.checkPortStatus(_port, '127.0.0.1', function(error, status) {
-        // Status is 'open' if currently in use or 'closed' if available
-        if (status === 'open') {
-          console.log(`komodod service start error at port ${_port}, reason: port is closed`);
-          shepherd.writeLog(`komodod service start error at port ${_port}, reason: port is closed`);
-          cache.io.emit('service', {
-            komodod: {
-              error: `error starting ${req.body.herd} ${req.body.options.ac_name} daemon. Port ${_port} is already taken!`,
-            },
-          });
+        portscanner.checkPortStatus(_port, '127.0.0.1', function(error, status) {
+          // Status is 'open' if currently in use or 'closed' if available
+          if (status === 'open') {
+            console.log(`komodod service start error at port ${_port}, reason: port is closed`);
+            shepherd.writeLog(`komodod service start error at port ${_port}, reason: port is closed`);
+            cache.io.emit('service', {
+              komodod: {
+                error: `error starting ${req.body.herd} ${req.body.options.ac_name} daemon. Port ${_port} is already taken!`,
+              },
+            });
 
-          const obj = {
-            msg: 'error',
-            result: `error starting ${req.body.herd} ${req.body.options.ac_name} daemon. Port ${_port} is already taken!`,
-          };
+            const obj = {
+              msg: 'error',
+              result: `error starting ${req.body.herd} ${req.body.options.ac_name} daemon. Port ${_port} is already taken!`,
+            };
 
-          res.status(500);
-          res.end(JSON.stringify(obj));
-        } else {
-          herder(req.body.herd, req.body.options);
+            res.status(500);
+            res.end(JSON.stringify(obj));
+          } else {
+            herder(req.body.herd, req.body.options);
 
-          const obj = {
-            msg: 'success',
-            result: 'result',
-          };
+            const obj = {
+              msg: 'success',
+              result: 'result',
+            };
 
-          res.end(JSON.stringify(obj));
-        }
-      });
+            res.end(JSON.stringify(obj));
+          }
+        });
+      }
     }
-  }
 
-  if (req.body.herd === 'komodod') {
-    // check if komodod instance is already running
-    testCoindPort();
-    setTimeout(function() {
+    if (req.body.herd === 'komodod') {
+      // check if komodod instance is already running
       testCoindPort();
-    }, 10000);
+      setTimeout(function() {
+        testCoindPort();
+      }, 10000);
+    } else {
+      herder(req.body.herd, req.body.options);
+
+      const obj = {
+        msg: 'success',
+        result: 'result',
+      };
+
+      res.end(JSON.stringify(obj));
+    }
   } else {
     herder(req.body.herd, req.body.options);
 
@@ -2790,28 +2802,33 @@ function herder(flock, data) {
           console.log(`daemon param ${data.ac_custom_param}`);
 
           coindInstanceRegistry[data.ac_name] = true;
-          let _arg = `${coindACParam}${data.ac_options.join(' ')}${_customParam}`;
-          _arg = _arg.trim().split(' ');
-          execFile(`${komododBin}`, _arg, {
-            maxBuffer: 1024 * 10000 // 10 mb
-          }, function(error, stdout, stderr) {
-            shepherd.writeLog(`stdout: ${stdout}`);
-            shepherd.writeLog(`stderr: ${stderr}`);
-
-            if (error !== null) {
-              console.log(`exec error: ${error}`);
-              shepherd.writeLog(`exec error: ${error}`);
-
-              if (error.toString().indexOf('using -reindex') > -1) {
-                cache.io.emit('service', {
-                  komodod: {
-                    error: 'run -reindex',
-                  }
-                });
+          if (!data.manualStart) {
+            let _arg = `${coindACParam}${data.ac_options.join(' ')}${_customParam}`;
+            _arg = _arg.trim().split(' ');
+            execFile(`${komododBin}`, _arg, {
+              maxBuffer: 1024 * 500000 // 500 mb
+            }, function(error, stdout, stderr) {
+              shepherd.writeLog(`stdout: ${stdout}`);
+              shepherd.writeLog(`stderr: ${stderr}`);
+
+              if (error !== null) {
+                console.log(`exec error: ${error}`);
+                shepherd.writeLog(`exec error: ${error}`);
+
+                if (error.toString().indexOf('using -reindex') > -1) {
+                  cache.io.emit('service', {
+                    komodod: {
+                      error: 'run -reindex',
+                    },
+                  });
+                }
               }
-            }
-          });
+            });
+          }
         } else {
+          if (data.manualStart) {
+            coindInstanceRegistry[data.ac_name] = true;
+          }
           console.log(`port ${_port} (${data.ac_name}) is already in use`);
           shepherd.writeLog(`port ${_port} (${data.ac_name}) is already in use`);
         }
@@ -2885,7 +2902,7 @@ shepherd.setConfKMD = function() {
   }
 
   // check if kmd conf exists
-  _fs.access(os.platform() === 'darwin' ? `${komodoDir}/Komodo.conf` : `${komodoDir}/komodo.conf`, fs.constants.R_OK, function(err) {
+  _fs.access(`${komodoDir}/komodo.conf`, fs.constants.R_OK, function(err) {
     if (err) {
       console.log('creating komodo conf');
       shepherd.writeLog(`creating komodo conf in ${komodoDir}/komodo.conf`);
@@ -2922,7 +2939,7 @@ function setConf(flock) {
   let DaemonConfPath;
   switch (flock) {
     case 'komodod':
-      DaemonConfPath = os.platform() === 'darwin' ? `${komodoDir}/Komodo.conf` : `${komodoDir}/komodo.conf`;
+      DaemonConfPath = `${komodoDir}/komodo.conf`;
 
       if (os.platform() === 'win32') {
         DaemonConfPath = path.normalize(DaemonConfPath);