diff --git a/windows/Toolbox.iss b/windows/Toolbox.iss
index 85b8d29929..3219aac8a7 100644
--- a/windows/Toolbox.iss
+++ b/windows/Toolbox.iss
@@ -83,7 +83,7 @@ Name: "VirtualBox"; Description: "VirtualBox"; Types: full
 Name: "MSYS"; Description: "MSYS-git UNIX tools"; Types: full
 
 [Files]
-Source: ".\toolbox.ico"; DestDir: "{app}"; Flags: ignoreversion
+Source: ".\docker-cli.ico"; DestDir: "{app}"; Flags: ignoreversion
 
 ; Docker
 Source: "{#dockerCli}"; DestDir: "{app}"; Flags: ignoreversion; Components: "Docker"
@@ -110,9 +110,9 @@ Source: "{#virtualBoxMsi}"; DestDir: "{app}\installers\virtualbox"; DestName: "v
 
 [Icons]
 Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{group}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/toolbox.ico"; Components: "Docker"
-Name: "{commondesktop}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/toolbox.ico"; Tasks: desktopicon; Components: "Docker"
-Name: "{commonprograms}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/toolbox.ico"; Components: "Docker"
+Name: "{group}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/docker-cli.ico"; Components: "Docker"
+Name: "{commondesktop}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/docker-cli.ico"; Tasks: desktopicon; Components: "Docker"
+Name: "{commonprograms}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/docker-cli.ico"; Components: "Docker"
 Name: "{group}\Delete VirtualBox Dev VM"; WorkingDir: "{app}"; Filename: "{app}\delete.sh"; Components: "DockerMachine"
 
 [UninstallRun]
@@ -213,15 +213,15 @@ begin
 		//WizardForm.NextButton.Caption := SetupMessage(msgButtonNext);
 	//if CurPageID = wpFinished then
 		//WizardForm.NextButton.Caption := SetupMessage(msgButtonFinish)
-		if CurPageID = wpSelectComponents then
-		begin
-			if IsUpgrade() then
-			begin
-				Wizardform.TypesCombo.ItemIndex := 2
-			end;
-			Wizardform.ComponentsList.Checked[2] := NeedToInstallVirtualBox();
-			Wizardform.ComponentsList.Checked[3] := NeedToInstallMSYS();
-		end;
+		// if CurPageID = wpSelectComponents then
+		// begin
+		//	if IsUpgrade() then
+		//	begin
+		//		Wizardform.TypesCombo.ItemIndex := 2
+		//	end;
+		//	Wizardform.ComponentsList.Checked[3] := NeedToInstallVirtualBox();
+		//	Wizardform.ComponentsList.Checked[4] := NeedToInstallMSYS();
+		// end;
 end;
 
 procedure RunInstallVirtualBox();
diff --git a/windows/docker-cli.ico b/windows/docker-cli.ico
new file mode 100644
index 0000000000..5c3992dd9c
Binary files /dev/null and b/windows/docker-cli.ico differ
diff --git a/windows/start.sh b/windows/start.sh
index a2520f5eeb..724134a97a 100644
--- a/windows/start.sh
+++ b/windows/start.sh
@@ -24,6 +24,8 @@ echo "Setting environment variables for machine $VM..."
 ./docker-machine.exe env $VM | sed  's,\\,\\\\,g' # eval swallows single backslashes in windows style path
 
 eval "$(./docker-machine.exe env $VM 2>/dev/null | sed  's,\\,\\\\,g')"
+
+cd
 clear
 
 cat << EOF
diff --git a/windows/toolbox.ico b/windows/toolbox.ico
new file mode 100644
index 0000000000..933f0ca189
Binary files /dev/null and b/windows/toolbox.ico differ