diff --git a/bin/installer/iss/lite/sections/analysis.iss b/bin/installer/iss/lite/sections/analysis.iss
index ce2c98d..7c76d96 100644
--- a/bin/installer/iss/lite/sections/analysis.iss
+++ b/bin/installer/iss/lite/sections/analysis.iss
@@ -32,8 +32,8 @@ Name: "analysis\exeinfope"; Description: "ExeinfoPe"; Types: full compact;
 Source: "{#MySrcDir}\toolkit\Analysis\ExeinfoPe\*"; DestDir: "{#MyAppToolsFolder}\Analysis\ExeinfoPe"; Components: "analysis\exeinfope"; Flags: ignoreversion recursesubdirs createallsubdirs; 
 
 [Icons]
-Name: "{group}\ExeinfoPe"; Filename: "{#MyAppToolsFolder}\Analysis\ExeinfoPe\exeinfope.exe"; WorkingDir: "{#MyAppToolsFolder}\Analysis\ExeinfoPe"; Components: "analysis\exeinfope";    
-Name: "{#MyAppBinsFolder}\sendto\sendto\Analysis\ExeinfoPe"; Filename: "{#MyAppToolsFolder}\Analysis\ExeinfoPe\exeinfope.exe"; WorkingDir: "{#MyAppToolsFolder}\Analysis\ExeinfoPe"; Components: "analysis\exeinfope";    
+Name: "{group}\ExeinfoPe"; Filename: "{#MyAppToolsFolder}\Analysis\ExeinfoPe\exeinfope.exe"; WorkingDir: "{#MyAppToolsFolder}\Analysis\ExeinfoPe"; Components: "analysis\exeinfope";   Check: not Is64BitInstallMode; 
+Name: "{#MyAppBinsFolder}\sendto\sendto\Analysis\ExeinfoPe"; Filename: "{#MyAppToolsFolder}\Analysis\ExeinfoPe\exeinfope.exe"; WorkingDir: "{#MyAppToolsFolder}\Analysis\ExeinfoPe"; Components: "analysis\exeinfope";   Check: not Is64BitInstallMode;  
 
 
 
diff --git a/bin/installer/iss/lite/sections/cli.iss b/bin/installer/iss/lite/sections/cli.iss
index b5142d7..9719f15 100644
--- a/bin/installer/iss/lite/sections/cli.iss
+++ b/bin/installer/iss/lite/sections/cli.iss
@@ -54,7 +54,6 @@ begin
     if CurStep = ssPostInstall then
     begin
         if WizardIsComponentSelected('analysis\capa') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Analysis\CAPA');
-        if WizardIsComponentSelected('hexeditor\imhex') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\HEX Editor\ImHex');
         if WizardIsComponentSelected('monitor\pesieve') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Monitor\PE-sieve');
         if WizardIsComponentSelected('other\floss') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\FLOSS');
         if WizardIsComponentSelected('other\malunpack') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\MalUnpack');
@@ -71,7 +70,6 @@ begin
     if CurUninstallStep = usPostUninstall then
     begin
         EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Analysis\CAPA');
-        EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\HEX Editor\ImHex');
         EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Monitor\PE-sieve');
         EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\FLOSS');
         EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\MalUnpack');
diff --git a/bin/installer/iss/lite/sections/hex-editor.iss b/bin/installer/iss/lite/sections/hex-editor.iss
index 5d6ffb8..574f412 100644
--- a/bin/installer/iss/lite/sections/hex-editor.iss
+++ b/bin/installer/iss/lite/sections/hex-editor.iss
@@ -23,7 +23,7 @@ Name: "hexeditor\imhex"; Description: "ImHex"; Types: full compact;
 Source: "{#MySrcDir}\toolkit\HEX Editor\ImHex\*"; DestDir: "{#MyAppToolsFolder}\HEX Editor\ImHex"; Components: "hexeditor\imhex"; Flags: ignoreversion recursesubdirs createallsubdirs; 
 
 [Icons]
-Name: "{group}\ImHex x64"; Filename: "{sys}\cmd.exe"; WorkingDir: "{#MyAppToolsFolder}\HEX Editor\ImHex"; Components: "hexeditor\imhex"; Parameters: "/K ""{#MyAppToolsFolder}\HEX Editor\ImHex\imhex-gui.exe"""; IconFilename: "{#MyAppToolsFolder}\HEX Editor\ImHex\imhex-gui.exe"; Check: Is64BitInstallMode; 
-Name: "{#MyAppBinsFolder}\sendto\sendto\HEX Editor\ImHex x64"; Filename: "{sys}\cmd.exe"; WorkingDir: "{#MyAppToolsFolder}\HEX Editor\ImHex"; Components: "hexeditor\imhex"; Parameters: "/K ""{#MyAppToolsFolder}\HEX Editor\ImHex\imhex-gui.exe"""; IconFilename: "{#MyAppToolsFolder}\HEX Editor\ImHex\imhex-gui.exe"; Check: Is64BitInstallMode; 
+Name: "{group}\ImHex x64"; Filename: "{#MyAppToolsFolder}\HEX Editor\ImHex\imhex-gui.exe"; WorkingDir: "{#MyAppToolsFolder}\HEX Editor\ImHex"; Components: "hexeditor\imhex";   Check: Is64BitInstallMode; 
+Name: "{#MyAppBinsFolder}\sendto\sendto\HEX Editor\ImHex x64"; Filename: "{#MyAppToolsFolder}\HEX Editor\ImHex\imhex-gui.exe"; WorkingDir: "{#MyAppToolsFolder}\HEX Editor\ImHex"; Components: "hexeditor\imhex";   Check: Is64BitInstallMode; 
 
 
diff --git a/bin/installer/iss/lite/sections/reverse.iss b/bin/installer/iss/lite/sections/reverse.iss
index 6fd886e..ab463e3 100644
--- a/bin/installer/iss/lite/sections/reverse.iss
+++ b/bin/installer/iss/lite/sections/reverse.iss
@@ -32,12 +32,12 @@ Name: "reverse\dlest"; Description: "DLest"; Types: full;
 Source: "{#MySrcDir}\toolkit\Reverse\DLest\*"; DestDir: "{#MyAppToolsFolder}\Reverse\DLest"; Components: "reverse\dlest"; Flags: ignoreversion recursesubdirs createallsubdirs; 
 
 [Icons]
-Name: "{group}\DLest"; Filename: "{#MyAppToolsFolder}\Reverse\DLest\dlest32.exe"; WorkingDir: "{#MyAppToolsFolder}\Reverse\DLest"; Components: "reverse\dlest";    
-Name: "{#MyAppBinsFolder}\sendto\sendto\Reverse\DLest"; Filename: "{#MyAppToolsFolder}\Reverse\DLest\dlest32.exe"; WorkingDir: "{#MyAppToolsFolder}\Reverse\DLest"; Components: "reverse\dlest";    
+Name: "{group}\DLest"; Filename: "{#MyAppToolsFolder}\Reverse\DLest\DLest32.exe"; WorkingDir: "{#MyAppToolsFolder}\Reverse\DLest"; Components: "reverse\dlest";    
+Name: "{#MyAppBinsFolder}\sendto\sendto\Reverse\DLest"; Filename: "{#MyAppToolsFolder}\Reverse\DLest\DLest32.exe"; WorkingDir: "{#MyAppToolsFolder}\Reverse\DLest"; Components: "reverse\dlest";    
 
 [Icons]
-Name: "{group}\DLest x64"; Filename: "{#MyAppToolsFolder}\Reverse\DLest\dlest64.exe"; WorkingDir: "{#MyAppToolsFolder}\Reverse\DLest"; Components: "reverse\dlest";   Check: Is64BitInstallMode; 
-Name: "{#MyAppBinsFolder}\sendto\sendto\Reverse\DLest x64"; Filename: "{#MyAppToolsFolder}\Reverse\DLest\dlest64.exe"; WorkingDir: "{#MyAppToolsFolder}\Reverse\DLest"; Components: "reverse\dlest";   Check: Is64BitInstallMode; 
+Name: "{group}\DLest x64"; Filename: "{#MyAppToolsFolder}\Reverse\DLest\DLest64.exe"; WorkingDir: "{#MyAppToolsFolder}\Reverse\DLest"; Components: "reverse\dlest";   Check: Is64BitInstallMode; 
+Name: "{#MyAppBinsFolder}\sendto\sendto\Reverse\DLest x64"; Filename: "{#MyAppToolsFolder}\Reverse\DLest\DLest64.exe"; WorkingDir: "{#MyAppToolsFolder}\Reverse\DLest"; Components: "reverse\dlest";   Check: Is64BitInstallMode;