diff --git a/ide/idefpcinfo.lfm b/ide/idefpcinfo.lfm
index b9b405e701..7df3be384f 100644
--- a/ide/idefpcinfo.lfm
+++ b/ide/idefpcinfo.lfm
@@ -1,33 +1,35 @@
 object IDEFPCInfoDialog: TIDEFPCInfoDialog
-  Left = 275
+  Left = 505
   Height = 450
-  Top = 250
-  Width = 704
+  Top = 227
+  Width = 700
+  BorderIcons = [biSystemMenu, biMaximize]
   Caption = 'IDEFPCInfoDialog'
   ClientHeight = 450
-  ClientWidth = 704
+  ClientWidth = 700
   OnClose = FormClose
   OnCreate = FormCreate
   Position = poScreenCenter
-  LCLVersion = '1.1'
+  LCLVersion = '1.5'
   object PageControl1: TPageControl
-    Left = 0
-    Height = 450
-    Top = 0
-    Width = 704
-    ActivePage = OutputTabSheet
+    Left = 6
+    Height = 403
+    Top = 6
+    Width = 688
+    ActivePage = ValuesTabSheet
     Align = alClient
-    TabIndex = 1
+    BorderSpacing.Around = 6
+    TabIndex = 0
     TabOrder = 0
     object ValuesTabSheet: TTabSheet
       Caption = 'FPC values used by the IDE'
-      ClientHeight = 418
-      ClientWidth = 698
+      ClientHeight = 372
+      ClientWidth = 684
       object ValuesMemo: TMemo
         Left = 0
-        Height = 422
+        Height = 372
         Top = 0
-        Width = 696
+        Width = 684
         Align = alClient
         Lines.Strings = (
           'ValuesMemo'
@@ -40,13 +42,13 @@ object IDEFPCInfoDialog: TIDEFPCInfoDialog
     end
     object OutputTabSheet: TTabSheet
       Caption = 'FPC output'
-      ClientHeight = 418
-      ClientWidth = 698
+      ClientHeight = 372
+      ClientWidth = 684
       object CmdLineOutputMemo: TMemo
         Left = 0
-        Height = 418
+        Height = 372
         Top = 0
-        Width = 698
+        Width = 688
         Align = alClient
         Lines.Strings = (
           'CmdLineOutputMemo'
@@ -57,4 +59,21 @@ object IDEFPCInfoDialog: TIDEFPCInfoDialog
       end
     end
   end
+  object ButtonPanel1: TButtonPanel
+    Left = 6
+    Height = 29
+    Top = 415
+    Width = 688
+    OKButton.Name = 'OKButton'
+    OKButton.DefaultCaption = True
+    HelpButton.Name = 'HelpButton'
+    HelpButton.DefaultCaption = True
+    CloseButton.Name = 'CloseButton'
+    CloseButton.DefaultCaption = True
+    CancelButton.Name = 'CancelButton'
+    CancelButton.DefaultCaption = True
+    TabOrder = 1
+    ShowButtons = [pbClose]
+    ShowBevel = False
+  end
 end
diff --git a/ide/idefpcinfo.pas b/ide/idefpcinfo.pas
index 65c7f1b892..e7700ea39d 100644
--- a/ide/idefpcinfo.pas
+++ b/ide/idefpcinfo.pas
@@ -31,17 +31,16 @@ interface
 
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls,
-  lazutf8classes, LazFileUtils, LazUTF8,
-  FileProcs, DefineTemplates, CodeToolManager,
-  IDEWindowIntf, LazIDEIntf,
-  BaseBuildManager, Project, EnvironmentOpts, LazarusIDEStrConsts,
-  AboutFrm, TransferMacros;
+  ButtonPanel, lazutf8classes, LazFileUtils, LazUTF8, FileProcs,
+  DefineTemplates, CodeToolManager, IDEWindowIntf, LazIDEIntf, BaseBuildManager,
+  Project, EnvironmentOpts, LazarusIDEStrConsts, AboutFrm, TransferMacros;
 
 type
 
   { TIDEFPCInfoDialog }
 
   TIDEFPCInfoDialog = class(TForm)
+    ButtonPanel1: TButtonPanel;
     CmdLineOutputMemo: TMemo;
     ValuesMemo: TMemo;
     PageControl1: TPageControl;
diff --git a/ide/ideinfodlg.lfm b/ide/ideinfodlg.lfm
index c4dfa44fa6..5db6d984ee 100644
--- a/ide/ideinfodlg.lfm
+++ b/ide/ideinfodlg.lfm
@@ -1,27 +1,30 @@
 object IDEInfoDialog: TIDEInfoDialog
-  Left = 269
-  Height = 397
-  Top = 294
-  Width = 735
+  Left = 490
+  Height = 450
+  Top = 207
+  Width = 700
+  BorderIcons = [biSystemMenu, biMaximize]
   Caption = 'IDEInfoDialog'
-  ClientHeight = 397
-  ClientWidth = 735
+  ClientHeight = 450
+  ClientWidth = 700
   OnClose = FormClose
   OnCreate = FormCreate
-  LCLVersion = '1.1'
+  Position = poScreenCenter
+  LCLVersion = '1.5'
   object PageControl1: TPageControl
-    Left = 0
-    Height = 397
-    Top = 0
-    Width = 735
+    Left = 6
+    Height = 403
+    Top = 6
+    Width = 688
     ActivePage = HelpTabSheet
     Align = alClient
+    BorderSpacing.Around = 6
     TabIndex = 2
     TabOrder = 0
     object GeneralTabSheet: TTabSheet
       Caption = 'General'
-      ClientHeight = 365
-      ClientWidth = 729
+      ClientHeight = 372
+      ClientWidth = 684
       object GeneralMemo: TMemo
         Left = 0
         Height = 361
@@ -38,8 +41,8 @@ object IDEInfoDialog: TIDEInfoDialog
     end
     object ModifiedTabSheet: TTabSheet
       Caption = 'Modified'
-      ClientHeight = 365
-      ClientWidth = 729
+      ClientHeight = 372
+      ClientWidth = 684
       object ModifiedMemo: TMemo
         Left = 0
         Height = 361
@@ -55,13 +58,13 @@ object IDEInfoDialog: TIDEInfoDialog
     end
     object HelpTabSheet: TTabSheet
       Caption = 'Help'
-      ClientHeight = 365
-      ClientWidth = 729
+      ClientHeight = 372
+      ClientWidth = 684
       object HelpMemo: TMemo
         Left = 0
-        Height = 365
+        Height = 372
         Top = 0
-        Width = 729
+        Width = 684
         Align = alClient
         Lines.Strings = (
           'HelpMemo'
@@ -71,4 +74,21 @@ object IDEInfoDialog: TIDEInfoDialog
       end
     end
   end
+  object ButtonPanel1: TButtonPanel
+    Left = 6
+    Height = 29
+    Top = 415
+    Width = 688
+    OKButton.Name = 'OKButton'
+    OKButton.DefaultCaption = True
+    HelpButton.Name = 'HelpButton'
+    HelpButton.DefaultCaption = True
+    CloseButton.Name = 'CloseButton'
+    CloseButton.DefaultCaption = True
+    CancelButton.Name = 'CancelButton'
+    CancelButton.DefaultCaption = True
+    TabOrder = 1
+    ShowButtons = [pbClose]
+    ShowBevel = False
+  end
 end
diff --git a/ide/ideinfodlg.pas b/ide/ideinfodlg.pas
index 60bab973e5..2886c23fb0 100644
--- a/ide/ideinfodlg.pas
+++ b/ide/ideinfodlg.pas
@@ -31,16 +31,17 @@ interface
 
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls,
-  LCLProc, LazFileUtils, LazUTF8, IDEHelpIntf, IDEWindowIntf, LazIDEIntf, LazHelpIntf,
-  LazHelpHTML, DefineTemplates, CodeToolManager, EnvironmentOpts, AboutFrm,
-  LazConf, LazarusIDEStrConsts,
-  Project, SourceEditor, InitialSetupProc, PackageSystem, PackageDefs;
+  LCLProc, LazFileUtils, LazUTF8, IDEHelpIntf, IDEWindowIntf, LazIDEIntf,
+  LazHelpIntf, LazHelpHTML, ButtonPanel, DefineTemplates, CodeToolManager,
+  EnvironmentOpts, AboutFrm, LazConf, LazarusIDEStrConsts, Project,
+  SourceEditor, InitialSetupProc, PackageSystem, PackageDefs;
 
 type
 
   { TIDEInfoDialog }
 
   TIDEInfoDialog = class(TForm)
+    ButtonPanel1: TButtonPanel;
     GeneralMemo: TMemo;
     HelpMemo: TMemo;
     ModifiedMemo: TMemo;