diff --git a/deployment/windows/wixSetup/build.bat b/deployment/windows/wixSetup/build.bat
index 6b47a0b3..ca340e2c 100644
--- a/deployment/windows/wixSetup/build.bat
+++ b/deployment/windows/wixSetup/build.bat
@@ -14,7 +14,7 @@ mkdir build
 
 rm -rf bin
 mkdir bin
-mkdir bin\bin
+mkdir bin/bin
 
 candle.exe -dprojectVersion="$VERSION_STRING" coati.wxs customActions.wxs dialogShortcuts.wxs installDir.wxs appDataDir.wxs -out build/ > build/compileLog.txt
 light.exe -ext WixUIExtension build/coati.wixobj build/customActions.wixobj build/dialogShortcuts.wixobj build/installDir.wixobj build/appDataDir.wixobj -out build/coati.msi > build/linkLog.txt
diff --git a/deployment/windows/wixSetup/coati.wxs b/deployment/windows/wixSetup/coati.wxs
index f82aeaac..0e12b4c2 100644
--- a/deployment/windows/wixSetup/coati.wxs
+++ b/deployment/windows/wixSetup/coati.wxs
@@ -169,32 +169,29 @@
 				<ComponentRef Id='ErrorViewCss'/>
 
 				<ComponentRef Id='GraphViewCss'/>
-				<ComponentRef Id='ArrowPng'/>
+				<ComponentRef Id='ArrowGraphPng'/>
 				<ComponentRef Id='BundlePng'/>
-				<ComponentRef Id='Enum_1Png'/>
-				<ComponentRef Id='Enum_2Png'/>
+				<ComponentRef Id='EnumPng'/>
 				<ComponentRef Id='FilePng'/>
-				<ComponentRef Id='Macro_1Png'/>
-				<ComponentRef Id='Macro_2Png'/>
-				<ComponentRef Id='Macro_3Png'/>
+				<ComponentRef Id='MacroPng'/>
+				<ComponentRef Id='NamespacePng'/>
 				<ComponentRef Id='GraphPatternPng'/>
 				<ComponentRef Id='PrivatePng'/>
 				<ComponentRef Id='ProtectedPng'/>
 				<ComponentRef Id='PublicPng'/>
 				<ComponentRef Id='TemplatePng'/>
-				<ComponentRef Id='Typedef_1Png'/>
-				<ComponentRef Id='Typedef_2Png'/>
-				<ComponentRef Id='Typedef_3Png'/>
+				<ComponentRef Id='TypedefPng'/>
 
 				<ComponentRef Id='C_icon_Png'/>
+				<ComponentRef Id='Cdb_icon_Png'/>
 				<ComponentRef Id='CoatiIco'/>
 				<ComponentRef Id='Cpp_icon_Png'/>
+				<ComponentRef Id='Empty_icon_Png'/>
 				<ComponentRef Id='Java_icon_Png'/>
 				<ComponentRef Id='Logo_1024_1024_Png'/>
 				<ComponentRef Id='ProjectIco'/>
 				<ComponentRef Id='Project_256_256_Png'/>
-				<ComponentRef Id='Project_cdb_256_256_Png'/>
-				<ComponentRef Id='Project_vs_256_256_Png'/>
+				<ComponentRef Id='Vs_icon_Png'/>
 
 				<ComponentRef Id='ErrorPng'/>
 				<ComponentRef Id='FlagPng'/>
@@ -207,6 +204,7 @@
 				<ComponentRef Id='RefreshPng'/>
 
 				<ComponentRef Id='SearchViewCss'/>
+				<ComponentRef Id='ArrowSearchPng'/>
 				<ComponentRef Id='HomePng'/>
 				<ComponentRef Id='SearchPng'/>
 
diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs
index d480e994..dcf49f08 100644
--- a/deployment/windows/wixSetup/installDir.wxs
+++ b/deployment/windows/wixSetup/installDir.wxs
@@ -201,29 +201,23 @@
 						</Component>
 
 						<Directory Id='DataGraphViewImages' Name='images'>
-							<Component Id='ArrowPng' Guid='EEC8C2CE-A647-4640-81DB-8297C46355E8'>
-								<File Id='Arrow' Name='arrow.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/arrow.png' KeyPath='yes' />
+							<Component Id='ArrowGraphPng' Guid='EEC8C2CE-A647-4640-81DB-8297C46355E8'>
+								<File Id='ArrowGraph' Name='arrow.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/arrow.png' KeyPath='yes' />
 							</Component>
 							<Component Id='BundlePng' Guid='67CA6A53-7DEA-48F1-9BD3-2CFA65AB554E'>
 								<File Id='Bundle' Name='bundle.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/bundle.png' KeyPath='yes' />
 							</Component>
-							<Component Id='Enum_1Png' Guid='E7F21BA5-8C3A-4373-B636-7BDA0475C96F'>
-								<File Id='Enum_1' Name='enum_1.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/enum_1.png' KeyPath='yes' />
-							</Component>
-							<Component Id='Enum_2Png' Guid='E9AC8702-7D24-4F8B-A3E3-03DF584017F6'>
-								<File Id='Enum_2' Name='enum_2.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/enum_2.png' KeyPath='yes' />
+							<Component Id='EnumPng' Guid='47724B89-D417-465C-B96E-1D60A6E7A99E'>
+								<File Id='Enum' Name='enum.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/enum.png' KeyPath='yes' />
 							</Component>
 							<Component Id='FilePng' Guid='72DA9267-AFB9-46B3-996E-67116FB6852E'>
 								<File Id='File' Name='file.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/file.png' KeyPath='yes' />
 							</Component>
-							<Component Id='Macro_1Png' Guid='FC845B09-C5E6-40D0-9F21-6C5F901B5A00'>
-								<File Id='Macro_1' Name='macro_1.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/macro_1.png' KeyPath='yes' />
+							<Component Id='MacroPng' Guid='7F9F1D3D-645A-4AEA-871A-4FA9229EA663'>
+								<File Id='Macro' Name='macro.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/macro.png' KeyPath='yes' />
 							</Component>
-							<Component Id='Macro_2Png' Guid='3E769590-29C4-4245-99EE-559C9AFD59AE'>
-								<File Id='Macro_2' Name='macro_2.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/macro_2.png' KeyPath='yes' />
-							</Component>
-							<Component Id='Macro_3Png' Guid='7164912E-53B8-472E-B756-1315A187CFE2'>
-								<File Id='Macro_3' Name='macro_3.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/macro_3.png' KeyPath='yes' />
+							<Component Id='NamespacePng' Guid='E3E7F161-3DD9-443B-A0AC-192C37DAE4CB'>
+								<File Id='Namespace' Name='namespace.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/namespace.png' KeyPath='yes' />
 							</Component>
 							<Component Id='GraphPatternPng' Guid='80B2562B-3DB0-42DA-B68A-B43120646EBA'>
 								<File Id='GraphPattern' Name='pattern.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/pattern.png' KeyPath='yes' />
@@ -240,14 +234,8 @@
 							<Component Id='TemplatePng' Guid='0CEF2BCE-C9C8-417A-89E9-8CB6478C4E89'>
 								<File Id='Template' Name='template.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/template.png' KeyPath='yes' />
 							</Component>
-							<Component Id='Typedef_1Png' Guid='47CC3CCE-9912-4039-B9DF-4BCC9F891700'>
-								<File Id='Typedef_1' Name='typedef_1.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/typedef_1.png' KeyPath='yes' />
-							</Component>
-							<Component Id='Typedef_2Png' Guid='6C65CE19-EBE1-4611-9E21-45A91B0C1B77'>
-								<File Id='Typedef_2' Name='typedef_2.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/typedef_2.png' KeyPath='yes' />
-							</Component>
-							<Component Id='Typedef_3Png' Guid='CDEF6B3F-AA7C-4BB0-B327-5448D84AF42C'>
-								<File Id='Typedef_3' Name='typedef_3.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/typedef_3.png' KeyPath='yes' />
+							<Component Id='TypedefPng' Guid='6B171ABD-0222-4477-A17E-C745C37D8B45'>
+								<File Id='Typedef' Name='typedef.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/typedef.png' KeyPath='yes' />
 							</Component>
 
 						</Directory>
@@ -257,12 +245,18 @@
 						<Component Id='C_icon_Png' Guid='5455ADA0-2477-4F46-9BEE-62DCB71D639F'>
 							<File Id='C_icon' Name='c_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/c_icon.png' KeyPath='yes' />
 						</Component>
+						<Component Id='Cdb_icon_Png' Guid='BFEF4175-69DA-49E3-A650-9C5995A3E8E7'>
+							<File Id='Cdb_icon' Name='cdb_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/cdb_icon.png' KeyPath='yes' />
+						</Component>
 						<Component Id='CoatiIco' Guid='9D65B057-EA87-4251-8898-9FAD23AD3371'>
 							<File Id='Coati' Name='coati.ico' DiskId='1' Source='./../../../bin/app/data/gui/icon/coati.ico' KeyPath='yes' />
 						</Component>
 						<Component Id='Cpp_icon_Png' Guid='B9EB2C3F-6256-4F54-9F8C-7DC338424839'>
 							<File Id='Cpp_icon' Name='cpp_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/cpp_icon.png' KeyPath='yes' />
 						</Component>
+						<Component Id='Empty_icon_Png' Guid='47F0E4A4-F74A-4D43-AB9E-75D3B1AB46C7'>
+							<File Id='Empty_icon' Name='empty_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/empty_icon.png' KeyPath='yes' />
+						</Component>
 						<Component Id='Java_icon_Png' Guid='66920390-A101-45B7-8C61-EA9EDF0876D3'>
 							<File Id='Java_icon' Name='java_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/java_icon.png' KeyPath='yes' />
 						</Component>
@@ -275,11 +269,8 @@
 						<Component Id='Project_256_256_Png' Guid='AD536928-0DE5-49BC-B33C-D1A9E9DDB74D'>
 							<File Id='Project_256_256' Name='project_256_256.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/project_256_256.png' KeyPath='yes' />
 						</Component>
-						<Component Id='Project_cdb_256_256_Png' Guid='72B4E345-88E0-4BE9-AC94-94947EE2E9B5'>
-							<File Id='Project_cdb_256_256' Name='project_cdb_256_256.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/project_cdb_256_256.png' KeyPath='yes' />
-						</Component>
-						<Component Id='Project_vs_256_256_Png' Guid='DA7698DC-8E10-4168-9E45-4B8ED48CC49F'>
-							<File Id='Project_vs_256_256' Name='project_vs_256_256.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/project_vs_256_256.png' KeyPath='yes' />
+						<Component Id='Vs_icon_Png' Guid='BBEDB96F-B0D5-4FA6-B808-E15A51921D69'>
+							<File Id='Vs_icon' Name='vs_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/vs_icon.png' KeyPath='yes' />
 						</Component>
 
 					</Directory>
@@ -326,6 +317,9 @@
 						</Component>
 
 						<Directory Id='DataSearchViewImages' Name='images'>
+							<Component Id='ArrowSearchPng' Guid='43858971-6577-49F8-8787-BEAC7B88CED1'>
+								<File Id='ArrowSearch' Name='arrow.png' DiskId='1' Source='./../../../bin/app/data/gui/search_view/images/arrow.png' KeyPath='yes' />
+							</Component>
 							<Component Id='HomePng' Guid='1D00476F-52C2-47F9-8A27-B583D9499311'>
 								<File Id='Home' Name='home.png' DiskId='1' Source='./../../../bin/app/data/gui/search_view/images/home.png' KeyPath='yes' />
 							</Component>
diff --git a/deployment/windows/wixSetup/readme.txt b/deployment/windows/wixSetup/readme.txt
index 1f15cd44..a98388d7 100644
--- a/deployment/windows/wixSetup/readme.txt
+++ b/deployment/windows/wixSetup/readme.txt
@@ -2,11 +2,11 @@
 ||Coati Setup||
 ===============
 
-To install Coati simply run 'setup.exe'
+To install Coati simply run 'Setup.exe'
 
-If you have a previous version installed, setup.exe will attempt to upgrade*.
+If you have a previous version installed, Setup.exe will attempt to upgrade*.
 Your previous application specific settings will be maintained.
 
 
 
-*Upgrades work for Coati versions newer than 0.9.0
\ No newline at end of file
+*Upgrades work for Coati versions newer than 0.9.0
diff --git a/script/deploy_windows.sh b/script/deploy_windows.sh
index 571e9481..f97165a4 100644
--- a/script/deploy_windows.sh
+++ b/script/deploy_windows.sh
@@ -120,15 +120,7 @@ echo -e "$INFO creating package folder"
 rm -rf $APP_PACKAGE_DIR
 mkdir -p $APP_PACKAGE_DIR
 
-cp -u -r deployment/windows/wixSetup/bin/Coati.msi $APP_PACKAGE_DIR/
-cp -u -r deployment/windows/wixSetup/bin/setup.exe $APP_PACKAGE_DIR/
-cp -u -r deployment/windows/wixSetup/bin/api-ms-win-crt-heap-l1-1-0.dll $APP_PACKAGE_DIR/
-cp -u -r deployment/windows/wixSetup/bin/api-ms-win-crt-locale-l1-1-0.dll $APP_PACKAGE_DIR/
-cp -u -r deployment/windows/wixSetup/bin/api-ms-win-crt-math-l1-1-0.dll $APP_PACKAGE_DIR/
-cp -u -r deployment/windows/wixSetup/bin/api-ms-win-crt-runtime-l1-1-0.dll $APP_PACKAGE_DIR/
-cp -u -r deployment/windows/wixSetup/bin/api-ms-win-crt-stdio-l1-1-0.dll $APP_PACKAGE_DIR/
-cp -u -r deployment/windows/wixSetup/bin/msvcp140.dll $APP_PACKAGE_DIR/
-cp -u -r deployment/windows/wixSetup/bin/vcruntime140.dll $APP_PACKAGE_DIR/
+cp -u -r deployment/windows/wixSetup/bin/* $APP_PACKAGE_DIR/
 
 mkdir -p $APP_PACKAGE_DIR/plugins/atom/
 cp -u -r ide_plugins/atom/* $APP_PACKAGE_DIR/plugins/atom/