diff --git a/ideintf/collectionpropeditform.lfm b/ideintf/collectionpropeditform.lfm
index fff8956ee0..04d103c63c 100644
--- a/ideintf/collectionpropeditform.lfm
+++ b/ideintf/collectionpropeditform.lfm
@@ -21,16 +21,14 @@ object CollectionPropertyEditorForm: TCollectionPropertyEditorForm
     ButtonHeight = 40
     ButtonWidth = 44
     Caption = 'ToolBar1'
-    DisabledImages = DisableImageList
+    Flat = True
     Height = 42
-    Images = ImageList
     ShowCaptions = True
     TabOrder = 0
     Height = 42
     Width = 190
     object AddButton: TToolButton
       Caption = 'Add'
-      ImageIndex = 0
       OnClick = AddButtonClick
       Height = 40
       Top = 2
@@ -38,7 +36,6 @@ object CollectionPropertyEditorForm: TCollectionPropertyEditorForm
     end
     object DeleteButton: TToolButton
       Caption = 'Delete'
-      ImageIndex = 1
       OnClick = DeleteButtonClick
       Left = 45
       Height = 40
@@ -56,7 +53,6 @@ object CollectionPropertyEditorForm: TCollectionPropertyEditorForm
     end
     object MoveUpButton: TToolButton
       Caption = 'Up'
-      ImageIndex = 2
       OnClick = MoveUpButtonClick
       Left = 99
       Height = 40
@@ -65,7 +61,6 @@ object CollectionPropertyEditorForm: TCollectionPropertyEditorForm
     end
     object MoveDownButton: TToolButton
       Caption = 'Down'
-      ImageIndex = 3
       OnClick = MoveDownButtonClick
       Left = 143
       Height = 40
@@ -81,126 +76,4 @@ object CollectionPropertyEditorForm: TCollectionPropertyEditorForm
     Top = 42
     Width = 190
   end
-  object ImageList: TImageList
-    left = 66
-    top = 138
-    Bitmap = {
-      6C69040000001000000010000000BA0100002F2A2058504D202A2F0A73746174
-      69632063686172202A677261706869635B5D203D207B0A223136203136203520
-      31222C0A222E2063204E6F6E65222C0A222C20632023303030303834222C0A22
-      2D20632023303038344646222C0A222A20632023303030304646222C0A226120
-      632023303036424436222C0A222E2E2E2E2E2C2C2C2C2C2C2E2E2E2E2E222C0A
-      222E2E2E2E2E2C2D2D2D2D2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2A2A2C2D
-      2E2E2E2E2E222C0A222E2E2E2E2E2C2D2A2A2C2D2E2E2E2E2E222C0A222E2E2E
-      2E2E2C2D2A2A2C2D2E2E2E2E2E222C0A222C2C2C2C2C2C2D2A2A2C2D2C2C2C2C
-      2C222C0A222C2D2D2D2D2D2D2A2A2C2D2D2D2D2D2D222C0A222C2D2A2A2A2A2A
-      2A2A2A2A2A2A2A2C2D222C0A222C2D2A2A2A2A2A2A2A2A2A2A2A2A2C2D222C0A
-      222C612C2C2C2C2D2A2A2C2C2C2C2C2C2D222C0A222D2D2D2D2D612D2A2A2C2D
-      2D2D2D2D2D222C0A222E2E2E2E2E2C2D2A2A2C2D2E2E2E2E2E222C0A222E2E2E
-      2E2E2C2D2A2A2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2A2A2C2D2E2E2E2E
-      2E222C0A222E2E2E2E2E2C2D2C2C2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D
-      2D2D2D2D2E2E2E2E2E227D0ABA0100002F2A2058504D202A2F0A737461746963
-      2063686172202A677261706869635B5D203D207B0A2231362031362035203122
-      2C0A222E2063204E6F6E65222C0A222C20632023303030303834222C0A222D20
-      632023303038344646222C0A222A20632023303036424436222C0A2261206320
-      23303030304646222C0A222E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E222C0A222E
-      2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E222C0A222E2E2E2E2E2E2E2E2E2E2E2E2E
-      2E2E2E222C0A222E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E222C0A222E2E2E2E2E
-      2E2E2E2E2E2E2E2E2E2E2E222C0A222C2C2C2C2C2C2C2C2C2C2C2C2C2C2C2C22
-      2C0A222C2D2D2D2D2D2D2D2D2D2D2D2D2D2A2D222C0A222C2D61616161616161
-      61616161612C2D222C0A222C2D6161616161616161616161612C2D222C0A222C
-      2A2C2C2C2C2C2C2C2C2C2C2C2C2C2D222C0A222D2D2D2D2D2D2D2D2D2D2D2D2D
-      2D2D2D222C0A222E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E222C0A222E2E2E2E2E
-      2E2E2E2E2E2E2E2E2E2E2E222C0A222E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E22
-      2C0A222E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E222C0A222E2E2E2E2E2E2E2E2E
-      2E2E2E2E2E2E2E227D0AAB0100002F2A2058504D202A2F0A7374617469632063
-      686172202A677261706869635B5D203D207B0A22313620313620342031222C0A
-      222E2063204E6F6E65222C0A222C20632023303030303834222C0A222D206320
-      23303038344646222C0A222A20632023303030304646222C0A222E2E2E2E2E2E
-      2E2C2D2E2E2E2E2E2E2E222C0A222E2E2E2E2E2E2C2D2C2D2E2E2E2E2E2E222C
-      0A222E2E2E2E2E2C2D2A2A2C2D2E2E2E2E2E222C0A222E2E2E2E2C2D2A2A2A2A
-      2C2D2E2E2E2E222C0A222E2E2E2C2D2A2A2A2A2A2A2C2D2E2E2E222C0A222E2E
-      2C2D2A2A2A2A2A2A2A2A2C2D2E2E222C0A222E2E2C2C2C2C2C2A2A2C2C2C2C2D
-      2E2E222C0A222E2E2E2D2D2D2D2A2A2C2D2D2D2E2E2E222C0A222E2E2E2E2E2C
-      2D2A2A2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2A2A2C2D2E2E2E2E2E222C
-      0A222E2E2E2E2E2C2D2A2A2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2A2A2C
-      2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2A2A2C2D2E2E2E2E2E222C0A222E2E
-      2E2E2E2C2D2A2A2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2C2C2C2D2E2E2E
-      2E2E222C0A222E2E2E2E2E2C2D2D2D2D2D2E2E2E2E2E227D0AAB0100002F2A20
-      58504D202A2F0A7374617469632063686172202A677261706869635B5D203D20
-      7B0A22313620313620342031222C0A222E2063204E6F6E65222C0A222C206320
-      23303030303834222C0A222D20632023303038344646222C0A222A2063202330
-      3030304646222C0A222E2E2E2E2E2C2D2D2D2D2D2E2E2E2E2E222C0A222E2E2E
-      2E2E2C2D2C2C2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2A2A2C2D2E2E2E2E
-      2E222C0A222E2E2E2E2E2C2D2A2A2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D
-      2A2A2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2A2A2C2D2E2E2E2E2E222C0A
-      222E2E2E2E2E2C2D2A2A2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2A2A2C2D
-      2E2E2E2E2E222C0A222E2E2E2D2D2D2D2A2A2C2D2D2D2E2E2E222C0A222E2E2C
-      2C2C2C2C2A2A2C2C2C2C2D2E2E222C0A222E2E2C2D2A2A2A2A2A2A2A2A2C2D2E
-      2E222C0A222E2E2E2C2D2A2A2A2A2A2A2C2D2E2E2E222C0A222E2E2E2E2C2D2A
-      2A2A2A2C2D2E2E2E2E222C0A222E2E2E2E2E2C2D2A2A2C2D2E2E2E2E2E222C0A
-      222E2E2E2E2E2E2C2D2C2D2E2E2E2E2E2E222C0A222E2E2E2E2E2E2E2C2D2E2E
-      2E2E2E2E2E227D0A
-    }
-  end
-  object DisableImageList: TImageList
-    left = 66
-    top = 106
-    Bitmap = {
-      6C69040000001000000010000000AB0100002F2A2058504D202A2F0A73746174
-      69632063686172202A677261706869635B5D203D207B0A223136203136203420
-      31222C0A222E2063204E6F6E65222C0A222C20632023334633463346222C0A22
-      2D20632023374637463746222C0A222A20632023364236423642222C0A222E2E
-      2E2E2E2C2C2C2C2C2C2E2E2E2E2E222C0A222E2E2E2E2E2C2D2D2D2D2D2E2E2E
-      2E2E222C0A222E2E2E2E2E2C2D2D2D2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C
-      2D2D2D2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2D2D2C2D2E2E2E2E2E222C
-      0A222C2C2C2C2C2C2D2D2D2C2D2C2C2C2C2C222C0A222C2D2D2D2D2D2D2D2D2C
-      2D2D2D2D2D2D222C0A222C2D2D2D2D2D2D2D2D2D2D2D2D2D2C2D222C0A222C2D
-      2D2D2D2D2D2D2D2D2D2D2D2D2C2D222C0A222C2A2C2C2C2C2D2D2D2C2C2C2C2C
-      2C2D222C0A222D2D2D2D2D2A2D2D2D2C2D2D2D2D2D2D222C0A222E2E2E2E2E2C
-      2D2D2D2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2D2D2C2D2E2E2E2E2E222C
-      0A222E2E2E2E2E2C2D2D2D2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2C2C2C
-      2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2D2D2D2D2E2E2E2E2E227D0AAB0100
-      002F2A2058504D202A2F0A7374617469632063686172202A677261706869635B
-      5D203D207B0A22313620313620342031222C0A222E2063204E6F6E65222C0A22
-      2C20632023334633463346222C0A222D20632023374637463746222C0A222A20
-      632023364236423642222C0A222E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E222C0A
-      222E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E222C0A222E2E2E2E2E2E2E2E2E2E2E
-      2E2E2E2E2E222C0A222E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E222C0A222E2E2E
-      2E2E2E2E2E2E2E2E2E2E2E2E2E222C0A222C2C2C2C2C2C2C2C2C2C2C2C2C2C2C
-      2C222C0A222C2D2D2D2D2D2D2D2D2D2D2D2D2D2A2D222C0A222C2D2D2D2D2D2D
-      2D2D2D2D2D2D2D2C2D222C0A222C2D2D2D2D2D2D2D2D2D2D2D2D2D2C2D222C0A
-      222C2A2C2C2C2C2C2C2C2C2C2C2C2C2C2D222C0A222D2D2D2D2D2D2D2D2D2D2D
-      2D2D2D2D2D222C0A222E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E222C0A222E2E2E
-      2E2E2E2E2E2E2E2E2E2E2E2E2E222C0A222E2E2E2E2E2E2E2E2E2E2E2E2E2E2E
-      2E222C0A222E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E222C0A222E2E2E2E2E2E2E
-      2E2E2E2E2E2E2E2E2E227D0A9C0100002F2A2058504D202A2F0A737461746963
-      2063686172202A677261706869635B5D203D207B0A2231362031362033203122
-      2C0A222E2063204E6F6E65222C0A222C20632023334633463346222C0A222D20
-      632023374637463746222C0A222E2E2E2E2E2E2E2C2D2E2E2E2E2E2E2E222C0A
-      222E2E2E2E2E2E2C2D2C2D2E2E2E2E2E2E222C0A222E2E2E2E2E2C2D2D2D2C2D
-      2E2E2E2E2E222C0A222E2E2E2E2C2D2D2D2D2D2C2D2E2E2E2E222C0A222E2E2E
-      2C2D2D2D2D2D2D2D2C2D2E2E2E222C0A222E2E2C2D2D2D2D2D2D2D2D2D2C2D2E
-      2E222C0A222E2E2C2C2C2C2C2D2D2C2C2C2C2D2E2E222C0A222E2E2E2D2D2D2D
-      2D2D2C2D2D2D2E2E2E222C0A222E2E2E2E2E2C2D2D2D2C2D2E2E2E2E2E222C0A
-      222E2E2E2E2E2C2D2D2D2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2D2D2C2D
-      2E2E2E2E2E222C0A222E2E2E2E2E2C2D2D2D2C2D2E2E2E2E2E222C0A222E2E2E
-      2E2E2C2D2D2D2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2D2D2C2D2E2E2E2E
-      2E222C0A222E2E2E2E2E2C2D2C2C2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D
-      2D2D2D2D2E2E2E2E2E227D0A9C0100002F2A2058504D202A2F0A737461746963
-      2063686172202A677261706869635B5D203D207B0A2231362031362033203122
-      2C0A222E2063204E6F6E65222C0A222C20632023334633463346222C0A222D20
-      632023374637463746222C0A222E2E2E2E2E2C2D2D2D2D2D2E2E2E2E2E222C0A
-      222E2E2E2E2E2C2D2C2C2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2D2D2C2D
-      2E2E2E2E2E222C0A222E2E2E2E2E2C2D2D2D2C2D2E2E2E2E2E222C0A222E2E2E
-      2E2E2C2D2D2D2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D2D2D2C2D2E2E2E2E
-      2E222C0A222E2E2E2E2E2C2D2D2D2C2D2E2E2E2E2E222C0A222E2E2E2E2E2C2D
-      2D2D2C2D2E2E2E2E2E222C0A222E2E2E2D2D2D2D2D2D2C2D2D2D2E2E2E222C0A
-      222E2E2C2C2C2C2C2D2D2C2C2C2C2D2E2E222C0A222E2E2C2D2D2D2D2D2D2D2D
-      2D2C2D2E2E222C0A222E2E2E2C2D2D2D2D2D2D2D2C2D2E2E2E222C0A222E2E2E
-      2E2C2D2D2D2D2D2C2D2E2E2E2E222C0A222E2E2E2E2E2C2D2D2D2C2D2E2E2E2E
-      2E222C0A222E2E2E2E2E2E2C2D2C2D2E2E2E2E2E2E222C0A222E2E2E2E2E2E2E
-      2C2D2E2E2E2E2E2E2E227D0A
-    }
-  end
 end
diff --git a/ideintf/collectionpropeditform.lrs b/ideintf/collectionpropeditform.lrs
index cd5ac6728c..e8b446e926 100644
--- a/ideintf/collectionpropeditform.lrs
+++ b/ideintf/collectionpropeditform.lrs
@@ -7,79 +7,18 @@ LazarusResources.Add('TCollectionPropertyEditorForm','FORMDATA',[
   +'PerInch'#2'`'#8'Position'#7#9'poDefault'#18'HorzScrollBar.Page'#3#189#0#18
   +'VertScrollBar.Page'#3'+'#1#4'Left'#3'"'#1#6'Height'#3','#1#3'Top'#3#153#0#5
   +'Width'#3#190#0#0#8'TToolBar'#8'ToolBar1'#8'AutoSize'#9#12'ButtonHeight'#2'('
-  +#11'ButtonWidth'#2','#7'Caption'#6#8'ToolBar1'#14'DisabledImages'#7#16'Disab'
-  +'leImageList'#6'Height'#2'*'#6'Images'#7#9'ImageList'#12'ShowCaptions'#9#8'T'
-  +'abOrder'#2#0#6'Height'#2'*'#5'Width'#3#190#0#0#11'TToolButton'#9'AddButton'
-  +#7'Caption'#6#3'Add'#10'ImageIndex'#2#0#7'OnClick'#7#14'AddButtonClick'#6'He'
+  +#11'ButtonWidth'#2','#7'Caption'#6#8'ToolBar1'#4'Flat'#9#6'Height'#2'*'#12'S'
+  +'howCaptions'#9#8'TabOrder'#2#0#6'Height'#2'*'#5'Width'#3#190#0#0#11'TToolBu'
+  +'tton'#9'AddButton'#7'Caption'#6#3'Add'#7'OnClick'#7#14'AddButtonClick'#6'He'
   +'ight'#2'('#3'Top'#2#2#5'Width'#2','#0#0#11'TToolButton'#12'DeleteButton'#7
-  +'Caption'#6#6'Delete'#10'ImageIndex'#2#1#7'OnClick'#7#17'DeleteButtonClick'#4
-  +'Left'#2'-'#6'Height'#2'('#3'Top'#2#2#5'Width'#2','#0#0#11'TToolButton'#11'T'
-  +'oolButton3'#7'Caption'#6#11'ToolButton3'#5'Style'#7#12'tbsSeparator'#5'Widt'
-  +'h'#2#10#4'Left'#2'Y'#6'Height'#2'('#3'Top'#2#2#5'Width'#2#10#0#0#11'TToolBu'
-  +'tton'#12'MoveUpButton'#7'Caption'#6#2'Up'#10'ImageIndex'#2#2#7'OnClick'#7#17
-  +'MoveUpButtonClick'#4'Left'#2'c'#6'Height'#2'('#3'Top'#2#2#5'Width'#2','#0#0
-  +#11'TToolButton'#14'MoveDownButton'#7'Caption'#6#4'Down'#10'ImageIndex'#2#3#7
-  +'OnClick'#7#19'MoveDownButtonClick'#4'Left'#3#143#0#6'Height'#2'('#3'Top'#2#2
-  +#5'Width'#2','#0#0#0#8'TListBox'#17'CollectionListBox'#5'Align'#7#8'alClient'
-  +#7'OnClick'#7#22'CollectionListBoxClick'#8'TabOrder'#2#1#6'Height'#3#2#1#3'T'
-  +'op'#2'*'#5'Width'#3#190#0#0#0#10'TImageList'#9'ImageList'#4'left'#2'B'#3'to'
-  +'p'#3#138#0#6'Bitmap'#10#232#6#0#0'li'#4#0#0#0#16#0#0#0#16#0#0#0#186#1#0#0'/'
-  +'* XPM */'#10'static char *graphic[] = {'#10'"16 16 5 1",'#10'". c None",'#10
-  +'", c #000084",'#10'"- c #0084FF",'#10'"* c #0000FF",'#10'"a c #006BD6",'#10
-  +'".....,,,,,,.....",'#10'".....,-----.....",'#10'".....,-**,-.....",'#10'"..'
-  +'...,-**,-.....",'#10'".....,-**,-.....",'#10'",,,,,,-**,-,,,,,",'#10'",----'
-  +'--**,------",'#10'",-************,-",'#10'",-************,-",'#10'",a,,,,-*'
-  +'*,,,,,,-",'#10'"-----a-**,------",'#10'".....,-**,-.....",'#10'".....,-**,-'
-  +'.....",'#10'".....,-**,-.....",'#10'".....,-,,,-.....",'#10'".....,-----...'
-  +'.."}'#10#186#1#0#0'/* XPM */'#10'static char *graphic[] = {'#10'"16 16 5 1"'
-  +','#10'". c None",'#10'", c #000084",'#10'"- c #0084FF",'#10'"* c #006BD6",'
-  +#10'"a c #0000FF",'#10'"................",'#10'"................",'#10'"....'
-  +'............",'#10'"................",'#10'"................",'#10'",,,,,,,'
-  +',,,,,,,,,",'#10'",-------------*-",'#10'",-aaaaaaaaaaaa,-",'#10'",-aaaaaaaa'
-  +'aaaa,-",'#10'",*,,,,,,,,,,,,,-",'#10'"----------------",'#10'".............'
-  +'...",'#10'"................",'#10'"................",'#10'"................'
-  +'",'#10'"................"}'#10#171#1#0#0'/* XPM */'#10'static char *graphic'
-  +'[] = {'#10'"16 16 4 1",'#10'". c None",'#10'", c #000084",'#10'"- c #0084FF'
-  +'",'#10'"* c #0000FF",'#10'".......,-.......",'#10'"......,-,-......",'#10'"'
-  +'.....,-**,-.....",'#10'"....,-****,-....",'#10'"...,-******,-...",'#10'"..,'
-  +'-********,-..",'#10'"..,,,,,**,,,,-..",'#10'"...----**,---...",'#10'".....,'
-  +'-**,-.....",'#10'".....,-**,-.....",'#10'".....,-**,-.....",'#10'".....,-**'
-  +',-.....",'#10'".....,-**,-.....",'#10'".....,-**,-.....",'#10'".....,-,,,-.'
-  +'....",'#10'".....,-----....."}'#10#171#1#0#0'/* XPM */'#10'static char *gra'
-  +'phic[] = {'#10'"16 16 4 1",'#10'". c None",'#10'", c #000084",'#10'"- c #00'
-  +'84FF",'#10'"* c #0000FF",'#10'".....,-----.....",'#10'".....,-,,,-.....",'
-  +#10'".....,-**,-.....",'#10'".....,-**,-.....",'#10'".....,-**,-.....",'#10
-  +'".....,-**,-.....",'#10'".....,-**,-.....",'#10'".....,-**,-.....",'#10'"..'
-  +'.----**,---...",'#10'"..,,,,,**,,,,-..",'#10'"..,-********,-..",'#10'"...,-'
-  +'******,-...",'#10'"....,-****,-....",'#10'".....,-**,-.....",'#10'"......,-'
-  +',-......",'#10'".......,-......."}'#10#0#0#10'TImageList'#16'DisableImageLi'
-  +'st'#4'left'#2'B'#3'top'#2'j'#6'Bitmap'#10#172#6#0#0'li'#4#0#0#0#16#0#0#0#16
-  +#0#0#0#171#1#0#0'/* XPM */'#10'static char *graphic[] = {'#10'"16 16 4 1",'
-  +#10'". c None",'#10'", c #3F3F3F",'#10'"- c #7F7F7F",'#10'"* c #6B6B6B",'#10
-  +'".....,,,,,,.....",'#10'".....,-----.....",'#10'".....,---,-.....",'#10'"..'
-  +'...,---,-.....",'#10'".....,---,-.....",'#10'",,,,,,---,-,,,,,",'#10'",----'
-  +'----,------",'#10'",-------------,-",'#10'",-------------,-",'#10'",*,,,,--'
-  +'-,,,,,,-",'#10'"-----*---,------",'#10'".....,---,-.....",'#10'".....,---,-'
-  +'.....",'#10'".....,---,-.....",'#10'".....,-,,,-.....",'#10'".....,-----...'
-  +'.."}'#10#171#1#0#0'/* XPM */'#10'static char *graphic[] = {'#10'"16 16 4 1"'
-  +','#10'". c None",'#10'", c #3F3F3F",'#10'"- c #7F7F7F",'#10'"* c #6B6B6B",'
-  ,#10'"................",'#10'"................",'#10'"................",'#10
-  +'"................",'#10'"................",'#10'",,,,,,,,,,,,,,,,",'#10'",-'
-  +'------------*-",'#10'",-------------,-",'#10'",-------------,-",'#10'",*,,,'
-  +',,,,,,,,,,-",'#10'"----------------",'#10'"................",'#10'"........'
-  +'........",'#10'"................",'#10'"................",'#10'"...........'
-  +'....."}'#10#156#1#0#0'/* XPM */'#10'static char *graphic[] = {'#10'"16 16 3'
-  +' 1",'#10'". c None",'#10'", c #3F3F3F",'#10'"- c #7F7F7F",'#10'".......,-..'
-  +'.....",'#10'"......,-,-......",'#10'".....,---,-.....",'#10'"....,-----,-..'
-  +'..",'#10'"...,-------,-...",'#10'"..,---------,-..",'#10'"..,,,,,--,,,,-.."'
-  +','#10'"...------,---...",'#10'".....,---,-.....",'#10'".....,---,-.....",'
-  +#10'".....,---,-.....",'#10'".....,---,-.....",'#10'".....,---,-.....",'#10
-  +'".....,---,-.....",'#10'".....,-,,,-.....",'#10'".....,-----....."}'#10#156
-  +#1#0#0'/* XPM */'#10'static char *graphic[] = {'#10'"16 16 3 1",'#10'". c No'
-  +'ne",'#10'", c #3F3F3F",'#10'"- c #7F7F7F",'#10'".....,-----.....",'#10'"...'
-  +'..,-,,,-.....",'#10'".....,---,-.....",'#10'".....,---,-.....",'#10'".....,'
-  +'---,-.....",'#10'".....,---,-.....",'#10'".....,---,-.....",'#10'".....,---'
-  +',-.....",'#10'"...------,---...",'#10'"..,,,,,--,,,,-..",'#10'"..,---------'
-  +',-..",'#10'"...,-------,-...",'#10'"....,-----,-....",'#10'".....,---,-....'
-  +'.",'#10'"......,-,-......",'#10'".......,-......."}'#10#0#0#0
+  +'Caption'#6#6'Delete'#7'OnClick'#7#17'DeleteButtonClick'#4'Left'#2'-'#6'Heig'
+  +'ht'#2'('#3'Top'#2#2#5'Width'#2','#0#0#11'TToolButton'#11'ToolButton3'#7'Cap'
+  +'tion'#6#11'ToolButton3'#5'Style'#7#12'tbsSeparator'#5'Width'#2#10#4'Left'#2
+  +'Y'#6'Height'#2'('#3'Top'#2#2#5'Width'#2#10#0#0#11'TToolButton'#12'MoveUpBut'
+  +'ton'#7'Caption'#6#2'Up'#7'OnClick'#7#17'MoveUpButtonClick'#4'Left'#2'c'#6'H'
+  +'eight'#2'('#3'Top'#2#2#5'Width'#2','#0#0#11'TToolButton'#14'MoveDownButton'
+  +#7'Caption'#6#4'Down'#7'OnClick'#7#19'MoveDownButtonClick'#4'Left'#3#143#0#6
+  +'Height'#2'('#3'Top'#2#2#5'Width'#2','#0#0#0#8'TListBox'#17'CollectionListBo'
+  +'x'#5'Align'#7#8'alClient'#7'OnClick'#7#22'CollectionListBoxClick'#8'TabOrde'
+  +'r'#2#1#6'Height'#3#2#1#3'Top'#2'*'#5'Width'#3#190#0#0#0#0
 ]);
diff --git a/ideintf/propedits.pp b/ideintf/propedits.pp
index 7bec97b0a1..3dde8abd51 100644
--- a/ideintf/propedits.pp
+++ b/ideintf/propedits.pp
@@ -38,7 +38,7 @@ uses
   LCLProc, Forms, Controls, GraphType,
   Graphics, StdCtrls, Buttons, ComCtrls, Menus, LCLType, ExtCtrls, LCLIntf,
   Dialogs, Grids, EditBtn, PropertyStorage, TextTools, FrmSelectProps,
-  StringsPropEditDlg, ColumnDlg, FileUtil, ObjInspStrConsts;
+  StringsPropEditDlg, ColumnDlg, FileUtil, ObjInspStrConsts, IDEImagesIntf;
 
 const
   MaxIdentLength: Byte = 63;
@@ -3324,8 +3324,6 @@ type
   
   TCollectionPropertyEditorForm = class(TForm)
     CollectionListBox: TListBox;
-    ImageList: TImageList;
-    DisableImageList: TImageList;
     ToolBar1: TToolBar;
     AddButton: TToolButton;
     DeleteButton: TToolButton;
@@ -3366,10 +3364,15 @@ const
 
 procedure TCollectionPropertyEditorForm.FormCreate(Sender: TObject);
 begin
+  ToolBar1.Images := IDEImages.Images_16;
   AddButton.Caption := oiColEditAdd;
   DeleteButton.Caption := oiColEditDelete;
   MoveUpButton.Caption := oiColEditUp;
   MoveDownButton.Caption := oiColEditDown;
+  AddButton.ImageIndex := IDEImages.LoadImage(16, 'add');
+  DeleteButton.ImageIndex := IDEImages.LoadImage(16, 'delete');
+  MoveUpButton.ImageIndex := IDEImages.LoadImage(16, 'arrow_up');
+  MoveDownButton.ImageIndex := IDEImages.LoadImage(16, 'arrow_down');
 end;
 
 procedure TCollectionPropertyEditorForm.FormDestroy(Sender: TObject);