diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index a06ff7094e..9217416a57 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -3895,6 +3895,16 @@ resourcestring
   lisFilterSets = 'Filter Sets';
   lisMessagesEditor = 'Messages Editor';
 
+  // Additional Information dialog (VersionInfoAdditinalInfo.pas)
+  lisComments = 'Comments:';
+  lisAdditionalInformation = 'Additional Information';
+  lisCompany = 'Company:';
+  lisInternalName = 'Internal Name:';
+  lisLegalTrademarks = 'Legal Trademarks:';
+  lisOriginalFileName = 'Original File Name:';
+  lisProductName = 'Product Name:';
+  lisProductVersion = 'Product Version:';
+
 implementation
 
 end.
diff --git a/ide/unitdependencies.lfm b/ide/unitdependencies.lfm
index fa74306229..ccd6dd05ce 100644
--- a/ide/unitdependencies.lfm
+++ b/ide/unitdependencies.lfm
@@ -3,15 +3,15 @@ object UnitDependenciesView: TUnitDependenciesView
   Height = 300
   Top = 355
   Width = 400
-  HorzScrollBar.Page = 399
-  VertScrollBar.Page = 299
   ActiveControl = UnitHistoryList
   Caption = 'UnitDependenciesView'
   ClientHeight = 300
   ClientWidth = 400
   KeyPreview = True
   OnClose = UnitDependenciesViewClose
+  ParentFont = False
   Position = poScreenCenter
+  LCLVersion = '0.9.25'
   object ToolBar: TToolBar
     Height = 48
     Width = 400
@@ -48,10 +48,8 @@ object UnitDependenciesView: TUnitDependenciesView
     Top = 54
     Width = 388
     Align = alTop
-    AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
     BorderSpacing.Around = 6
     ItemHeight = 13
-    MaxLength = 0
     OnEditingDone = UnitHistoryListEditingDone
     TabOrder = 1
     Text = 'UnitHistoryList'
@@ -59,10 +57,10 @@ object UnitDependenciesView: TUnitDependenciesView
   object CloseButton: TBitBtn
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 320
-    Height = 26
-    Top = 268
-    Width = 71
+    Left = 339
+    Height = 23
+    Top = 271
+    Width = 52
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Bottom = 6
@@ -73,7 +71,7 @@ object UnitDependenciesView: TUnitDependenciesView
   end
   object UnitTreeView: TTreeView
     AnchorSideBottom.Control = CloseButton
-    Height = 181
+    Height = 184
     Top = 81
     Width = 400
     Align = alTop
diff --git a/ide/unitdependencies.lrs b/ide/unitdependencies.lrs
index f138a72964..0c6519229a 100644
--- a/ide/unitdependencies.lrs
+++ b/ide/unitdependencies.lrs
@@ -2,32 +2,31 @@
 
 LazarusResources.Add('TUnitDependenciesView','FORMDATA',[
   'TPF0'#21'TUnitDependenciesView'#20'UnitDependenciesView'#4'Left'#3'>'#1#6'He'
-  +'ight'#3','#1#3'Top'#3'c'#1#5'Width'#3#144#1#18'HorzScrollBar.Page'#3#143#1
-  +#18'VertScrollBar.Page'#3'+'#1#13'ActiveControl'#7#15'UnitHistoryList'#7'Cap'
-  +'tion'#6#20'UnitDependenciesView'#12'ClientHeight'#3','#1#11'ClientWidth'#3
-  +#144#1#10'KeyPreview'#9#7'OnClose'#7#25'UnitDependenciesViewClose'#8'Positio'
-  +'n'#7#14'poScreenCenter'#0#8'TToolBar'#7'ToolBar'#6'Height'#2'0'#5'Width'#3
-  +#144#1#12'ButtonHeight'#2'.'#11'ButtonWidth'#2'/'#7'Caption'#6#7'ToolBar'#4
-  +'Flat'#9#14'ParentShowHint'#8#12'ShowCaptions'#9#8'ShowHint'#9#8'TabOrder'#2
-  +#0#0#11'TToolButton'#17'ShowProjectButton'#4'Left'#3#167#0#3'Top'#2#2#7'Capt'
-  +'ion'#6#17'ShowProjectButton'#7'OnClick'#7#22'ShowProjectButtonClick'#0#0#11
-  +'TToolButton'#16'SelectUnitButton'#4'Left'#2#1#3'Top'#2#2#7'Caption'#6#16'Se'
-  +'lectUnitButton'#7'OnClick'#7#21'SelectUnitButtonClick'#0#0#11'TToolButton'
-  +#13'RefreshButton'#4'Left'#2'Y'#3'Top'#2#2#7'Caption'#6#13'RefreshButton'#7
-  +'OnClick'#7#18'RefreshButtonClick'#0#0#0#9'TComboBox'#15'UnitHistoryList'#4
-  +'Left'#2#6#6'Height'#2#21#3'Top'#2'6'#5'Width'#3#132#1#5'Align'#7#5'alTop'#16
-  +'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0
-  +#20'BorderSpacing.Around'#2#6#10'ItemHeight'#2#13#9'MaxLength'#2#0#13'OnEdit'
-  +'ingDone'#7#26'UnitHistoryListEditingDone'#8'TabOrder'#2#1#4'Text'#6#15'Unit'
-  +'HistoryList'#0#0#7'TBitBtn'#11'CloseButton'#24'AnchorSideBottom.Control'#7#5
-  +'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'@'#1#6'Height'#2
-  +#26#3'Top'#3#12#1#5'Width'#2'G'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'Aut'
-  +'oSize'#9#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#6'&Close'#4'Kind'#7#7'bk'
-  +'Close'#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#9'TTreeView'#12'UnitTreeView'#24
-  +'AnchorSideBottom.Control'#7#11'CloseButton'#6'Height'#3#181#0#3'Top'#2'Q'#5
-  +'Width'#3#144#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRig'
-  +'ht'#8'akBottom'#0#20'BorderSpacing.Bottom'#2#6#17'DefaultItemHeight'#2#15#8
-  +'TabOrder'#2#3#24'OnAdvancedCustomDrawItem'#7'"UnitTreeViewAdvancedCustomDra'
-  +'wItem'#12'OnCollapsing'#7#22'UnitTreeViewCollapsing'#11'OnExpanding'#7#21'U'
-  +'nitTreeViewExpanding'#11'OnMouseDown'#7#21'UnitTreeViewMouseDown'#0#0#0
+  +'ight'#3','#1#3'Top'#3'c'#1#5'Width'#3#144#1#13'ActiveControl'#7#15'UnitHist'
+  +'oryList'#7'Caption'#6#20'UnitDependenciesView'#12'ClientHeight'#3','#1#11'C'
+  +'lientWidth'#3#144#1#10'KeyPreview'#9#7'OnClose'#7#25'UnitDependenciesViewCl'
+  +'ose'#10'ParentFont'#8#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0'
+  +'.9.25'#0#8'TToolBar'#7'ToolBar'#6'Height'#2'0'#5'Width'#3#144#1#12'ButtonHe'
+  +'ight'#2'.'#11'ButtonWidth'#2'/'#7'Caption'#6#7'ToolBar'#4'Flat'#9#14'Parent'
+  +'ShowHint'#8#12'ShowCaptions'#9#8'ShowHint'#9#8'TabOrder'#2#0#0#11'TToolButt'
+  +'on'#17'ShowProjectButton'#4'Left'#3#167#0#3'Top'#2#2#7'Caption'#6#17'ShowPr'
+  +'ojectButton'#7'OnClick'#7#22'ShowProjectButtonClick'#0#0#11'TToolButton'#16
+  +'SelectUnitButton'#4'Left'#2#1#3'Top'#2#2#7'Caption'#6#16'SelectUnitButton'#7
+  +'OnClick'#7#21'SelectUnitButtonClick'#0#0#11'TToolButton'#13'RefreshButton'#4
+  +'Left'#2'Y'#3'Top'#2#2#7'Caption'#6#13'RefreshButton'#7'OnClick'#7#18'Refres'
+  +'hButtonClick'#0#0#0#9'TComboBox'#15'UnitHistoryList'#4'Left'#2#6#6'Height'#2
+  +#21#3'Top'#2'6'#5'Width'#3#132#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'
+  +#2#6#10'ItemHeight'#2#13#13'OnEditingDone'#7#26'UnitHistoryListEditingDone'#8
+  +'TabOrder'#2#1#4'Text'#6#15'UnitHistoryList'#0#0#7'TBitBtn'#11'CloseButton'
+  +#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBo'
+  +'ttom'#4'Left'#3'S'#1#6'Height'#2#23#3'Top'#3#15#1#5'Width'#2'4'#7'Anchors'
+  +#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Bottom'#2#6#7'Ca'
+  +'ption'#6#6'&Close'#4'Kind'#7#7'bkClose'#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0
+  +#9'TTreeView'#12'UnitTreeView'#24'AnchorSideBottom.Control'#7#11'CloseButton'
+  +#6'Height'#3#184#0#3'Top'#2'Q'#5'Width'#3#144#1#5'Align'#7#5'alTop'#7'Anchor'
+  +'s'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Bottom'#2
+  +#6#17'DefaultItemHeight'#2#15#8'TabOrder'#2#3#24'OnAdvancedCustomDrawItem'#7
+  +'"UnitTreeViewAdvancedCustomDrawItem'#12'OnCollapsing'#7#22'UnitTreeViewColl'
+  +'apsing'#11'OnExpanding'#7#21'UnitTreeViewExpanding'#11'OnMouseDown'#7#21'Un'
+  +'itTreeViewMouseDown'#0#0#0
 ]);
diff --git a/ide/unitdependencies.pas b/ide/unitdependencies.pas
index 22bc717a36..d5cbfd84b2 100644
--- a/ide/unitdependencies.pas
+++ b/ide/unitdependencies.pas
@@ -436,6 +436,8 @@ begin
   ShowProjectButton.ImageIndex := IDEImages.LoadImage(16, 'item_project');
   SelectUnitButton.ImageIndex := IDEImages.LoadImage(16, 'open');
   RefreshButton.ImageIndex := IDEImages.LoadImage(16, 'refresh');
+  CloseButton.LoadGlyphFromLazarusResource('btn_close');
+
 end;
 
 destructor TUnitDependenciesView.Destroy;
diff --git a/ide/unitinfodlg.lfm b/ide/unitinfodlg.lfm
index e3ef208476..e985c323ce 100644
--- a/ide/unitinfodlg.lfm
+++ b/ide/unitinfodlg.lfm
@@ -3,20 +3,20 @@ object UnitInfoDialog: TUnitInfoDialog
   Height = 283
   Top = 251
   Width = 500
-  HorzScrollBar.Page = 499
-  VertScrollBar.Page = 282
   ActiveControl = OkButton
   BorderStyle = bsSizeToolWin
   Caption = 'UnitInfoDialog'
   ClientHeight = 283
   ClientWidth = 500
   OnCreate = FormCreate
+  ParentFont = False
   Position = poScreenCenter
+  LCLVersion = '0.9.25'
   object OkButton: TBitBtn
-    Left = 437
-    Height = 36
-    Top = 234
-    Width = 57
+    Left = 454
+    Height = 23
+    Top = 247
+    Width = 40
     Anchors = [akRight, akBottom]
     AutoSize = True
     Cancel = True
@@ -31,7 +31,7 @@ object UnitInfoDialog: TUnitInfoDialog
   object Notebook: TNotebook
     AnchorSideBottom.Control = OkButton
     Left = 6
-    Height = 222
+    Height = 235
     Top = 6
     Width = 488
     Align = alTop
@@ -52,6 +52,7 @@ object UnitInfoDialog: TUnitInfoDialog
         Caption = 'ULines'
         Font.Style = [fsBold]
         ParentColor = False
+        ParentFont = False
       end
       object OutLines: TLabel
         AnchorSideLeft.Control = ULines
@@ -84,6 +85,7 @@ object UnitInfoDialog: TUnitInfoDialog
         Caption = 'UPath'
         Font.Style = [fsBold]
         ParentColor = False
+        ParentFont = False
       end
       object UIncludedBy: TLabel
         Left = 12
@@ -94,6 +96,7 @@ object UnitInfoDialog: TUnitInfoDialog
         Caption = 'UIncludedBy'
         Font.Style = [fsBold]
         ParentColor = False
+        ParentFont = False
       end
       object OutIncludedBy: TLabel
         AnchorSideLeft.Control = UIncludedBy
@@ -126,6 +129,7 @@ object UnitInfoDialog: TUnitInfoDialog
         Caption = 'USize'
         Font.Style = [fsBold]
         ParentColor = False
+        ParentFont = False
       end
       object UInProject: TLabel
         Left = 12
@@ -136,6 +140,7 @@ object UnitInfoDialog: TUnitInfoDialog
         Caption = 'UInProject'
         Font.Style = [fsBold]
         ParentColor = False
+        ParentFont = False
       end
       object OutInProject: TLabel
         AnchorSideLeft.Control = UInProject
@@ -168,6 +173,7 @@ object UnitInfoDialog: TUnitInfoDialog
         Caption = 'UType'
         Font.Style = [fsBold]
         ParentColor = False
+        ParentFont = False
       end
       object OutName: TLabel
         AnchorSideLeft.Control = UName
@@ -189,6 +195,7 @@ object UnitInfoDialog: TUnitInfoDialog
         Caption = 'UName'
         Font.Style = [fsBold]
         ParentColor = False
+        ParentFont = False
       end
       object ClearIncludedBy: TButton
         AnchorSideTop.Control = UIncludedBy
@@ -221,13 +228,13 @@ object UnitInfoDialog: TUnitInfoDialog
     end
     object IncludePathsPage: TPage
       Caption = 'IncludePathsPage'
-      ClientWidth = 484
-      ClientHeight = 191
+      ClientWidth = 480
+      ClientHeight = 209
       object IncludePathMemo: TMemo
         Left = 6
-        Height = 179
+        Height = 197
         Top = 6
-        Width = 472
+        Width = 468
         Align = alClient
         BorderSpacing.Around = 6
         ReadOnly = True
@@ -257,9 +264,9 @@ object UnitInfoDialog: TUnitInfoDialog
     AnchorSideBottom.Control = OkButton
     AnchorSideBottom.Side = asrBottom
     Left = 6
-    Height = 36
-    Top = 234
-    Width = 148
+    Height = 23
+    Top = 247
+    Width = 130
     Anchors = [akTop, akLeft, akBottom]
     AutoSize = True
     Caption = 'CodeToolsDefsButton'
@@ -271,10 +278,10 @@ object UnitInfoDialog: TUnitInfoDialog
     AnchorSideRight.Control = OkButton
     AnchorSideBottom.Control = OkButton
     AnchorSideBottom.Side = asrBottom
-    Left = 240
-    Height = 36
-    Top = 234
-    Width = 187
+    Left = 286
+    Height = 23
+    Top = 247
+    Width = 158
     Anchors = [akTop, akRight, akBottom]
     AutoSize = True
     BorderSpacing.Right = 10
diff --git a/ide/unitinfodlg.lrs b/ide/unitinfodlg.lrs
index 5bf462b0ea..f088c24822 100644
--- a/ide/unitinfodlg.lrs
+++ b/ide/unitinfodlg.lrs
@@ -2,22 +2,22 @@
 
 LazarusResources.Add('TUnitInfoDialog','FORMDATA',[
   'TPF0'#15'TUnitInfoDialog'#14'UnitInfoDialog'#4'Left'#3'['#1#6'Height'#3#27#1
-  +#3'Top'#3#251#0#5'Width'#3#244#1#18'HorzScrollBar.Page'#3#243#1#18'VertScrol'
-  +'lBar.Page'#3#26#1#13'ActiveControl'#7#8'OkButton'#11'BorderStyle'#7#13'bsSi'
-  +'zeToolWin'#7'Caption'#6#14'UnitInfoDialog'#12'ClientHeight'#3#27#1#11'Clien'
-  +'tWidth'#3#244#1#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poScreenCente'
-  +'r'#0#7'TBitBtn'#8'OkButton'#4'Left'#3#181#1#6'Height'#2'$'#3'Top'#3#234#0#5
-  +'Width'#2'9'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#6'Cancel'#9
-  +#7'Caption'#6#3'&OK'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'Nu'
-  +'mGlyphs'#2#0#7'OnClick'#7#13'OkButtonClick'#8'TabOrder'#2#0#0#0#9'TNotebook'
-  +#8'Notebook'#24'AnchorSideBottom.Control'#7#8'OkButton'#4'Left'#2#6#6'Height'
-  +#3#222#0#3'Top'#2#6#5'Width'#3#232#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akT'
-  +'op'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#9'PageI'
-  +'ndex'#2#2#8'TabOrder'#2#1#0#5'TPage'#11'GeneralPage'#7'Caption'#6#11'Genera'
-  +'lPage'#11'ClientWidth'#3#228#1#12'ClientHeight'#3#191#0#0#6'TLabel'#6'ULine'
-  +'s'#4'Left'#2#12#6'Height'#2#13#3'Top'#2'\'#5'Width'#2''''#9'Alignment'#7#14
-  +'taRightJustify'#7'Caption'#6#6'ULines'#10'Font.Style'#11#6'fsBold'#0#11'Par'
-  +'entColor'#8#0#0#6'TLabel'#8'OutLines'#22'AnchorSideLeft.Control'#7#6'ULines'
+  +#3'Top'#3#251#0#5'Width'#3#244#1#13'ActiveControl'#7#8'OkButton'#11'BorderSt'
+  +'yle'#7#13'bsSizeToolWin'#7'Caption'#6#14'UnitInfoDialog'#12'ClientHeight'#3
+  +#27#1#11'ClientWidth'#3#244#1#8'OnCreate'#7#10'FormCreate'#10'ParentFont'#8#8
+  +'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.25'#0#7'TBitBtn'#8'Ok'
+  +'Button'#4'Left'#3#198#1#6'Height'#2#23#3'Top'#3#247#0#5'Width'#2'('#7'Ancho'
+  +'rs'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#6'Cancel'#9#7'Caption'#6#3'&O'
+  +'K'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'On'
+  +'Click'#7#13'OkButtonClick'#8'TabOrder'#2#0#0#0#9'TNotebook'#8'Notebook'#24
+  +'AnchorSideBottom.Control'#7#8'OkButton'#4'Left'#2#6#6'Height'#3#235#0#3'Top'
+  +#2#6#5'Width'#3#232#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#9'PageIndex'#2#2#8'TabO'
+  +'rder'#2#1#0#5'TPage'#11'GeneralPage'#7'Caption'#6#11'GeneralPage'#11'Client'
+  +'Width'#3#228#1#12'ClientHeight'#3#191#0#0#6'TLabel'#6'ULines'#4'Left'#2#12#6
+  +'Height'#2#13#3'Top'#2'\'#5'Width'#2''''#9'Alignment'#7#14'taRightJustify'#7
+  +'Caption'#6#6'ULines'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#10'Par'
+  +'entFont'#8#0#0#6'TLabel'#8'OutLines'#22'AnchorSideLeft.Control'#7#6'ULines'
   +#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#2'?'#6'Height'#2#13#3'Top'#2
   +'\'#5'Width'#2'3'#18'BorderSpacing.Left'#2#12#7'Caption'#6#8'OutLines'#11'Pa'
   +'rentColor'#8#0#0#6'TLabel'#7'OutPath'#22'AnchorSideLeft.Control'#7#5'UPath'
@@ -25,61 +25,62 @@ LazarusResources.Add('TUnitInfoDialog','FORMDATA',[
   +'p'#5'Width'#2'.'#18'BorderSpacing.Left'#2#12#7'Caption'#6#7'OutPath'#11'Par'
   +'entColor'#8#0#0#6'TLabel'#5'UPath'#4'Left'#2#12#6'Height'#2#13#3'Top'#2'p'#5
   +'Width'#2'"'#9'Alignment'#7#14'taRightJustify'#7'Caption'#6#5'UPath'#10'Font'
-  +'.Style'#11#6'fsBold'#0#11'ParentColor'#8#0#0#6'TLabel'#11'UIncludedBy'#4'Le'
-  +'ft'#2#12#6'Height'#2#13#3'Top'#3#132#0#5'Width'#2'H'#9'Alignment'#7#14'taRi'
-  +'ghtJustify'#7'Caption'#6#11'UIncludedBy'#10'Font.Style'#11#6'fsBold'#0#11'P'
-  +'arentColor'#8#0#0#6'TLabel'#13'OutIncludedBy'#22'AnchorSideLeft.Control'#7
-  +#11'UIncludedBy'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#2'`'#6'Heigh'
-  +'t'#2#13#3'Top'#3#132#0#5'Width'#2'T'#18'BorderSpacing.Left'#2#12#7'Caption'
-  +#6#13'OutIncludedBy'#11'ParentColor'#8#0#0#6'TLabel'#7'OutSize'#22'AnchorSid'
-  +'eLeft.Control'#7#5'USize'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#2
-  +'9'#6'Height'#2#13#3'Top'#2'H'#5'Width'#2'-'#18'BorderSpacing.Left'#2#12#7'C'
-  +'aption'#6#7'OutSize'#11'ParentColor'#8#0#0#6'TLabel'#5'USize'#4'Left'#2#12#6
-  +'Height'#2#13#3'Top'#2'H'#5'Width'#2'!'#9'Alignment'#7#14'taRightJustify'#7
-  +'Caption'#6#5'USize'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#0#0#6'T'
-  +'Label'#10'UInProject'#4'Left'#2#12#6'Height'#2#13#3'Top'#2'4'#5'Width'#2':'
-  +#9'Alignment'#7#14'taRightJustify'#7'Caption'#6#10'UInProject'#10'Font.Style'
-  +#11#6'fsBold'#0#11'ParentColor'#8#0#0#6'TLabel'#12'OutInProject'#22'AnchorSi'
-  +'deLeft.Control'#7#10'UInProject'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'L'
-  +'eft'#2'R'#6'Height'#2#13#3'Top'#2'4'#5'Width'#2'F'#18'BorderSpacing.Left'#2
-  +#12#7'Caption'#6#12'OutInProject'#11'ParentColor'#8#0#0#6'TLabel'#7'OutType'
-  +#22'AnchorSideLeft.Control'#7#5'UType'#19'AnchorSideLeft.Side'#7#9'asrBottom'
-  +#4'Left'#2'='#6'Height'#2#13#3'Top'#2' '#5'Width'#2'1'#18'BorderSpacing.Left'
-  +#2#12#7'Caption'#6#7'OutType'#11'ParentColor'#8#0#0#6'TLabel'#5'UType'#4'Lef'
-  +'t'#2#12#6'Height'#2#13#3'Top'#2' '#5'Width'#2'%'#9'Alignment'#7#14'taRightJ'
-  +'ustify'#7'Caption'#6#5'UType'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'
-  +#8#0#0#6'TLabel'#7'OutName'#22'AnchorSideLeft.Control'#7#5'UName'#19'AnchorS'
-  +'ideLeft.Side'#7#9'asrBottom'#4'Left'#2'A'#6'Height'#2#13#3'Top'#2#12#5'Widt'
-  +'h'#2'5'#18'BorderSpacing.Left'#2#12#7'Caption'#6#7'OutName'#11'ParentColor'
-  +#8#0#0#6'TLabel'#5'UName'#4'Left'#2#12#6'Height'#2#13#3'Top'#2#12#5'Width'#2
-  +')'#9'Alignment'#7#14'taRightJustify'#7'Caption'#6#5'UName'#10'Font.Style'#11
-  +#6'fsBold'#0#11'ParentColor'#8#0#0#7'TButton'#15'ClearIncludedBy'#21'AnchorS'
-  +'ideTop.Control'#7#11'UIncludedBy'#4'Left'#2#12#6'Height'#2#26#3'Top'#3#152#0
-  +#5'Width'#2'k'#8'AutoSize'#9#17'BorderSpacing.Top'#2#20#7'Caption'#6#15'Clea'
-  +'rIncludedBy'#7'OnClick'#7#20'clearIncludedByClick'#8'TabOrder'#2#0#0#0#0#5
-  +'TPage'#13'UnitPathsPage'#7'Caption'#6#13'UnitPathsPage'#11'ClientWidth'#3
-  +#228#1#12'ClientHeight'#3#195#0#0#5'TMemo'#12'UnitPathMemo'#4'Left'#2#6#6'He'
-  +'ight'#3#183#0#3'Top'#2#6#5'Width'#3#216#1#5'Align'#7#8'alClient'#20'BorderS'
-  +'pacing.Around'#2#6#8'ReadOnly'#9#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'
-  +#2#0#0#0#0#5'TPage'#16'IncludePathsPage'#7'Caption'#6#16'IncludePathsPage'#11
-  +'ClientWidth'#3#228#1#12'ClientHeight'#3#191#0#0#5'TMemo'#15'IncludePathMemo'
-  +#4'Left'#2#6#6'Height'#3#179#0#3'Top'#2#6#5'Width'#3#216#1#5'Align'#7#8'alCl'
-  +'ient'#20'BorderSpacing.Around'#2#6#8'ReadOnly'#9#10'ScrollBars'#7#10'ssAuto'
-  ,'Both'#8'TabOrder'#2#0#0#0#0#5'TPage'#21'CompleteUnitPathsPage'#7'Caption'#6
-  +#21'CompleteUnitPathsPage'#11'ClientWidth'#3#228#1#12'ClientHeight'#3#195#0#0
-  +#5'TMemo'#11'SrcPathMemo'#4'Left'#2#6#6'Height'#3#183#0#3'Top'#2#6#5'Width'#3
-  +#216#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#8'ReadOnly'#9#10
-  +'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#0#0#0#0#7'TButton'#19'CodeTool'
-  +'sDefsButton'#21'AnchorSideTop.Control'#7#8'OkButton'#24'AnchorSideBottom.Co'
-  +'ntrol'#7#8'OkButton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6
-  +'Height'#2'$'#3'Top'#3#234#0#5'Width'#3#148#0#7'Anchors'#11#5'akTop'#6'akLef'
-  +'t'#8'akBottom'#0#8'AutoSize'#9#7'Caption'#6#19'CodeToolsDefsButton'#7'OnCli'
-  +'ck'#7#24'CodeToolsDefsButtonClick'#8'TabOrder'#2#2#0#0#7'TButton'#26'GotoIn'
-  +'cludeDirectiveButton'#21'AnchorSideTop.Control'#7#8'OkButton'#23'AnchorSide'
-  +'Right.Control'#7#8'OkButton'#24'AnchorSideBottom.Control'#7#8'OkButton'#21
-  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#240#0#6'Height'#2'$'#3'Top'
-  +#3#234#0#5'Width'#3#187#0#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#8
-  +'AutoSize'#9#19'BorderSpacing.Right'#2#10#7'Caption'#6#26'GotoIncludeDirecti'
-  +'veButton'#11'ModalResult'#2#6#7'OnClick'#7#31'GotoIncludeDirectiveButtonCli'
-  +'ck'#8'TabOrder'#2#3#0#0#0
+  +'.Style'#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#6'TLabel'#11
+  +'UIncludedBy'#4'Left'#2#12#6'Height'#2#13#3'Top'#3#132#0#5'Width'#2'H'#9'Ali'
+  +'gnment'#7#14'taRightJustify'#7'Caption'#6#11'UIncludedBy'#10'Font.Style'#11
+  +#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#6'TLabel'#13'OutIncluded'
+  +'By'#22'AnchorSideLeft.Control'#7#11'UIncludedBy'#19'AnchorSideLeft.Side'#7#9
+  +'asrBottom'#4'Left'#2'`'#6'Height'#2#13#3'Top'#3#132#0#5'Width'#2'T'#18'Bord'
+  +'erSpacing.Left'#2#12#7'Caption'#6#13'OutIncludedBy'#11'ParentColor'#8#0#0#6
+  +'TLabel'#7'OutSize'#22'AnchorSideLeft.Control'#7#5'USize'#19'AnchorSideLeft.'
+  +'Side'#7#9'asrBottom'#4'Left'#2'9'#6'Height'#2#13#3'Top'#2'H'#5'Width'#2'-'
+  +#18'BorderSpacing.Left'#2#12#7'Caption'#6#7'OutSize'#11'ParentColor'#8#0#0#6
+  +'TLabel'#5'USize'#4'Left'#2#12#6'Height'#2#13#3'Top'#2'H'#5'Width'#2'!'#9'Al'
+  +'ignment'#7#14'taRightJustify'#7'Caption'#6#5'USize'#10'Font.Style'#11#6'fsB'
+  +'old'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#6'TLabel'#10'UInProject'#4'Le'
+  +'ft'#2#12#6'Height'#2#13#3'Top'#2'4'#5'Width'#2':'#9'Alignment'#7#14'taRight'
+  +'Justify'#7'Caption'#6#10'UInProject'#10'Font.Style'#11#6'fsBold'#0#11'Paren'
+  +'tColor'#8#10'ParentFont'#8#0#0#6'TLabel'#12'OutInProject'#22'AnchorSideLeft'
+  +'.Control'#7#10'UInProject'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#2
+  +'R'#6'Height'#2#13#3'Top'#2'4'#5'Width'#2'F'#18'BorderSpacing.Left'#2#12#7'C'
+  +'aption'#6#12'OutInProject'#11'ParentColor'#8#0#0#6'TLabel'#7'OutType'#22'An'
+  +'chorSideLeft.Control'#7#5'UType'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'L'
+  +'eft'#2'='#6'Height'#2#13#3'Top'#2' '#5'Width'#2'1'#18'BorderSpacing.Left'#2
+  +#12#7'Caption'#6#7'OutType'#11'ParentColor'#8#0#0#6'TLabel'#5'UType'#4'Left'
+  +#2#12#6'Height'#2#13#3'Top'#2' '#5'Width'#2'%'#9'Alignment'#7#14'taRightJust'
+  +'ify'#7'Caption'#6#5'UType'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8
+  +#10'ParentFont'#8#0#0#6'TLabel'#7'OutName'#22'AnchorSideLeft.Control'#7#5'UN'
+  +'ame'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#2'A'#6'Height'#2#13#3'T'
+  +'op'#2#12#5'Width'#2'5'#18'BorderSpacing.Left'#2#12#7'Caption'#6#7'OutName'
+  +#11'ParentColor'#8#0#0#6'TLabel'#5'UName'#4'Left'#2#12#6'Height'#2#13#3'Top'
+  +#2#12#5'Width'#2')'#9'Alignment'#7#14'taRightJustify'#7'Caption'#6#5'UName'
+  +#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#7'TBut'
+  +'ton'#15'ClearIncludedBy'#21'AnchorSideTop.Control'#7#11'UIncludedBy'#4'Left'
+  +#2#12#6'Height'#2#26#3'Top'#3#152#0#5'Width'#2'k'#8'AutoSize'#9#17'BorderSpa'
+  +'cing.Top'#2#20#7'Caption'#6#15'ClearIncludedBy'#7'OnClick'#7#20'clearInclud'
+  +'edByClick'#8'TabOrder'#2#0#0#0#0#5'TPage'#13'UnitPathsPage'#7'Caption'#6#13
+  +'UnitPathsPage'#11'ClientWidth'#3#228#1#12'ClientHeight'#3#195#0#0#5'TMemo'
+  +#12'UnitPathMemo'#4'Left'#2#6#6'Height'#3#183#0#3'Top'#2#6#5'Width'#3#216#1#5
+  +'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#8'ReadOnly'#9#10'ScrollBa'
+  +'rs'#7#10'ssAutoBoth'#8'TabOrder'#2#0#0#0#0#5'TPage'#16'IncludePathsPage'#7
+  +'Caption'#6#16'IncludePathsPage'#11'ClientWidth'#3#224#1#12'ClientHeight'#3
+  +#209#0#0#5'TMemo'#15'IncludePathMemo'#4'Left'#2#6#6'Height'#3#197#0#3'Top'#2
+  ,#6#5'Width'#3#212#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#8'Re'
+  +'adOnly'#9#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#0#0#0#5'TPage'#21
+  +'CompleteUnitPathsPage'#7'Caption'#6#21'CompleteUnitPathsPage'#11'ClientWidt'
+  +'h'#3#228#1#12'ClientHeight'#3#195#0#0#5'TMemo'#11'SrcPathMemo'#4'Left'#2#6#6
+  +'Height'#3#183#0#3'Top'#2#6#5'Width'#3#216#1#5'Align'#7#8'alClient'#20'Borde'
+  +'rSpacing.Around'#2#6#8'ReadOnly'#9#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrd'
+  +'er'#2#0#0#0#0#0#7'TButton'#19'CodeToolsDefsButton'#21'AnchorSideTop.Control'
+  +#7#8'OkButton'#24'AnchorSideBottom.Control'#7#8'OkButton'#21'AnchorSideBotto'
+  +'m.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#247#0#5'Width'#3
+  +#130#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#7'Captio'
+  +'n'#6#19'CodeToolsDefsButton'#7'OnClick'#7#24'CodeToolsDefsButtonClick'#8'Ta'
+  +'bOrder'#2#2#0#0#7'TButton'#26'GotoIncludeDirectiveButton'#21'AnchorSideTop.'
+  +'Control'#7#8'OkButton'#23'AnchorSideRight.Control'#7#8'OkButton'#24'AnchorS'
+  +'ideBottom.Control'#7#8'OkButton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
+  +'Left'#3#30#1#6'Height'#2#23#3'Top'#3#247#0#5'Width'#3#158#0#7'Anchors'#11#5
+  +'akTop'#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#10#7
+  +'Caption'#6#26'GotoIncludeDirectiveButton'#11'ModalResult'#2#6#7'OnClick'#7
+  +#31'GotoIncludeDirectiveButtonClick'#8'TabOrder'#2#3#0#0#0
 ]);
diff --git a/ide/unitinfodlg.pp b/ide/unitinfodlg.pp
index dc5e82ab92..4f6b820773 100644
--- a/ide/unitinfodlg.pp
+++ b/ide/unitinfodlg.pp
@@ -153,6 +153,7 @@ begin
   ClearIncludedBy.Caption:=lisUIClearIncludedByReference;
   CodeToolsDefsButton.Caption:=lisUIShowCodeToolsValues;
   GotoIncludeDirectiveButton.Caption:=lisMenuGotoIncludeDirective;
+  OkButton.LoadGlyphFromLazarusResource('btn_ok');
 end;
 
 procedure TUnitInfoDialog.GotoIncludeDirectiveButtonClick(Sender: TObject);
diff --git a/ide/versioninfoadditionalinfo.lfm b/ide/versioninfoadditionalinfo.lfm
index c266dbb1b2..4aab5d4611 100644
--- a/ide/versioninfoadditionalinfo.lfm
+++ b/ide/versioninfoadditionalinfo.lfm
@@ -138,42 +138,6 @@ object VersionInfoAdditinalInfoForm: TVersionInfoAdditinalInfoForm
     Width = 75
     Cancel = True
     Caption = 'Cancel'
-    Glyph.Data = {
-      36040000424D3604000000000000360000002800000010000000100000000100
-      2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF003F3DED413B38EB08FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00211FE3081E1CE241FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF004A47F0414F4CF2FF403EEDFD3C39EB08FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF002725E5082422E4FC312FEAFF1F1DE241FFFFFF00FFFFFF00FFFFFF005451
-      F3415856F5FF6361FAFF5855F6FF413FEDFC3D3AEC08FFFFFF00FFFFFF00302D
-      E7082C2AE6FC413FF1FF4C4AF6FF312FEAFF1F1DE241FFFFFF00FFFFFF005956
-      F52B5B58F6FF6562FAFF7170FFFF5956F6FF4240EEFC3E3BEC083937EB083532
-      E9FC4745F2FF6362FFFF4A48F4FF2F2DE9FF2220E32BFFFFFF00FFFFFF00FFFF
-      FF005A57F52B5B59F6FF6663FAFF7471FFFF5A58F6FF4341EEFC3E3CECFD504D
-      F4FF6867FFFF504EF5FF3634EBFF2A27E52BFFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF005B58F62B5C5AF6FF6764FAFF7472FFFF7370FFFF706EFFFF6E6C
-      FFFF5755F7FF3F3DEEFF3230E82BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF005C59F62B5D5BF7FF7976FFFF5956FFFF5754FFFF7270
-      FFFF4846F0FF3C39EB2BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00615EF8085D5AF6FD7D79FFFF5E5BFFFF5B58FFFF7674
-      FFFF4643EFFD413FED08FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF006967FB086663F9FC706DFBFF807EFFFF7E7BFFFF7C79FFFF7977
-      FFFF5E5CF7FF4744EFFC4240EE08FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00716EFD086E6BFCFC7774FDFF8682FFFF7673FCFF6462F8FF605DF7FF6D6A
-      FAFF7B79FFFF605DF7FF4845EFFC4341EE08FFFFFF00FFFFFF00FFFFFF007673
-      FF087471FEFD7D7AFEFF8A87FFFF7C79FDFF6C69FBFF6361F92B5F5CF72B615E
-      F8FF6E6CFAFF7D7AFFFF615FF7FF4946F0FC4441EE05FFFFFF00FFFFFF007774
-      FF1F7A77FFFF817EFFFF817EFEFF7471FDFF6C69FB2BFFFFFF00FFFFFF00605D
-      F72B625FF8FF6F6DFBFF7E7CFFFF625FF8FF4A47F06F4542EE02FFFFFF00FFFF
-      FF007774FF1F7A77FFFF7976FEFF726FFD2BFFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00615EF82B6461F8FF6A68F9FF5451F3A84F4DF229FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF007774FF1F7774FF2BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00625FF82B5D5BF76F5956F53EFFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF006360F80AFFFFFF00FFFFFF00FFFFFF00
-    }
     ModalResult = 2
     NumGlyphs = 0
     TabOrder = 1
@@ -185,42 +149,6 @@ object VersionInfoAdditinalInfoForm: TVersionInfoAdditinalInfoForm
     Width = 75
     Caption = 'OK'
     Default = True
-    Glyph.Data = {
-      36040000424D3604000000000000360000002800000010000000100000000100
-      2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00317A360A2D753207FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF003985400A37833DFF317B37FB2E763307FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF004292490A408E47FF54A35CFF4F9F57FF327C38FE2E773408FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF004B9E530A499A51FF5BAC64FF77CA82FF74C87EFF51A059FF337D39FE2F78
-      3508FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0053A9
-      5C0A51A65AFF63B56DFF7ECE89FF7BCC87FF76CA81FF76C981FF52A25AFF347E
-      3AFE30793508FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF005AB4650959B0
-      63FF6BBD76FF84D290FF7AC985FF60B26AFF63B46DFF78C983FF78CB82FF53A3
-      5CFF347F3AFD317A3608FFFFFF00FFFFFF00FFFFFF00FFFFFF005EB969465BB5
-      66E479C986FF80CE8DFF51A65AFC4DA1566F499C518B5CAD67FF7CCC86FF79CB
-      85FF54A45DFF35803BFC317B3708FFFFFF00FFFFFF00FFFFFF00FFFFFF005FBA
-      6A3C5CB666E66DC079FF55AC5F6FFFFFFF00FFFFFF004A9D52915EAE68FF7DCD
-      89FF7CCD87FF56A55FFF36813CFC327C3808FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF005FBB6A435CB76765FFFFFF00FFFFFF00FFFFFF00FFFFFF004B9E53915FAF
-      69FF7FCE8AFF7ECE89FF57A660FF37823DFC337D3908FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF004B9F
-      549160B06AFF81CF8DFF7FCF8BFF58A761FF398540FF347E3A08FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF004CA0559162B26CFF82D18FFF7AC885FF57A660FF38843F7BFFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF004DA1569163B36DFF5FAF69FF41914979FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF004EA257914A9D527FFFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
-    }
     ModalResult = 1
     NumGlyphs = 0
     TabOrder = 2
diff --git a/ide/versioninfoadditionalinfo.lrs b/ide/versioninfoadditionalinfo.lrs
index 12e44054d7..e6711b0372 100644
--- a/ide/versioninfoadditionalinfo.lrs
+++ b/ide/versioninfoadditionalinfo.lrs
@@ -36,100 +36,8 @@ LazarusResources.Add('TVersionInfoAdditinalInfoForm','FORMDATA',[
   +'.Control'#7#12'CommentsEdit'#4'Left'#2'n'#6'Height'#2#23#3'Top'#3#200#0#5'W'
   +'idth'#3#0#1#8'TabOrder'#2#6#0#0#0#7'TBitBtn'#12'CancelButton'#4'Left'#3'5'#1
   +#6'Height'#2#25#3'Top'#3#8#1#5'Width'#2'K'#6'Cancel'#9#7'Caption'#6#6'Cancel'
-  +#10'Glyph.Data'#10':'#4#0#0'6'#4#0#0'BM6'#4#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#16
-  +#0#0#0#16#0#0#0#1#0' '#0#0#0#0#0#0#4#0#0'd'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0'?='#237'A;8'#235#8#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'!'#31
-  +#227#8#30#28#226'A'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0'JG'#240'AOL'#242#255'@>'#237#253'<9'#235#8#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0'''%'#229#8'$"'#228#252'1/'#234#255#31
-  +#29#226'A'#255#255#255#0#255#255#255#0#255#255#255#0'TQ'#243'AXV'#245#255'ca'
-  +#250#255'XU'#246#255'A?'#237#252'=:'#236#8#255#255#255#0#255#255#255#0'0-'
-  +#231#8',*'#230#252'A?'#241#255'LJ'#246#255'1/'#234#255#31#29#226'A'#255#255
-  +#255#0#255#255#255#0'YV'#245'+[X'#246#255'eb'#250#255'qp'#255#255'YV'#246#255
-  +'B@'#238#252'>;'#236#8'97'#235#8'52'#233#252'GE'#242#255'cb'#255#255'JH'#244
-  +#255'/-'#233#255'" '#227'+'#255#255#255#0#255#255#255#0#255#255#255#0'ZW'#245
-  +'+[Y'#246#255'fc'#250#255'tq'#255#255'ZX'#246#255'CA'#238#252'><'#236#253'PM'
-  +#244#255'hg'#255#255'PN'#245#255'64'#235#255'*'''#229'+'#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'[X'#246'+\Z'#246#255'gd'
-  +#250#255'tr'#255#255'sp'#255#255'pn'#255#255'nl'#255#255'WU'#247#255'?='#238
-  +#255'20'#232'+'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0'\Y'#246'+]['#247#255'yv'#255#255'YV'
-  +#255#255'WT'#255#255'rp'#255#255'HF'#240#255'<9'#235'+'#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0'a^'#248#8']Z'#246#253'}y'#255#255'^['#255#255'[X'#255#255'vt'
-  +#255#255'FC'#239#253'A?'#237#8#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'ig'#251#8'fc'#249#252'p'
-  +'m'#251#255#128'~'#255#255'~{'#255#255'|y'#255#255'yw'#255#255'^\'#247#255'G'
-  +'D'#239#252'B@'#238#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  ,#255#255#255#0'qn'#253#8'nk'#252#252'wt'#253#255#134#130#255#255'vs'#252#255
-  +'db'#248#255'`]'#247#255'mj'#250#255'{y'#255#255'`]'#247#255'HE'#239#252'CA'
-  +#238#8#255#255#255#0#255#255#255#0#255#255#255#0'vs'#255#8'tq'#254#253'}z'
-  +#254#255#138#135#255#255'|y'#253#255'li'#251#255'ca'#249'+_\'#247'+a^'#248
-  +#255'nl'#250#255'}z'#255#255'a_'#247#255'IF'#240#252'DA'#238#5#255#255#255#0
-  +#255#255#255#0'wt'#255#31'zw'#255#255#129'~'#255#255#129'~'#254#255'tq'#253
-  +#255'li'#251'+'#255#255#255#0#255#255#255#0'`]'#247'+b_'#248#255'om'#251#255
-  +'~|'#255#255'b_'#248#255'JG'#240'oEB'#238#2#255#255#255#0#255#255#255#0'wt'
-  +#255#31'zw'#255#255'yv'#254#255'ro'#253'+'#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0'a^'#248'+da'#248#255'jh'#249#255'TQ'#243#168'OM'#242
-  +')'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'wt'#255#31'wt'
-  +#255'+'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0'b_'#248'+]['#247'oYV'#245'>'#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0'c`'#248#10#255#255#255#0#255#255#255#0#255#255#255#0#11'Modal'
-  +'Result'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#7'TBitBtn'#8'OKButton'#4'L'
-  +'eft'#3#224#0#6'Height'#2#25#3'Top'#3#8#1#5'Width'#2'K'#7'Caption'#6#2'OK'#7
-  +'Default'#9#10'Glyph.Data'#10':'#4#0#0'6'#4#0#0'BM6'#4#0#0#0#0#0#0'6'#0#0#0
-  +'('#0#0#0#16#0#0#0#16#0#0#0#1#0' '#0#0#0#0#0#0#4#0#0'd'#0#0#0'd'#0#0#0#0#0#0
-  +#0#0#0#0#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0'1z6'#10'-u2'#7#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'9'#133'@'#10'7'#131'='
-  +#255'1{7'#251'.v3'#7#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0'B'#146'I'#10'@'#142'G'#255'T'#163'\'#255'O'#159'W'
-  +#255'2|8'#254'.w4'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'K'#158
-  +'S'#10'I'#154'Q'#255'['#172'd'#255'w'#202#130#255't'#200'~'#255'Q'#160'Y'#255
-  +'3}9'#254'/x5'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0'S'#169'\'#10'Q'#166'Z'#255'c'#181'm'
-  +#255'~'#206#137#255'{'#204#135#255'v'#202#129#255'v'#201#129#255'R'#162'Z'
-  +#255'4~:'#254'0y5'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0'Z'#180'e'#9'Y'#176'c'#255'k'#189'v'#255#132#210#144#255'z'#201
-  +#133#255'`'#178'j'#255'c'#180'm'#255'x'#201#131#255'x'#203#130#255'S'#163'\'
-  +#255'4:'#253'1z6'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +'^'#185'iF['#181'f'#228'y'#201#134#255#128#206#141#255'Q'#166'Z'#252'M'#161
-  +'VoI'#156'Q'#139'\'#173'g'#255'|'#204#134#255'y'#203#133#255'T'#164']'#255'5'
-  +#128';'#252'1{7'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'_'
-  +#186'j<\'#182'f'#230'm'#192'y'#255'U'#172'_o'#255#255#255#0#255#255#255#0'J'
-  +#157'R'#145'^'#174'h'#255'}'#205#137#255'|'#205#135#255'V'#165'_'#255'6'#129
-  +'<'#252'2|8'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'_'#187
-  +'jC\'#183'ge'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'K'#158
-  +'S'#145'_'#175'i'#255''#206#138#255'~'#206#137#255'W'#166'`'#255'7'#130'='
-  +#252'3}9'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +'K'#159'T'#145'`'#176'j'#255#129#207#141#255''#207#139#255'X'#167'a'#255'9'
-  +#133'@'#255'4~:'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0'L'#160'U'#145'b'#178'l'#255#130#209#143#255'z'#200#133#255'W'#166
-  +'`'#255'8'#132'?{'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0'M'#161'V'#145'c'#179'm'#255'_'#175'i'#255'A'#145'Iy'
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0'N'#162'W'#145'J'#157'R'#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  ,#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#0
+  +#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#7'TBitBtn'#8'OKBut'
+  +'ton'#4'Left'#3#224#0#6'Height'#2#25#3'Top'#3#8#1#5'Width'#2'K'#7'Caption'#6
+  +#2'OK'#7'Default'#9#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0
+  +#0
 ]);
diff --git a/ide/versioninfoadditionalinfo.pas b/ide/versioninfoadditionalinfo.pas
index 368bd6d308..c0de208d4a 100644
--- a/ide/versioninfoadditionalinfo.pas
+++ b/ide/versioninfoadditionalinfo.pas
@@ -38,7 +38,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Buttons,
-  StdCtrls, ExtCtrls, W32VersionInfo;
+  StdCtrls, ExtCtrls, W32VersionInfo, LazarusIDEStrConsts;
 
 type
 
@@ -111,6 +111,20 @@ end;
 constructor TVersionInfoAdditinalInfoForm.Create(TheOwner: TComponent);
 begin
    inherited Create(TheOwner);
+
+   Caption:= lisAdditionalInformation;
+   CancelButton.Caption:= dlgCancel;
+   OKButton.Caption:= lisOkBtn;
+   AdditionalInfoGroupBox.Caption:= lisAdditionalInformation;
+   CommentsLabel.Caption:= lisComments;
+   CompanyLabel.Caption:= lisCompany;
+   InternalNameLabel.Caption:= lisInternalName;
+   LegalTrademarksLabel.Caption:= lisLegalTrademarks;
+   OriginalFileNameLabel.Caption:= lisOriginalFileName;
+   ProductNameLabel.Caption:= lisProductName;
+   ProductVersionLabel.Caption:= lisProductVersion;
+   CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
+   OKButton.LoadGlyphFromLazarusResource('btn_ok');
 end;
 
 initialization
diff --git a/ide/viewunit_dlg.lfm b/ide/viewunit_dlg.lfm
index 1f9546e662..3f3b81ffab 100644
--- a/ide/viewunit_dlg.lfm
+++ b/ide/viewunit_dlg.lfm
@@ -3,14 +3,13 @@ object ViewUnitDialog: TViewUnitDialog
   Height = 301
   Top = 280
   Width = 378
-  HorzScrollBar.Page = 377
-  VertScrollBar.Page = 300
   ActiveControl = Edit
   BorderIcons = [biSystemMenu]
   Caption = 'View Project Units'
   ClientHeight = 301
   ClientWidth = 378
   OnCreate = FormCreate
+  ParentFont = False
   Position = poScreenCenter
   LCLVersion = '0.9.25'
   object Edit: TEdit
@@ -50,7 +49,7 @@ object ViewUnitDialog: TViewUnitDialog
     Left = 6
     Height = 19
     Top = 226
-    Width = 81
+    Width = 80
     Anchors = [akLeft, akBottom]
     BorderSpacing.Around = 6
     Caption = 'Multi Select'
@@ -72,10 +71,10 @@ object ViewUnitDialog: TViewUnitDialog
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = Owner
       AnchorSideBottom.Side = asrBottom
-      Left = 294
+      Left = 297
       Height = 38
       Top = 6
-      Width = 78
+      Width = 75
       Align = alRight
       Anchors = [akRight, akBottom]
       AutoSize = True
@@ -94,7 +93,7 @@ object ViewUnitDialog: TViewUnitDialog
       AnchorSideRight.Control = btnCancel
       AnchorSideBottom.Control = Owner
       AnchorSideBottom.Side = asrBottom
-      Left = 213
+      Left = 216
       Height = 38
       Top = 6
       Width = 75
diff --git a/ide/viewunit_dlg.lrs b/ide/viewunit_dlg.lrs
index b69b79005b..6664000647 100644
--- a/ide/viewunit_dlg.lrs
+++ b/ide/viewunit_dlg.lrs
@@ -2,46 +2,45 @@
 
 LazarusResources.Add('TViewUnitDialog','FORMDATA',[
   'TPF0'#15'TViewUnitDialog'#14'ViewUnitDialog'#4'Left'#3'J'#1#6'Height'#3'-'#1
-  +#3'Top'#3#24#1#5'Width'#3'z'#1#18'HorzScrollBar.Page'#3'y'#1#18'VertScrollBa'
-  +'r.Page'#3','#1#13'ActiveControl'#7#4'Edit'#11'BorderIcons'#11#12'biSystemMe'
-  +'nu'#0#7'Caption'#6#18'View Project Units'#12'ClientHeight'#3'-'#1#11'Client'
-  +'Width'#3'z'#1#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poScreenCenter'
-  +#10'LCLVersion'#6#6'0.9.25'#0#5'TEdit'#4'Edit'#4'Left'#2#6#6'Height'#2#25#3
-  +'Top'#2#6#5'Width'#3'n'#1#5'Align'#7#5'alTop'#7'Anchors'#11#7'akRight'#0#20
-  +'BorderSpacing.Around'#2#6#8'OnChange'#7#10'EditChange'#7'OnEnter'#7#9'EditE'
-  +'nter'#9'OnKeyDown'#7#11'EditKeyDown'#8'TabOrder'#2#1#0#0#8'TListBox'#7'List'
-  +'box'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asr'
-  +'Bottom'#24'AnchorSideBottom.Control'#7#19'MultiSelectCheckBox'#4'Left'#2#6#6
-  +'Height'#3#183#0#3'Top'#2'%'#5'Width'#3'n'#1#5'Align'#7#5'alTop'#7'Anchors'
-  +#11#8'akBottom'#0#20'BorderSpacing.Around'#2#6#16'ClickOnSelChange'#8#7'OnCl'
-  +'ick'#7#12'ListboxClick'#10'OnDblClick'#7#10'BTNOKCLICK'#9'OnKeyDown'#7#14'L'
-  +'istboxKeyDown'#8'TabOrder'#2#0#0#0#9'TCheckBox'#19'MultiSelectCheckBox'#22
-  +'AnchorSideLeft.Control'#7#5'Owner'#18'AnchorSideTop.Side'#7#9'asrBottom'#24
-  +'AnchorSideBottom.Control'#7#8'BtnPanel'#4'Left'#2#6#6'Height'#2#19#3'Top'#3
-  +#226#0#5'Width'#2'Q'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.'
-  +'Around'#2#6#7'Caption'#6#12'Multi Select'#7'OnClick'#7#24'MultiselectCheckB'
-  +'oxClick'#8'TabOrder'#2#2#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2'2'#3'Top'#3
-  +#251#0#5'Width'#3'z'#1#5'Align'#7#8'alBottom'#10'BevelOuter'#7#6'bvNone'#12
-  +'ClientHeight'#2'2'#11'ClientWidth'#3'z'#1#8'TabOrder'#2#3#0#7'TBitBtn'#9'bt'
-  +'nCancel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7
-  +#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Contro'
-  +'l'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'&'#1#6'Hei'
-  +'ght'#2'&'#3'Top'#2#6#5'Width'#2'N'#5'Align'#7#7'alRight'#7'Anchors'#11#7'ak'
-  +'Right'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9
-  +#7'Caption'#6#6'Cancel'#21'Constraints.MinHeight'#2#25#20'Constraints.MinWid'
-  +'th'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#7'OnCli'
-  +'ck'#7#14'BTNCANCELCLICK'#8'TabOrder'#2#0#0#0#7'TBitBtn'#5'btnOK'#23'AnchorS'
-  +'ideRight.Control'#7#9'btnCancel'#24'AnchorSideBottom.Control'#7#5'Owner'#21
-  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#213#0#6'Height'#2'&'#3'Top'
-  +#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#7'Anchors'#11#7'akRight'#8'akBottom'
-  +#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#21'Constra'
-  +'ints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#4
-  +'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7#10'BTNOKCLICK'#8'Ta'
-  +'bOrder'#2#1#0#0#7'TBitBtn'#10'HelpButton'#22'AnchorSideLeft.Control'#7#5'Ow'
-  +'ner'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9
-  +'asrBottom'#4'Left'#2#6#6'Height'#2'&'#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#6
-  +'alLeft'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacin'
-  +'g.Around'#2#6#7'Caption'#6#5'&Help'#21'Constraints.MinHeight'#2#25#20'Const'
-  +'raints.MinWidth'#2'K'#4'Kind'#7#6'bkHelp'#9'NumGlyphs'#2#0#7'OnClick'#7#15
-  +'HelpButtonClick'#8'TabOrder'#2#2#0#0#0#0
+  +#3'Top'#3#24#1#5'Width'#3'z'#1#13'ActiveControl'#7#4'Edit'#11'BorderIcons'#11
+  +#12'biSystemMenu'#0#7'Caption'#6#18'View Project Units'#12'ClientHeight'#3'-'
+  +#1#11'ClientWidth'#3'z'#1#8'OnCreate'#7#10'FormCreate'#10'ParentFont'#8#8'Po'
+  +'sition'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.25'#0#5'TEdit'#4'Edit'#4
+  +'Left'#2#6#6'Height'#2#25#3'Top'#2#6#5'Width'#3'n'#1#5'Align'#7#5'alTop'#7'A'
+  +'nchors'#11#7'akRight'#0#20'BorderSpacing.Around'#2#6#8'OnChange'#7#10'EditC'
+  +'hange'#7'OnEnter'#7#9'EditEnter'#9'OnKeyDown'#7#11'EditKeyDown'#8'TabOrder'
+  +#2#1#0#0#8'TListBox'#7'Listbox'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'Anc'
+  +'horSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#19'MultiSe'
+  +'lectCheckBox'#4'Left'#2#6#6'Height'#3#183#0#3'Top'#2'%'#5'Width'#3'n'#1#5'A'
+  +'lign'#7#5'alTop'#7'Anchors'#11#8'akBottom'#0#20'BorderSpacing.Around'#2#6#16
+  +'ClickOnSelChange'#8#7'OnClick'#7#12'ListboxClick'#10'OnDblClick'#7#10'BTNOK'
+  +'CLICK'#9'OnKeyDown'#7#14'ListboxKeyDown'#8'TabOrder'#2#0#0#0#9'TCheckBox'#19
+  +'MultiSelectCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#18'AnchorSideTop'
+  +'.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#4'Left'#2#6
+  +#6'Height'#2#19#3'Top'#3#226#0#5'Width'#2'P'#7'Anchors'#11#6'akLeft'#8'akBot'
+  +'tom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'Multi Select'#7'OnClick'
+  +#7#24'MultiselectCheckBoxClick'#8'TabOrder'#2#2#0#0#6'TPanel'#8'BtnPanel'#6
+  +'Height'#2'2'#3'Top'#3#251#0#5'Width'#3'z'#1#5'Align'#7#8'alBottom'#10'Bevel'
+  +'Outer'#7#6'bvNone'#12'ClientHeight'#2'2'#11'ClientWidth'#3'z'#1#8'TabOrder'
+  +#2#3#0#7'TBitBtn'#9'btnCancel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anch'
+  +'orSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24
+  +'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBotto'
+  +'m'#4'Left'#3')'#1#6'Height'#2'&'#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRi'
+  +'ght'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.'
+  +'Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#21'Constraints.MinHeight'#2
+  +#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9
+  +'NumGlyphs'#2#0#7'OnClick'#7#14'BTNCANCELCLICK'#8'TabOrder'#2#0#0#0#7'TBitBt'
+  +'n'#5'btnOK'#23'AnchorSideRight.Control'#7#9'btnCancel'#24'AnchorSideBottom.'
+  +'Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#216#0
+  +#6'Height'#2'&'#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#7'Anchors'#11
+  +#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Capti'
+  +'on'#6#3'&OK'#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#7
+  +'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'
+  +#7#10'BTNOKCLICK'#8'TabOrder'#2#1#0#0#7'TBitBtn'#10'HelpButton'#22'AnchorSid'
+  +'eLeft.Control'#7#5'Owner'#24'AnchorSideBottom.Control'#7#5'Owner'#21'Anchor'
+  +'SideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'&'#3'Top'#2#6#5'Wid'
+  +'th'#2'K'#5'Align'#7#6'alLeft'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoS'
+  +'ize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#5'&Help'#21'Constraints.Mi'
+  +'nHeight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#6'bkHelp'#9'NumGlyphs'
+  +#2#0#7'OnClick'#7#15'HelpButtonClick'#8'TabOrder'#2#2#0#0#0#0
 ]);
diff --git a/ide/viewunit_dlg.pp b/ide/viewunit_dlg.pp
index 594306bb94..5ddfa2bd14 100644
--- a/ide/viewunit_dlg.pp
+++ b/ide/viewunit_dlg.pp
@@ -153,6 +153,9 @@ begin
   btnCancel.Caption := dlgCancel;
   HelpButton.Caption := lisPckEditHelp;
   MultiSelectCheckBox.Caption := dlgMultiSelect;
+  btnOK.LoadGlyphFromLazarusResource('btn_ok');
+  btnCancel.LoadGlyphFromLazarusResource('btn_cancel');
+  HelpButton.LoadGlyphFromLazarusResource('btn_help');
 end;
 
 Procedure TViewUnitDialog.btnOKClick(Sender : TOBject);