diff --git a/components/tvplanit/examples/fulldemo/demo.lpi b/components/tvplanit/examples/fulldemo/demo.lpi
index 9eadf954f..bf3ad6c27 100644
--- a/components/tvplanit/examples/fulldemo/demo.lpi
+++ b/components/tvplanit/examples/fulldemo/demo.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <SessionStorage Value="InProjectDir"/>
@@ -25,9 +25,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="localhost"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="localhost"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="3">
       <Item1>
diff --git a/components/tvplanit/examples/fulldemo/demomain.lfm b/components/tvplanit/examples/fulldemo/demomain.lfm
index 7dec65f50..1b8b49ede 100644
--- a/components/tvplanit/examples/fulldemo/demomain.lfm
+++ b/components/tvplanit/examples/fulldemo/demomain.lfm
@@ -9,7 +9,7 @@ object MainForm: TMainForm
   Menu = MainMenu1
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
-  LCLVersion = '1.6.4.0'
+  LCLVersion = '1.9.0.0'
   object Panel1: TPanel
     Left = 125
     Height = 576
@@ -85,7 +85,6 @@ object MainForm: TMainForm
             Align = alBottom
             TabStop = True
             TabOrder = 0
-            KBNavigation = True
             DateLabelFormat = 'mmmm yyyy'
             DayHeadAttributes.Color = clBtnFace
             DayNameStyle = dsShort
@@ -95,6 +94,7 @@ object MainForm: TMainForm
             HeadAttributes.Font.Style = [fsItalic]
             HeadAttributes.Color = clBtnFace
             HolidayAttributes.Font.Color = clBlack
+            KBNavigation = True
             SelectedDayColor = clRed
             ShowEvents = True
             ShowEventTime = False
@@ -695,41 +695,41 @@ object MainForm: TMainForm
     DrawingStyle = dsCoolTab
     FolderCollection = <    
       item
-        Version = 'v1.05'
+        Version = 'v1.10'
         Caption = 'Planner'
         Enabled = True
         FolderType = ftDefault
         ItemCollection = <        
           item
-            Version = 'v1.05'
+            Version = 'v1.10'
             Caption = 'Events'
             IconIndex = 0
             Name = 'NIEvents'
             Tag = 0
           end        
           item
-            Version = 'v1.05'
+            Version = 'v1.10'
             Caption = 'Month view'
             IconIndex = 5
             Name = 'NIEventsByMonth'
             Tag = 0
           end        
           item
-            Version = 'v1.05'
+            Version = 'v1.10'
             Caption = 'Week view'
             IconIndex = 4
             Name = 'NIEventsByWeek'
             Tag = 0
           end        
           item
-            Version = 'v1.05'
+            Version = 'v1.10'
             Caption = 'Day view'
             IconIndex = 3
             Name = 'NIEventsByDay'
             Tag = 0
           end        
           item
-            Version = 'v1.05'
+            Version = 'v1.10'
             Caption = 'Tasks'
             Description = 'Show tasks'
             IconIndex = 1
@@ -737,7 +737,7 @@ object MainForm: TMainForm
             Tag = 0
           end        
           item
-            Version = 'v1.05'
+            Version = 'v1.10'
             Caption = 'Contacts'
             Description = 'Show address book'
             IconIndex = 2
@@ -749,20 +749,20 @@ object MainForm: TMainForm
         Tag = 0
       end    
       item
-        Version = 'v1.05'
+        Version = 'v1.10'
         Caption = 'Maintenance'
         Enabled = True
         FolderType = ftDefault
         ItemCollection = <        
           item
-            Version = 'v1.05'
+            Version = 'v1.10'
             Caption = 'Resources'
             IconIndex = 7
             Name = 'NIResources'
             Tag = 0
           end        
           item
-            Version = 'v1.05'
+            Version = 'v1.10'
             Caption = 'Settings'
             IconIndex = 8
             Name = 'NISettings'
@@ -773,8 +773,8 @@ object MainForm: TMainForm
         Tag = 0
       end>
     Images = ImageList1
+    ImagesWidth = 0
     ItemFont.Color = clWhite
-    ItemSpacing = 3
     PlaySounds = False
     SelectedItem = -1
     SelectedItemFont.Color = clWhite
@@ -801,12 +801,12 @@ object MainForm: TMainForm
     Printer.MarginUnits = imPercent
     Printer.PrintFormats = <    
       item
-        Version = 'v1.05'
+        Version = 'v1.10'
         DayInc = 0
         DayIncUnits = duDay
         Elements = <        
           item
-            Version = 'v1.05'
+            Version = 'v1.10'
             Caption.Caption = 'Current week'
             Caption.Font.Style = [fsItalic]
             DayOffset = 0
@@ -821,12 +821,12 @@ object MainForm: TMainForm
         FormatName = 'Events of current week (dayview)'
       end    
       item
-        Version = 'v1.05'
+        Version = 'v1.10'
         DayInc = 0
         DayIncUnits = duWeek
         Elements = <        
           item
-            Version = 'v1.05'
+            Version = 'v1.10'
             DayOffset = 0
             DayOffsetUnits = duDay
             ElementName = 'WeekView'
@@ -840,12 +840,12 @@ object MainForm: TMainForm
         FormatName = 'Events of current week (Week view)'
       end    
       item
-        Version = 'v1.05'
+        Version = 'v1.10'
         DayInc = 0
         DayIncUnits = duDay
         Elements = <        
           item
-            Version = 'v1.05'
+            Version = 'v1.10'
             DayOffset = 0
             DayOffsetUnits = duWeek
             ElementName = 'TaskList'
@@ -859,12 +859,12 @@ object MainForm: TMainForm
         FormatName = 'Tasks of current week'
       end    
       item
-        Version = 'v1.05'
+        Version = 'v1.10'
         DayInc = 0
         DayIncUnits = duDay
         Elements = <        
           item
-            Version = 'v1.05'
+            Version = 'v1.10'
             DayOffset = 0
             DayOffsetUnits = duDay
             ElementName = 'TaskList'
@@ -884,7 +884,7 @@ object MainForm: TMainForm
     top = 200
   end
   object VpResourceEditDialog1: TVpResourceEditDialog
-    Version = 'v1.05'
+    Version = 'v1.10'
     Options = []
     Placement.Position = mpCenter
     Placement.Top = 10
@@ -2111,7 +2111,7 @@ object MainForm: TMainForm
     top = 368
   end
   object VpPrintPreviewDialog1: TVpPrintPreviewDialog
-    Version = 'v1.05'
+    Version = 'v1.10'
     BottomMargin = 0
     ControlLink = VpControlLink1
     EndDate = 42561.5151169907
@@ -2130,7 +2130,7 @@ object MainForm: TMainForm
     top = 432
   end
   object VpPrintFormatEditDialog1: TVpPrintFormatEditDialog
-    Version = 'v1.05'
+    Version = 'v1.10'
     ControlLink = VpControlLink1
     Options = []
     Placement.Position = mpCenter
diff --git a/components/tvplanit/examples/navbar/unit1.lfm b/components/tvplanit/examples/navbar/unit1.lfm
index 750fccf1c..3f2daa5c1 100644
--- a/components/tvplanit/examples/navbar/unit1.lfm
+++ b/components/tvplanit/examples/navbar/unit1.lfm
@@ -24,34 +24,34 @@ object Form1: TForm1
     DrawingStyle = dsEtchedButton
     FolderCollection = <    
       item
-        Version = 'v1.08'
+        Version = 'v1.10'
         Caption = 'Folder 1'
         Enabled = True
         FolderType = ftDefault
         ItemCollection = <        
           item
-            Version = 'v1.08'
+            Version = 'v1.10'
             Caption = 'Item 1 (Folder 1)'
             IconIndex = 0
             Name = 'Item0-0'
             Tag = 0
           end        
           item
-            Version = 'v1.08'
+            Version = 'v1.10'
             Caption = 'Item 2 (Folder 1)'
             IconIndex = 1
             Name = 'Item0-1'
             Tag = 0
           end        
           item
-            Version = 'v1.08'
+            Version = 'v1.10'
             Caption = 'Item 3 (Folder 1)'
             IconIndex = 2
             Name = 'Item0-2'
             Tag = 0
           end        
           item
-            Version = 'v1.08'
+            Version = 'v1.10'
             Caption = 'Item 4 (Folder 1)'
             IconIndex = 3
             Name = 'Item0-3'
@@ -62,20 +62,20 @@ object Form1: TForm1
         Tag = 0
       end    
       item
-        Version = 'v1.08'
+        Version = 'v1.10'
         Caption = 'Folder 2'
         Enabled = True
         FolderType = ftDefault
         ItemCollection = <        
           item
-            Version = 'v1.08'
+            Version = 'v1.10'
             Caption = 'Item 1 (Folder 2)'
             IconIndex = 4
             Name = 'Item1-0'
             Tag = 0
           end        
           item
-            Version = 'v1.08'
+            Version = 'v1.10'
             Caption = 'Item 2 (Folder 2)'
             IconIndex = 5
             Name = 'Item1-1'
@@ -86,27 +86,27 @@ object Form1: TForm1
         Tag = 0
       end    
       item
-        Version = 'v1.08'
+        Version = 'v1.10'
         Caption = 'Folder 3'
         Enabled = True
         FolderType = ftDefault
         ItemCollection = <        
           item
-            Version = 'v1.08'
+            Version = 'v1.10'
             Caption = 'Item 1 (Folder 3)'
             IconIndex = 6
             Name = 'Item2-0'
             Tag = 0
           end        
           item
-            Version = 'v1.08'
+            Version = 'v1.10'
             Caption = 'Item 2 (Folder 3)'
             IconIndex = 7
             Name = 'Item2-1'
             Tag = 0
           end        
           item
-            Version = 'v1.08'
+            Version = 'v1.10'
             Caption = 'Item 3 (Folder 3)'
             IconIndex = 8
             Name = 'Item2-2'
@@ -117,7 +117,7 @@ object Form1: TForm1
         Tag = 0
       end    
       item
-        Version = 'v1.08'
+        Version = 'v1.10'
         Caption = 'Container'
         Enabled = True
         FolderType = ftContainer
@@ -128,9 +128,10 @@ object Form1: TForm1
         ContainerIndex = 0
       end>
     Images = Images
+    ImagesWidth = 0
     ItemFont.Color = clWhite
     ItemSpacing = 5
-    PlaySounds = True
+    PlaySounds = False
     SelectedItem = -1
     SelectedItemFont.Color = clYellow
     SelectedItemFont.Style = [fsBold]
diff --git a/components/tvplanit/languages/demo.de.po b/components/tvplanit/languages/demo.de.po
index 69b42ca07..5c98c10aa 100644
--- a/components/tvplanit/languages/demo.de.po
+++ b/components/tvplanit/languages/demo.de.po
@@ -145,170 +145,132 @@ msgstr "Mittwoch"
 msgid "XML files (*.xml)"
 msgstr "XML-Dateien (*.XML)"
 
-#: tfrmreportsetup.btncancel.caption
-msgctxt "tfrmreportsetup.btncancel.caption"
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: tfrmreportsetup.btnok.caption
-msgctxt "tfrmreportsetup.btnok.caption"
-msgid "OK"
-msgstr "OK"
-
-#: tfrmreportsetup.caption
-msgid "Report Setup"
-msgstr "Ausdruck einrichten"
-
-#: tfrmreportsetup.lblenddate.caption
-msgctxt "tfrmreportsetup.lblenddate.caption"
-msgid "End Date:"
-msgstr "Enddatum:"
-
-#: tfrmreportsetup.lblformat.caption
-msgctxt "tfrmreportsetup.lblformat.caption"
-msgid "Format:"
-msgstr "Format:"
-
-#: tfrmreportsetup.lblstartdate.caption
-msgctxt "tfrmreportsetup.lblstartdate.caption"
-msgid "Start Date:"
-msgstr "Startdatum:"
-
 #: tmainform.btndeleteres.caption
 msgid "Delete"
-msgstr "Löschen"
+msgstr ""
 
 #: tmainform.btneditres.caption
 msgid "Edit"
-msgstr "Bearbeiten"
+msgstr ""
 
 #: tmainform.btnnewres.caption
 msgid "New"
-msgstr "Neu"
+msgstr ""
 
 #: tmainform.caption
 msgid "Turbo Power VisualPlanIt Demo"
-msgstr "Turbo Power VisualPlanIt Demo"
+msgstr ""
 
 #: tmainform.cbaddressbuilder.text
 msgid "(default)"
-msgstr "(Standard)"
+msgstr ""
 
 #: tmainform.cballowdraganddrop.caption
 msgid "Allow drag and drop of events"
-msgstr "\"Ziehen und Fallenlassen\" (Drag&&Drop) von Ereignissen erlauben"
+msgstr ""
 
 #: tmainform.cballowinplaceediting.caption
 msgid "Allow inplace editing"
-msgstr "Editieren an Ort und Stelle erlauben"
+msgstr ""
 
 #: tmainform.cbdragdroptransparent.caption
 msgid "Transparent drag and drop"
-msgstr "\"Ziehen und Fallenlassen\" (Drag&&Drop)  mit transparentem Hintergrund"
+msgstr ""
 
 #: tmainform.cbgranularity.text
 msgid "30 Min"
-msgstr "30 Min"
+msgstr ""
 
 #: tmainform.cbshoweventhints.caption
 msgid "Show event and contact hints"
-msgstr "Ereignis- und Kontakt-Hinweise anzeigen"
+msgstr ""
 
 #: tmainform.lbladdressbuilder.caption
 msgid "Address builder"
-msgstr "Aufbau der Adresse:"
+msgstr ""
 
 #: tmainform.lbldrawingstyle.caption
 msgid "Drawing style:"
-msgstr "Darstellungs-Stil:"
+msgstr ""
 
 #: tmainform.lblfirstdayofweek.caption
 msgid "First day of week"
-msgstr "Die Woche beginnt am"
+msgstr ""
 
 #: tmainform.lblgranularity.caption
 msgid "Granularity"
-msgstr "Raster"
+msgstr ""
 
 #: tmainform.lbllanguage.caption
-msgctxt "tmainform.lbllanguage.caption"
 msgid "Language"
-msgstr "Sprache"
+msgstr ""
 
 #: tmainform.lbltimeformat.caption
 msgid "Time format"
-msgstr "Zeitformat"
+msgstr ""
 
 #: tmainform.lblvisibledays.caption
 msgid "Visible days"
-msgstr "Sichtbare Tage"
+msgstr ""
 
 #: tmainform.menuitem1.caption
 msgid "File"
-msgstr "Datei"
+msgstr ""
 
 #: tmainform.menuitem2.caption
 msgid "Help"
-msgstr "Hilfe"
-
-#: tmainform.menuitem3.caption
-msgctxt "tmainform.menuitem3.caption"
-msgid "-"
-msgstr ""
-
-#: tmainform.menuitem4.caption
-msgctxt "tmainform.menuitem4.caption"
-msgid "-"
 msgstr ""
 
 #: tmainform.mnuabout.caption
 msgid "About Visual PlanIt"
-msgstr "Über Visual PlanIt"
+msgstr ""
 
 #: tmainform.mnueditprintformats.caption
 msgid "Edit print formats..."
-msgstr "Druckformate bearbeiten..."
+msgstr ""
 
 #: tmainform.mnuloadprintformats.caption
 msgid "Load print formats..."
-msgstr "Druckformate laden..."
+msgstr ""
 
 #: tmainform.mnumaintenance.caption
+#, fuzzy
 msgctxt "tmainform.mnumaintenance.caption"
 msgid "Maintenance"
 msgstr "Wartung"
 
 #: tmainform.mnuprint.caption
 msgid "Print..."
-msgstr "Drucken..."
+msgstr ""
 
 #: tmainform.mnuprintpreview.caption
 msgid "Print preview..."
-msgstr "Druckvorschau..."
+msgstr ""
 
 #: tmainform.mnuquit.caption
 msgid "Quit"
-msgstr "Beenden"
+msgstr ""
 
 #: tmainform.mnuresources.caption
+#, fuzzy
 msgctxt "tmainform.mnuresources.caption"
 msgid "Resources"
 msgstr "Ressourcen"
 
 #: tmainform.mnusettings.caption
+#, fuzzy
 msgctxt "tmainform.mnusettings.caption"
 msgid "Settings"
 msgstr "Einstellungen"
 
 #: tmainform.rballtasks.caption
 msgid "All tasks"
-msgstr "Alle Aufgaben"
+msgstr ""
 
 #: tmainform.rbhidecompletedtasks.caption
 msgid "Hide completed tasks"
-msgstr "Fertiggestellte Aufgaben ausblenden"
+msgstr ""
 
-# No need to translate
 #: tmainform.titlelbl.caption
 msgid "TitleLbl"
 msgstr ""
diff --git a/components/tvplanit/languages/demo.fi.po b/components/tvplanit/languages/demo.fi.po
index 261843be2..3d85d5b83 100644
--- a/components/tvplanit/languages/demo.fi.po
+++ b/components/tvplanit/languages/demo.fi.po
@@ -46,6 +46,7 @@ msgid "no border"
 msgstr ""
 
 #: demomain.rsconfirmdeleteres
+#, fuzzy,badformat
 msgid "Do you really want to delete resource %s?"
 msgstr "Haluatko varmasti poistaa resurssin% s?"
 
@@ -92,9 +93,10 @@ msgid "Planner"
 msgstr ""
 
 #: demomain.rsresources
+#, fuzzy
 msgctxt "demomain.rsresources"
 msgid "Resources"
-msgstr ""
+msgstr "Resurssit"
 
 #: demomain.rssaturday
 msgid "Saturday"
@@ -134,46 +136,17 @@ msgstr "Keskiviikko"
 msgid "XML files (*.xml)"
 msgstr "XML tiedostot (*xml)"
 
-#: tfrmreportsetup.btncancel.caption
-msgctxt "tfrmreportsetup.btncancel.caption"
-msgid "Cancel"
-msgstr "Peru"
-
-#: tfrmreportsetup.btnok.caption
-msgctxt "tfrmreportsetup.btnok.caption"
-msgid "OK"
-msgstr ""
-
-#: tfrmreportsetup.caption
-msgid "Report Setup"
-msgstr ""
-
-#: tfrmreportsetup.lblenddate.caption
-msgctxt "tfrmreportsetup.lblenddate.caption"
-msgid "End Date:"
-msgstr "Loppumispäivä:"
-
-#: tfrmreportsetup.lblformat.caption
-msgctxt "tfrmreportsetup.lblformat.caption"
-msgid "Format:"
-msgstr ""
-
-#: tfrmreportsetup.lblstartdate.caption
-msgctxt "tfrmreportsetup.lblstartdate.caption"
-msgid "Start Date:"
-msgstr "Alkamispäivä:"
-
 #: tmainform.btndeleteres.caption
 msgid "Delete"
-msgstr "Poista"
+msgstr ""
 
 #: tmainform.btneditres.caption
 msgid "Edit"
-msgstr "Muokkaa"
+msgstr ""
 
 #: tmainform.btnnewres.caption
 msgid "New"
-msgstr "Uusi"
+msgstr ""
 
 #: tmainform.caption
 msgid "Turbo Power VisualPlanIt Demo"
@@ -181,11 +154,11 @@ msgstr ""
 
 #: tmainform.cbaddressbuilder.text
 msgid "(default)"
-msgstr "(oletus)"
+msgstr ""
 
 #: tmainform.cballowdraganddrop.caption
 msgid "Allow drag and drop of events"
-msgstr "Salli tapahtumien vedä ja pudota toiminta"
+msgstr ""
 
 #: tmainform.cballowinplaceediting.caption
 msgid "Allow inplace editing"
@@ -213,16 +186,15 @@ msgstr ""
 
 #: tmainform.lblfirstdayofweek.caption
 msgid "First day of week"
-msgstr "Viikon ensimmäinen päivä"
+msgstr ""
 
 #: tmainform.lblgranularity.caption
 msgid "Granularity"
 msgstr ""
 
 #: tmainform.lbllanguage.caption
-msgctxt "TMAINFORM.LBLLANGUAGE.CAPTION"
 msgid "Language"
-msgstr "Kieli"
+msgstr ""
 
 #: tmainform.lbltimeformat.caption
 msgid "Time format"
@@ -234,25 +206,15 @@ msgstr ""
 
 #: tmainform.menuitem1.caption
 msgid "File"
-msgstr "Tiedosto"
+msgstr ""
 
 #: tmainform.menuitem2.caption
 msgid "Help"
-msgstr "Ohje"
-
-#: tmainform.menuitem3.caption
-msgctxt "tmainform.menuitem3.caption"
-msgid "-"
-msgstr ""
-
-#: tmainform.menuitem4.caption
-msgctxt "tmainform.menuitem4.caption"
-msgid "-"
 msgstr ""
 
 #: tmainform.mnuabout.caption
 msgid "About Visual PlanIt"
-msgstr "Tietoja Visual PlanIt:stä"
+msgstr ""
 
 #: tmainform.mnueditprintformats.caption
 msgid "Edit print formats..."
@@ -263,39 +225,40 @@ msgid "Load print formats..."
 msgstr ""
 
 #: tmainform.mnumaintenance.caption
-msgctxt "TMAINFORM.MNUMAINTENANCE.CAPTION"
+msgctxt "tmainform.mnumaintenance.caption"
 msgid "Maintenance"
 msgstr ""
 
 #: tmainform.mnuprint.caption
 msgid "Print..."
-msgstr "Tulosta..."
+msgstr ""
 
 #: tmainform.mnuprintpreview.caption
 msgid "Print preview..."
-msgstr "Tulostuksen esilatselu..."
+msgstr ""
 
 #: tmainform.mnuquit.caption
 msgid "Quit"
-msgstr "Lopeta"
+msgstr ""
 
 #: tmainform.mnuresources.caption
-msgctxt "TMAINFORM.MNURESOURCES.CAPTION"
+msgctxt "tmainform.mnuresources.caption"
 msgid "Resources"
-msgstr "Resurssit"
+msgstr ""
 
 #: tmainform.mnusettings.caption
-msgctxt "TMAINFORM.MNUSETTINGS.CAPTION"
+#, fuzzy
+msgctxt "tmainform.mnusettings.caption"
 msgid "Settings"
 msgstr "Asetukset"
 
 #: tmainform.rballtasks.caption
 msgid "All tasks"
-msgstr "Kaikki tehtävät"
+msgstr ""
 
 #: tmainform.rbhidecompletedtasks.caption
 msgid "Hide completed tasks"
-msgstr "Piilota suoritetut tehtävät"
+msgstr ""
 
 #: tmainform.titlelbl.caption
 msgid "TitleLbl"
diff --git a/components/tvplanit/languages/demo.nl.po b/components/tvplanit/languages/demo.nl.po
index fdeafd4b8..4a3c084e8 100644
--- a/components/tvplanit/languages/demo.nl.po
+++ b/components/tvplanit/languages/demo.nl.po
@@ -134,59 +134,25 @@ msgstr "Woensdag"
 msgid "XML files (*.xml)"
 msgstr ""
 
-#: tfrmreportsetup.btncancel.caption
-#, fuzzy
-msgctxt "tfrmreportsetup.btncancel.caption"
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: tfrmreportsetup.btnok.caption
-#, fuzzy
-msgctxt "tfrmreportsetup.btnok.caption"
-msgid "OK"
-msgstr "OK"
-
-#: tfrmreportsetup.caption
-msgid "Report Setup"
-msgstr "Overzicht Instellingen"
-
-#: tfrmreportsetup.lblenddate.caption
-#, fuzzy
-msgctxt "tfrmreportsetup.lblenddate.caption"
-msgid "End Date:"
-msgstr "Eind Datum:"
-
-#: tfrmreportsetup.lblformat.caption
-#, fuzzy
-msgctxt "tfrmreportsetup.lblformat.caption"
-msgid "Format:"
-msgstr "Formaat:"
-
-#: tfrmreportsetup.lblstartdate.caption
-#, fuzzy
-msgctxt "tfrmreportsetup.lblstartdate.caption"
-msgid "Start Date:"
-msgstr "Start Datum:"
-
 #: tmainform.btndeleteres.caption
 msgid "Delete"
-msgstr "Wissen"
+msgstr ""
 
 #: tmainform.btneditres.caption
 msgid "Edit"
-msgstr "Bewerken"
+msgstr ""
 
 #: tmainform.btnnewres.caption
 msgid "New"
-msgstr "Nieuw"
+msgstr ""
 
 #: tmainform.caption
 msgid "Turbo Power VisualPlanIt Demo"
-msgstr "Turbo Power VisualPlanIt Demo"
+msgstr ""
 
 #: tmainform.cbaddressbuilder.text
 msgid "(default)"
-msgstr "(standaard)"
+msgstr ""
 
 #: tmainform.cballowdraganddrop.caption
 msgid "Allow drag and drop of events"
@@ -194,7 +160,7 @@ msgstr ""
 
 #: tmainform.cballowinplaceediting.caption
 msgid "Allow inplace editing"
-msgstr "Direct bewerken toestaan"
+msgstr ""
 
 #: tmainform.cbdragdroptransparent.caption
 msgid "Transparent drag and drop"
@@ -202,7 +168,7 @@ msgstr ""
 
 #: tmainform.cbgranularity.text
 msgid "30 Min"
-msgstr "30 Min"
+msgstr ""
 
 #: tmainform.cbshoweventhints.caption
 msgid "Show event and contact hints"
@@ -210,7 +176,7 @@ msgstr ""
 
 #: tmainform.lbladdressbuilder.caption
 msgid "Address builder"
-msgstr "Adres bouwer"
+msgstr ""
 
 #: tmainform.lbldrawingstyle.caption
 msgid "Drawing style:"
@@ -218,46 +184,35 @@ msgstr ""
 
 #: tmainform.lblfirstdayofweek.caption
 msgid "First day of week"
-msgstr "Eerste dag van de week"
+msgstr ""
 
 #: tmainform.lblgranularity.caption
 msgid "Granularity"
-msgstr "Granulariteit"
+msgstr ""
 
 #: tmainform.lbllanguage.caption
-msgctxt "TMAINFORM.LBLLANGUAGE.CAPTION"
 msgid "Language"
-msgstr "Taal"
+msgstr ""
 
 #: tmainform.lbltimeformat.caption
 msgid "Time format"
-msgstr "Tijd formaat"
+msgstr ""
 
 #: tmainform.lblvisibledays.caption
 msgid "Visible days"
-msgstr "Zichtbare dagen"
+msgstr ""
 
 #: tmainform.menuitem1.caption
 msgid "File"
-msgstr "Bestand"
+msgstr ""
 
 #: tmainform.menuitem2.caption
 msgid "Help"
-msgstr "Help"
-
-#: tmainform.menuitem3.caption
-msgctxt "tmainform.menuitem3.caption"
-msgid "-"
-msgstr ""
-
-#: tmainform.menuitem4.caption
-msgctxt "tmainform.menuitem4.caption"
-msgid "-"
 msgstr ""
 
 #: tmainform.mnuabout.caption
 msgid "About Visual PlanIt"
-msgstr "Over Visual PlanIt"
+msgstr ""
 
 #: tmainform.mnueditprintformats.caption
 msgid "Edit print formats..."
@@ -268,7 +223,8 @@ msgid "Load print formats..."
 msgstr ""
 
 #: tmainform.mnumaintenance.caption
-msgctxt "TMAINFORM.MNUMAINTENANCE.CAPTION"
+#, fuzzy
+msgctxt "tmainform.mnumaintenance.caption"
 msgid "Maintenance"
 msgstr "Onderhoud"
 
@@ -282,27 +238,29 @@ msgstr ""
 
 #: tmainform.mnuquit.caption
 msgid "Quit"
-msgstr "Afsluiten"
+msgstr ""
 
 #: tmainform.mnuresources.caption
-msgctxt "TMAINFORM.MNURESOURCES.CAPTION"
+#, fuzzy
+msgctxt "tmainform.mnuresources.caption"
 msgid "Resources"
 msgstr "Hulpmiddelen"
 
 #: tmainform.mnusettings.caption
-msgctxt "TMAINFORM.MNUSETTINGS.CAPTION"
+#, fuzzy
+msgctxt "tmainform.mnusettings.caption"
 msgid "Settings"
 msgstr "Instellingen"
 
 #: tmainform.rballtasks.caption
 msgid "All tasks"
-msgstr "Alle taken"
+msgstr ""
 
 #: tmainform.rbhidecompletedtasks.caption
 msgid "Hide completed tasks"
-msgstr "Verberg afgewerkte taken"
+msgstr ""
 
 #: tmainform.titlelbl.caption
 msgid "TitleLbl"
-msgstr "TitleLbl"
+msgstr ""
 
diff --git a/components/tvplanit/languages/demo.po b/components/tvplanit/languages/demo.po
index 7c0261176..eeb4cfc38 100644
--- a/components/tvplanit/languages/demo.po
+++ b/components/tvplanit/languages/demo.po
@@ -134,35 +134,6 @@ msgstr ""
 msgid "XML files (*.xml)"
 msgstr ""
 
-#: tfrmreportsetup.btncancel.caption
-msgctxt "tfrmreportsetup.btncancel.caption"
-msgid "Cancel"
-msgstr ""
-
-#: tfrmreportsetup.btnok.caption
-msgctxt "tfrmreportsetup.btnok.caption"
-msgid "OK"
-msgstr ""
-
-#: tfrmreportsetup.caption
-msgid "Report Setup"
-msgstr ""
-
-#: tfrmreportsetup.lblenddate.caption
-msgctxt "tfrmreportsetup.lblenddate.caption"
-msgid "End Date:"
-msgstr ""
-
-#: tfrmreportsetup.lblformat.caption
-msgctxt "tfrmreportsetup.lblformat.caption"
-msgid "Format:"
-msgstr ""
-
-#: tfrmreportsetup.lblstartdate.caption
-msgctxt "tfrmreportsetup.lblstartdate.caption"
-msgid "Start Date:"
-msgstr ""
-
 #: tmainform.btndeleteres.caption
 msgid "Delete"
 msgstr ""
@@ -220,7 +191,6 @@ msgid "Granularity"
 msgstr ""
 
 #: tmainform.lbllanguage.caption
-msgctxt "TMAINFORM.LBLLANGUAGE.CAPTION"
 msgid "Language"
 msgstr ""
 
@@ -240,16 +210,6 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: tmainform.menuitem3.caption
-msgctxt "TMAINFORM.MENUITEM3.CAPTION"
-msgid "-"
-msgstr ""
-
-#: tmainform.menuitem4.caption
-msgctxt "tmainform.menuitem4.caption"
-msgid "-"
-msgstr ""
-
 #: tmainform.mnuabout.caption
 msgid "About Visual PlanIt"
 msgstr ""
@@ -263,7 +223,7 @@ msgid "Load print formats..."
 msgstr ""
 
 #: tmainform.mnumaintenance.caption
-msgctxt "TMAINFORM.MNUMAINTENANCE.CAPTION"
+msgctxt "tmainform.mnumaintenance.caption"
 msgid "Maintenance"
 msgstr ""
 
@@ -280,12 +240,12 @@ msgid "Quit"
 msgstr ""
 
 #: tmainform.mnuresources.caption
-msgctxt "TMAINFORM.MNURESOURCES.CAPTION"
+msgctxt "tmainform.mnuresources.caption"
 msgid "Resources"
 msgstr ""
 
 #: tmainform.mnusettings.caption
-msgctxt "TMAINFORM.MNUSETTINGS.CAPTION"
+msgctxt "tmainform.mnusettings.caption"
 msgid "Settings"
 msgstr ""
 
diff --git a/components/tvplanit/languages/demo.ru.po b/components/tvplanit/languages/demo.ru.po
index 1574cb7dd..6306c5877 100644
--- a/components/tvplanit/languages/demo.ru.po
+++ b/components/tvplanit/languages/demo.ru.po
@@ -144,50 +144,17 @@ msgstr "Среда"
 msgid "XML files (*.xml)"
 msgstr ""
 
-#: tfrmreportsetup.btncancel.caption
-#, fuzzy
-msgctxt "tfrmreportsetup.btncancel.caption"
-msgid "Cancel"
-msgstr "Отмена"
-
-#: tfrmreportsetup.btnok.caption
-msgctxt "tfrmreportsetup.btnok.caption"
-msgid "OK"
-msgstr ""
-
-#: tfrmreportsetup.caption
-msgid "Report Setup"
-msgstr "Параметры отчёта"
-
-#: tfrmreportsetup.lblenddate.caption
-#, fuzzy
-msgctxt "tfrmreportsetup.lblenddate.caption"
-msgid "End Date:"
-msgstr "Дата окончания:"
-
-#: tfrmreportsetup.lblformat.caption
-#, fuzzy
-msgctxt "tfrmreportsetup.lblformat.caption"
-msgid "Format:"
-msgstr "Формат:"
-
-#: tfrmreportsetup.lblstartdate.caption
-#, fuzzy
-msgctxt "tfrmreportsetup.lblstartdate.caption"
-msgid "Start Date:"
-msgstr "Дата начала:"
-
 #: tmainform.btndeleteres.caption
 msgid "Delete"
-msgstr "Удалить"
+msgstr ""
 
 #: tmainform.btneditres.caption
 msgid "Edit"
-msgstr "Изменить"
+msgstr ""
 
 #: tmainform.btnnewres.caption
 msgid "New"
-msgstr "Новый"
+msgstr ""
 
 #: tmainform.caption
 msgid "Turbo Power VisualPlanIt Demo"
@@ -195,7 +162,7 @@ msgstr ""
 
 #: tmainform.cbaddressbuilder.text
 msgid "(default)"
-msgstr "(по умолчанию)"
+msgstr ""
 
 #: tmainform.cballowdraganddrop.caption
 msgid "Allow drag and drop of events"
@@ -203,7 +170,7 @@ msgstr ""
 
 #: tmainform.cballowinplaceediting.caption
 msgid "Allow inplace editing"
-msgstr "Разрешить редактор по месту"
+msgstr ""
 
 #: tmainform.cbdragdroptransparent.caption
 msgid "Transparent drag and drop"
@@ -211,7 +178,7 @@ msgstr ""
 
 #: tmainform.cbgranularity.text
 msgid "30 Min"
-msgstr "30 минут"
+msgstr ""
 
 #: tmainform.cbshoweventhints.caption
 msgid "Show event and contact hints"
@@ -219,99 +186,90 @@ msgstr ""
 
 #: tmainform.lbladdressbuilder.caption
 msgid "Address builder"
-msgstr "Конструктор адреса"
+msgstr ""
 
 #: tmainform.lbldrawingstyle.caption
 msgid "Drawing style:"
-msgstr "Стиль отрисовки:"
+msgstr ""
 
 #: tmainform.lblfirstdayofweek.caption
 msgid "First day of week"
-msgstr "Первый день недели"
+msgstr ""
 
 #: tmainform.lblgranularity.caption
 msgid "Granularity"
-msgstr "Точность"
+msgstr ""
 
 #: tmainform.lbllanguage.caption
-msgctxt "TMAINFORM.LBLLANGUAGE.CAPTION"
 msgid "Language"
-msgstr "Язык"
+msgstr ""
 
 #: tmainform.lbltimeformat.caption
 msgid "Time format"
-msgstr "Формат времени"
+msgstr ""
 
 #: tmainform.lblvisibledays.caption
 msgid "Visible days"
-msgstr "Отображаемые дни"
+msgstr ""
 
 #: tmainform.menuitem1.caption
 msgid "File"
-msgstr "Файл"
+msgstr ""
 
 #: tmainform.menuitem2.caption
 msgid "Help"
-msgstr "Справка"
-
-#: tmainform.menuitem3.caption
-msgctxt "tmainform.menuitem3.caption"
-msgid "-"
-msgstr ""
-
-#: tmainform.menuitem4.caption
-msgctxt "tmainform.menuitem4.caption"
-msgid "-"
 msgstr ""
 
 #: tmainform.mnuabout.caption
 msgid "About Visual PlanIt"
-msgstr "О Visual PlanIt"
+msgstr ""
 
 #: tmainform.mnueditprintformats.caption
 msgid "Edit print formats..."
-msgstr "Редактор формата печати..."
+msgstr ""
 
 #: tmainform.mnuloadprintformats.caption
 msgid "Load print formats..."
 msgstr ""
 
 #: tmainform.mnumaintenance.caption
-msgctxt "TMAINFORM.MNUMAINTENANCE.CAPTION"
+#, fuzzy
+msgctxt "tmainform.mnumaintenance.caption"
 msgid "Maintenance"
 msgstr "Обслуживание"
 
 #: tmainform.mnuprint.caption
 msgid "Print..."
-msgstr "Печать..."
+msgstr ""
 
 #: tmainform.mnuprintpreview.caption
 msgid "Print preview..."
-msgstr "Предварительный просмотр печати..."
+msgstr ""
 
 #: tmainform.mnuquit.caption
 msgid "Quit"
-msgstr "Выход"
+msgstr ""
 
 #: tmainform.mnuresources.caption
-msgctxt "TMAINFORM.MNURESOURCES.CAPTION"
+#, fuzzy
+msgctxt "tmainform.mnuresources.caption"
 msgid "Resources"
 msgstr "Ресурсы"
 
 #: tmainform.mnusettings.caption
-msgctxt "TMAINFORM.MNUSETTINGS.CAPTION"
+#, fuzzy
+msgctxt "tmainform.mnusettings.caption"
 msgid "Settings"
 msgstr "Настройки"
 
 #: tmainform.rballtasks.caption
 msgid "All tasks"
-msgstr "Все задачи"
+msgstr ""
 
 #: tmainform.rbhidecompletedtasks.caption
 msgid "Hide completed tasks"
-msgstr "Скрыть исполненные задачи"
+msgstr ""
 
-# No need to translate
 #: tmainform.titlelbl.caption
 msgid "TitleLbl"
 msgstr ""
diff --git a/components/tvplanit/laz_visualplanit.lpk b/components/tvplanit/laz_visualplanit.lpk
index 76d126069..4e447950d 100644
--- a/components/tvplanit/laz_visualplanit.lpk
+++ b/components/tvplanit/laz_visualplanit.lpk
@@ -31,7 +31,7 @@ The Initial Developer of the Original Code is TurboPower Software.
 Portions created by TurboPower Software Inc. are Copyright (C) 2002 TurboPower Software Inc. All Rights Reserved. 
 
 Contributor(s): "/>
-    <Version Major="1" Release="9"/>
+    <Version Major="1" Release="10"/>
     <Files Count="71">
       <Item1>
         <Filename Value="source\vpbase.pas"/>
diff --git a/components/tvplanit/laz_visualplanit_design.lpk b/components/tvplanit/laz_visualplanit_design.lpk
index c3647692a..4fcdec852 100644
--- a/components/tvplanit/laz_visualplanit_design.lpk
+++ b/components/tvplanit/laz_visualplanit_design.lpk
@@ -27,7 +27,7 @@ The Initial Developer of the Original Code is TurboPower Software.
 Portions created by TurboPower Software Inc. are Copyright (C) 2002 TurboPower Software Inc. All Rights Reserved. 
 
 Contributor(s): "/>
-    <Version Major="1" Release="9"/>
+    <Version Major="1" Release="10"/>
     <Files Count="6">
       <Item1>
         <Filename Value="source\design\vpreg.pas"/>
diff --git a/components/tvplanit/laz_visualplanit_zeos.lpk b/components/tvplanit/laz_visualplanit_zeos.lpk
index c90f1f84a..70f8aa1a3 100644
--- a/components/tvplanit/laz_visualplanit_zeos.lpk
+++ b/components/tvplanit/laz_visualplanit_zeos.lpk
@@ -18,7 +18,7 @@
 
 Software distributed under the License is distributed on an &quot;AS IS&quot; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.   
 "/>
-    <Version Major="1" Release="9"/>
+    <Version Major="1" Release="10"/>
     <Files Count="1">
       <Item1>
         <Filename Value="source\addons\zeos\vpzeosds.pas"/>
diff --git a/components/tvplanit/laz_visualplanit_zeos_design.lpk b/components/tvplanit/laz_visualplanit_zeos_design.lpk
index 699a47140..e2e5a8173 100644
--- a/components/tvplanit/laz_visualplanit_zeos_design.lpk
+++ b/components/tvplanit/laz_visualplanit_zeos_design.lpk
@@ -14,7 +14,7 @@
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\zeos_design"/>
       </SearchPaths>
     </CompilerOptions>
-    <Version Major="1" Release="9"/>
+    <Version Major="1" Release="10"/>
     <Files Count="1">
       <Item1>
         <Filename Value="source\addons\zeos\vpregzeos.pas"/>
diff --git a/components/tvplanit/source/design/vpnabed.pas b/components/tvplanit/source/design/vpnabed.pas
index 579a6bf07..03aecb6ff 100644
--- a/components/tvplanit/source/design/vpnabed.pas
+++ b/components/tvplanit/source/design/vpnabed.pas
@@ -522,8 +522,6 @@ begin
 end;
 
 procedure TfrmNavBarEd.SetData(ADesigner: TComponentEditorDesigner; ABar: TVpNavBar);
-var
-  i: Integer;
 begin
   if FBar <> nil then
     FBar.RemoveFreeNotification(self);
@@ -573,6 +571,8 @@ procedure TfrmNavBarEd.lbImagesDrawItem(Control: TWinControl; Index: Integer;
 var
   x, y: Integer;
 begin
+  Unused(Control);
+
   if [odSelected, odFocused] * State <> [] then
     lbImages.Canvas.Brush.Color := clHighlight
   else
@@ -634,7 +634,7 @@ begin
   ts.Wordbreak := false;
   x := Rect.Left + 2;
   y := (Rect.Top + Rect.Bottom - lb.Canvas.TextHeight('Tg')) div 2;
-  lb.Canvas.TextRect(Rect, x, y, lb.Items[Index]);
+  lb.Canvas.TextRect(Rect, x, y, lb.Items[Index], ts);
 end;
 
 procedure TfrmNavBarEd.lbItemsClick(Sender: TObject);
@@ -665,11 +665,11 @@ end;
 
 procedure TfrmNavBarEd.btnItemUpClick(Sender: TObject);
 var
-  SaveItemIndex : Integer;
+  //SaveItemIndex : Integer;
   Item: TVpNavBtnItem;
 begin
   if (lbItems.ItemIndex > 0) then begin
-    SaveItemIndex := lbItems.ItemIndex;
+    //SaveItemIndex := lbItems.ItemIndex;
     Item := TVpNavBtnItem(lbItems.Items.Objects[lbItems.ItemIndex]);
     if Item.Index > 0 then
       Item.Index := Item.Index - 1;
diff --git a/components/tvplanit/source/vpconst.pas b/components/tvplanit/source/vpconst.pas
index 9a2a2aafa..1549a4d54 100644
--- a/components/tvplanit/source/vpconst.pas
+++ b/components/tvplanit/source/vpconst.pas
@@ -48,7 +48,7 @@ uses
 
 const
   BuildTime = {$I %DATE%} + {$I %TIME}; //'09/13/2002 09:25 AM';
-  VpVersionStr = 'v1.08';    {Visual PlanIt library version}
+  VpVersionStr = 'v1.10';    {Visual PlanIt library version}
   VpProductName = 'Visual PlanIt';
 
   BorderStyles    : array[TBorderStyle] of LongInt =
diff --git a/components/tvplanit/source/vpdayviewpainter.pas b/components/tvplanit/source/vpdayviewpainter.pas
index f88070165..450a90d0a 100644
--- a/components/tvplanit/source/vpdayviewpainter.pas
+++ b/components/tvplanit/source/vpdayviewpainter.pas
@@ -1023,6 +1023,7 @@ var
       bmp := TBitmap.Create;
       try
         bmp.Assign(ABitmap);
+        bmp.Transparent := true;
        {$IFDEF FPC}
         RotateBitmap(Bmp, Angle);
        {$ENDIF}
diff --git a/components/tvplanit/source/vpledlabel.pas b/components/tvplanit/source/vpledlabel.pas
index 99fdf457a..7a684567c 100644
--- a/components/tvplanit/source/vpledlabel.pas
+++ b/components/tvplanit/source/vpledlabel.pas
@@ -543,7 +543,7 @@ begin
   if FSize <> Value then begin
     if Value < 2 then
       Value := 2;
-    if Value > 10 then
+    if Integer(Value) > 10 then
       Value := 10;
     ResizeControl(FRows, FColumns, Value);
   end;
diff --git a/components/tvplanit/source/vpnavbar.pas b/components/tvplanit/source/vpnavbar.pas
index 8173fd9bd..258c76ede 100644
--- a/components/tvplanit/source/vpnavbar.pas
+++ b/components/tvplanit/source/vpnavbar.pas
@@ -305,12 +305,12 @@ type
     procedure WMSetCursor(var Msg: TLMSetCursor); message LM_SETCURSOR;
     {$IF LCL_FullVersion >= 1080000}
     procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
-      const AXProportion, AYProportion: Double);
+      const AXProportion, AYProportion: Double); override;
     {$ENDIF}
     {$IF VP_LCL_SCALING = 2}
-    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double);
+    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
     {$ELSEIF VP_LCL_SCALING = 1}
-    procedure ScaleFontsPPI(const AProportion: Double);
+    procedure ScaleFontsPPI(const AProportion: Double); override;
     {$ENDIF}
     {$ENDIF}
     procedure CreateParams(var Params: TCreateParams); override;
@@ -351,7 +351,7 @@ type
     property ImagesWidth: Integer read FImagesWidth write SetImagesWidth;
     property ItemFont: TFont read FItemFont write SetItemFont;
     property ItemSpacing: Integer read FItemSpacing write SetItemSpacing stored IsStoredItemSpacing;
-    property PlaySounds: Boolean read FPlaySounds write FPlaySounds;
+    property PlaySounds: Boolean read FPlaySounds write FPlaySounds default false;
     property ScrollDelta: Integer read FScrollDelta write SetScrollDelta default 2;
     property SelectedItem: Integer read FSelectedItem write FSelectedItem;
     property SelectedItemFont: TFont read FSelectedItemFont write SetSelectedItemFont;
diff --git a/components/tvplanit/source/vpnavbarpainter.pas b/components/tvplanit/source/vpnavbarpainter.pas
index e7ce2076a..fe938fdea 100644
--- a/components/tvplanit/source/vpnavbarpainter.pas
+++ b/components/tvplanit/source/vpnavbarpainter.pas
@@ -137,7 +137,7 @@ end;
 procedure TVpNavBarPainter.DrawActiveFolderItems(Canvas: TCanvas; var CurPos: Integer);
 const
   BUTTON_DISTANCE = 8;
-  LARGE_ICON_OFFSET = 4;
+  LARGE_ICON_TEXT_DISTANCE = 2;
   SMALL_ICON_TEXT_DISTANCE = 6;
 var
   folder: TVpNavFolder;
@@ -146,8 +146,7 @@ var
   text: String;
   h: Integer;
   R: TRect;
-  largeIconOffs: Integer;
-  smallIconOffs: Integer;
+  dx, dy: Integer;
  {$IFDEF LCL}
   {$IF LCL_FullVersion >= 1090000}
   imgres: TScaledImageListResolution;
@@ -157,9 +156,15 @@ var
  {$ENDIF}
 begin
   folder := FNavBar.Folders[FActiveFolder];
-  largeIconOffs := ScaleY(LARGE_ICON_OFFSET, DesignTimeDPI);
-  smallIconOffs := ScaleX(SMALL_ICON_TEXT_DISTANCE, DesignTimeDPI);
 
+  // Distance between icon and text, for large icons vertically, for small icons
+  // horizontally
+  dy := ScaleY(LARGE_ICON_TEXT_DISTANCE, DesignTimeDPI);
+  dx := ScaleX(SMALL_ICON_TEXT_DISTANCE, DesignTimeDPI);
+
+  { If an image list is assigned then use the image size.
+    If no image list is assinged then assume a 32 x 32 image size.
+    The size of the small images is always half size of the large images. }
   if FImages <> nil then begin
    {$IFDEF LCL}{$IF LCL_FullVersion >= 1090000}
     with  TVpNavBarOpener(FNavBar) do begin
@@ -202,7 +207,7 @@ begin
         Canvas.Font := FItemFont;
 
       item := Folder.Items[J];
-      { If the caption is empty at designtime then display the item's name instead }
+      { If the caption is empty at design time display the item's name instead }
       if (csDesigning in FNavBar.ComponentState) and (item.Caption = '') then
         text := item.Name
       else
@@ -215,11 +220,11 @@ begin
 
         {make the icon's bottom blend into the label's top}
         R := item.IconRect;
-        inc(R.Bottom, largeIconOffs);
+        inc(R.Bottom, dy);
         item.IconRect := R;
         CurPos := item.IconRect.Bottom;
 
-        {now, draw the text}
+        {now draw the text}
         if not DrawItemText(Canvas, item, CurPos, text, true, h) then
           Continue;
         Inc(CurPos, FItemSpacing + h);
@@ -231,10 +236,10 @@ begin
 
         {make the icon's right blend into the label's left}
         R := item.IconRect;
-        inc(R.Right, smallIconOffs);
+        inc(R.Right, dx);
         item.IconRect := R;
 
-        {now, draw the text}
+        {now draw the text}
         if not DrawItemText(Canvas, item, CurPos, text, false, h) then
           Continue;
         Inc(CurPos, FItemSpacing + h);
@@ -628,19 +633,9 @@ var
 begin
   Result := false;
 
-  { If an image list is assigned then use the image size.
-    If no image list is assinged then assume a 32 x 32 image size. }
   dist := ScaleX(MARGIN, DesignTimeDPI);
   W := FLargeImagesSize + 2*dist;
   H := FLargeImagesSize + 2*dist;
-  {
-  if Assigned(FImages) then begin
-    W := FImages.Width + 2*dist;
-    H := FImages.Height + 2*dist;
-  end else begin
-    W := ScaleX(32, DesignTimeDPI);
-    H := ScaleY(32, DesignTimeDPI);
-  end;}
 
   R.Top := CurPos;
   R.Bottom := CurPos + H;
@@ -676,12 +671,10 @@ function TVpNavBarPainter.DrawSmallIcon(Canvas: TCanvas; AItem: TVpNavBtnItem;
   CurPos: Integer): Boolean;
 const
   DELTA = 8;
-  MARGIN = 2;
 var
   lOffset: Integer;
   R: TRect;
   del: Integer;
-  m: Integer;
  {$IFDEF LCL}{$IF LCL_FullVersion >= 1090000}
   imgres: TScaledImageListResolution;
   f: Double;
@@ -695,7 +688,6 @@ begin
   {glyph is at the left}
   R.Top := CurPos;
   del := ScaleY(DELTA, DesignTimeDPI);
-  m := ScaleX(MARGIN, DesignTimeDPI);
   lOffset := abs(Canvas.Font.Height) div 2;
   if lOffset > del then
     R.Top := R.Top + lOffset - del;