diff --git a/bin/app/data/gui/window/size_grip.png b/bin/app/data/gui/window/size_grip.png
deleted file mode 100644
index 39246b9b..00000000
Binary files a/bin/app/data/gui/window/size_grip.png and /dev/null differ
diff --git a/bin/app/data/gui/window/size_grip_black.png b/bin/app/data/gui/window/size_grip_black.png
new file mode 100644
index 00000000..87de5059
Binary files /dev/null and b/bin/app/data/gui/window/size_grip_black.png differ
diff --git a/bin/app/data/gui/window/size_grip_white.png b/bin/app/data/gui/window/size_grip_white.png
new file mode 100644
index 00000000..04deacd7
Binary files /dev/null and b/bin/app/data/gui/window/size_grip_white.png differ
diff --git a/deployment/windows/wixSetup/coati.wxs b/deployment/windows/wixSetup/coati.wxs
index e932b7cd..f866e8a6 100644
--- a/deployment/windows/wixSetup/coati.wxs
+++ b/deployment/windows/wixSetup/coati.wxs
@@ -2,20 +2,20 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
 
     <Product Name='Coati' Manufacturer='Coati Software OG'
-        Id='596E7336-D5B9-449A-95E9-6040F354E283' 
+        Id='596E7336-D5B9-449A-95E9-6040F354E283'
         UpgradeCode='6DAB9E05-6E5B-4D26-A2A0-8F1757F2A4EF'
         Language='1033' Codepage='1252' Version='$(var.projectVersion)'>
-		
+
 		<Package Id='*' Keywords='Installer' Description="Coati Installer"
 			Comments='Coati is a registered trademark of Coati Software OG' Manufacturer='Coati Software OG'
 			InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
-			
+
 		<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
-		
+
 		<Property Id='DiskPrompt' Value="Coati Installation [1]" />
 		<Property Id="INSTALLDESKTOPSHORTCUT" />
 		<Property Id="INSTALLSTARTMENUSHORTCUT" Value="true" />
-		
+
 		<!-- Shortcuts -->
 		<Upgrade Id='A4C8F644-9A8C-4825-8C48-F6A98F111722'>
 			<UpgradeVersion OnlyDetect='yes' Property='SELFFOUND'
@@ -26,33 +26,33 @@
 		</Upgrade>
 
 		<Directory Id='TARGETDIR' Name='SourceDir'>
-			
+
 			<!-- This would be an alternative to include C++ runtime stuff, currently the required DLLs are included directly instead -->
 			<!-- <Merge Id="VCRedist" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC140_CRT_x86.msm" DiskId="1" Language="0"/> -->
-			
+
 			<Directory Id="ProgramMenuFolder" Name="Programs">
 				<Directory Id="ProgramMenuDir" Name="Coati">
 					<Component Id="UninstallShortcut" Guid="028B666E-FAE8-4F53-A0E6-C2E0396CB6F2">
 						<Condition>INSTALLSTARTMENUSHORTCUT</Condition>
-						<!-- <Shortcut Id="UninstallProduct"     
+						<!-- <Shortcut Id="UninstallProduct"
 									Name="Coati Uninstall"
 									Description="Uninstall Coati"
 									Target="[System64Folder]msiexec.exe"
 									Arguments="/x [ProductCode]"/> -->
-						
+
 						<Shortcut Id="UninstallProduct"
 								Name="Uninstall Coati"
 								Description="Remove Coati from your computer"
 								Target="[INSTALLDIR]uninstall.bat" />
-						
+
 						<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]\CoatiUninstall" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
 						<RemoveFolder Id='ProgramMenuDir' On='uninstall' />
 					</Component>
-					
+
 					<Component Id="ApplicationShortcut" Guid="5AD30B21-61BA-4002-AF2F-E9E69989E446">
 						<Condition>INSTALLSTARTMENUSHORTCUT</Condition>
 						<Shortcut Id="ApplicationStartMenuShortcut"
-									
+
 									Name="Coati"
 									Description="The Sauce Explorer"
 									Target="[INSTALLDIR]Coati.exe"
@@ -62,7 +62,7 @@
 				</Directory>
 			</Directory>
 
-			
+
 			<Directory Id="DesktopFolder" Name="Desktop">
 				<Component Id='DesktopShortcut' Guid='285FA7FC-F355-4892-AFA7-DD49B8D81563'>
 					<Condition>INSTALLDESKTOPSHORTCUT</Condition>
@@ -75,19 +75,19 @@
 					<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]\CoatiDesktop" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
 				</Component>
 			</Directory>
-			
+
 			<!-- Application Folder -->
 			<Directory Id='ProgramFilesFolder' Name='PFiles'>
 				<Directory Id='COMPANYDIR' Name='Coati Software'>
 					<Directory Id='INSTALLDIR' Name='Coati' />
 				</Directory>
 			</Directory>
-			
-			
+
+
 			<!-- AppData Folder -->
 			<Directory Id="LocalAppDataFolder">
 				<Directory Id="CoatiSoftwareAppData" Name="Coati Software">
-				
+
 					<Component Id="CoatiSoftwareAppDataDummy" Guid="E57CFAEC-B3E7-45EB-8B94-F50EBDA1355C">
 						<CreateFolder />
 						<RemoveFolder Id='CoatiSoftwareAppData' On='uninstall' />
@@ -95,7 +95,7 @@
 							<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 						</RegistryKey>
 					</Component>
-				
+
 					<Directory Id="CoatiAppData" Name="Coati">
 						<Component Id="WindowSettingsIni" Guid="F6E9CCD3-C2BE-4309-8E0F-B1FC7ABB189E">
 							<CreateFolder />
@@ -109,26 +109,26 @@
 				</Directory>
 			</Directory>
 		</Directory>
-		
-		
-		
+
+
+
 		<Feature Id='Complete' Title='Coati' Description='Source Explorer' Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
 			<Feature Id='Program' Title='Program' Description='The main installation' Level='1'>
 				<!-- Prerequisites -->
 				<!-- <MergeRef Id='VCRedist'/> --> <!-- see comment at declaration -->
-			
+
 				<!-- Application Folder Stuff -->
 				<ComponentRef Id='MainExecutable'/>
-			
+
 				<ComponentRef Id='ApplicationShortcut'/>
-				<ComponentRef Id='DesktopShortcut'/>				
+				<ComponentRef Id='DesktopShortcut'/>
 				<ComponentRef Id='UninstallShortcut'/>
-				
+
 				<ComponentRef Id='Qt5CoreDll'/>
 				<ComponentRef Id='Qt5GuiDll'/>
 				<ComponentRef Id='Qt5NetworkDll'/>
 				<ComponentRef Id='Qt5WidgetsDll'/>
-				
+
 				<ComponentRef Id='apiMsWinCrtConvert_l1_1_0Dll'/>
 				<ComponentRef Id='apiMsWinCrtEnvironment_l1_1_0Dll'/>
 				<ComponentRef Id='apiMsWinCrtFilesystem_l1_1_0Dll'/>
@@ -141,19 +141,19 @@
 				<ComponentRef Id='apiMsWinCrtTime_l1_1_0Dll'/>
 				<ComponentRef Id='apiMsWinCrtUtility_l1_1_0Dll'/>
 				<ComponentRef Id='qtConf'/>
-				
+
 				<ComponentRef Id='QWindowsDll'/>
-				
+
 				<ComponentRef Id='MainCss'/>
 				<ComponentRef Id='SplashBluePng'/>
 				<ComponentRef Id='SplashWhitePng'/>
-				
+
 				<ComponentRef Id='AboutCss'/>
 				<ComponentRef Id='IconClosePng'/>
 				<ComponentRef Id='LogoAwsPng'/>
 				<ComponentRef Id='LogoCoatiPng'/>
 				<ComponentRef Id='LogoFhsPng'/>
-				
+
 				<ComponentRef Id='CodeViewCss'/>
 				<ComponentRef Id='EditPng'/>
 				<ComponentRef Id='MaximizeActivePng'/>
@@ -163,7 +163,7 @@
 				<ComponentRef Id='PatternPng'/>
 				<ComponentRef Id='SnippetActivePng'/>
 				<ComponentRef Id='SnippetInactivePng'/>
-				
+
 				<ComponentRef Id='GraphViewCss'/>
 				<ComponentRef Id='ArrowPng'/>
 				<ComponentRef Id='BundlePng'/>
@@ -181,37 +181,37 @@
 				<ComponentRef Id='Typedef_1Png'/>
 				<ComponentRef Id='Typedef_2Png'/>
 				<ComponentRef Id='Typedef_3Png'/>
-				
+
 				<ComponentRef Id='CoatiIco'/>
 				<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='ErrorPng'/>
 				<ComponentRef Id='FlagPng'/>
 				<ComponentRef Id='IndexingDialogCss'/>
 				<ComponentRef Id='ProgressBarElementPng'/>
-				
+
 				<ComponentRef Id='LicenseCss'/>
-				
+
 				<ComponentRef Id='RefreshViewCss'/>
 				<ComponentRef Id='RefreshPng'/>
-				
+
 				<ComponentRef Id='SearchViewCss'/>
 				<ComponentRef Id='HomePng'/>
 				<ComponentRef Id='SearchPng'/>
-				
+
 				<ComponentRef Id='StartscreenCss'/>
-				
+
 				<ComponentRef Id='DotPng'/>
 				<ComponentRef Id='LoaderGif'/>
-				
+
 				<ComponentRef Id='UndoRedoViewCss'/>
 				<ComponentRef Id='ArrowLeftPng'/>
 				<ComponentRef Id='ArrowRightPng'/>
-				
+
 				<ComponentRef Id='WindowDotsPng'/>
 				<ComponentRef Id='WindowDotsHoverPng'/>
 				<ComponentRef Id='HelpPng'/>
@@ -224,12 +224,13 @@
 				<ComponentRef Id='PlusHoverPng'/>
 				<ComponentRef Id='WindowRefreshPng'/>
 				<ComponentRef Id='RefreshHoverPng'/>
-				<ComponentRef Id='SizeGripPng'/>
+				<ComponentRef Id='SizeGripBlackPng'/>
+				<ComponentRef Id='SizeGripWhitePng'/>
 				<ComponentRef Id='WindowCss'/>
-				
+
 				<ComponentRef Id='ColorSchemes'/>
 				<ComponentRef Id='FontSet'/>
-				
+
 				<ComponentRef Id='JavaGuavaJar'/>
 				<ComponentRef Id='JavaJavaIndexerJar'/>
 				<ComponentRef Id='JavaJavaparserJar'/>
@@ -238,26 +239,26 @@
 				<ComponentRef Id='JavaJavaSymbolSolverCoreJar'/>
 				<ComponentRef Id='JavaJavaSymbolSolverLogicJar'/>
 				<ComponentRef Id='JavaJavaSymbolSolverModelJar'/>
-				
+
 				<ComponentRef Id='UninstallBat'/>
-				
+
 				<!-- AppData Folder Stuff -->
 				<ComponentRef Id='CoatiSoftwareAppDataDummy'/>
-				
+
 				<ComponentRef Id='WindowSettingsIni'/>
 				<ComponentRef Id='ApplicationSettingsXml'/>
 			<!-- </Feature> -->
-			
+
 			<!-- Sample Projects for AddData Folder -->
 			<!-- <Feature Id='SampleCode' Title='Samples' Description='Tutorial and Sample Project' Level='1000'> -->
 				<ComponentRef Id='SampleProjects'/>
-				
+
 				<ComponentRef Id='TictactoeCoatiproject'/>
 				<ComponentRef Id='TictactoeCode'/>
-				
+
 				<ComponentRef Id='TutorialCoatiproject'/>
 				<ComponentRef Id='TutorialCode'/>
-				
+
 				<ComponentRef Id='JavaparserCoatiproject'/>
 				<ComponentRef Id='SampleProjectJavaparserSrcFolder'/>
 				<ComponentRef Id='SampleProjectJavaparserSrcMainFolder'/>
@@ -283,40 +284,40 @@
 				<ComponentRef Id='SampleProjectJavaparserTargetGeneratedSourcesCode'/>
 			</Feature>
 		</Feature>
-		
+
 		<CustomAction Id='AlreadyUpdated' Error='[ProductName] is already up to date.' />
 		<CustomAction Id='NoDowngrade' Error='A later version of [ProductName] is already installed' />
-		
+
 		<InstallExecuteSequence>
 			<Custom Action='AlreadyUpdated' After='FindRelatedProducts'>SELFFOUND</Custom>
 			<Custom Action='NoDowngrade' After='FindRelatedProducts'>NEWERFOUND</Custom>
 			<Custom Action='SetupAppSettings' After='InstallFiles'>NOT Installed AND NOT PATCH</Custom>
 			<Custom Action='UninstallRemoveLogFolder' After='UnpublishComponents'>(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
 		</InstallExecuteSequence>
-		
+
 		<!-- <UIRef Id="WixUI_InstallDir" /> -->
-		
+
 		<UI Id="MyWixUI_InstallDir">
 			<UIRef Id="WixUI_InstallDir" />
-		
+
 			<DialogRef Id="ShortcutDlg" />
 
 			<Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="ShortcutDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
 			<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ShortcutDlg">1</Publish>
 		</UI>
-		
+
 		<Property Id="WIXUI_INSTALLDIR" Value="COMPANYDIR" />
-		
+
 		<UIRef Id="WixUI_ErrorProgressText" />
-		
+
 		<Icon Id="Coati.ico" SourceFile="./../../../bin/app/data/gui/icon/coati.ico" />
 		<Icon Id="Project.ico" SourceFile="./../../../bin/app/data/gui/icon/project.ico" />
-		
+
 		<WixVariable Id="WixUILicenseRtf" Value="./../../../bin/app/data/gui/installer/EULA.rtf" />
-		
+
 		<WixVariable Id="WixUIBannerBmp" Value="Images/banner.bmp" />
 		<WixVariable Id="WixUIDialogBmp" Value="Images/w_installer.bmp" />
-		
+
 		<!-- <WixVariable Id="var.Coati.projectVersion" Value="0.7.0" /> -->
 	</Product>
 </Wix>
\ No newline at end of file
diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs
index f47d337f..1649e890 100644
--- a/deployment/windows/wixSetup/installDir.wxs
+++ b/deployment/windows/wixSetup/installDir.wxs
@@ -2,10 +2,10 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
 	<Fragment>
 		<DirectoryRef Id='INSTALLDIR'>
-			
+
 			<Component Id='MainExecutable' Guid='A6136907-B3C5-4393-88D7-2ACF63E138A8'>
 				<File Id='CoatiEXE' Name='Coati.exe' DiskId='1' Source='./../../../bin/app/Release/Coati_obfuscated.exe' KeyPath='yes' />
-				
+
 				<!-- File association -->
 				<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\[ProductName].Document" Name="projectfile" Value="Coati project file" Type="string" />
 				<ProgId Id='Coati.coatiprojectfile' Description='Coati project file' Advertise='yes' Icon='Project.ico'>
@@ -14,102 +14,102 @@
 						<MIME Advertise='yes' ContentType='application/coatiproject' Default='yes' />
 					</Extension>
 				</ProgId>
-				
+
 			</Component>
-			
+
 			<Component Id='Qt5CoreDll' Guid='0C899A49-DE40-4D35-A0E9-9B64E330BCFA'>
 				<File Id='qt5coreDLL' Name='Qt5Core.dll' DiskId='1' Source='./../../../bin/app/Release/Qt5Core.dll' KeyPath='yes' />
 			</Component>
-			
+
 			<Component Id='Qt5GuiDll' Guid='F57A8F21-7420-49BC-98B9-2ECD3C5B9674'>
 				<File Id='qt5guiDLL' Name='Qt5Gui.dll' DiskId='1' Source='./../../../bin/app/Release/Qt5Gui.dll' KeyPath='yes' />
 			</Component>
-			
+
 			<Component Id='Qt5NetworkDll' Guid='78E8699E-42EA-48BD-B844-DD0F9C0ED432'>
 				<File Id='qt5networkDLL' Name='Qt5Network.dll' DiskId='1' Source='./../../../bin/app/Release/Qt5Network.dll' KeyPath='yes' />
 			</Component>
-			
+
 			<Component Id='Qt5WidgetsDll' Guid='462F10F3-6AC7-473C-95EA-C5616E2822A3'>
 				<File Id='qt5widgetsDLL' Name='Qt5Widgets.dll' DiskId='1' Source='./../../../bin/app/Release/Qt5Widgets.dll' KeyPath='yes' />
 			</Component>
-			
+
 			<Component Id='apiMsWinCrtConvert_l1_1_0Dll' Guid='947B7587-3C4D-4706-BFE2-F3FAC60D7AC0'>
 				<File Id='apiMsWinCrtConvert_l1_1_0' Name='api-ms-win-crt-convert-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-convert-l1-1-0.dll' KeyPath='yes' />
 			</Component>
-			
+
 			<Component Id='apiMsWinCrtEnvironment_l1_1_0Dll' Guid='105CDF55-7DC2-40D3-9F0D-9327EB5972DC'>
 				<File Id='apiMsWinCrtEnvironment_l1_1_0' Name='api-ms-win-crt-environment-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-environment-l1-1-0.dll' KeyPath='yes' />
 			</Component>
-			
+
 			<Component Id='apiMsWinCrtFilesystem_l1_1_0Dll' Guid='C68E183F-6346-4B67-AE41-880A7CB696D5'>
 				<File Id='apiMsWinCrtFilesystem_l1_1_0' Name='api-ms-win-crt-filesystem-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-filesystem-l1-1-0.dll' KeyPath='yes' />
 			</Component>
-			
+
 			<Component Id='apiMsWinCrtHeap_l1_1_0Dll' Guid='0CC58622-7280-48E8-92B5-8E2329449215'>
 				<File Id='apiMsWinCrtHeap_l1_1_0' Name='api-ms-win-crt-heap-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-heap-l1-1-0.dll' KeyPath='yes' />
 			</Component>
-			
+
 			<Component Id='apiMsWinCrtLocale_l1_1_0Dll' Guid='50833B74-8A48-4994-A176-A28BFBBAEFC1'>
 				<File Id='apiMsWinCrtLocale_l1_1_0' Name='api-ms-win-crt-locale-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-locale-l1-1-0.dll' KeyPath='yes' />
 			</Component>
-			
+
 			<Component Id='apiMsWinCrtMath_l1_1_0Dll' Guid='9A608BBB-3152-4B1D-BFD4-E5D6A10039BB'>
 				<File Id='apiMsWinCrtMath_l1_1_0' Name='api-ms-win-crt-math-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-math-l1-1-0.dll' KeyPath='yes' />
 			</Component>
-			
+
 			<Component Id='apiMsWinCrtRuntime_l1_1_0Dll' Guid='48419CF9-BFE3-4B48-BC44-B4A610E0DAA1'>
 				<File Id='apiMsWinCrtRuntime_l1_1_0' Name='api-ms-win-crt-runtime-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-runtime-l1-1-0.dll' KeyPath='yes' />
 			</Component>
-			
+
 			<Component Id='apiMsWinCrtStdio_l1_1_0Dll' Guid='DFD68FED-5E68-46DF-A015-999B0A0C1008'>
 				<File Id='apiMsWinCrtStdio_l1_1_0' Name='api-ms-win-crt-stdio-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-stdio-l1-1-0.dll' KeyPath='yes' />
 			</Component>
-			
+
 			<Component Id='apiMsWinCrtString_l1_1_0Dll' Guid='6A3BF854-00C7-4813-BFE9-3BD4C2A3A0AB'>
 				<File Id='apiMsWinCrtString_l1_1_0' Name='api-ms-win-crt-string-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-string-l1-1-0.dll' KeyPath='yes' />
 			</Component>
-			
+
 			<Component Id='apiMsWinCrtTime_l1_1_0Dll' Guid='AB413622-275D-4D37-976D-4BD04DCCCE91'>
 				<File Id='apiMsWinCrtTime_l1_1_0' Name='api-ms-win-crt-time-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-time-l1-1-0.dll' KeyPath='yes' />
 			</Component>
-			
+
 			<Component Id='apiMsWinCrtUtility_l1_1_0Dll' Guid='40F5F1AA-1849-45F2-A15F-816CE20AFECB'>
 				<File Id='apiMsWinCrtUtility_l1_1_0' Name='api-ms-win-crt-utility-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-utility-l1-1-0.dll' KeyPath='yes' />
 			</Component>
-			
+
 			<Component Id='qtConf' Guid='58C34A47-0F21-4C41-9CCC-08141D84FF2A'>
 				<File Id='qt' Name='qt.conf' DiskId='1' Source='./../../../bin/app/Release/qt.conf' KeyPath='yes' />
 			</Component>
-			
+
 			<Directory Id='Platforms' Name='platforms'>
-			
+
 				<Component Id='QWindowsDll' Guid='0B57B111-1068-42D1-891B-A21C6C0CC63E'>
 					<File Id='qwindowsDLL' Name='qwindows.dll' DiskId='1' Source='./../../../bin/app/Release/platforms/qwindows.dll' KeyPath='yes' />
 				</Component>
-			
+
 			</Directory>
-			
+
 			<Directory Id='LieutenantCommanderData' Name='data'>
-				
+
 				<Directory Id='DataFonts' Name='fonts'>
-					
+
 					<Component Id='FontSet' Guid='F5330EDB-A1E2-4B1D-BBA3-A65DAFE34814'>
 						<File Id='FiraSansLicensetxt' Name='FiraSans_License.txt' DiskId='1' Source='./../../../bin/app/data/fonts/FiraSans_License.txt' KeyPath='yes' />
 						<File Id='FiraSansRegularotf' Name='FiraSans-Regular.otf' DiskId='1' Source='./../../../bin/app/data/fonts/FiraSans-Regular.otf' KeyPath='no' />
 						<File Id='FiraSansSemiBoldotf' Name='FiraSans-SemiBold.otf' DiskId='1' Source='./../../../bin/app/data/fonts/FiraSans-SemiBold.otf' KeyPath='no' />
-						
+
 						<File Id='RobotoLicensetxt' Name='Roboto_License.txt' DiskId='1' Source='./../../../bin/app/data/fonts/Roboto_License.txt' KeyPath='no' />
 						<File Id='RobotoBoldttf' Name='Roboto-Bold.ttf' DiskId='1' Source='./../../../bin/app/data/fonts/Roboto-Bold.ttf' KeyPath='no' />
 						<File Id='RobotoRegularttf' Name='Roboto-Regular.ttf' DiskId='1' Source='./../../../bin/app/data/fonts/Roboto-Regular.ttf' KeyPath='no' />
-						
+
 						<File Id='SourceCodeProLicensetxt' Name='SourceCodePro_License.txt' DiskId='1' Source='./../../../bin/app/data/fonts/SourceCodePro_License.txt' KeyPath='no' />
 						<File Id='SourceCodeProBoldotf' Name='SourceCodePro-Bold.otf' DiskId='1' Source='./../../../bin/app/data/fonts/SourceCodePro-Bold.otf' KeyPath='no' />
 						<File Id='SourceCodeProMediumotf' Name='SourceCodePro-Medium.otf' DiskId='1' Source='./../../../bin/app/data/fonts/SourceCodePro-Medium.otf' KeyPath='no' />
 						<File Id='SourceCodeProRegularotf' Name='SourceCodePro-Regular.otf' DiskId='1' Source='./../../../bin/app/data/fonts/SourceCodePro-Regular.otf' KeyPath='no' />
 					</Component>
-					
+
 				</Directory>
-				
+
 				<Directory Id='DataColorSchemes' Name='color_schemes'>
 					<Component Id='ColorSchemes' Guid='D6F2E227-6442-4415-B2F6-050E2A142D09'>
 						<File Id='badRainbowXml' Name='bad_rainbow.xml' DiskId='1' Source='./../../../bin/app/data/color_schemes/bad_rainbow.xml' KeyPath='yes' />
@@ -117,7 +117,7 @@
 						<File Id='darkXml' Name='dark.xml' DiskId='1' Source='./../../../bin/app/data/color_schemes/dark.xml' KeyPath='no' />
 					</Component>
 				</Directory>
-				
+
 				<Directory Id='DataGui' Name='gui'>
 					<Component Id='MainCss' Guid='70C63F6F-C13B-4EDA-94D4-7884A8BEFA55'>
 						<File Id='Main' Name='main.css' DiskId='1' Source='./../../../bin/app/data/gui/main.css' KeyPath='yes' />
@@ -128,7 +128,7 @@
 					<Component Id='SplashWhitePng' Guid='0567B438-1770-4201-B040-E63480544315'>
 						<File Id='SplashWhite' Name='splash_white.png' DiskId='1' Source='./../../../bin/app/data/gui/splash_white.png' KeyPath='yes' />
 					</Component>
-					
+
 					<Directory Id='DataAbout' Name='about'>
 						<Component Id='AboutCss' Guid='137816FE-E17E-47FF-8826-FBD74E4E5BB7'>
 							<File Id='About' Name='splash_white.png' DiskId='1' Source='./../../../bin/app/data/gui/about/about.css' KeyPath='yes' />
@@ -146,12 +146,12 @@
 							<File Id='LogoFhs' Name='logo_fhs.png' DiskId='1' Source='./../../../bin/app/data/gui/about/logo_fhs.png' KeyPath='yes' />
 						</Component>
 					</Directory>
-					
+
 					<Directory Id='DataCodeView' Name='code_view'>
 						<Component Id='CodeViewCss' Guid='D880FDCE-037E-4401-95D5-38D4472C9A47'>
 							<File Id='CodeView' Name='code_view.css' DiskId='1' Source='./../../../bin/app/data/gui/code_view/code_view.css' KeyPath='yes' />
 						</Component>
-						
+
 						<Directory Id='DataCodeViewImages' Name='images'>
 							<Component Id='EditPng' Guid='09F23361-CE52-4D04-8E3D-34821EBF57B3'>
 								<File Id='Edit' Name='edit.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/edit.png' KeyPath='yes' />
@@ -177,15 +177,15 @@
 							<Component Id='SnippetInactivePng' Guid='EA3522FC-EF33-4732-8F93-586985EB0549'>
 								<File Id='SnippetInactive' Name='snippet_inactive.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/snippet_inactive.png' KeyPath='yes' />
 							</Component>
-							
+
 						</Directory>
 					</Directory>
-					
+
 					<Directory Id='DataGraphView' Name='graph_view'>
 						<Component Id='GraphViewCss' Guid='BC8CDF1A-5831-4686-927C-C9E26ED85A3B'>
 							<File Id='GraphView' Name='graph_view.css' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/graph_view.css' KeyPath='yes' />
 						</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' />
@@ -219,7 +219,7 @@
 							</Component>
 							<Component Id='ProtectedPng' Guid='D7EE1C80-C68E-42BB-B16F-F114DA635BB9'>
 								<File Id='Protected' Name='protected.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/protected.png' KeyPath='yes' />
-							</Component>		
+							</Component>
 							<Component Id='PublicPng' Guid='66E2CB4C-A9D8-4450-B630-393009D021A1'>
 								<File Id='Public' Name='public.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/public.png' KeyPath='yes' />
 							</Component>
@@ -235,17 +235,17 @@
 							<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>
-							
+
 						</Directory>
 					</Directory>
-					
+
 					<Directory Id='DataIcon' Name='icon'>
 						<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='Logo_1024_1024_Png' Guid='4A25272C-380F-4414-BFBA-06C92D19B116'>
 							<File Id='Logo_1024_1024' Name='logo_1024_1024.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/logo_1024_1024.png' KeyPath='yes' />
-						</Component>									
+						</Component>
 						<Component Id='ProjectIco' Guid='CDAC3217-C104-4D88-98F9-C138825721D4'>
 							<File Id='Project' Name='project.ico' DiskId='1' Source='./../../../bin/app/data/gui/icon/project.ico' KeyPath='yes' />
 						</Component>
@@ -254,13 +254,13 @@
 						</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>
 						<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>
-						
+
 					</Directory>
-					
+
 					<Directory Id='DataIndexingDialog' Name='indexing_dialog'>
 						<Component Id='ErrorPng' Guid='90C8F0E3-C532-4088-A3CB-66CB1DEE0CCD'>
 							<File Id='Error' Name='error.png' DiskId='1' Source='./../../../bin/app/data/gui/indexing_dialog/error.png' KeyPath='yes' />
@@ -274,34 +274,34 @@
 						<Component Id='ProgressBarElementPng' Guid='85B80506-6F42-457F-8B6D-148F20340545'>
 							<File Id='ProgressBarElement' Name='progress_bar_element.png' DiskId='1' Source='./../../../bin/app/data/gui/indexing_dialog/progress_bar_element.png' KeyPath='yes' />
 						</Component>
-						
+
 					</Directory>
-					
+
 					<Directory Id='DataLicense' Name='license'>
 						<Component Id='LicenseCss' Guid='3A9B9310-10B0-477E-A1D8-027666F22476'>
 							<File Id='License' Name='license.css' DiskId='1' Source='./../../../bin/app/data/gui/license/license.css' KeyPath='yes' />
 						</Component>
 					</Directory>
-					
+
 					<Directory Id='DataRefreshView' Name='refresh_view'>
 						<Component Id='RefreshViewCss' Guid='8AF888D9-BC4B-4AC3-8E2C-20B74F82A888'>
 							<File Id='RefreshView' Name='refresh_view.css' DiskId='1' Source='./../../../bin/app/data/gui/refresh_view/refresh_view.css' KeyPath='yes' />
 						</Component>
-						
+
 						<Directory Id='DataRefreshViewImages' Name='images'>
 							<Component Id='RefreshPng' Guid='AD5F7B6B-0373-4207-B053-16293FC4C631'>
 								<File Id='Refresh' Name='refresh.png' DiskId='1' Source='./../../../bin/app/data/gui/refresh_view/images/refresh.png' KeyPath='yes' />
 							</Component>
 						</Directory>
-						
+
 					</Directory>
-					
+
 					<Directory Id='DataSearchView' Name='search_view'>
-					
+
 						<Component Id='SearchViewCss' Guid='77634E10-B955-48E1-BA12-12C1FA131C00'>
 							<File Id='SearchView' Name='search_view.css' DiskId='1' Source='./../../../bin/app/data/gui/search_view/search_view.css' KeyPath='yes' />
 						</Component>
-						
+
 						<Directory Id='DataSearchViewImages' Name='images'>
 							<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' />
@@ -310,48 +310,48 @@
 								<File Id='Search' Name='search.png' DiskId='1' Source='./../../../bin/app/data/gui/search_view/images/search.png' KeyPath='yes' />
 							</Component>
 						</Directory>
-						
+
 					</Directory>
-					
+
 					<Directory Id='DataStartScreen' Name='startscreen'>
-					
+
 						<Component Id='StartscreenCss' Guid='9D3496D5-735A-4686-ADE9-DEB19DF69045'>
 							<File Id='Startscreen' Name='startscreen.css' DiskId='1' Source='./../../../bin/app/data/gui/startscreen/startscreen.css' KeyPath='yes' />
 						</Component>
-					
+
 					</Directory>
-					
+
 					<Directory Id='DataStatusbarView' Name='statusbar_view'>
-					
+
 						<Component Id='DotPng' Guid='7F7173DC-E888-4F03-82CC-3DD86BF402C4'>
 							<File Id='Dot' Name='dot.png' DiskId='1' Source='./../../../bin/app/data/gui/statusbar_view/dot.png' KeyPath='yes' />
 						</Component>
 						<Component Id='LoaderGif' Guid='E0F92524-DDE8-442E-9AD6-A1B2123A979F'>
 							<File Id='Loader' Name='loader.gif' DiskId='1' Source='./../../../bin/app/data/gui/statusbar_view/loader.gif' KeyPath='yes' />
 						</Component>
-					
+
 					</Directory>
-					
+
 					<Directory Id='DataUndoRedoView' Name='undoredo_view'>
-					
+
 						<Component Id='UndoRedoViewCss' Guid='4B2A3FB0-C8F4-4FFE-AE49-93204C35506C'>
 							<File Id='UndoRedoView' Name='undoredo_view.css' DiskId='1' Source='./../../../bin/app/data/gui/undoredo_view/undoredo_view.css' KeyPath='yes' />
 						</Component>
-						
+
 						<Directory Id='DataUndoRedoViewImages' Name='images'>
-						
+
 							<Component Id='ArrowLeftPng' Guid='71CD283C-88A6-4E3A-B3BD-D9F94B835875'>
 								<File Id='ArrowLeft' Name='arrow_left.png' DiskId='1' Source='./../../../bin/app/data/gui/undoredo_view/images/arrow_left.png' KeyPath='yes' />
 							</Component>
 							<Component Id='ArrowRightPng' Guid='95C3B2B2-4411-4086-A75B-2E03B7A3119F'>
 								<File Id='ArrowRight' Name='arrow_right.png' DiskId='1' Source='./../../../bin/app/data/gui/undoredo_view/images/arrow_right.png' KeyPath='yes' />
 							</Component>
-					
+
 						</Directory>
 					</Directory>
-					
+
 					<Directory Id='DataWindow' Name='window'>
-					
+
 						<Component Id='WindowDotsPng' Guid='CA2C89C9-91E3-4755-B7BB-DA2253807784'>
 							<File Id='WindowDots' Name='dots.png' DiskId='1' Source='./../../../bin/app/data/gui/window/dots.png' KeyPath='yes' />
 						</Component>
@@ -388,19 +388,22 @@
 						<Component Id='RefreshHoverPng' Guid='5F2FFEC8-149F-4AA4-8935-6EED3093DE23'>
 							<File Id='RefreshHover' Name='refresh_hover.png' DiskId='1' Source='./../../../bin/app/data/gui/window/refresh_hover.png' KeyPath='yes' />
 						</Component>
-						<Component Id='SizeGripPng' Guid='0AD61462-31E3-40EE-B6BB-7509C48C6816'>
-							<File Id='SizeGrip' Name='size_grip.png' DiskId='1' Source='./../../../bin/app/data/gui/window/size_grip.png' KeyPath='yes' />
+						<Component Id='SizeGripBlackPng' Guid='ADC8042C-3CDA-47C5-8FA7-5741394BE1D3'>
+							<File Id='SizeGripBlack' Name='size_grip_black.png' DiskId='1' Source='./../../../bin/app/data/gui/window/size_grip_black.png' KeyPath='yes' />
+						</Component>
+						<Component Id='SizeGripWhitePng' Guid='223B9301-8CDB-4C41-A67E-03CE0558E48E'>
+							<File Id='SizeGripWhite' Name='size_grip_white.png' DiskId='1' Source='./../../../bin/app/data/gui/window/size_grip_white.png' KeyPath='yes' />
 						</Component>
 						<Component Id='WindowCss' Guid='C9BDB09F-7278-41BA-BF3B-AD335B7FB129'>
 							<File Id='Window' Name='window.css' DiskId='1' Source='./../../../bin/app/data/gui/window/window.css' KeyPath='yes' />
 						</Component>
-					
+
 					</Directory>
-					
+
 				</Directory>
-				
+
 				<Directory Id='DataJava' Name='java'>
-					
+
 					<Component Id='JavaGuavaJar' Guid='BAA854D3-5669-4E1E-94DF-33B3C84DDD23'>
 						<File Id='JavaGuava' Name='guava-18.0.jar' DiskId='1' Source='./../../../bin/app/data/java/guava-18.0.jar' KeyPath='yes' />
 					</Component>
@@ -425,16 +428,16 @@
 					<Component Id='JavaJavaSymbolSolverModelJar' Guid='1BE000DF-98A9-44FA-8EE6-DC25C239B051'>
 						<File Id='JavaJavaSymbolSolverModel' Name='java-symbol-solver-model.jar' DiskId='1' Source='./../../../bin/app/data/java/java-symbol-solver-model.jar' KeyPath='yes' />
 					</Component>
-					
-				
+
+
 				</Directory>
-				
+
 			</Directory>
-			
+
 			<Component Id='UninstallBat' Guid='75D67FBD-06C8-4D3C-AE1D-4802456F4466'>
 				<File Id='Uninstall' Name='uninstall.bat' DiskId='1' Source='./../../../bin/app/data/install/uninstall_wix.bat' KeyPath='yes' />
 			</Component>
-			
+
 		</DirectoryRef>
 	</Fragment>
 </Wix>
\ No newline at end of file
diff --git a/src/lib_gui/qt/window/QtAbout.cpp b/src/lib_gui/qt/window/QtAbout.cpp
index cc83c425..57088263 100644
--- a/src/lib_gui/qt/window/QtAbout.cpp
+++ b/src/lib_gui/qt/window/QtAbout.cpp
@@ -13,6 +13,7 @@
 QtAbout::QtAbout(QWidget *parent)
 	: QtWindow(parent)
 {
+	setSizeGripStyle(false);
 }
 
 QSize QtAbout::sizeHint() const
diff --git a/src/lib_gui/qt/window/QtIndexingDialog.cpp b/src/lib_gui/qt/window/QtIndexingDialog.cpp
index 3be10c2a..4b1adf88 100644
--- a/src/lib_gui/qt/window/QtIndexingDialog.cpp
+++ b/src/lib_gui/qt/window/QtIndexingDialog.cpp
@@ -25,6 +25,7 @@ QtIndexingDialog::QtIndexingDialog(QWidget* parent)
 	, m_callback([](bool){})
 {
 	// setWindowFlags(Qt::WindowStaysOnTopHint);
+	setSizeGripStyle(false);
 }
 
 QSize QtIndexingDialog::sizeHint() const
diff --git a/src/lib_gui/qt/window/QtWindow.cpp b/src/lib_gui/qt/window/QtWindow.cpp
index 45c9be0b..71577551 100644
--- a/src/lib_gui/qt/window/QtWindow.cpp
+++ b/src/lib_gui/qt/window/QtWindow.cpp
@@ -55,16 +55,10 @@ QtWindow::QtWindow(QWidget* parent)
 	layout->addWidget(m_content);
 
 	QHBoxLayout* gripLayout = new QHBoxLayout();
-	QSizeGrip* sizeGrip = new QSizeGrip(m_window);
-	sizeGrip->setStyleSheet(QString::fromStdString(
-		"QSizeGrip {"
-		"	max-height: 12px;"
-		"	max-width: 12px;"
-		"	border-image: url(" + ResourcePaths::getGuiPath() + "window/size_grip.png);"
-		"}"
-	));
+	m_sizeGrip = new QSizeGrip(m_window);
+	setSizeGripStyle(true);
 	gripLayout->addWidget(new QWidget());
-	gripLayout->addWidget(sizeGrip);
+	gripLayout->addWidget(m_sizeGrip);
 	layout->addLayout(gripLayout);
 
 	resize(sizeHint());
@@ -143,6 +137,19 @@ void QtWindow::setup()
 	setupDone();
 }
 
+void QtWindow::setSizeGripStyle(bool isBlack)
+{
+	std::string path = isBlack ? "size_grip_black.png" : "size_grip_white.png";
+
+	m_sizeGrip->setStyleSheet(QString::fromStdString(
+		"QSizeGrip {"
+		"	max-height: 16px;"
+		"	max-width: 16px;"
+		"	border-image: url(" + ResourcePaths::getGuiPath() + "window/" + path + ");"
+		"}"
+	));
+}
+
 void QtWindow::setCancelAble(bool cancelable)
 {
 	setCloseEnabled(cancelable);
diff --git a/src/lib_gui/qt/window/QtWindow.h b/src/lib_gui/qt/window/QtWindow.h
index a452ca7b..3b677b54 100644
--- a/src/lib_gui/qt/window/QtWindow.h
+++ b/src/lib_gui/qt/window/QtWindow.h
@@ -24,6 +24,8 @@ public:
 
 	void setup();
 
+	void setSizeGripStyle(bool isBlack);
+
 	void setCancelAble(bool cancelAble);
 	void setScrollAble(bool scrollAble);