diff --git a/components/tvplanit/examples/fulldemo/ExVpRptSetup.lfm b/components/tvplanit/examples/fulldemo/ExVpRptSetup.lfm
index f5db05c4d..99ed00c60 100644
--- a/components/tvplanit/examples/fulldemo/ExVpRptSetup.lfm
+++ b/components/tvplanit/examples/fulldemo/ExVpRptSetup.lfm
@@ -12,7 +12,6 @@ object frmReportSetup: TfrmReportSetup
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poMainFormCenter
-  LCLVersion = '1.6.4.0'
   object Panel1: TPanel
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
@@ -37,6 +36,7 @@ object frmReportSetup: TfrmReportSetup
       BorderSpacing.Left = 8
       BorderSpacing.Right = 8
       Caption = 'Start Date:'
+      Color = clDefault
       FocusControl = edStartDate
       ParentColor = False
     end
@@ -52,6 +52,7 @@ object frmReportSetup: TfrmReportSetup
       BorderSpacing.Left = 8
       BorderSpacing.Right = 8
       Caption = 'End Date:'
+      Color = clDefault
       FocusControl = edEndDate
       ParentColor = False
     end
@@ -67,6 +68,7 @@ object frmReportSetup: TfrmReportSetup
       BorderSpacing.Left = 8
       BorderSpacing.Right = 8
       Caption = 'Format:'
+      Color = clDefault
       FocusControl = PrintFormatCombo
       ParentColor = False
     end
@@ -85,7 +87,7 @@ object frmReportSetup: TfrmReportSetup
       Borderspacing.Bottom = 12
       ItemHeight = 15
       Sorted = True
-      TabOrder = 0
+      TabOrder = 2
     end
     object edStartDate: TDateEdit
       AnchorSideTop.Control = Panel1
@@ -103,7 +105,7 @@ object frmReportSetup: TfrmReportSetup
       BorderSpacing.Right = 8
       NumGlyphs = 1
       MaxLength = 0
-      TabOrder = 1
+      TabOrder = 0
     end
     object edEndDate: TDateEdit
       AnchorSideLeft.Control = edStartDate
@@ -122,7 +124,22 @@ object frmReportSetup: TfrmReportSetup
       BorderSpacing.Top = 8
       NumGlyphs = 1
       MaxLength = 0
-      TabOrder = 2
+      TabOrder = 1
+    end
+    object Bevel1: TBevel
+      AnchorSideLeft.Control = Panel1
+      AnchorSideRight.Control = Panel1
+      AnchorSideRight.Side = asrBottom
+      AnchorSideBottom.Control = Panel1
+      AnchorSideBottom.Side = asrBottom
+      Left = 8
+      Height = 3
+      Top = 102
+      Width = 249
+      Anchors = [akLeft, akRight, akBottom]
+      BorderSpacing.Left = 8
+      BorderSpacing.Right = 8
+      Shape = bsBottomLine
     end
   end
   object ButtonPanel: TPanel
@@ -133,10 +150,11 @@ object frmReportSetup: TfrmReportSetup
     AnchorSideRight.Side = asrBottom
     Left = 0
     Height = 33
-    Top = 105
+    Top = 113
     Width = 265
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
+    BorderSpacing.Top = 8
     BevelOuter = bvNone
     ClientHeight = 33
     ClientWidth = 265
diff --git a/components/tvplanit/examples/fulldemo/ExVpRptSetup.pas b/components/tvplanit/examples/fulldemo/ExVpRptSetup.pas
index f9fb7d0be..7e4d97613 100644
--- a/components/tvplanit/examples/fulldemo/ExVpRptSetup.pas
+++ b/components/tvplanit/examples/fulldemo/ExVpRptSetup.pas
@@ -41,6 +41,7 @@ type
   { TfrmReportSetup }
 
   TfrmReportSetup = class(TForm)
+    Bevel1: TBevel;
     btnOK: TButton;
     btnCancel: TButton;
     lblStartDate: TLabel;
@@ -100,6 +101,8 @@ end;
 
 procedure TfrmReportSetup.FormCreate(Sender: TObject);
 begin
+  LoadGlyphFromRCDATA(edStartDate.Glyph, 'VpDateEdit', 16, 24, 32);
+  LoadGlyphFromRCDATA(edEndDate.Glyph, 'VpDateEdit', 16, 24, 32);
   SetCaptions;
 end;
 
diff --git a/components/tvplanit/images/components/monochrome/VpDateEdit16.png b/components/tvplanit/images/components/monochrome/VpDateEdit16.png
index 37986e309..5d32aa7c9 100644
Binary files a/components/tvplanit/images/components/monochrome/VpDateEdit16.png and b/components/tvplanit/images/components/monochrome/VpDateEdit16.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpDateEdit24.png b/components/tvplanit/images/components/monochrome/VpDateEdit24.png
index a42733da6..efcffcc4a 100644
Binary files a/components/tvplanit/images/components/monochrome/VpDateEdit24.png and b/components/tvplanit/images/components/monochrome/VpDateEdit24.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpDateEdit32.png b/components/tvplanit/images/components/monochrome/VpDateEdit32.png
index 5b4afa7e8..3f55ac9a3 100644
Binary files a/components/tvplanit/images/components/monochrome/VpDateEdit32.png and b/components/tvplanit/images/components/monochrome/VpDateEdit32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpDateEdit16.png b/components/tvplanit/images/components/twocolor/VpDateEdit16.png
index ff0124d43..14162329a 100644
Binary files a/components/tvplanit/images/components/twocolor/VpDateEdit16.png and b/components/tvplanit/images/components/twocolor/VpDateEdit16.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpDateEdit24.png b/components/tvplanit/images/components/twocolor/VpDateEdit24.png
index 9706023c8..56bae2709 100644
Binary files a/components/tvplanit/images/components/twocolor/VpDateEdit24.png and b/components/tvplanit/images/components/twocolor/VpDateEdit24.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpDateEdit32.png b/components/tvplanit/images/components/twocolor/VpDateEdit32.png
index ed30de7c7..fb3dfc5e2 100644
Binary files a/components/tvplanit/images/components/twocolor/VpDateEdit32.png and b/components/tvplanit/images/components/twocolor/VpDateEdit32.png differ
diff --git a/components/tvplanit/languages/demo.de.po b/components/tvplanit/languages/demo.de.po
index 46d20f559..f18c6d7a3 100644
--- a/components/tvplanit/languages/demo.de.po
+++ b/components/tvplanit/languages/demo.de.po
@@ -146,6 +146,30 @@ msgstr "Mittwoch"
 msgid "XML files (*.xml)"
 msgstr "XML-Dateien (*.XML)"
 
+#: tfrmreportsetup.btncancel.caption
+msgid "Cancel"
+msgstr ""
+
+#: tfrmreportsetup.btnok.caption
+msgid "OK"
+msgstr ""
+
+#: tfrmreportsetup.caption
+msgid "Report Setup"
+msgstr ""
+
+#: tfrmreportsetup.lblenddate.caption
+msgid "End Date:"
+msgstr ""
+
+#: tfrmreportsetup.lblformat.caption
+msgid "Format:"
+msgstr ""
+
+#: tfrmreportsetup.lblstartdate.caption
+msgid "Start Date:"
+msgstr ""
+
 #: tmainform.btndeleteres.caption
 msgid "Delete"
 msgstr "Löschen"
diff --git a/components/tvplanit/languages/demo.en.po b/components/tvplanit/languages/demo.en.po
index 5cb9d18ed..2e0f9effc 100644
--- a/components/tvplanit/languages/demo.en.po
+++ b/components/tvplanit/languages/demo.en.po
@@ -143,6 +143,30 @@ msgstr "Wednesday"
 msgid "XML files (*.xml)"
 msgstr "XML files (*.xml)"
 
+#: tfrmreportsetup.btncancel.caption
+msgid "Cancel"
+msgstr ""
+
+#: tfrmreportsetup.btnok.caption
+msgid "OK"
+msgstr ""
+
+#: tfrmreportsetup.caption
+msgid "Report Setup"
+msgstr ""
+
+#: tfrmreportsetup.lblenddate.caption
+msgid "End Date:"
+msgstr ""
+
+#: tfrmreportsetup.lblformat.caption
+msgid "Format:"
+msgstr ""
+
+#: tfrmreportsetup.lblstartdate.caption
+msgid "Start Date:"
+msgstr ""
+
 #: tmainform.btndeleteres.caption
 msgid "Delete"
 msgstr "Delete"
diff --git a/components/tvplanit/languages/demo.fi.po b/components/tvplanit/languages/demo.fi.po
index 41587a981..4c470bf0d 100644
--- a/components/tvplanit/languages/demo.fi.po
+++ b/components/tvplanit/languages/demo.fi.po
@@ -136,6 +136,30 @@ msgstr "Keskiviikko"
 msgid "XML files (*.xml)"
 msgstr "XML tiedostot (*xml)"
 
+#: tfrmreportsetup.btncancel.caption
+msgid "Cancel"
+msgstr ""
+
+#: tfrmreportsetup.btnok.caption
+msgid "OK"
+msgstr ""
+
+#: tfrmreportsetup.caption
+msgid "Report Setup"
+msgstr ""
+
+#: tfrmreportsetup.lblenddate.caption
+msgid "End Date:"
+msgstr ""
+
+#: tfrmreportsetup.lblformat.caption
+msgid "Format:"
+msgstr ""
+
+#: tfrmreportsetup.lblstartdate.caption
+msgid "Start Date:"
+msgstr ""
+
 #: tmainform.btndeleteres.caption
 msgid "Delete"
 msgstr ""
diff --git a/components/tvplanit/languages/demo.nl.po b/components/tvplanit/languages/demo.nl.po
index 00e12a2d7..f441bf240 100644
--- a/components/tvplanit/languages/demo.nl.po
+++ b/components/tvplanit/languages/demo.nl.po
@@ -135,6 +135,30 @@ msgstr "Woensdag"
 msgid "XML files (*.xml)"
 msgstr ""
 
+#: tfrmreportsetup.btncancel.caption
+msgid "Cancel"
+msgstr ""
+
+#: tfrmreportsetup.btnok.caption
+msgid "OK"
+msgstr ""
+
+#: tfrmreportsetup.caption
+msgid "Report Setup"
+msgstr ""
+
+#: tfrmreportsetup.lblenddate.caption
+msgid "End Date:"
+msgstr ""
+
+#: tfrmreportsetup.lblformat.caption
+msgid "Format:"
+msgstr ""
+
+#: tfrmreportsetup.lblstartdate.caption
+msgid "Start Date:"
+msgstr ""
+
 #: tmainform.btndeleteres.caption
 msgid "Delete"
 msgstr ""
diff --git a/components/tvplanit/languages/demo.pl.po b/components/tvplanit/languages/demo.pl.po
index 8badca25e..c6c3434bf 100644
--- a/components/tvplanit/languages/demo.pl.po
+++ b/components/tvplanit/languages/demo.pl.po
@@ -146,6 +146,30 @@ msgstr "Środa"
 msgid "XML files (*.xml)"
 msgstr "Plik XML (*.XML)"
 
+#: tfrmreportsetup.btncancel.caption
+msgid "Cancel"
+msgstr ""
+
+#: tfrmreportsetup.btnok.caption
+msgid "OK"
+msgstr ""
+
+#: tfrmreportsetup.caption
+msgid "Report Setup"
+msgstr ""
+
+#: tfrmreportsetup.lblenddate.caption
+msgid "End Date:"
+msgstr ""
+
+#: tfrmreportsetup.lblformat.caption
+msgid "Format:"
+msgstr ""
+
+#: tfrmreportsetup.lblstartdate.caption
+msgid "Start Date:"
+msgstr ""
+
 #: tmainform.btndeleteres.caption
 msgid "Delete"
 msgstr "Usuń"
diff --git a/components/tvplanit/languages/demo.pot b/components/tvplanit/languages/demo.pot
index c0fdc40b1..6bb2baed5 100644
--- a/components/tvplanit/languages/demo.pot
+++ b/components/tvplanit/languages/demo.pot
@@ -133,6 +133,30 @@ msgstr ""
 msgid "XML files (*.xml)"
 msgstr ""
 
+#: tfrmreportsetup.btncancel.caption
+msgid "Cancel"
+msgstr ""
+
+#: tfrmreportsetup.btnok.caption
+msgid "OK"
+msgstr ""
+
+#: tfrmreportsetup.caption
+msgid "Report Setup"
+msgstr ""
+
+#: tfrmreportsetup.lblenddate.caption
+msgid "End Date:"
+msgstr ""
+
+#: tfrmreportsetup.lblformat.caption
+msgid "Format:"
+msgstr ""
+
+#: tfrmreportsetup.lblstartdate.caption
+msgid "Start Date:"
+msgstr ""
+
 #: tmainform.btndeleteres.caption
 msgid "Delete"
 msgstr ""
diff --git a/components/tvplanit/languages/demo.ru.po b/components/tvplanit/languages/demo.ru.po
index 3ef532990..a1cbc6e38 100644
--- a/components/tvplanit/languages/demo.ru.po
+++ b/components/tvplanit/languages/demo.ru.po
@@ -145,6 +145,30 @@ msgstr "Среда"
 msgid "XML files (*.xml)"
 msgstr ""
 
+#: tfrmreportsetup.btncancel.caption
+msgid "Cancel"
+msgstr ""
+
+#: tfrmreportsetup.btnok.caption
+msgid "OK"
+msgstr ""
+
+#: tfrmreportsetup.caption
+msgid "Report Setup"
+msgstr ""
+
+#: tfrmreportsetup.lblenddate.caption
+msgid "End Date:"
+msgstr ""
+
+#: tfrmreportsetup.lblformat.caption
+msgid "Format:"
+msgstr ""
+
+#: tfrmreportsetup.lblstartdate.caption
+msgid "Start Date:"
+msgstr ""
+
 #: tmainform.btndeleteres.caption
 msgid "Delete"
 msgstr ""
diff --git a/components/tvplanit/source/vpbasepng.res b/components/tvplanit/source/vpbasepng.res
index c4fd820ae..915f11355 100644
Binary files a/components/tvplanit/source/vpbasepng.res and b/components/tvplanit/source/vpbasepng.res differ