diff --git a/components/virtualtreeview-unstable/demos/dataarray/dataarray.lpi b/components/virtualtreeview-unstable/demos/dataarray/dataarray.lpi
index 6c85387b9..0a6833910 100644
--- a/components/virtualtreeview-unstable/demos/dataarray/dataarray.lpi
+++ b/components/virtualtreeview-unstable/demos/dataarray/dataarray.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="\"/>
+    <PathDelim Value="/"/>
     <Version Value="5"/>
     <General>
       <Flags>
@@ -9,6 +9,7 @@
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
+      <IconPath Value="./"/>
       <TargetFileExt Value=".exe"/>
     </General>
     <VersionInfo>
@@ -52,7 +53,6 @@
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="5"/>
-    <PathDelim Value="\"/>
     <CodeGeneration>
       <Generate Value="Faster"/>
     </CodeGeneration>
diff --git a/components/virtualtreeview-unstable/demos/images/images.lpi b/components/virtualtreeview-unstable/demos/images/images.lpi
index 8385da6df..53d063726 100644
--- a/components/virtualtreeview-unstable/demos/images/images.lpi
+++ b/components/virtualtreeview-unstable/demos/images/images.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="\"/>
+    <PathDelim Value="/"/>
     <Version Value="5"/>
     <General>
       <Flags>
@@ -53,7 +53,6 @@
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="5"/>
-    <PathDelim Value="\"/>
     <CodeGeneration>
       <Generate Value="Faster"/>
     </CodeGeneration>
diff --git a/components/virtualtreeview-unstable/demos/objects/mvcdemo.lpi b/components/virtualtreeview-unstable/demos/objects/mvcdemo.lpi
index e6717a530..489517a53 100644
--- a/components/virtualtreeview-unstable/demos/objects/mvcdemo.lpi
+++ b/components/virtualtreeview-unstable/demos/objects/mvcdemo.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="\"/>
+    <PathDelim Value="/"/>
     <Version Value="5"/>
     <General>
       <Flags>
@@ -9,7 +9,7 @@
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <IconPath Value=".\"/>
+      <IconPath Value="./"/>
       <TargetFileExt Value=".exe"/>
     </General>
     <VersionInfo>
@@ -23,15 +23,15 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
     <RequiredPackages Count="3">
       <Item1>
-        <PackageName Value="lclextensions_package"/>
+        <PackageName Value="virtualtreeview_package"/>
       </Item1>
       <Item2>
-        <PackageName Value="virtualtreeview_package"/>
+        <PackageName Value="lclextensions_package"/>
       </Item2>
       <Item3>
         <PackageName Value="LCL"/>
@@ -65,7 +65,6 @@
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="5"/>
-    <PathDelim Value="\"/>
     <CodeGeneration>
       <Generate Value="Faster"/>
     </CodeGeneration>
diff --git a/components/virtualtreeview-unstable/ideicons.lrs b/components/virtualtreeview-unstable/ideicons.lrs
index f72ea41b0..4b2c2e553 100644
--- a/components/virtualtreeview-unstable/ideicons.lrs
+++ b/components/virtualtreeview-unstable/ideicons.lrs
@@ -1,51 +1,48 @@
 LazarusResources.Add('tvirtualdrawtree','XPM',[
-  '/* XPM */'#13#10'static char * tvirtualdrawtree_xpm[] = {'#13#10'"24 24 9 1"'
-  +','#13#10'".'#9'c #000000",'#13#10'"+'#9'c None",'#13#10'"@'#9'c #808000",'
-  +#13#10'"#'#9'c #20A080",'#13#10'"$'#9'c #808080",'#13#10'"%'#9'c #C0A000",'
-  +#13#10'"&'#9'c #C0C0C0",'#13#10'"*'#9'c #FFFFFF",'#13#10'"++++++..++++++++++'
-  +'++++++",'#13#10'"+++++.&&.............+++",'#13#10'"++++.***&&&&&&&&&&$$@.+'
-  +'+",'#13#10'"++++.************@$$$.++",'#13#10'"+++.************@$$$$.++",'
-  +#13#10'"++++...@********.$$$$.++",'#13#10'"+++++++.........$$$$@+++",'#13#10
-  +'"+++++++.$$$$$$$$***$.+++",'#13#10'"+++++++.*******%***&.+++",'#13#10'"++++'
-  +'+++.*.****%%%**$.+++",'#13#10'"+++++++.*...*%%%%%*.++++",'#13#10'"+++++++.*'
-  +'.**%%%%%%%.++++",'#13#10'"++++++.**.***####**.++++",'#13#10'"+++++.$**.**##'
-  +'####*.++++",'#13#10'"+++++.&**..*######*.++++",'#13#10'"+++++.******######*'
-  +'.++++",'#13#10'"+++++.*******####**&.+++",'#13#10'"+...+.***.....******.+++'
-  +'",'#13#10'"+.&&@....&&&&&.****$.+++",'#13#10'"+.&&&&&&&&&&&&&.**&.++++",'#13
-  +#10'"++.$&&&&&&&&&&&.&&&.++++",'#13#10'"++.$$$$$$$$$$$$$.&.+++++",'#13#10'"+'
-  +'++...............++++++",'#13#10'"++++++++++++++++++++++++"};'#13#10
+  '/* XPM */'#10'static char * tvirtualdrawtree_xpm[] = {'#10'"24 24 8 1",'#10
+  +'".'#9'c #000000",'#10'"+'#9'c None",'#10'"@'#9'c #808000",'#10'"#'#9'c #20A'
+  +'080",'#10'"$'#9'c #808080",'#10'"%'#9'c #C0A000",'#10'"&'#9'c #C0C0C0",'#10
+  +'"*'#9'c #FFFFFF",'#10'"++++++..++++++++++++++++",'#10'"+++++.&&............'
+  +'.+++",'#10'"++++.***&&&&&&&&&&$$@.++",'#10'"++++.************@$$$.++",'#10
+  +'"+++.************@$$$$.++",'#10'"++++...@********.$$$$.++",'#10'"+++++++...'
+  +'......$$$$@+++",'#10'"+++++++.$$$$$$$$***$.+++",'#10'"+++++++.*******%***&.'
+  +'+++",'#10'"+++++++.*.****%%%**$.+++",'#10'"+++++++.*...*%%%%%*.++++",'#10'"'
+  +'+++++++.*.**%%%%%%%.++++",'#10'"++++++.**.***####**.++++",'#10'"+++++.$**.*'
+  +'*######*.++++",'#10'"+++++.&**..*######*.++++",'#10'"+++++.******######*.++'
+  +'++",'#10'"+++++.*******####**&.+++",'#10'"+...+.***.....******.+++",'#10'"+'
+  +'.&&@....&&&&&.****$.+++",'#10'"+.&&&&&&&&&&&&&.**&.++++",'#10'"++.$&&&&&&&&'
+  +'&&&.&&&.++++",'#10'"++.$$$$$$$$$$$$$.&.+++++",'#10'"+++...............+++++'
+  +'+",'#10'"++++++++++++++++++++++++"};'#10
 ]);
 LazarusResources.Add('tvirtualstringtree','XPM',[
-  '/* XPM */'#13#10'static char * tvirtualstringtree_xpm[] = {'#13#10'"24 24 9 '
-  +'1",'#13#10'".'#9'c #000000",'#13#10'"+'#9'c None",'#13#10'"@'#9'c #808000",'
-  +#13#10'"#'#9'c #20A080",'#13#10'"$'#9'c #808080",'#13#10'"%'#9'c #C0A000",'
-  +#13#10'"&'#9'c #C0C0C0",'#13#10'"*'#9'c #FFFFFF",'#13#10'"++++++..++++++++++'
-  +'++++++",'#13#10'"+++++.&&.............+++",'#13#10'"++++.***&&&&&&&&&&$$@.+'
-  +'+",'#13#10'"++++.************@$$$.++",'#13#10'"+++.************@$$$$.++",'
-  +#13#10'"++++...@********.$$$$.++",'#13#10'"+++++++.........$$$$@+++",'#13#10
-  +'"+++++++.$$$$$$$$***$.+++",'#13#10'"+++++++.***********&.+++",'#13#10'"++++'
-  +'+++.*.**......*$.+++",'#13#10'"+++++++.*....%%%%.*.++++",'#13#10'"+++++++.*'
-  +'.**......*.++++",'#13#10'"++++++.**.*********.++++",'#13#10'"+++++.$**.**..'
-  +'....*.++++",'#13#10'"+++++.&**....####.*.++++",'#13#10'"+++++.******......*'
-  +'.++++",'#13#10'"+++++.*************&.+++",'#13#10'"+...+.***.....******.+++'
-  +'",'#13#10'"+.&&@....&&&&&.****$.+++",'#13#10'"+.&&&&&&&&&&&&&.**&.++++",'#13
-  +#10'"++.$&&&&&&&&&&&.&&&.++++",'#13#10'"++.$$$$$$$$$$$$$.&.+++++",'#13#10'"+'
-  +'++...............++++++",'#13#10'"++++++++++++++++++++++++"};'#13#10
+  '/* XPM */'#10'static char * tvirtualstringtree_xpm[] = {'#10'"24 24 8 1",'#10
+  +'".'#9'c #000000",'#10'"+'#9'c None",'#10'"@'#9'c #808000",'#10'"#'#9'c #20A'
+  +'080",'#10'"$'#9'c #808080",'#10'"%'#9'c #C0A000",'#10'"&'#9'c #C0C0C0",'#10
+  +'"*'#9'c #FFFFFF",'#10'"++++++..++++++++++++++++",'#10'"+++++.&&............'
+  +'.+++",'#10'"++++.***&&&&&&&&&&$$@.++",'#10'"++++.************@$$$.++",'#10
+  +'"+++.************@$$$$.++",'#10'"++++...@********.$$$$.++",'#10'"+++++++...'
+  +'......$$$$@+++",'#10'"+++++++.$$$$$$$$***$.+++",'#10'"+++++++.***********&.'
+  +'+++",'#10'"+++++++.*.**......*$.+++",'#10'"+++++++.*....%%%%.*.++++",'#10'"'
+  +'+++++++.*.**......*.++++",'#10'"++++++.**.*********.++++",'#10'"+++++.$**.*'
+  +'*......*.++++",'#10'"+++++.&**....####.*.++++",'#10'"+++++.******......*.++'
+  +'++",'#10'"+++++.*************&.+++",'#10'"+...+.***.....******.+++",'#10'"+'
+  +'.&&@....&&&&&.****$.+++",'#10'"+.&&&&&&&&&&&&&.**&.++++",'#10'"++.$&&&&&&&&'
+  +'&&&.&&&.++++",'#10'"++.$$$$$$$$$$$$$.&.+++++",'#10'"+++...............+++++'
+  +'+",'#10'"++++++++++++++++++++++++"};'#10
 ]);
 LazarusResources.Add('tvtheaderpopupmenu','XPM',[
-  '/* XPM */'#13#10'static char * tvtheaderpopupmenu_xpm[] = {'#13#10'"24 24 8 '
-  +'1",'#13#10'".'#9'c #000000",'#13#10'"+'#9'c #000080",'#13#10'"@'#9'c None",'
-  +#13#10'"#'#9'c #808000",'#13#10'"$'#9'c #808080",'#13#10'"%'#9'c #C0C0C0",'
-  +#13#10'"&'#9'c #FFFFFF",'#13#10'"@@@@@@..@@@@@@@@@@@@@@@@",'#13#10'"@@@@@.%%'
-  +'.............@@@",'#13#10'"@@@@.&&&%%%%%%%%%%$$#.@@",'#13#10'"@@@@.&&&&&&&&'
-  +'&&&&#$$$.@@",'#13#10'"@@@.&&&&&&&&&&&&#$$$$.@@",'#13#10'"@@@@...#&&&&&&&&.$'
-  +'$$$.@@",'#13#10'"@@@@@@@.........$$$$#@@@",'#13#10'"@@@@@@@.$$$$$$$$&&&$.@@'
-  +'@",'#13#10'"@@@@@@@.$&&&&&&.&&&%.@@@",'#13#10'"@@@@@@@.$&+++&&.&&&$.@@@",'
-  +#13#10'"@@@@@@@.$&&&&&&.&&&.@@@@",'#13#10'"@@@@@@@.$&+++++.&&&.@@@@",'#13#10
-  +'"@@@@@@.&$+&&&+&+&&&.@@@@",'#13#10'"@@@@@.$&$&++++&&+&&.@@@@",'#13#10'"@@@@'
-  +'@.%&$&&&&+&&&+&.@@@@",'#13#10'"@@@@@.&&$....+&&&&+.@@@@",'#13#10'"@@@@@.&&&'
-  +'&&&&+&&&++++@@@",'#13#10'"@...@.&&&....+&&&&+&.@@@",'#13#10'"@.%%#....%%%%+'
-  +'&++&&+.@@@",'#13#10'"@.%%%%%%%%%%%++$+&&+@@@@",'#13#10'"@@.$%%%%%%%%%+%.%+&'
-  +'&+@@@",'#13#10'"@@.$$$$$$$$$$$$$.+&&+@@@",'#13#10'"@@@...............++@@@@'
-  +'",'#13#10'"@@@@@@@@@@@@@@@@@@@@@@@@"};'#13#10
+  '/* XPM */'#10'static char * tvtheaderpopupmenu_xpm[] = {'#10'"24 24 7 1",'#10
+  +'".'#9'c #000000",'#10'"+'#9'c #000080",'#10'"@'#9'c None",'#10'"#'#9'c #808'
+  +'000",'#10'"$'#9'c #808080",'#10'"%'#9'c #C0C0C0",'#10'"&'#9'c #FFFFFF",'#10
+  +'"@@@@@@..@@@@@@@@@@@@@@@@",'#10'"@@@@@.%%.............@@@",'#10'"@@@@.&&&%%'
+  +'%%%%%%%%$$#.@@",'#10'"@@@@.&&&&&&&&&&&&#$$$.@@",'#10'"@@@.&&&&&&&&&&&&#$$$$'
+  +'.@@",'#10'"@@@@...#&&&&&&&&.$$$$.@@",'#10'"@@@@@@@.........$$$$#@@@",'#10'"'
+  +'@@@@@@@.$$$$$$$$&&&$.@@@",'#10'"@@@@@@@.$&&&&&&.&&&%.@@@",'#10'"@@@@@@@.$&+'
+  +'++&&.&&&$.@@@",'#10'"@@@@@@@.$&&&&&&.&&&.@@@@",'#10'"@@@@@@@.$&+++++.&&&.@@'
+  +'@@",'#10'"@@@@@@.&$+&&&+&+&&&.@@@@",'#10'"@@@@@.$&$&++++&&+&&.@@@@",'#10'"@'
+  +'@@@@.%&$&&&&+&&&+&.@@@@",'#10'"@@@@@.&&$....+&&&&+.@@@@",'#10'"@@@@@.&&&&&&'
+  +'&+&&&++++@@@",'#10'"@...@.&&&....+&&&&+&.@@@",'#10'"@.%%#....%%%%+&++&&+.@@'
+  +'@",'#10'"@.%%%%%%%%%%%++$+&&+@@@@",'#10'"@@.$%%%%%%%%%+%.%+&&+@@@",'#10'"@@'
+  +'.$$$$$$$$$$$$$.+&&+@@@",'#10'"@@@...............++@@@@",'#10'"@@@@@@@@@@@@@'
+  +'@@@@@@@@@@@"};'#10
 ]);
diff --git a/components/virtualtreeview-unstable/resources/tvirtualdrawtree.xpm b/components/virtualtreeview-unstable/resources/tvirtualdrawtree.xpm
index 2971bc0bd..e96eee86f 100644
--- a/components/virtualtreeview-unstable/resources/tvirtualdrawtree.xpm
+++ b/components/virtualtreeview-unstable/resources/tvirtualdrawtree.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * tvirtualdrawtree_xpm[] = {
-"24 24 9 1",
+"24 24 8 1",
 ".	c #000000",
 "+	c None",
 "@	c #808000",
diff --git a/components/virtualtreeview-unstable/resources/tvirtualexplorertree.xpm b/components/virtualtreeview-unstable/resources/tvirtualexplorertree.xpm
index fb83adb02..084110f70 100644
--- a/components/virtualtreeview-unstable/resources/tvirtualexplorertree.xpm
+++ b/components/virtualtreeview-unstable/resources/tvirtualexplorertree.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * tvirtualexplorertree_xpm[] = {
-"24 24 9 1",
+"24 24 8 1",
 ".	c #000000",
 "+	c None",
 "@	c #808000",
diff --git a/components/virtualtreeview-unstable/resources/tvirtualstringtree.xpm b/components/virtualtreeview-unstable/resources/tvirtualstringtree.xpm
index 79774ff94..a403599c3 100644
--- a/components/virtualtreeview-unstable/resources/tvirtualstringtree.xpm
+++ b/components/virtualtreeview-unstable/resources/tvirtualstringtree.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * tvirtualstringtree_xpm[] = {
-"24 24 9 1",
+"24 24 8 1",
 ".	c #000000",
 "+	c None",
 "@	c #808000",
diff --git a/components/virtualtreeview-unstable/resources/tvtheaderpopupmenu.xpm b/components/virtualtreeview-unstable/resources/tvtheaderpopupmenu.xpm
index d9b840f5d..6cafbd61b 100644
--- a/components/virtualtreeview-unstable/resources/tvtheaderpopupmenu.xpm
+++ b/components/virtualtreeview-unstable/resources/tvtheaderpopupmenu.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * tvtheaderpopupmenu_xpm[] = {
-"24 24 8 1",
+"24 24 7 1",
 ".	c #000000",
 "+	c #000080",
 "@	c None",