diff --git a/ide/frames/buildmodeseditor.lfm b/ide/frames/buildmodeseditor.lfm
index ef987aac27..bcfba76e5b 100644
--- a/ide/frames/buildmodeseditor.lfm
+++ b/ide/frames/buildmodeseditor.lfm
@@ -1,12 +1,14 @@
-inherited BuildModesEditorFrame: TBuildModesEditorFrame
+object BuildModesEditorFrame: TBuildModesEditorFrame
+  Left = 0
   Height = 421
+  Top = 0
   Width = 550
   ClientHeight = 421
   ClientWidth = 550
   TabOrder = 0
   DesignLeft = 460
   DesignTop = 269
-  object BuildMacroValuesGroupBox: TGroupBox[0]
+  object BuildMacroValuesGroupBox: TGroupBox
     Left = 6
     Height = 234
     Top = 181
@@ -14,14 +16,14 @@ inherited BuildModesEditorFrame: TBuildModesEditorFrame
     Align = alClient
     BorderSpacing.Around = 6
     Caption = 'BuildMacroValuesGroupBox'
-    ClientHeight = 212
-    ClientWidth = 530
-    TabOrder = 0
+    ClientHeight = 218
+    ClientWidth = 534
+    TabOrder = 2
     object BuildMacroValuesStringGrid: TStringGrid
       Left = 0
-      Height = 212
+      Height = 218
       Top = 0
-      Width = 530
+      Width = 534
       Align = alClient
       AutoFillColumns = True
       ColCount = 2
@@ -39,7 +41,7 @@ inherited BuildModesEditorFrame: TBuildModesEditorFrame
       )
     end
   end
-  object BuildModesGroupBox: TGroupBox[1]
+  object BuildModesGroupBox: TGroupBox
     Left = 6
     Height = 158
     Top = 6
@@ -47,16 +49,16 @@ inherited BuildModesEditorFrame: TBuildModesEditorFrame
     Align = alTop
     BorderSpacing.Around = 6
     Caption = 'BuildModesGroupBox'
-    ClientHeight = 136
-    ClientWidth = 530
-    TabOrder = 1
+    ClientHeight = 142
+    ClientWidth = 534
+    TabOrder = 0
     object BuildModesStringGrid: TStringGrid
       AnchorSideTop.Control = BuildModeAddSpeedButton
       AnchorSideTop.Side = asrBottom
       Left = 0
-      Height = 114
+      Height = 120
       Top = 22
-      Width = 530
+      Width = 534
       Align = alBottom
       Anchors = [akTop, akLeft, akRight, akBottom]
       AutoFillColumns = True
@@ -100,7 +102,6 @@ inherited BuildModesEditorFrame: TBuildModesEditorFrame
       Height = 22
       Top = 0
       Width = 23
-      Color = clBtnFace
       NumGlyphs = 0
       OnClick = BuildModeAddSpeedButtonClick
       ShowHint = True
@@ -114,7 +115,6 @@ inherited BuildModesEditorFrame: TBuildModesEditorFrame
       Height = 22
       Top = 0
       Width = 23
-      Color = clBtnFace
       NumGlyphs = 0
       OnClick = BuildModeDeleteSpeedButtonClick
       ShowHint = True
@@ -128,7 +128,6 @@ inherited BuildModesEditorFrame: TBuildModesEditorFrame
       Height = 22
       Top = 0
       Width = 23
-      Color = clBtnFace
       NumGlyphs = 0
       OnClick = BuildModeMoveUpSpeedButtonClick
       ShowHint = True
@@ -142,7 +141,6 @@ inherited BuildModesEditorFrame: TBuildModesEditorFrame
       Height = 22
       Top = 0
       Width = 23
-      Color = clBtnFace
       NumGlyphs = 0
       OnClick = BuildModeMoveDownSpeedButtonClick
       ShowHint = True
@@ -157,14 +155,13 @@ inherited BuildModesEditorFrame: TBuildModesEditorFrame
       Top = 0
       Width = 23
       BorderSpacing.Left = 10
-      Color = clBtnFace
       NumGlyphs = 0
       OnClick = BuildModeDiffSpeedButtonClick
       ShowHint = True
       ParentShowHint = False
     end
   end
-  object Splitter1: TSplitter[2]
+  object Splitter1: TSplitter
     Cursor = crVSplit
     Left = 0
     Height = 5
@@ -173,7 +170,7 @@ inherited BuildModesEditorFrame: TBuildModesEditorFrame
     Align = alTop
     ResizeAnchor = akTop
   end
-  object BuildModesPopupMenu: TPopupMenu[3]
+  object BuildModesPopupMenu: TPopupMenu
     left = 180
     top = 60
   end
diff --git a/ide/frames/buildmodeseditor.pas b/ide/frames/buildmodeseditor.pas
index 99b05589dc..1b0d410b62 100644
--- a/ide/frames/buildmodeseditor.pas
+++ b/ide/frames/buildmodeseditor.pas
@@ -708,8 +708,7 @@ begin
   BuildModeMoveDownSpeedButton.LoadGlyphFromLazarusResource('arrow_down');
   BuildModeDiffSpeedButton.LoadGlyphFromLazarusResource('menu_tool_diff');
 
-  BuildMacroValuesGroupBox.Caption:=
-    lisIDEMacroValuesForFPCMacrosUseCustomOptions;
+  BuildMacroValuesGroupBox.Caption:=lisIDEMacroValuesForFPCMacrosUseCustomOptions;
   Grid:=BuildMacroValuesStringGrid;
   Grid.Columns.Add;
   Grid.Columns[0].Title.Caption:=lisMacroName;
diff --git a/ide/frames/project_misc_options.lfm b/ide/frames/project_misc_options.lfm
index 334b04b671..a4df62fa6b 100644
--- a/ide/frames/project_misc_options.lfm
+++ b/ide/frames/project_misc_options.lfm
@@ -1,12 +1,14 @@
-inherited ProjectMiscOptionsFrame: TProjectMiscOptionsFrame
+object ProjectMiscOptionsFrame: TProjectMiscOptionsFrame
+  Left = 0
   Height = 460
+  Top = 0
   Width = 536
   ClientHeight = 460
   ClientWidth = 536
   TabOrder = 0
   DesignLeft = 306
   DesignTop = 188
-  object Bevel1: TBevel[0]
+  object Bevel1: TBevel
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MainUnitHasTitleStatementCheckBox
     AnchorSideTop.Side = asrBottom
@@ -14,93 +16,93 @@ inherited ProjectMiscOptionsFrame: TProjectMiscOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 0
     Height = 3
-    Top = 112
+    Top = 108
     Width = 536
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Top = 6
   end
-  object MainUnitHasUsesSectionForAllUnitsCheckBox: TCheckBox[1]
+  object MainUnitHasUsesSectionForAllUnitsCheckBox: TCheckBox
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MainUnitIsPascalSourceCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 22
-    Top = 28
-    Width = 340
+    Height = 21
+    Top = 27
+    Width = 254
     BorderSpacing.Top = 6
     Caption = 'MainUnitHasUsesSectionForAllUnitsCheckBox'
-    TabOrder = 0
+    TabOrder = 1
   end
-  object MainUnitHasCreateFormStatementsCheckBox: TCheckBox[2]
+  object MainUnitHasCreateFormStatementsCheckBox: TCheckBox
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MainUnitHasUsesSectionForAllUnitsCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 22
-    Top = 56
-    Width = 341
+    Height = 21
+    Top = 54
+    Width = 255
     BorderSpacing.Top = 6
     Caption = 'MainUnitHasCreateFormStatementsCheckBox'
-    TabOrder = 1
+    TabOrder = 2
   end
-  object MainUnitIsPascalSourceCheckBox: TCheckBox[3]
+  object MainUnitIsPascalSourceCheckBox: TCheckBox
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     Left = 0
-    Height = 22
+    Height = 21
     Top = 0
-    Width = 257
+    Width = 191
     Caption = 'MainUnitIsPascalSourceCheckBox'
-    TabOrder = 2
+    TabOrder = 0
   end
-  object MainUnitHasTitleStatementCheckBox: TCheckBox[4]
+  object MainUnitHasTitleStatementCheckBox: TCheckBox
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MainUnitHasCreateFormStatementsCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 22
-    Top = 84
-    Width = 283
+    Height = 21
+    Top = 81
+    Width = 213
     BorderSpacing.Top = 6
     Caption = 'MainUnitHasTitleStatementCheckBox'
     TabOrder = 3
   end
-  object RunnableCheckBox: TCheckBox[5]
+  object RunnableCheckBox: TCheckBox
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Bevel1
     Left = 0
-    Height = 22
-    Top = 118
-    Width = 158
+    Height = 21
+    Top = 114
+    Width = 118
     BorderSpacing.Top = 6
     Caption = 'RunnableCheckBox'
     TabOrder = 4
   end
-  object AlwaysBuildCheckBox: TCheckBox[6]
+  object AlwaysBuildCheckBox: TCheckBox
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = UseDesignTimePkgsCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 22
-    Top = 174
-    Width = 178
+    Height = 21
+    Top = 168
+    Width = 132
     BorderSpacing.Top = 6
     Caption = 'AlwaysBuildCheckBox'
-    TabOrder = 5
+    TabOrder = 6
   end
-  object LRSInOutputDirCheckBox: TCheckBox[7]
+  object LRSInOutputDirCheckBox: TCheckBox
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = AlwaysBuildCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 22
-    Top = 202
-    Width = 202
+    Height = 21
+    Top = 195
+    Width = 152
     BorderSpacing.Top = 6
     Caption = 'LRSInOutputDirCheckBox'
-    TabOrder = 6
+    TabOrder = 7
   end
-  object ResourceGroupBox: TGroupBox[8]
+  object ResourceGroupBox: TGroupBox
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = LRSInOutputDirCheckBox
     AnchorSideTop.Side = asrBottom
@@ -108,7 +110,7 @@ inherited ProjectMiscOptionsFrame: TProjectMiscOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 0
     Height = 81
-    Top = 230
+    Top = 222
     Width = 536
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Top = 6
@@ -121,14 +123,14 @@ inherited ProjectMiscOptionsFrame: TProjectMiscOptionsFrame
     ChildSizing.ShrinkVertical = crsScaleChilds
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 1
-    ClientHeight = 60
-    ClientWidth = 528
-    TabOrder = 7
+    ClientHeight = 65
+    ClientWidth = 532
+    TabOrder = 8
     object UseLRSFilesRadioButton: TRadioButton
       Left = 6
-      Height = 24
+      Height = 27
       Top = 6
-      Width = 516
+      Width = 520
       Caption = 'UseLRSFilesRadioButton'
       Checked = True
       ParentShowHint = False
@@ -138,39 +140,39 @@ inherited ProjectMiscOptionsFrame: TProjectMiscOptionsFrame
     end
     object UseFPCResourcesRadioButton: TRadioButton
       Left = 6
-      Height = 24
-      Top = 30
-      Width = 516
+      Height = 26
+      Top = 33
+      Width = 520
       Caption = 'UseFPCResourcesRadioButton'
       ParentShowHint = False
       ShowHint = True
       TabOrder = 1
     end
   end
-  object UseDesignTimePkgsCheckBox: TCheckBox[9]
+  object UseDesignTimePkgsCheckBox: TCheckBox
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = RunnableCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 22
-    Top = 146
-    Width = 234
+    Height = 21
+    Top = 141
+    Width = 172
     BorderSpacing.Top = 6
     Caption = 'UseDesignTimePkgsCheckBox'
-    TabOrder = 8
+    TabOrder = 5
   end
-  object PathDelimLabel: TLabel[10]
+  object PathDelimLabel: TLabel
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = PathDelimComboBox
     AnchorSideTop.Side = asrCenter
     Left = 0
-    Height = 18
-    Top = 330
-    Width = 110
+    Height = 15
+    Top = 323
+    Width = 81
     Caption = 'PathDelimLabel'
     ParentColor = False
   end
-  object Bevel2: TBevel[11]
+  object Bevel2: TBevel
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = ResourceGroupBox
     AnchorSideTop.Side = asrBottom
@@ -178,20 +180,20 @@ inherited ProjectMiscOptionsFrame: TProjectMiscOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 0
     Height = 3
-    Top = 317
+    Top = 309
     Width = 536
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Top = 6
   end
-  object PathDelimComboBox: TComboBox[12]
+  object PathDelimComboBox: TComboBox
     AnchorSideLeft.Control = PathDelimLabel
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = Bevel2
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Side = asrBottom
-    Left = 116
-    Height = 27
-    Top = 326
+    Left = 87
+    Height = 25
+    Top = 318
     Width = 259
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
diff --git a/ide/frames/project_versioninfo_options.lfm b/ide/frames/project_versioninfo_options.lfm
index 00671e16c3..66a8151d29 100644
--- a/ide/frames/project_versioninfo_options.lfm
+++ b/ide/frames/project_versioninfo_options.lfm
@@ -1,30 +1,32 @@
-inherited ProjectVersionInfoOptionsFrame: TProjectVersionInfoOptionsFrame
+object ProjectVersionInfoOptionsFrame: TProjectVersionInfoOptionsFrame
+  Left = 0
   Height = 364
+  Top = 0
   Width = 594
   ClientHeight = 364
   ClientWidth = 594
   TabOrder = 0
   DesignLeft = 273
   DesignTop = 145
-  object VersionInfoGroupBox: TGroupBox[0]
+  object VersionInfoGroupBox: TGroupBox
     Left = 0
-    Height = 109
-    Top = 32
+    Height = 101
+    Top = 27
     Width = 594
     Align = alTop
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'Version Numbering'
-    ClientHeight = 92
+    ClientHeight = 85
     ClientWidth = 590
-    TabOrder = 0
+    TabOrder = 1
     object MajorVersionLabel: TLabel
       AnchorSideLeft.Control = VersionInfoGroupBox
       AnchorSideTop.Control = VersionInfoGroupBox
       Left = 6
-      Height = 16
+      Height = 15
       Top = 6
-      Width = 88
+      Width = 70
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
       BorderSpacing.Bottom = 3
@@ -37,9 +39,9 @@ inherited ProjectVersionInfoOptionsFrame: TProjectVersionInfoOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = VersionInfoGroupBox
       Left = 131
-      Height = 16
+      Height = 15
       Top = 6
-      Width = 88
+      Width = 70
       BorderSpacing.Left = 55
       BorderSpacing.Top = 6
       BorderSpacing.Bottom = 3
@@ -52,9 +54,9 @@ inherited ProjectVersionInfoOptionsFrame: TProjectVersionInfoOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = VersionInfoGroupBox
       Left = 256
-      Height = 16
+      Height = 15
       Top = 6
-      Width = 55
+      Width = 45
       BorderSpacing.Left = 55
       BorderSpacing.Top = 6
       BorderSpacing.Bottom = 3
@@ -67,9 +69,9 @@ inherited ProjectVersionInfoOptionsFrame: TProjectVersionInfoOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = VersionInfoGroupBox
       Left = 381
-      Height = 16
+      Height = 15
       Top = 6
-      Width = 35
+      Width = 29
       BorderSpacing.Left = 55
       BorderSpacing.Top = 6
       BorderSpacing.Bottom = 3
@@ -82,8 +84,8 @@ inherited ProjectVersionInfoOptionsFrame: TProjectVersionInfoOptionsFrame
       AnchorSideTop.Control = MajorVersionLabel
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 23
-      Top = 25
+      Height = 22
+      Top = 24
       Width = 70
       MaxValue = 65535
       TabOrder = 0
@@ -93,8 +95,8 @@ inherited ProjectVersionInfoOptionsFrame: TProjectVersionInfoOptionsFrame
       AnchorSideTop.Control = MinorVersionLabel
       AnchorSideTop.Side = asrBottom
       Left = 131
-      Height = 23
-      Top = 25
+      Height = 22
+      Top = 24
       Width = 70
       MaxValue = 65535
       TabOrder = 1
@@ -104,8 +106,8 @@ inherited ProjectVersionInfoOptionsFrame: TProjectVersionInfoOptionsFrame
       AnchorSideTop.Control = RevisionLabel
       AnchorSideTop.Side = asrBottom
       Left = 256
-      Height = 23
-      Top = 25
+      Height = 22
+      Top = 24
       Width = 70
       MaxValue = 65535
       TabOrder = 2
@@ -115,9 +117,9 @@ inherited ProjectVersionInfoOptionsFrame: TProjectVersionInfoOptionsFrame
       AnchorSideTop.Control = MajorVersionSpinEdit
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 26
-      Top = 60
-      Width = 203
+      Height = 21
+      Top = 58
+      Width = 164
       BorderSpacing.Top = 6
       BorderSpacing.Around = 6
       Caption = 'Automatically increase Build'
@@ -128,27 +130,27 @@ inherited ProjectVersionInfoOptionsFrame: TProjectVersionInfoOptionsFrame
       AnchorSideTop.Control = BuildLabel
       AnchorSideTop.Side = asrBottom
       Left = 381
-      Height = 23
-      Top = 25
+      Height = 22
+      Top = 24
       Width = 70
       MaxValue = 65535
       TabOrder = 3
     end
   end
-  object UseVersionInfoCheckBox: TCheckBox[1]
+  object UseVersionInfoCheckBox: TCheckBox
     Left = 0
-    Height = 26
+    Height = 21
     Top = 0
     Width = 594
     Align = alTop
     Caption = 'Include Version Info in executable'
     OnChange = UseVersionInfoCheckBoxChange
-    TabOrder = 1
+    TabOrder = 0
   end
-  object LanguageSettingsGroupBox: TGroupBox[2]
+  object LanguageSettingsGroupBox: TGroupBox
     Left = 0
-    Height = 76
-    Top = 147
+    Height = 75
+    Top = 134
     Width = 594
     Align = alTop
     AutoSize = True
@@ -161,9 +163,9 @@ inherited ProjectVersionInfoOptionsFrame: TProjectVersionInfoOptionsFrame
       AnchorSideLeft.Control = LanguageSettingsGroupBox
       AnchorSideTop.Control = LanguageSettingsGroupBox
       Left = 6
-      Height = 16
+      Height = 15
       Top = 6
-      Width = 129
+      Width = 101
       BorderSpacing.Around = 6
       Caption = 'Language Selection:'
       ParentColor = False
@@ -173,9 +175,9 @@ inherited ProjectVersionInfoOptionsFrame: TProjectVersionInfoOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = LanguageSettingsGroupBox
       Left = 260
-      Height = 16
+      Height = 15
       Top = 6
-      Width = 92
+      Width = 73
       BorderSpacing.Around = 6
       Caption = 'Character Set:'
       ParentColor = False
@@ -185,8 +187,8 @@ inherited ProjectVersionInfoOptionsFrame: TProjectVersionInfoOptionsFrame
       AnchorSideTop.Control = LanguageSelectionLabel
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 25
-      Top = 28
+      Height = 26
+      Top = 27
       Width = 248
       BorderSpacing.Top = 2
       BorderSpacing.Bottom = 6
@@ -200,8 +202,8 @@ inherited ProjectVersionInfoOptionsFrame: TProjectVersionInfoOptionsFrame
       AnchorSideRight.Control = LanguageSettingsGroupBox
       AnchorSideRight.Side = asrBottom
       Left = 260
-      Height = 25
-      Top = 28
+      Height = 26
+      Top = 27
       Width = 324
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Right = 6
@@ -211,21 +213,21 @@ inherited ProjectVersionInfoOptionsFrame: TProjectVersionInfoOptionsFrame
       TabOrder = 1
     end
   end
-  object OtherInfoGroupBox: TGroupBox[3]
+  object OtherInfoGroupBox: TGroupBox
     Left = 0
-    Height = 135
-    Top = 229
+    Height = 149
+    Top = 215
     Width = 594
     Align = alClient
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'Other Info'
-    ClientHeight = 118
+    ClientHeight = 133
     ClientWidth = 590
     TabOrder = 3
     object StringInfo: TStringGrid
       Left = 6
-      Height = 106
+      Height = 121
       Top = 6
       Width = 578
       Align = alClient
@@ -236,14 +238,12 @@ inherited ProjectVersionInfoOptionsFrame: TProjectVersionInfoOptionsFrame
           MinSize = 50
           ReadOnly = True
           Title.Caption = 'Key'
-          Title.PrefixOption = poNone
           Width = 150
         end      
         item
           MinSize = 100
           MaxSize = 400
           Title.Caption = 'Value'
-          Title.PrefixOption = poNone
           Width = 300
         end>
       FixedCols = 0