diff --git a/components/tachart/demo/imagelist/Main.lfm b/components/tachart/demo/imagelist/Main.lfm
index 5ee1471f36..d509ad42f5 100644
--- a/components/tachart/demo/imagelist/Main.lfm
+++ b/components/tachart/demo/imagelist/Main.lfm
@@ -6,6 +6,7 @@ object frmMain: TfrmMain
   Caption = 'frmMain'
   ClientHeight = 434
   ClientWidth = 484
+  OnCreate = FormCreate
   LCLVersion = '2.1.0.0'
   object Chart1: TChart
     Left = 0
@@ -64,13 +65,13 @@ object frmMain: TfrmMain
     Color = clBtnFace
     Columns = <>
     Items.LazData = {
-      8C0000000400000000000000FFFFFFFFFFFFFFFF000000000D00000064657369
-      676E206974656D203001000000FFFFFFFFFFFFFFFF000000000D000000646573
-      69676E206974656D203102000000FFFFFFFFFFFFFFFF000000000D0000006465
-      7369676E206974656D203203000000FFFFFFFFFFFFFFFF000000000D00000064
-      657369676E206974656D2033
+      940000000400000000000000FFFFFFFFFFFFFFFF000000000F0000006C697374
+      76696577206974656D203001000000FFFFFFFFFFFFFFFF000000000F0000006C
+      69737476696577206974656D203102000000FFFFFFFFFFFFFFFF000000000F00
+      00006C69737476696577206974656D203203000000FFFFFFFFFFFFFFFF000000
+      000F0000006C69737476696577206974656D2033
     }
-    SmallImages = ChartImageList1
+    SmallImages = ChartImageList
     TabOrder = 1
   end
   object ToolBar1: TToolBar
@@ -83,7 +84,7 @@ object frmMain: TfrmMain
     ButtonWidth = 23
     Caption = 'ToolBar1'
     EdgeBorders = [ebBottom]
-    Images = ChartImageList1
+    Images = ToolbarImages
     ShowCaptions = True
     TabOrder = 2
     object tbAdd: TToolButton
@@ -125,12 +126,83 @@ object frmMain: TfrmMain
     left = 191
     top = 159
   end
-  object ChartImageList1: TChartImageList
+  object ChartImageList: TChartImageList
     Chart = Chart1
-    OnPopulate = ChartImageList1Populate
+    OnPopulate = ChartImageListPopulate
     left = 192
     top = 97
     Bitmap = {
     }
   end
+  object ToolbarImages: TImageList
+    left = 328
+    top = 97
+    Bitmap = {
+      4C69020000001000000010000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF006D9CD4896A9AD2FB6697CFEEFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00709ED6DB6D9C
+      D4FF85B1DAFF5A91B9FF6093CBEAFFFFFF00FFFFFF00808080FF7E7E7EFF7C7C
+      7CFF7A7A7AFF777777FF757575FF727272FF719ED4FF6F9ED6FF87B2DCFFABD3
+      E8FFA9D0E6FF5890B8FF598EC6EAFFFFFF00FFFFFF007D7D7DFF999999FF9999
+      99FF9A9A9AFF9A9A9AFF9B9B9BFF9B9B9BFF6F9DD3FFAAD1E7FFABD1E7FF98C7
+      E1FF91C2DEFF568FB7FF5289C1EAFFFFFF00FFFFFF007A7A7AFF999999FF5291
+      59FF999A99FF9B9B9BFF9C9C9CFF9C9C9CFF6C9AD0FFA7CEE5FF8FC1DFFF89BD
+      DCFF8BBDDCFF538DB6FF4B84BCEAFFFFFF00FFFFFF00777777FF9A9A9AFF3D8A
+      45FF498A4FFF9C9C9CFF9D9D9DFF9D9D9DFF6696CCFFA2CBE3FF89BDDCFF83B9
+      DAFF84B9DAFF518BB5FF437EB6EA44944DFF42914BFF3F8D48FF3D8945FF5DA4
+      65FF5AA061FF45834BFF9E9E9EFF9E9E9EFF6092C9FF9EC7E2FF83B8DAFF7DB4
+      D7FF7EB3D7FF4F89B4FF3B79B1EA41904AFF94D29FFF91D09AFF8DCD96FF89CB
+      92FF84C88DFF519858FF417C46FF9F9F9FFF5A8EC4FF98C3E0FF7CB3D7FF74AF
+      D6FF5EC4EDFF4B88B3FF3473ABEA3E8B46FF8FCE99FF7DC687FF78C381FF73C0
+      7CFF74C07CFF79C281FF49904FFF547F57FF5489BFFF94BFDDFF75ADD4FF63B8
+      E1FF4BD4FFFF428BB8FF2C6EA6EA3B8742FF89CB92FF84C88DFF80C688FF7BC3
+      83FF77C17FFF478F4DFF3B743FFFA1A1A1FF4C84BAFF8DBBDBFF6EA8D1FF66A6
+      D1FF5FB4DFFF4785B1FF2569A1EA37823EFF347E3BFF317937FF2E7534FF4991
+      50FF468F4CFF39733DFFA1A1A1FFA2A2A2FF457EB4FF88B7D9FF67A3CFFF619E
+      CCFF639FCCFF4583B1FF1F649CEAFFFFFF00FFFFFF00606060FFA0A0A0FF3D76
+      41FF367139FFA2A2A2FFA2A2A2FFA3A3A3FF3D79B0FF82B3D7FF629FCCFF5A9A
+      C9FF5E9BCAFF4381AFFF196098EAFFFFFF00FFFFFF005C5C5CFFA1A1A1FF3C73
+      40FFA0A1A1FFA3A3A3FFA3A3A3FFA4A4A4FF3674AAFF7DAFD4FF5B9AC9FF5495
+      C7FF5896C8FF4180AEFF135C94EAFFFFFF00FFFFFF00585858FFA2A2A2FFA2A2
+      A2FFA3A3A3FFA4A4A4FFA4A4A4FFA5A5A5FF2F6FA5FF78ABD2FF78ABD3FF73A7
+      D1FF69A0CDFF407FAEFF0F5991EA999999FF717171FF545454FF515151FF4F4F
+      4FFF4C4C4CFF4A4A4AFF474747FF454545FF25679DFF3274A8FF3D7CAFFF4784
+      B5FF4E8ABAFF3E7EADFF0C578FEAFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF001D639B1619609839145D9562105A
+      92880D5890A4135C92FC0C578FEDFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FC00FFFFF7008A6245FF8A6245FF8A6245FF8A6245FFFFFFF700FFFFFC00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FB00FFFFF2008A6245FFE8CDB8FFE8CDB8FF8A6245FFFFFFF200FFFFFA00FFFF
+      FF00FFFFFE00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFC00FFFFFB00FFFF
+      F500FFFFED008A6245FFE8CDB8FFE8CDB8FF8A6245FFFFFFEB00FFFFF500FFFF
+      F900FFFFFC00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFF700FFFFF200FFFF
+      EB00FFFFE6008A6245FFE8CDB8FFE8CDB8FF8A6245FFFFFFE600FFFFEB00FFFF
+      F100FFFFF700FFFFFF00FFFFFF00FFFFFF00FFFFFF008A6245FF8A6245FF8A62
+      45FF8A6245FF8A6245FFE8CDB8FFE8CDB8FF8A6245FF8A6245FF8A6245FF8A62
+      45FF8A6245FFFFFFFF00FFFFFF00FFFFFF00FFFFFF008A6245FFE8CDB8FFE8CD
+      B8FFE8CDB8FFE8CDB8FFE8CDB8FFE8CDB8FFE8CDB8FFE8CDB8FFE8CDB8FFE8CD
+      B8FF8A6245FFFFFFFF00FFFFFF00FFFFFF00FFFFFF008A6245FFE8CDB8FFE8CD
+      B8FFE8CDB8FFE8CDB8FFE8CDB8FFE8CDB8FFE8CDB8FFE8CDB8FFE8CDB8FFE8CD
+      B8FF8A6245FFFFFFFF00FFFFFF00FFFFFF00FFFFFF008A6245FF8A6245FF8A62
+      45FF8A6245FF8A6245FFE8CDB8FFE8CDB8FF8A6245FF8A6245FF8A6245FF8A62
+      45FF8A6245FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFF800FFFFF200FFFF
+      ED00FFFFE6008A6245FFE8CDB8FFE8CDB8FF8A6245FFFFFFE600FFFFED00FFFF
+      F200FFFFF700FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFC00FFFFFB00FFFF
+      F500FFFFED008A6245FFE8CDB8FFE8CDB8FF8A6245FFFFFFEB00FFFFF500FFFF
+      FB00FFFFFC00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FB00FFFFF2008A6245FFE8CDB8FFE8CDB8FF8A6245FFFFFFF200FFFFFB00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FC00FFFFF7008A6245FF8A6245FF8A6245FF8A6245FFFFFFF700FFFFFC00FDFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00
+    }
+  end
 end
diff --git a/components/tachart/demo/imagelist/Main.pas b/components/tachart/demo/imagelist/Main.pas
index d3314b3454..db8aa7e47e 100644
--- a/components/tachart/demo/imagelist/Main.pas
+++ b/components/tachart/demo/imagelist/Main.pas
@@ -16,7 +16,8 @@ type
     Chart1: TChart;
     Chart1FuncSeries1: TFuncSeries;
     Chart1FuncSeries2: TFuncSeries;
-    ChartImageList1: TChartImageList;
+    ChartImageList: TChartImageList;
+    ToolbarImages: TImageList;
     ListView1: TListView;
     RandomChartSource1: TRandomChartSource;
     StatusBar1: TStatusBar;
@@ -26,7 +27,8 @@ type
     tbSep1: TToolButton;
     procedure Chart1FuncSeries1Calculate(const AX: Double; out AY: Double);
     procedure Chart1FuncSeries2Calculate(const AX: Double; out AY: Double);
-    procedure ChartImageList1Populate(Sender: TObject);
+    procedure ChartImageListPopulate(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
     procedure tbAddClick(Sender: TObject);
     procedure tbQuitClick(Sender: TObject);
   end;
@@ -53,15 +55,22 @@ begin
   AY := Cos(AX);
 end;
 
-procedure TfrmMain.ChartImageList1Populate(Sender: TObject);
+procedure TfrmMain.ChartImageListPopulate(Sender: TObject);
 begin
-  with ChartImageList1 do
+  with ChartImageList do
     StatusBar1.SimpleText := Format(
       'Now %d images in image list. ' +
       'Among them %d series images starting at index %d',
       [Count, SeriesCount, FirstSeriesIndex]);
 end;
 
+procedure TfrmMain.FormCreate(Sender: TObject);
+begin
+  ChartImageList.Chart := nil;
+  ChartImageList.AddImages(ToolbarImages);
+  ChartImageList.Chart := Chart1;
+end;
+
 procedure TfrmMain.tbAddClick(Sender: TObject);
 var
   series: TLineSeries;
@@ -79,7 +88,7 @@ begin
   Chart1.AddSeries(series);
   with Listview1.Items.Add do begin
     Caption := Format('run item %d', [ListView1.Items.Count]);
-    ImageIndex := ChartImageList1.Count - 1;
+    ImageIndex := ChartImageList.Count - 1;
   end;
 end;
 
diff --git a/components/tachart/demo/imagelist/imagelistdemo.lpi b/components/tachart/demo/imagelist/imagelistdemo.lpi
index 8bed3ad992..09354147ef 100644
--- a/components/tachart/demo/imagelist/imagelistdemo.lpi
+++ b/components/tachart/demo/imagelist/imagelistdemo.lpi
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <SessionStorage Value="InProjectDir"/>
@@ -13,21 +13,17 @@
     <i18n>
       <EnableI18N LFM="False"/>
     </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
@@ -41,14 +37,13 @@
       <Unit0>
         <Filename Value="imagelistdemo.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="imagelistdemo"/>
       </Unit0>
       <Unit1>
         <Filename Value="Main.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmMain"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="Main"/>
       </Unit1>
     </Units>
   </ProjectOptions>
@@ -73,12 +68,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerMessages>
-        <UseMsgFile Value="True"/>
-      </CompilerMessages>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="3">