diff --git a/components/tvplanit/source/vpedelem.lfm b/components/tvplanit/source/vpedelem.lfm
index 41db3b771..1b892258a 100644
--- a/components/tvplanit/source/vpedelem.lfm
+++ b/components/tvplanit/source/vpedelem.lfm
@@ -1,7 +1,7 @@
 object frmEditElement: TfrmEditElement
-  Left = 1069
+  Left = 486
   Height = 449
-  Top = 231
+  Top = 220
   Width = 489
   HorzScrollBar.Page = 378
   VertScrollBar.Page = 444
@@ -443,27 +443,22 @@ object frmEditElement: TfrmEditElement
       TabOrder = 0
     end
     object btnOk: TButton
-      AnchorSideRight.Control = btnCancel
-      Left = 308
+      Left = 316
       Height = 25
       Top = 0
       Width = 75
-      Anchors = [akTop, akRight]
-      BorderSpacing.Left = 8
-      BorderSpacing.Right = 8
       Caption = 'OK'
       Default = True
       OnClick = btnOkClick
       TabOrder = 1
     end
     object btnCancel: TButton
-      AnchorSideRight.Control = ButtonPanel
       AnchorSideRight.Side = asrBottom
       Left = 391
       Height = 25
       Top = 0
       Width = 74
-      Anchors = [akTop, akRight]
+      Anchors = [akTop]
       Cancel = True
       Caption = 'Cancel'
       OnClick = btnCancelClick
diff --git a/components/tvplanit/source/vpedelem.pas b/components/tvplanit/source/vpedelem.pas
index a2016a7ef..55c08237d 100644
--- a/components/tvplanit/source/vpedelem.pas
+++ b/components/tvplanit/source/vpedelem.pas
@@ -362,24 +362,6 @@ begin
   btnOK.Width := w;
   btnCancel.Width := w;
   btnShape.Width := GetButtonWidth(btnShape);
- {$IFDEF MSWINDOWS}
-  btnOK.BorderSpacing.Right := 8;
-  btnOK.AnchorSideRight.Control := btnCancel;
-  btnOK.TabOrder := 1;
-  btnCancel.BorderSpacing.Left := 0;
-  btnCancel.AnchorSideRight.Control := ButtonPanel;
-  btnCancel.AnchorSideRight.Side := asrBottom;
-  btnCancel.TabOrder := 2;
- {$ELSE}
-  btnOK.BorderSpacing.Right := 0;
-  btnOK.BorderSpacing.Left := 8;
-  btnOK.AnchorSideRight.Control := ButtonPanel;
-  btnOK.AnchorSideRight.Side := asrBottom;
-  btnCancel.AnchorSideRight.Control := btnOK;
-  btnCancel.BorderSpacing.Right := 0;
-  btnCancel.TabOrder := 1;
-  btnOK.TabOrder := 2;
- {$ENDIF}
 
   // Form size
   rgItemType.Align := alNone;
@@ -389,6 +371,18 @@ begin
     ClientWidth := RightOf(udHeight) + gbVisual.BorderSpacing.Left + gbVisual.BorderSpacing.Right;
 
   AutoSize := true;
+
+  {$IFDEF MSWINDOWS}
+   btnCancel.Left := ButtonPanel.ClientWidth - btnCancel.Width;
+   btnOK.Left := btnCancel.Left - btnOK.Width - DELTA;
+   btnOK.TabOrder := 1;
+   btnCancel.TabOrder := 2;
+  {$ELSE}
+   btnOK.Left := ButtonCancel.ClientWidth - btnOK.Width;
+   btnCancel.Left := btnOK.Left - btnCancel.Width - DELTA;
+   btnCancel.TabOrder := 1;
+   btnOK.TabOrder := 2;
+  {$ENDIF}
 end;
 
 procedure TfrmEditElement.SetData(AnElement : TVpPrintFormatElementItem);