diff --git a/components/tvplanit/languages/demo.de.po b/components/tvplanit/languages/demo.de.po
index f18c6d7a3..635b78ff2 100644
--- a/components/tvplanit/languages/demo.de.po
+++ b/components/tvplanit/languages/demo.de.po
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.1\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: demomain.rs10min
 msgid "10 min"
@@ -148,27 +148,27 @@ msgstr "XML-Dateien (*.XML)"
 
 #: tfrmreportsetup.btncancel.caption
 msgid "Cancel"
-msgstr ""
+msgstr "Abbrechen"
 
 #: tfrmreportsetup.btnok.caption
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: tfrmreportsetup.caption
 msgid "Report Setup"
-msgstr ""
+msgstr "Bericht-Vorbereitung"
 
 #: tfrmreportsetup.lblenddate.caption
 msgid "End Date:"
-msgstr ""
+msgstr "Ende-Datum:"
 
 #: tfrmreportsetup.lblformat.caption
 msgid "Format:"
-msgstr ""
+msgstr "Format:"
 
 #: tfrmreportsetup.lblstartdate.caption
 msgid "Start Date:"
-msgstr ""
+msgstr "Beginn-Datum:"
 
 #: tmainform.btndeleteres.caption
 msgid "Delete"
@@ -306,4 +306,3 @@ msgstr "Erledigte Aufgaben verbergen"
 #: tmainform.titlelbl.caption
 msgid "TitleLbl"
 msgstr ""
-
diff --git a/components/tvplanit/languages/demo.en.po b/components/tvplanit/languages/demo.en.po
index 2e0f9effc..b0520979c 100644
--- a/components/tvplanit/languages/demo.en.po
+++ b/components/tvplanit/languages/demo.en.po
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.1\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: demomain.rs10min
 msgid "10 min"
@@ -145,27 +145,27 @@ msgstr "XML files (*.xml)"
 
 #: tfrmreportsetup.btncancel.caption
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel"
 
 #: tfrmreportsetup.btnok.caption
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: tfrmreportsetup.caption
 msgid "Report Setup"
-msgstr ""
+msgstr "Report Setup"
 
 #: tfrmreportsetup.lblenddate.caption
 msgid "End Date:"
-msgstr ""
+msgstr "End Date:"
 
 #: tfrmreportsetup.lblformat.caption
 msgid "Format:"
-msgstr ""
+msgstr "Format:"
 
 #: tfrmreportsetup.lblstartdate.caption
 msgid "Start Date:"
-msgstr ""
+msgstr "Start Date:"
 
 #: tmainform.btndeleteres.caption
 msgid "Delete"
@@ -303,4 +303,3 @@ msgstr "Hide completed tasks"
 #: tmainform.titlelbl.caption
 msgid "TitleLbl"
 msgstr "TitleLbl"
-
diff --git a/components/tvplanit/languages/vpsr.de.po b/components/tvplanit/languages/vpsr.de.po
index ab63a7ac1..be833c61d 100644
--- a/components/tvplanit/languages/vpsr.de.po
+++ b/components/tvplanit/languages/vpsr.de.po
@@ -1018,6 +1018,10 @@ msgstr "Andere"
 msgid "Pixels"
 msgstr "Pixel"
 
+#: vpsr.rsplaybtn
+msgid "Play"
+msgstr "Abspielen"
+
 #: vpsr.rspopupaddevent
 msgctxt "vpsr.rspopupaddevent"
 msgid "Add event..."
diff --git a/components/tvplanit/languages/vpsr.en.po b/components/tvplanit/languages/vpsr.en.po
index 173ba346e..93bbd42eb 100644
--- a/components/tvplanit/languages/vpsr.en.po
+++ b/components/tvplanit/languages/vpsr.en.po
@@ -1010,6 +1010,10 @@ msgstr "Other"
 msgid "Pixels"
 msgstr "Pixels"
 
+#: vpsr.rsplaybtn
+msgid "Play"
+msgstr "Play"
+
 #: vpsr.rspopupaddevent
 msgid "Add event..."
 msgstr "Add event..."
diff --git a/components/tvplanit/languages/vpsr.fi.po b/components/tvplanit/languages/vpsr.fi.po
index 366dade4d..05b019a42 100644
--- a/components/tvplanit/languages/vpsr.fi.po
+++ b/components/tvplanit/languages/vpsr.fi.po
@@ -1009,6 +1009,10 @@ msgstr ""
 msgid "Pixels"
 msgstr ""
 
+#: vpsr.rsplaybtn
+msgid "Play"
+msgstr ""
+
 #: vpsr.rspopupaddevent
 msgctxt "vpsr.rspopupaddevent"
 msgid "Add event..."
diff --git a/components/tvplanit/languages/vpsr.fr.po b/components/tvplanit/languages/vpsr.fr.po
index f17cf5a48..d7411a7bc 100644
--- a/components/tvplanit/languages/vpsr.fr.po
+++ b/components/tvplanit/languages/vpsr.fr.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2016-09-17 17:11+0200\n"
+"PO-Revision-Date: 2022-09-12 19:03+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: vpsr.rs1day
 msgid "1 day"
@@ -1024,6 +1024,10 @@ msgstr "Autre"
 msgid "Pixels"
 msgstr ""
 
+#: vpsr.rsplaybtn
+msgid "Play"
+msgstr ""
+
 #: vpsr.rspopupaddevent
 msgctxt "vpsr.rspopupaddevent"
 msgid "Add event..."
@@ -1267,8 +1271,6 @@ msgid "Error: Unable to update "
 msgstr "Erreur: Modification à echoué"
 
 #: vpsr.rsstartendtimeerror
-#, fuzzy
-#| msgid "Incorrect order of start and end times. Do you want to flip them?"
 msgid "Incorrect order of start and end times. Do you want to exchange them?"
 msgstr "Ordre incorrect des heures de début et de fin. Voulez-vous les retourner?"
 
@@ -1386,7 +1388,7 @@ msgid "Tuesday"
 msgstr "Mardi"
 
 #: vpsr.rsunabletoopen
-#, object-pascal-format, fuzzy, badformat
+#, fuzzy, object-pascal-format
 #| msgid "Error: Unable to open "
 msgid "Error: Unable to open %s"
 msgstr "Erreur: Incapable d'ouvrir"
@@ -1696,7 +1698,7 @@ msgid "Invalid XML Character found"
 msgstr "Caractère XML non valide trouvé"
 
 #: vpsr.sinvalidxmlversion
-#, object-pascal-format, fuzzy, badformat
+#, fuzzy, object-pascal-format
 msgid "XMLPartner does not support XML specification greater than %s"
 msgstr "XMLPartner ne supporte pas la spécification XML supérieure à"
 
@@ -1805,11 +1807,10 @@ msgid "End of input while looking for delimiter: "
 msgstr "Fin de l'entrée tout en recherchant delimiter:"
 
 #: vpsr.sunknownaxis
-#, object-pascal-format, fuzzy, badformat
+#, fuzzy, object-pascal-format
 msgid "Unknown axis specifier: %s"
 msgstr "Spécificateur d'axe inconnu"
 
 #: vpsr.sxmldecnotatbeg
 msgid "The XML declaration must appear before the first element"
 msgstr "La déclaration XML doit apparaître avant le premier élément"
-
diff --git a/components/tvplanit/languages/vpsr.nl.po b/components/tvplanit/languages/vpsr.nl.po
index 61b26e4f4..5207627b0 100644
--- a/components/tvplanit/languages/vpsr.nl.po
+++ b/components/tvplanit/languages/vpsr.nl.po
@@ -1018,6 +1018,10 @@ msgstr "Andere"
 msgid "Pixels"
 msgstr ""
 
+#: vpsr.rsplaybtn
+msgid "Play"
+msgstr ""
+
 #: vpsr.rspopupaddevent
 msgctxt "vpsr.rspopupaddevent"
 msgid "Add event..."
diff --git a/components/tvplanit/languages/vpsr.pl.po b/components/tvplanit/languages/vpsr.pl.po
index 63db4fabf..4bdeda021 100644
--- a/components/tvplanit/languages/vpsr.pl.po
+++ b/components/tvplanit/languages/vpsr.pl.po
@@ -1018,6 +1018,10 @@ msgstr "Inny"
 msgid "Pixels"
 msgstr "Pixele"
 
+#: vpsr.rsplaybtn
+msgid "Play"
+msgstr ""
+
 #: vpsr.rspopupaddevent
 msgid "Add event..."
 msgstr "Dodaj wydarzenie..."
diff --git a/components/tvplanit/languages/vpsr.pot b/components/tvplanit/languages/vpsr.pot
index 3cbc8fe49..ac52f5f0d 100644
--- a/components/tvplanit/languages/vpsr.pot
+++ b/components/tvplanit/languages/vpsr.pot
@@ -1000,6 +1000,10 @@ msgstr ""
 msgid "Pixels"
 msgstr ""
 
+#: vpsr.rsplaybtn
+msgid "Play"
+msgstr ""
+
 #: vpsr.rspopupaddevent
 msgid "Add event..."
 msgstr ""
diff --git a/components/tvplanit/languages/vpsr.ru.po b/components/tvplanit/languages/vpsr.ru.po
index ad713529c..4bc1c4d6d 100644
--- a/components/tvplanit/languages/vpsr.ru.po
+++ b/components/tvplanit/languages/vpsr.ru.po
@@ -1018,6 +1018,10 @@ msgstr "Другой"
 msgid "Pixels"
 msgstr ""
 
+#: vpsr.rsplaybtn
+msgid "Play"
+msgstr ""
+
 #: vpsr.rspopupaddevent
 msgctxt "vpsr.rspopupaddevent"
 msgid "Add event..."
diff --git a/components/tvplanit/source/include/vpsr.inc b/components/tvplanit/source/include/vpsr.inc
index 20383a8cf..d79228784 100644
--- a/components/tvplanit/source/include/vpsr.inc
+++ b/components/tvplanit/source/include/vpsr.inc
@@ -261,6 +261,7 @@ resourcestring
   RSSoundFinder             = 'Sound Finder';
   RSDefaultSound            = 'Use the default sound';
   RSNothingToSelectFrom     = 'There is nothing to select if default sound is used.';
+  RSPlayBtn                 = 'Play';
 
   { Event Edit Dialog Captions }
   RSDlgEventEdit            = 'Event';
diff --git a/components/tvplanit/source/vpmisc.pas b/components/tvplanit/source/vpmisc.pas
index 94196eb2d..62e6b1e68 100644
--- a/components/tvplanit/source/vpmisc.pas
+++ b/components/tvplanit/source/vpmisc.pas
@@ -493,6 +493,45 @@ begin
 end;
 
 
+procedure AlignOKCancel(OKButton, CancelButton: TButton; APanel: TPanel);
+var
+  w: Integer;
+begin
+  OKButton.AutoSize := true;
+  CancelButton.AutoSize := true;
+  w := Max(OKButton.Width, CancelButton.Width);
+
+  OKButton.Constraints.MinWidth := w;
+  OKButton.Width := w;
+  CancelButton.Constraints.MinWidth := w;
+  CancelButton.Width := w;
+
+  {$IFDEF MSWINDOWS}   // button order: OK - Cancel
+  CancelButton.AnchorSideRight.Control := APanel;
+  CancelButton.AnchorSideRight.Side := asrRight;
+  CancelButton.Anchors := [akTop, akRight];
+
+  OKButton.AnchorSideRight.Control := CancelButton;
+  OKButton.AnchorSideRight.Side := asrRight;
+  OKButton.Anchors := [akTop, akRight];
+  OKButton.TabOrder := 0;
+  CancelButton.TabOrder := 1;
+  {$ELSE}
+  OKButton.AnchorSideRight.Control := APanel;
+  OKButton.AnchorSideRight.Side := asrRight;
+  OKButton.Anchors := [akTop, akRight];
+  CancelButton.AnchorSideRight.Control := OKButton;
+  CancelButton.AnchorSideRight.Side := asrRight;
+  CancelButton.Anchors := [akTop, akRight];
+  CancelButton.TabOrder := 0;
+  OKButton.TabOrder := 1;
+  {$ENDIF}
+
+  APanel.AutoSize := true;
+end;
+
+
+                          (*
 procedure AlignOKCancel(OKButton, CancelButton: TButton; APanel: TPanel);
 var
   w, h: Integer;
@@ -538,6 +577,7 @@ begin
   OKButton.TabOrder := 1;
   {$ENDIF}
 end;
+*)
 
 function PointInRect(Point: TPoint; Rect: TRect): Boolean;
 begin
diff --git a/components/tvplanit/source/vpwavdlg.lfm b/components/tvplanit/source/vpwavdlg.lfm
index 25fe9f257..2af70f3d8 100644
--- a/components/tvplanit/source/vpwavdlg.lfm
+++ b/components/tvplanit/source/vpwavdlg.lfm
@@ -12,7 +12,6 @@ object FrmSoundDialog: TFrmSoundDialog
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '1.9.0.0'
   object PageControl1: TPageControl
     Left = 0
     Height = 474
@@ -54,7 +53,7 @@ object FrmSoundDialog: TFrmSoundDialog
             Left = 4
             Height = 19
             Top = 4
-            Width = 73
+            Width = 71
             BorderSpacing.Around = 4
             Caption = 'CBDefault'
             OnClick = CBDefaultClick
@@ -72,38 +71,17 @@ object FrmSoundDialog: TFrmSoundDialog
           ClientHeight = 33
           ClientWidth = 515
           TabOrder = 2
-          object PlayButton: TSpeedButton
+          object PlayBtn: TSpeedButton
             AnchorSideTop.Control = OkBtn
             AnchorSideBottom.Control = OkBtn
             AnchorSideBottom.Side = asrBottom
             Left = 0
             Height = 25
             Top = 4
-            Width = 77
+            Width = 118
             Anchors = [akTop, akLeft, akBottom]
-            Caption = 'Play'
-            Glyph.Data = {
-              DE010000424DDE01000000000000760000002800000024000000120000000100
-              0400000000006801000000000000000000001000000010000000000000000000
-              80000080000000808000800000008000800080800000C0C0C000808080000000
-              FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF00666666666666
-              6666666666666666666666660000666666660066666666666666668866666666
-              0000666666603086666666666666688886666666000066666603077866686666
-              66668887786668660000666660388FF866866666666888877866866600006666
-              03B07FF8686666666688787778686666000066003BF07FF8666666668887F877
-              7866666600006038BFB00FF866666668887F788778666666000063B7FBF080F8
-              6888866877F7F88878688886000063B7BFB070F866666668777F787878666666
-              000063F7FBF00FF866666668F7F7F8877866666600006633BFB07FF868666666
-              887F787778686666000066663BF07FF8668666666687F8777866866600006666
-              63B887F866686666666878877866686600006666663B07766666666666668787
-              7866666600006666666380866666666666666888866666660000666666660066
-              6666666666666688666666660000666666666666666666666666666666666666
-              0000
-            }
             Margin = 4
-            NumGlyphs = 2
-            Spacing = -1
-            OnClick = PlayButtonClick
+            OnClick = PlayBtnClick
           end
           object OkBtn: TButton
             Left = 361
@@ -169,6 +147,7 @@ object FrmSoundDialog: TFrmSoundDialog
             Alignment = taCenter
             AutoSize = False
             Caption = 'Nothing to select from'
+            Color = clDefault
             Layout = tlCenter
             ParentColor = False
             WordWrap = True
@@ -217,6 +196,7 @@ object FrmSoundDialog: TFrmSoundDialog
           Alignment = taCenter
           AutoSize = False
           Caption = 'Nothing to select from'
+          Color = clDefault
           Layout = tlCenter
           ParentColor = False
           WordWrap = True
diff --git a/components/tvplanit/source/vpwavdlg.pas b/components/tvplanit/source/vpwavdlg.pas
index 9a9169201..344b62150 100644
--- a/components/tvplanit/source/vpwavdlg.pas
+++ b/components/tvplanit/source/vpwavdlg.pas
@@ -61,7 +61,7 @@ type
     ShellTreeView: TShellTreeView;
     Splitter1: TSplitter;
     TabSheet1: TTabSheet;
-    PlayButton: TSpeedButton;
+    PlayBtn: TSpeedButton;
     CBDefault: TCheckBox;
     OkBtn: TButton;
     CancelBtn: TButton;
@@ -70,7 +70,7 @@ type
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure OkBtnClick(Sender: TObject);
-    procedure PlayButtonClick(Sender: TObject);
+    procedure PlayBtnClick(Sender: TObject);
   private
     FOnPlaySound: TVpPlaySoundEvent;
     function FindFileItem(AFilename: String): TListItem;
@@ -107,7 +107,7 @@ begin
   ShellListview.Visible := not CBDefault.Checked;
   Panel3.Visible := CBDefault.Checked;
   Label4.Visible := CBDefault.Checked;
-  PlayButton.Visible := not CBDefault.Checked;
+  PlayBtn.Visible := not CBDefault.Checked;
 end;
 {=====}
 
@@ -135,15 +135,15 @@ begin
   ShellListView.Mask := '*.wav';
   {$ENDIF}
 {$ENDIF}
+{$IFDEF NEW_ICONS}
+  LoadGlyphFromRCDATA(PlayBtn.Glyph, 'VpSpeaker', 16, 24, 32);
+{$ENDIF}
 end;
 
 procedure TFrmSoundDialog.FormShow(Sender: TObject);
 begin
-  {$IFDEF NEW_ICONS}
-  LoadGlyphFromRCDATA(PlayButton.Glyph, 'VpSpeaker', 16, 24, 32);
-  {$ENDIF}
   AlignOKCancel(OkBtn, CancelBtn, ButtonPanel);
-  PlayButton.Width := CancelBtn.Width; //MulDiv(PlayButton.Height, 3, 2) ;
+  PlayBtn.AutoSize := true;
 end;
 
 function TFrmSoundDialog.GetSelectedFileName: String;
@@ -159,7 +159,7 @@ begin
   StopSound;
 end;
 
-procedure TFrmSoundDialog.PlayButtonClick(Sender: TObject);
+procedure TFrmSoundDialog.PlayBtnClick(Sender: TObject);
 begin
   DingPath := GetSelectedFileName;
   PlaySound;
@@ -178,6 +178,10 @@ begin
   CBDefault.Caption := RSDefaultSound;
   OkBtn.Caption := RSOkBtn;
   CancelBtn.Caption := RSCancelBtn;
+  if BiDiMode = bdLeftToRight then
+    PlayBtn.Caption := RSPlayBtn + '   '  // Workaround for AutoSize bug of TSpeedButton ignoring right Margin
+  else
+    PlayBtn.Caption := '   ' + RSPlayBtn;
   Label3.Caption := RSNothingToSelectFrom;
   Label4.Caption := RSNothingToSelectFrom;