diff --git a/ide/addprofiledialog.lfm b/ide/addprofiledialog.lfm
index 09fc632834..78dc71a64f 100644
--- a/ide/addprofiledialog.lfm
+++ b/ide/addprofiledialog.lfm
@@ -1,82 +1,62 @@
 object AddProfileForm: TAddProfileForm
   Left = 279
-  Height = 149
+  Height = 110
   Top = 246
-  Width = 394
-  ActiveControl = NameEdit
+  Width = 443
+  AutoSize = True
   Caption = 'Add New Profile'
-  ClientHeight = 149
-  ClientWidth = 394
+  ClientHeight = 110
+  ClientWidth = 443
+  Constraints.MinWidth = 400
+  OnCreate = FormCreate
   LCLVersion = '0.9.29'
   object NameEdit: TEdit
-    AnchorSideLeft.Control = NameLabel
-    AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = NameLabel
+    AnchorSideLeft.Control = Owner
     AnchorSideTop.Side = asrCenter
-    Left = 75
-    Height = 23
-    Top = 50
-    Width = 276
-    Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Left = 6
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = ButtonPanel
+    Left = 12
+    Height = 21
+    Top = 51
+    Width = 419
+    Anchors = [akLeft, akRight, akBottom]
+    BorderSpacing.Left = 12
+    BorderSpacing.Right = 12
+    BorderSpacing.Bottom = 6
     TabOrder = 0
   end
   object ProfileHeaderLabel: TLabel
     AnchorSideLeft.Control = NameEdit
-    Left = 75
-    Height = 16
-    Top = 21
-    Width = 81
+    AnchorSideBottom.Control = NameEdit
+    Left = 12
+    Height = 14
+    Top = 31
+    Width = 64
+    Anchors = [akLeft, akBottom]
+    BorderSpacing.Top = 6
+    BorderSpacing.Bottom = 6
     Caption = 'Profile name:'
     ParentColor = False
   end
-  object NameLabel: TLabel
-    Left = 32
-    Height = 16
-    Top = 53
-    Width = 37
-    Alignment = taRightJustify
-    Caption = 'Name'
-    ParentColor = False
-  end
-  object OKButton: TBitBtn
-    AnchorSideTop.Control = NameEdit
-    AnchorSideTop.Side = asrBottom
-    AnchorSideBottom.Side = asrBottom
-    Left = 75
-    Height = 25
-    Top = 92
-    Width = 75
-    AutoSize = True
-    BorderSpacing.Top = 19
-    Caption = '&OK'
-    Constraints.MinHeight = 25
-    Constraints.MinWidth = 75
-    Default = True
-    Kind = bkOK
-    ModalResult = 1
-    NumGlyphs = 0
+  object ButtonPanel: TButtonPanel
+    Left = 6
+    Height = 26
+    Top = 78
+    Width = 431
+    OKButton.Name = 'OKButton'
+    OKButton.Caption = '&ОК'
+    HelpButton.Name = 'HelpButton'
+    HelpButton.Caption = '&Справка'
+    HelpButton.Enabled = False
+    CloseButton.Name = 'CloseButton'
+    CloseButton.Caption = '&Закрыть'
+    CloseButton.Enabled = False
+    CancelButton.Name = 'CancelButton'
+    CancelButton.Caption = 'Отмена'
     TabOrder = 1
-  end
-  object CancelButton: TBitBtn
-    AnchorSideLeft.Control = OKButton
-    AnchorSideTop.Control = NameEdit
-    AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = NameEdit
-    AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Side = asrBottom
-    Left = 256
-    Height = 31
-    Top = 92
-    Width = 95
-    Anchors = [akTop, akRight]
-    AutoSize = True
-    BorderSpacing.Top = 19
-    Cancel = True
-    Caption = 'Cancel'
-    Kind = bkCancel
-    ModalResult = 2
-    NumGlyphs = 0
-    TabOrder = 2
+    DefaultButton = pbCancel
+    ShowButtons = [pbOK, pbCancel]
+    ShowBevel = False
   end
 end
diff --git a/ide/addprofiledialog.pas b/ide/addprofiledialog.pas
index 4cb24aa298..743c298a0a 100644
--- a/ide/addprofiledialog.pas
+++ b/ide/addprofiledialog.pas
@@ -6,18 +6,17 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, Buttons;
+  StdCtrls, ButtonPanel, LazarusIDEStrConsts;
 
 type
 
   { TAddProfileForm }
 
   TAddProfileForm = class(TForm)
-    CancelButton: TBitBtn;
-    NameLabel: TLabel;
+    ButtonPanel: TButtonPanel;
     NameEdit: TEdit;
     ProfileHeaderLabel: TLabel;
-    OKButton: TBitBtn;
+    procedure FormCreate(Sender:TObject);
   private
 
   public
@@ -32,5 +31,13 @@ implementation
 {$R *.lfm}
 
 
+{ TAddProfileForm }
+
+procedure TAddProfileForm.FormCreate(Sender:TObject);
+begin
+  ButtonPanel.OKButton.Caption:=lisOk;
+  ButtonPanel.CancelButton.Caption:=dlgCancel;
+end;
+
 end.