diff --git a/ideintf/listviewpropedit.lfm b/ideintf/listviewpropedit.lfm
index 95d1e1a816..1d44a1a1e8 100644
--- a/ideintf/listviewpropedit.lfm
+++ b/ideintf/listviewpropedit.lfm
@@ -79,7 +79,7 @@ object ListViewItemsEditorForm: TListViewItemsEditorForm
       Left = 5
       Height = 170
       Top = 5
-      Width = 162
+      Width = 158
       Anchors = [akTop, akLeft, akRight, akBottom]
       BorderSpacing.Left = 5
       BorderSpacing.Top = 5
@@ -97,10 +97,10 @@ object ListViewItemsEditorForm: TListViewItemsEditorForm
       AnchorSideTop.Control = GroupBox1
       AnchorSideRight.Control = GroupBox1
       AnchorSideRight.Side = asrBottom
-      Left = 172
+      Left = 168
       Height = 25
       Top = 5
-      Width = 112
+      Width = 116
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 5
       BorderSpacing.Top = 5
@@ -117,10 +117,10 @@ object ListViewItemsEditorForm: TListViewItemsEditorForm
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = BtnNewItem
       AnchorSideRight.Side = asrBottom
-      Left = 172
+      Left = 168
       Height = 25
       Top = 35
-      Width = 112
+      Width = 116
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Top = 5
       BorderSpacing.InnerBorder = 4
@@ -134,10 +134,10 @@ object ListViewItemsEditorForm: TListViewItemsEditorForm
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = BtnNewSubItem
       AnchorSideRight.Side = asrBottom
-      Left = 172
+      Left = 168
       Height = 25
       Top = 65
-      Width = 112
+      Width = 116
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Top = 5
       BorderSpacing.InnerBorder = 4
@@ -171,60 +171,68 @@ object ListViewItemsEditorForm: TListViewItemsEditorForm
     end
     object LabelImageIndex: TLabel
       AnchorSideLeft.Control = LabelCaption
-      AnchorSideTop.Control = LabelCaption
+      AnchorSideTop.Control = edtText
       AnchorSideTop.Side = asrBottom
       Left = 5
       Height = 14
-      Top = 39
+      Top = 49
       Width = 66
-      BorderSpacing.Top = 20
+      BorderSpacing.Top = 5
       Caption = 'Image Index:'
       FocusControl = edtIndexImg
       ParentColor = False
     end
     object LabelStateIndex: TLabel
       AnchorSideLeft.Control = LabelImageIndex
-      AnchorSideTop.Control = LabelImageIndex
+      AnchorSideTop.Control = edtIndexImg
       AnchorSideTop.Side = asrBottom
       Left = 5
       Height = 14
-      Top = 73
+      Top = 93
       Width = 62
-      BorderSpacing.Top = 20
+      BorderSpacing.Top = 5
       Caption = 'State Index:'
       FocusControl = edtIndexState
       ParentColor = False
       Visible = False
     end
     object edtText: TEdit
+      AnchorSideLeft.Control = LabelCaption
       AnchorSideTop.Control = LabelCaption
-      AnchorSideTop.Side = asrCenter
-      Left = 106
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = GroupBox2
+      AnchorSideRight.Side = asrBottom
+      Left = 5
       Height = 23
-      Top = 1
-      Width = 91
+      Top = 21
+      Width = 191
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 2
+      BorderSpacing.Right = 5
       OnChange = Edit1Change
       TabOrder = 0
     end
     object edtIndexImg: TEdit
       AnchorSideLeft.Control = edtText
       AnchorSideTop.Control = LabelImageIndex
-      AnchorSideTop.Side = asrCenter
-      Left = 106
+      AnchorSideTop.Side = asrBottom
+      Left = 5
       Height = 23
-      Top = 35
+      Top = 65
       Width = 48
+      BorderSpacing.Top = 2
       OnEditingDone = edtIndexStateEditingDone
       TabOrder = 1
     end
     object edtIndexState: TEdit
       AnchorSideLeft.Control = edtIndexImg
       AnchorSideTop.Control = LabelStateIndex
-      AnchorSideTop.Side = asrCenter
-      Left = 106
+      AnchorSideTop.Side = asrBottom
+      Left = 5
       Height = 23
-      Top = 69
+      Top = 109
       Width = 48
+      BorderSpacing.Top = 2
       OnEditingDone = edtIndexStateEditingDone
       TabOrder = 2
       Visible = False
diff --git a/ideintf/listviewpropedit.lrs b/ideintf/listviewpropedit.lrs
index 032b9b2bea..e78dedb5c9 100644
--- a/ideintf/listviewpropedit.lrs
+++ b/ideintf/listviewpropedit.lrs
@@ -25,7 +25,7 @@ LazarusResources.Add('TListViewItemsEditorForm','FORMDATA',[
   +'ew'#9'TreeView1'#22'AnchorSideLeft.Control'#7#9'GroupBox1'#21'AnchorSideTop'
   +'.Control'#7#9'GroupBox1'#24'AnchorSideBottom.Control'#7#9'GroupBox1'#21'Anc'
   +'horSideBottom.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#3#170#0#3'Top'#2#5
-  +#5'Width'#3#162#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0
+  +#5'Width'#3#158#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0
   +#18'BorderSpacing.Left'#2#5#17'BorderSpacing.Top'#2#5#20'BorderSpacing.Botto'
   +'m'#2#5#17'DefaultItemHeight'#2#15#13'HideSelection'#8#8'TabOrder'#2#0#18'On'
   +'SelectionChanged'#7#25'TreeView1SelectionChanged'#7'Options'#11#17'tvoAutoI'
@@ -33,22 +33,22 @@ LazarusResources.Add('TListViewItemsEditorForm','FORMDATA',[
   +'tvoShowRoot'#11'tvoToolTips'#0#0#0#7'TButton'#10'BtnNewItem'#3'Tag'#2#1#22
   +'AnchorSideLeft.Control'#7#9'TreeView1'#19'AnchorSideLeft.Side'#7#9'asrBotto'
   +'m'#21'AnchorSideTop.Control'#7#9'GroupBox1'#23'AnchorSideRight.Control'#7#9
-  +'GroupBox1'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#172#0#6'Height'
-  +#2#25#3'Top'#2#5#5'Width'#2'p'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
+  +'GroupBox1'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#168#0#6'Height'
+  +#2#25#3'Top'#2#5#5'Width'#2't'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
   +#18'BorderSpacing.Left'#2#5#17'BorderSpacing.Top'#2#5#19'BorderSpacing.Right'
   +#2#5#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#9'&New Item'#7'Default'#9
   +#7'OnClick'#7#15'BtnNewItemClick'#8'TabOrder'#2#1#0#0#7'TButton'#13'BtnNewSu'
   +'bItem'#22'AnchorSideLeft.Control'#7#10'BtnNewItem'#21'AnchorSideTop.Control'
   +#7#10'BtnNewItem'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.C'
   +'ontrol'#7#10'BtnNewItem'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3
-  +#172#0#6'Height'#2#25#3'Top'#2'#'#5'Width'#2'p'#7'Anchors'#11#5'akTop'#6'akL'
+  +#168#0#6'Height'#2#25#3'Top'#2'#'#5'Width'#2't'#7'Anchors'#11#5'akTop'#6'akL'
   +'eft'#7'akRight'#0#17'BorderSpacing.Top'#2#5#25'BorderSpacing.InnerBorder'#2
   +#4#7'Caption'#6#12'N&ew SubItem'#7'OnClick'#7#15'BtnNewItemClick'#8'TabOrder'
   +#2#2#0#0#7'TButton'#9'BtnDelete'#22'AnchorSideLeft.Control'#7#13'BtnNewSubIt'
   +'em'#21'AnchorSideTop.Control'#7#13'BtnNewSubItem'#18'AnchorSideTop.Side'#7#9
   +'asrBottom'#23'AnchorSideRight.Control'#7#13'BtnNewSubItem'#20'AnchorSideRig'
-  +'ht.Side'#7#9'asrBottom'#4'Left'#3#172#0#6'Height'#2#25#3'Top'#2'A'#5'Width'
-  +#2'p'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#5
+  +'ht.Side'#7#9'asrBottom'#4'Left'#3#168#0#6'Height'#2#25#3'Top'#2'A'#5'Width'
+  +#2't'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#5
   +#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#7'&Delete'#7'OnClick'#7#14'b'
   +'tnDeleteClick'#8'TabOrder'#2#3#0#0#0#9'TGroupBox'#9'GroupBox2'#4'Left'#3'+'
   +#1#6'Height'#3#198#0#3'Top'#2#8#5'Width'#3#205#0#7'Anchors'#11#5'akTop'#7'ak'
@@ -58,23 +58,27 @@ LazarusResources.Add('TListViewItemsEditorForm','FORMDATA',[
   +'x2'#4'Left'#2#5#6'Height'#2#14#3'Top'#2#5#5'Width'#2'*'#18'BorderSpacing.Le'
   +'ft'#2#5#17'BorderSpacing.Top'#2#5#7'Caption'#6#8'Caption:'#12'FocusControl'
   +#7#7'edtText'#11'ParentColor'#8#0#0#6'TLabel'#15'LabelImageIndex'#22'AnchorS'
-  +'ideLeft.Control'#7#12'LabelCaption'#21'AnchorSideTop.Control'#7#12'LabelCap'
-  +'tion'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#14#3'To'
-  +'p'#2''''#5'Width'#2'B'#17'BorderSpacing.Top'#2#20#7'Caption'#6#12'Image Ind'
-  +'ex:'#12'FocusControl'#7#11'edtIndexImg'#11'ParentColor'#8#0#0#6'TLabel'#15
-  +'LabelStateIndex'#22'AnchorSideLeft.Control'#7#15'LabelImageIndex'#21'Anchor'
-  +'SideTop.Control'#7#15'LabelImageIndex'#18'AnchorSideTop.Side'#7#9'asrBottom'
-  +#4'Left'#2#5#6'Height'#2#14#3'Top'#2'I'#5'Width'#2'>'#17'BorderSpacing.Top'#2
-  ,#20#7'Caption'#6#12'State Index:'#12'FocusControl'#7#13'edtIndexState'#11'Pa'
-  +'rentColor'#8#7'Visible'#8#0#0#5'TEdit'#7'edtText'#21'AnchorSideTop.Control'
-  +#7#12'LabelCaption'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2'j'#6'Hei'
-  +'ght'#2#23#3'Top'#2#1#5'Width'#2'['#8'OnChange'#7#11'Edit1Change'#8'TabOrder'
-  +#2#0#0#0#5'TEdit'#11'edtIndexImg'#22'AnchorSideLeft.Control'#7#7'edtText'#21
-  +'AnchorSideTop.Control'#7#15'LabelImageIndex'#18'AnchorSideTop.Side'#7#9'asr'
-  +'Center'#4'Left'#2'j'#6'Height'#2#23#3'Top'#2'#'#5'Width'#2'0'#13'OnEditingD'
-  +'one'#7#24'edtIndexStateEditingDone'#8'TabOrder'#2#1#0#0#5'TEdit'#13'edtInde'
-  +'xState'#22'AnchorSideLeft.Control'#7#11'edtIndexImg'#21'AnchorSideTop.Contr'
-  +'ol'#7#15'LabelStateIndex'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2'j'
-  +#6'Height'#2#23#3'Top'#2'E'#5'Width'#2'0'#13'OnEditingDone'#7#24'edtIndexSta'
-  +'teEditingDone'#8'TabOrder'#2#2#7'Visible'#8#0#0#0#0
+  +'ideLeft.Control'#7#12'LabelCaption'#21'AnchorSideTop.Control'#7#7'edtText'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#14#3'Top'#2'1'
+  +#5'Width'#2'B'#17'BorderSpacing.Top'#2#5#7'Caption'#6#12'Image Index:'#12'Fo'
+  +'cusControl'#7#11'edtIndexImg'#11'ParentColor'#8#0#0#6'TLabel'#15'LabelState'
+  +'Index'#22'AnchorSideLeft.Control'#7#15'LabelImageIndex'#21'AnchorSideTop.Co'
+  +'ntrol'#7#11'edtIndexImg'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#5#6
+  +'Height'#2#14#3'Top'#2']'#5'Width'#2'>'#17'BorderSpacing.Top'#2#5#7'Caption'
+  ,#6#12'State Index:'#12'FocusControl'#7#13'edtIndexState'#11'ParentColor'#8#7
+  +'Visible'#8#0#0#5'TEdit'#7'edtText'#22'AnchorSideLeft.Control'#7#12'LabelCap'
+  +'tion'#21'AnchorSideTop.Control'#7#12'LabelCaption'#18'AnchorSideTop.Side'#7
+  +#9'asrBottom'#23'AnchorSideRight.Control'#7#9'GroupBox2'#20'AnchorSideRight.'
+  +'Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#23#3'Top'#2#21#5'Width'#3#191#0
+  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#2#19
+  +'BorderSpacing.Right'#2#5#8'OnChange'#7#11'Edit1Change'#8'TabOrder'#2#0#0#0#5
+  +'TEdit'#11'edtIndexImg'#22'AnchorSideLeft.Control'#7#7'edtText'#21'AnchorSid'
+  +'eTop.Control'#7#15'LabelImageIndex'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
+  +'Left'#2#5#6'Height'#2#23#3'Top'#2'A'#5'Width'#2'0'#17'BorderSpacing.Top'#2#2
+  +#13'OnEditingDone'#7#24'edtIndexStateEditingDone'#8'TabOrder'#2#1#0#0#5'TEdi'
+  +'t'#13'edtIndexState'#22'AnchorSideLeft.Control'#7#11'edtIndexImg'#21'Anchor'
+  +'SideTop.Control'#7#15'LabelStateIndex'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#4'Left'#2#5#6'Height'#2#23#3'Top'#2'm'#5'Width'#2'0'#17'BorderSpacing.Top'#2
+  +#2#13'OnEditingDone'#7#24'edtIndexStateEditingDone'#8'TabOrder'#2#2#7'Visibl'
+  +'e'#8#0#0#0#0
 ]);
diff --git a/ideintf/treeviewpropedit.lfm b/ideintf/treeviewpropedit.lfm
index 7b54c4b1de..36f33d45f8 100644
--- a/ideintf/treeviewpropedit.lfm
+++ b/ideintf/treeviewpropedit.lfm
@@ -79,7 +79,7 @@ object TreeViewItemsEditorForm: TTreeViewItemsEditorForm
       Left = 5
       Height = 185
       Top = 5
-      Width = 170
+      Width = 166
       Anchors = [akTop, akLeft, akRight, akBottom]
       BorderSpacing.Left = 5
       BorderSpacing.Top = 5
@@ -97,10 +97,10 @@ object TreeViewItemsEditorForm: TTreeViewItemsEditorForm
       AnchorSideTop.Control = GroupBox1
       AnchorSideRight.Control = GroupBox1
       AnchorSideRight.Side = asrBottom
-      Left = 180
+      Left = 176
       Height = 25
       Top = 5
-      Width = 104
+      Width = 108
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 5
       BorderSpacing.Top = 5
@@ -117,10 +117,10 @@ object TreeViewItemsEditorForm: TTreeViewItemsEditorForm
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = BtnNewItem
       AnchorSideRight.Side = asrBottom
-      Left = 180
+      Left = 176
       Height = 25
       Top = 35
-      Width = 104
+      Width = 108
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Top = 5
       BorderSpacing.InnerBorder = 4
@@ -134,10 +134,10 @@ object TreeViewItemsEditorForm: TTreeViewItemsEditorForm
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = BtnNewSubItem
       AnchorSideRight.Side = asrBottom
-      Left = 180
+      Left = 176
       Height = 25
       Top = 65
-      Width = 104
+      Width = 108
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Top = 5
       BorderSpacing.InnerBorder = 4
@@ -151,10 +151,10 @@ object TreeViewItemsEditorForm: TTreeViewItemsEditorForm
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = BtnDelete
       AnchorSideRight.Side = asrBottom
-      Left = 180
+      Left = 176
       Height = 25
       Top = 95
-      Width = 104
+      Width = 108
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Top = 5
       BorderSpacing.InnerBorder = 4
@@ -168,10 +168,10 @@ object TreeViewItemsEditorForm: TTreeViewItemsEditorForm
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = BtnLoad
       AnchorSideRight.Side = asrBottom
-      Left = 180
+      Left = 176
       Height = 25
       Top = 125
-      Width = 104
+      Width = 108
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Top = 5
       BorderSpacing.InnerBorder = 4
@@ -205,80 +205,92 @@ object TreeViewItemsEditorForm: TTreeViewItemsEditorForm
     end
     object LabelImageIndex: TLabel
       AnchorSideLeft.Control = LabelText
-      AnchorSideTop.Control = LabelText
+      AnchorSideTop.Control = edtText
       AnchorSideTop.Side = asrBottom
       Left = 5
       Height = 14
-      Top = 39
+      Top = 49
       Width = 66
-      BorderSpacing.Top = 20
+      BorderSpacing.Top = 5
       Caption = 'Image Index:'
       FocusControl = edtIndexImg
       ParentColor = False
     end
     object LabelSelectedIndex: TLabel
       AnchorSideLeft.Control = LabelImageIndex
-      AnchorSideTop.Control = LabelImageIndex
+      AnchorSideTop.Control = edtIndexImg
       AnchorSideTop.Side = asrBottom
       Left = 5
       Height = 14
-      Top = 73
+      Top = 93
       Width = 75
-      BorderSpacing.Top = 20
+      BorderSpacing.Top = 5
       Caption = 'Selected index:'
       FocusControl = edtIndexSel
       ParentColor = False
     end
     object LabelStateIndex: TLabel
       AnchorSideLeft.Control = LabelSelectedIndex
-      AnchorSideTop.Control = LabelSelectedIndex
+      AnchorSideTop.Control = edtIndexSel
       AnchorSideTop.Side = asrBottom
       Left = 5
       Height = 14
-      Top = 107
+      Top = 137
       Width = 62
-      BorderSpacing.Top = 20
+      BorderSpacing.Top = 5
       Caption = 'State Index:'
       FocusControl = edtIndexState
       ParentColor = False
     end
     object edtText: TEdit
+      AnchorSideLeft.Control = LabelText
       AnchorSideTop.Control = LabelText
-      AnchorSideTop.Side = asrCenter
-      Left = 106
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = GroupBox2
+      AnchorSideRight.Side = asrBottom
+      Left = 5
       Height = 23
-      Top = 1
-      Width = 91
+      Top = 21
+      Width = 191
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 2
+      BorderSpacing.Right = 5
       OnChange = Edit1Change
       TabOrder = 0
     end
     object edtIndexImg: TEdit
+      AnchorSideLeft.Control = LabelImageIndex
       AnchorSideTop.Control = LabelImageIndex
-      AnchorSideTop.Side = asrCenter
-      Left = 106
+      AnchorSideTop.Side = asrBottom
+      Left = 5
       Height = 23
-      Top = 35
+      Top = 65
       Width = 48
+      BorderSpacing.Top = 2
       OnEditingDone = edtIndexStateEditingDone
       TabOrder = 1
     end
     object edtIndexSel: TEdit
+      AnchorSideLeft.Control = LabelSelectedIndex
       AnchorSideTop.Control = LabelSelectedIndex
-      AnchorSideTop.Side = asrCenter
-      Left = 106
+      AnchorSideTop.Side = asrBottom
+      Left = 5
       Height = 23
-      Top = 69
+      Top = 109
       Width = 48
+      BorderSpacing.Top = 2
       OnEditingDone = edtIndexStateEditingDone
       TabOrder = 2
     end
     object edtIndexState: TEdit
+      AnchorSideLeft.Control = LabelStateIndex
       AnchorSideTop.Control = LabelStateIndex
-      AnchorSideTop.Side = asrCenter
-      Left = 106
+      AnchorSideTop.Side = asrBottom
+      Left = 5
       Height = 23
-      Top = 103
+      Top = 153
       Width = 48
+      BorderSpacing.Top = 2
       OnEditingDone = edtIndexStateEditingDone
       TabOrder = 3
     end
diff --git a/ideintf/treeviewpropedit.lrs b/ideintf/treeviewpropedit.lrs
index f39b6e73a8..3b282bbef4 100644
--- a/ideintf/treeviewpropedit.lrs
+++ b/ideintf/treeviewpropedit.lrs
@@ -24,7 +24,7 @@ LazarusResources.Add('TTreeViewItemsEditorForm','FORMDATA',[
   +#3#195#0#11'ClientWidth'#3'!'#1#8'TabOrder'#2#4#0#9'TTreeView'#9'TreeView1'
   +#22'AnchorSideLeft.Control'#7#9'GroupBox1'#21'AnchorSideTop.Control'#7#9'Gro'
   +'upBox1'#24'AnchorSideBottom.Control'#7#9'GroupBox1'#21'AnchorSideBottom.Sid'
-  +'e'#7#9'asrBottom'#4'Left'#2#5#6'Height'#3#185#0#3'Top'#2#5#5'Width'#3#170#0
+  +'e'#7#9'asrBottom'#4'Left'#2#5#6'Height'#3#185#0#3'Top'#2#5#5'Width'#3#166#0
   +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#18'BorderSpacing.'
   +'Left'#2#5#17'BorderSpacing.Top'#2#5#20'BorderSpacing.Bottom'#2#5#17'Default'
   +'ItemHeight'#2#15#13'HideSelection'#8#8'TabOrder'#2#0#18'OnSelectionChanged'
@@ -33,34 +33,34 @@ LazarusResources.Add('TTreeViewItemsEditorForm','FORMDATA',[
   +'voToolTips'#0#0#0#7'TButton'#10'BtnNewItem'#3'Tag'#2#1#22'AnchorSideLeft.Co'
   +'ntrol'#7#9'TreeView1'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideT'
   +'op.Control'#7#9'GroupBox1'#23'AnchorSideRight.Control'#7#9'GroupBox1'#20'An'
-  +'chorSideRight.Side'#7#9'asrBottom'#4'Left'#3#180#0#6'Height'#2#25#3'Top'#2#5
-  +#5'Width'#2'h'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacin'
+  +'chorSideRight.Side'#7#9'asrBottom'#4'Left'#3#176#0#6'Height'#2#25#3'Top'#2#5
+  +#5'Width'#2'l'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacin'
   +'g.Left'#2#5#17'BorderSpacing.Top'#2#5#19'BorderSpacing.Right'#2#5#25'Border'
   +'Spacing.InnerBorder'#2#4#7'Caption'#6#9'&New Item'#7'Default'#9#7'OnClick'#7
   +#15'BtnNewItemClick'#8'TabOrder'#2#1#0#0#7'TButton'#13'BtnNewSubItem'#22'Anc'
   +'horSideLeft.Control'#7#10'BtnNewItem'#21'AnchorSideTop.Control'#7#10'BtnNew'
   +'Item'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#10
-  +'BtnNewItem'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#180#0#6'Heigh'
-  +'t'#2#25#3'Top'#2'#'#5'Width'#2'h'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
+  +'BtnNewItem'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#176#0#6'Heigh'
+  +'t'#2#25#3'Top'#2'#'#5'Width'#2'l'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
   +'t'#0#17'BorderSpacing.Top'#2#5#25'BorderSpacing.InnerBorder'#2#4#7'Caption'
   +#6#12'N&ew SubItem'#7'OnClick'#7#15'BtnNewItemClick'#8'TabOrder'#2#2#0#0#7'T'
   +'Button'#9'BtnDelete'#22'AnchorSideLeft.Control'#7#13'BtnNewSubItem'#21'Anch'
   +'orSideTop.Control'#7#13'BtnNewSubItem'#18'AnchorSideTop.Side'#7#9'asrBottom'
   +#23'AnchorSideRight.Control'#7#13'BtnNewSubItem'#20'AnchorSideRight.Side'#7#9
-  +'asrBottom'#4'Left'#3#180#0#6'Height'#2#25#3'Top'#2'A'#5'Width'#2'h'#7'Ancho'
+  +'asrBottom'#4'Left'#3#176#0#6'Height'#2#25#3'Top'#2'A'#5'Width'#2'l'#7'Ancho'
   +'rs'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#5#25'BorderS'
   +'pacing.InnerBorder'#2#4#7'Caption'#6#7'&Delete'#7'OnClick'#7#14'btnDeleteCl'
   +'ick'#8'TabOrder'#2#3#0#0#7'TButton'#7'BtnLoad'#22'AnchorSideLeft.Control'#7
   +#9'BtnDelete'#21'AnchorSideTop.Control'#7#9'BtnDelete'#18'AnchorSideTop.Side'
   +#7#9'asrBottom'#23'AnchorSideRight.Control'#7#9'BtnDelete'#20'AnchorSideRigh'
-  +'t.Side'#7#9'asrBottom'#4'Left'#3#180#0#6'Height'#2#25#3'Top'#2'_'#5'Width'#2
-  +'h'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#5
+  +'t.Side'#7#9'asrBottom'#4'Left'#3#176#0#6'Height'#2#25#3'Top'#2'_'#5'Width'#2
+  +'l'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#5
   +#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#5'&Load'#7'OnClick'#7#12'btn'
   +'LoadClick'#8'TabOrder'#2#4#0#0#7'TButton'#7'BtnSave'#22'AnchorSideLeft.Cont'
   +'rol'#7#7'BtnLoad'#21'AnchorSideTop.Control'#7#7'BtnLoad'#18'AnchorSideTop.S'
   +'ide'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#7'BtnLoad'#20'AnchorSideR'
-  +'ight.Side'#7#9'asrBottom'#4'Left'#3#180#0#6'Height'#2#25#3'Top'#2'}'#5'Widt'
-  +'h'#2'h'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'
+  +'ight.Side'#7#9'asrBottom'#4'Left'#3#176#0#6'Height'#2#25#3'Top'#2'}'#5'Widt'
+  +'h'#2'l'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'
   +#2#5#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#5'&Save'#7'OnClick'#7#12
   +'btnSaveClick'#8'TabOrder'#2#5#0#0#0#9'TGroupBox'#9'GroupBox2'#4'Left'#3'+'#1
   +#6'Height'#3#213#0#3'Top'#2#8#5'Width'#3#205#0#7'Anchors'#11#5'akTop'#7'akRi'
@@ -70,32 +70,38 @@ LazarusResources.Add('TTreeViewItemsEditorForm','FORMDATA',[
   +'Left'#2#5#6'Height'#2#14#3'Top'#2#5#5'Width'#2#27#18'BorderSpacing.Left'#2#5
   +#17'BorderSpacing.Top'#2#5#7'Caption'#6#5'Text:'#12'FocusControl'#7#7'edtTex'
   +'t'#11'ParentColor'#8#0#0#6'TLabel'#15'LabelImageIndex'#22'AnchorSideLeft.Co'
-  +'ntrol'#7#9'LabelText'#21'AnchorSideTop.Control'#7#9'LabelText'#18'AnchorSid'
-  +'eTop.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#14#3'Top'#2''''#5'Width'#2
-  +'B'#17'BorderSpacing.Top'#2#20#7'Caption'#6#12'Image Index:'#12'FocusControl'
-  +#7#11'edtIndexImg'#11'ParentColor'#8#0#0#6'TLabel'#18'LabelSelectedIndex'#22
-  +'AnchorSideLeft.Control'#7#15'LabelImageIndex'#21'AnchorSideTop.Control'#7#15
-  +'LabelImageIndex'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'
-  +#2#14#3'Top'#2'I'#5'Width'#2'K'#17'BorderSpacing.Top'#2#20#7'Caption'#6#15'S'
-  +'elected index:'#12'FocusControl'#7#11'edtIndexSel'#11'ParentColor'#8#0#0#6
-  +'TLabel'#15'LabelStateIndex'#22'AnchorSideLeft.Control'#7#18'LabelSelectedIn'
-  +'dex'#21'AnchorSideTop.Control'#7#18'LabelSelectedIndex'#18'AnchorSideTop.Si'
-  +'de'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#14#3'Top'#2'k'#5'Width'#2'>'#17
-  +'BorderSpacing.Top'#2#20#7'Caption'#6#12'State Index:'#12'FocusControl'#7#13
-  +'edtIndexState'#11'ParentColor'#8#0#0#5'TEdit'#7'edtText'#21'AnchorSideTop.C'
-  +'ontrol'#7#9'LabelText'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2'j'#6
-  +'Height'#2#23#3'Top'#2#1#5'Width'#2'['#8'OnChange'#7#11'Edit1Change'#8'TabOr'
-  +'der'#2#0#0#0#5'TEdit'#11'edtIndexImg'#21'AnchorSideTop.Control'#7#15'LabelI'
-  +'mageIndex'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2'j'#6'Height'#2#23
-  +#3'Top'#2'#'#5'Width'#2'0'#13'OnEditingDone'#7#24'edtIndexStateEditingDone'#8
-  +'TabOrder'#2#1#0#0#5'TEdit'#11'edtIndexSel'#21'AnchorSideTop.Control'#7#18'L'
-  +'abelSelectedIndex'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2'j'#6'Hei'
-  +'ght'#2#23#3'Top'#2'E'#5'Width'#2'0'#13'OnEditingDone'#7#24'edtIndexStateEdi'
-  +'tingDone'#8'TabOrder'#2#2#0#0#5'TEdit'#13'edtIndexState'#21'AnchorSideTop.C'
-  +'ontrol'#7#15'LabelStateIndex'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'
-  +#2'j'#6'Height'#2#23#3'Top'#2'g'#5'Width'#2'0'#13'OnEditingDone'#7#24'edtInd'
-  +'exStateEditingDone'#8'TabOrder'#2#3#0#0#0#11'TOpenDialog'#11'OpenDialog1'#5
-  +'Title'#6#4'Open'#11'FilterIndex'#2#0#4'left'#3#176#0#3'top'#3#234#0#0#0#11
-  +'TSaveDialog'#11'SaveDialog1'#5'Title'#6#4'Save'#11'FilterIndex'#2#0#4'left'
-  +#3#176#0#3'top'#3#234#0#0#0#0
+  +'ntrol'#7#9'LabelText'#21'AnchorSideTop.Control'#7#7'edtText'#18'AnchorSideT'
+  +'op.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#14#3'Top'#2'1'#5'Width'#2'B'
+  +#17'BorderSpacing.Top'#2#5#7'Caption'#6#12'Image Index:'#12'FocusControl'#7
+  +#11'edtIndexImg'#11'ParentColor'#8#0#0#6'TLabel'#18'LabelSelectedIndex'#22'A'
+  +'nchorSideLeft.Control'#7#15'LabelImageIndex'#21'AnchorSideTop.Control'#7#11
+  +'edtIndexImg'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2
+  +#14#3'Top'#2']'#5'Width'#2'K'#17'BorderSpacing.Top'#2#5#7'Caption'#6#15'Sele'
+  +'cted index:'#12'FocusControl'#7#11'edtIndexSel'#11'ParentColor'#8#0#0#6'TLa'
+  +'bel'#15'LabelStateIndex'#22'AnchorSideLeft.Control'#7#18'LabelSelectedIndex'
+  +#21'AnchorSideTop.Control'#7#11'edtIndexSel'#18'AnchorSideTop.Side'#7#9'asrB'
+  +'ottom'#4'Left'#2#5#6'Height'#2#14#3'Top'#3#137#0#5'Width'#2'>'#17'BorderSpa'
+  +'cing.Top'#2#5#7'Caption'#6#12'State Index:'#12'FocusControl'#7#13'edtIndexS'
+  +'tate'#11'ParentColor'#8#0#0#5'TEdit'#7'edtText'#22'AnchorSideLeft.Control'#7
+  +#9'LabelText'#21'AnchorSideTop.Control'#7#9'LabelText'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#23'AnchorSideRight.Control'#7#9'GroupBox2'#20'AnchorSideRigh'
+  +'t.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#23#3'Top'#2#21#5'Width'#3#191
+  +#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#2#19
+  +'BorderSpacing.Right'#2#5#8'OnChange'#7#11'Edit1Change'#8'TabOrder'#2#0#0#0#5
+  +'TEdit'#11'edtIndexImg'#22'AnchorSideLeft.Control'#7#15'LabelImageIndex'#21
+  +'AnchorSideTop.Control'#7#15'LabelImageIndex'#18'AnchorSideTop.Side'#7#9'asr'
+  +'Bottom'#4'Left'#2#5#6'Height'#2#23#3'Top'#2'A'#5'Width'#2'0'#17'BorderSpaci'
+  +'ng.Top'#2#2#13'OnEditingDone'#7#24'edtIndexStateEditingDone'#8'TabOrder'#2#1
+  +#0#0#5'TEdit'#11'edtIndexSel'#22'AnchorSideLeft.Control'#7#18'LabelSelectedI'
+  +'ndex'#21'AnchorSideTop.Control'#7#18'LabelSelectedIndex'#18'AnchorSideTop.S'
+  +'ide'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#23#3'Top'#2'm'#5'Width'#2'0'#17
+  +'BorderSpacing.Top'#2#2#13'OnEditingDone'#7#24'edtIndexStateEditingDone'#8'T'
+  +'abOrder'#2#2#0#0#5'TEdit'#13'edtIndexState'#22'AnchorSideLeft.Control'#7#15
+  +'LabelStateIndex'#21'AnchorSideTop.Control'#7#15'LabelStateIndex'#18'AnchorS'
+  +'ideTop.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#23#3'Top'#3#153#0#5'Wid'
+  +'th'#2'0'#17'BorderSpacing.Top'#2#2#13'OnEditingDone'#7#24'edtIndexStateEdit'
+  +'ingDone'#8'TabOrder'#2#3#0#0#0#11'TOpenDialog'#11'OpenDialog1'#5'Title'#6#4
+  +'Open'#11'FilterIndex'#2#0#4'left'#3#176#0#3'top'#3#234#0#0#0#11'TSaveDialog'
+  +#11'SaveDialog1'#5'Title'#6#4'Save'#11'FilterIndex'#2#0#4'left'#3#176#0#3'to'
+  +'p'#3#234#0#0#0#0
 ]);