diff --git a/components/tvplanit/images/components/monochrome/VpAlarmClock24.png b/components/tvplanit/images/components/monochrome/VpAlarmClock24.png
new file mode 100644
index 000000000..7e109b024
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpAlarmClock24.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpAlarmClock32.png b/components/tvplanit/images/components/monochrome/VpAlarmClock32.png
new file mode 100644
index 000000000..0f580e767
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpAlarmClock32.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpAlarmClock48.png b/components/tvplanit/images/components/monochrome/VpAlarmClock48.png
new file mode 100644
index 000000000..e463a03bd
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpAlarmClock48.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpDateEdit16.png b/components/tvplanit/images/components/monochrome/VpDateEdit16.png
new file mode 100644
index 000000000..37986e309
Binary files /dev/null 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
new file mode 100644
index 000000000..a42733da6
Binary files /dev/null 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
new file mode 100644
index 000000000..5b4afa7e8
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpDateEdit32.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpDateTime24.png b/components/tvplanit/images/components/monochrome/VpDateTime24.png
new file mode 100644
index 000000000..ec5132274
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpDateTime24.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpDateTime32.png b/components/tvplanit/images/components/monochrome/VpDateTime32.png
new file mode 100644
index 000000000..0ce48f3cf
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpDateTime32.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpDateTime48.png b/components/tvplanit/images/components/monochrome/VpDateTime48.png
new file mode 100644
index 000000000..6e5119592
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpDateTime48.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpDownArrow.png b/components/tvplanit/images/components/monochrome/VpDownArrow.png
new file mode 100644
index 000000000..81d98e1df
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpDownArrow.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpDownArrow150.png b/components/tvplanit/images/components/monochrome/VpDownArrow150.png
new file mode 100644
index 000000000..178f7c870
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpDownArrow150.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpDownArrow200.png b/components/tvplanit/images/components/monochrome/VpDownArrow200.png
new file mode 100644
index 000000000..47f69139c
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpDownArrow200.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpFinished24.png b/components/tvplanit/images/components/monochrome/VpFinished24.png
new file mode 100644
index 000000000..659e58363
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpFinished24.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpFinished32.png b/components/tvplanit/images/components/monochrome/VpFinished32.png
new file mode 100644
index 000000000..350a17f0f
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpFinished32.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpFinished48.png b/components/tvplanit/images/components/monochrome/VpFinished48.png
new file mode 100644
index 000000000..f60b39307
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpFinished48.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpLArrow16.png b/components/tvplanit/images/components/monochrome/VpLArrow16.png
new file mode 100644
index 000000000..d3387d09f
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpLArrow16.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpLArrow24.png b/components/tvplanit/images/components/monochrome/VpLArrow24.png
new file mode 100644
index 000000000..0c4cb08e7
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpLArrow24.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpLArrow32.png b/components/tvplanit/images/components/monochrome/VpLArrow32.png
new file mode 100644
index 000000000..19d91f886
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpLArrow32.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpLArrows16.png b/components/tvplanit/images/components/monochrome/VpLArrows16.png
new file mode 100644
index 000000000..317eecdaf
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpLArrows16.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpLArrows24.png b/components/tvplanit/images/components/monochrome/VpLArrows24.png
new file mode 100644
index 000000000..746fc7938
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpLArrows24.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpLArrows32.png b/components/tvplanit/images/components/monochrome/VpLArrows32.png
new file mode 100644
index 000000000..1f8bc2d66
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpLArrows32.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpPersons32.png b/components/tvplanit/images/components/monochrome/VpPersons32.png
new file mode 100644
index 000000000..d5e726ed7
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpPersons32.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpPersons48.png b/components/tvplanit/images/components/monochrome/VpPersons48.png
new file mode 100644
index 000000000..0a10d6557
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpPersons48.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpPersons64.png b/components/tvplanit/images/components/monochrome/VpPersons64.png
new file mode 100644
index 000000000..f16752a44
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpPersons64.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpRArrow16.png b/components/tvplanit/images/components/monochrome/VpRArrow16.png
new file mode 100644
index 000000000..1c380815a
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpRArrow16.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpRArrow24.png b/components/tvplanit/images/components/monochrome/VpRArrow24.png
new file mode 100644
index 000000000..696ac7fa2
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpRArrow24.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpRArrow32.png b/components/tvplanit/images/components/monochrome/VpRArrow32.png
new file mode 100644
index 000000000..37b11dfe0
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpRArrow32.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpRArrows16.png b/components/tvplanit/images/components/monochrome/VpRArrows16.png
new file mode 100644
index 000000000..9e2044a7a
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpRArrows16.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpRArrows24.png b/components/tvplanit/images/components/monochrome/VpRArrows24.png
new file mode 100644
index 000000000..b2e288fc6
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpRArrows24.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpRArrows32.png b/components/tvplanit/images/components/monochrome/VpRArrows32.png
new file mode 100644
index 000000000..1d45b4e6f
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpRArrows32.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpRecurringEvent24.png b/components/tvplanit/images/components/monochrome/VpRecurringEvent24.png
new file mode 100644
index 000000000..11385c59f
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpRecurringEvent24.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpRecurringEvent32.png b/components/tvplanit/images/components/monochrome/VpRecurringEvent32.png
new file mode 100644
index 000000000..f01235623
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpRecurringEvent32.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpRecurringEvent48.png b/components/tvplanit/images/components/monochrome/VpRecurringEvent48.png
new file mode 100644
index 000000000..b7422438e
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpRecurringEvent48.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpReminder24.png b/components/tvplanit/images/components/monochrome/VpReminder24.png
new file mode 100644
index 000000000..d1a7b3cd0
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpReminder24.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpReminder32.png b/components/tvplanit/images/components/monochrome/VpReminder32.png
new file mode 100644
index 000000000..70f73a728
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpReminder32.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpReminder48.png b/components/tvplanit/images/components/monochrome/VpReminder48.png
new file mode 100644
index 000000000..f1896e353
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpReminder48.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpRevert16.png b/components/tvplanit/images/components/monochrome/VpRevert16.png
new file mode 100644
index 000000000..d692f31c5
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpRevert16.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpRevert24.png b/components/tvplanit/images/components/monochrome/VpRevert24.png
new file mode 100644
index 000000000..6bede6d8d
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpRevert24.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpRevert32.png b/components/tvplanit/images/components/monochrome/VpRevert32.png
new file mode 100644
index 000000000..ccfce230c
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpRevert32.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpSpeaker16.png b/components/tvplanit/images/components/monochrome/VpSpeaker16.png
new file mode 100644
index 000000000..928a7570d
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpSpeaker16.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpSpeaker24.png b/components/tvplanit/images/components/monochrome/VpSpeaker24.png
new file mode 100644
index 000000000..5a2b647ba
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpSpeaker24.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpSpeaker32.png b/components/tvplanit/images/components/monochrome/VpSpeaker32.png
new file mode 100644
index 000000000..5351fc9f7
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpSpeaker32.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpTasks16.png b/components/tvplanit/images/components/monochrome/VpTasks16.png
new file mode 100644
index 000000000..4d869a23c
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpTasks16.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpTasks24.png b/components/tvplanit/images/components/monochrome/VpTasks24.png
new file mode 100644
index 000000000..bcc880940
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpTasks24.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpTasks32.png b/components/tvplanit/images/components/monochrome/VpTasks32.png
new file mode 100644
index 000000000..d5b570e77
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpTasks32.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpTimeEdit16.png b/components/tvplanit/images/components/monochrome/VpTimeEdit16.png
new file mode 100644
index 000000000..a1ce187ce
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpTimeEdit16.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpTimeEdit24.png b/components/tvplanit/images/components/monochrome/VpTimeEdit24.png
new file mode 100644
index 000000000..6652409f3
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpTimeEdit24.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpTimeEdit32.png b/components/tvplanit/images/components/monochrome/VpTimeEdit32.png
new file mode 100644
index 000000000..8bb0e8710
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpTimeEdit32.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpToday16.png b/components/tvplanit/images/components/monochrome/VpToday16.png
new file mode 100644
index 000000000..51034ac43
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpToday16.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpToday24.png b/components/tvplanit/images/components/monochrome/VpToday24.png
new file mode 100644
index 000000000..bfddc4a91
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpToday24.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpToday32.png b/components/tvplanit/images/components/monochrome/VpToday32.png
new file mode 100644
index 000000000..7748edf32
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpToday32.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpUpArrow.png b/components/tvplanit/images/components/monochrome/VpUpArrow.png
new file mode 100644
index 000000000..aa76a9fa2
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpUpArrow.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpUpArrow150.png b/components/tvplanit/images/components/monochrome/VpUpArrow150.png
new file mode 100644
index 000000000..45479200c
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpUpArrow150.png differ
diff --git a/components/tvplanit/images/components/monochrome/VpUpArrow200.png b/components/tvplanit/images/components/monochrome/VpUpArrow200.png
new file mode 100644
index 000000000..f97a22f8f
Binary files /dev/null and b/components/tvplanit/images/components/monochrome/VpUpArrow200.png differ
diff --git a/components/tvplanit/images/components/monochrome/readme.txt b/components/tvplanit/images/components/monochrome/readme.txt
new file mode 100644
index 000000000..6ee5d18d7
--- /dev/null
+++ b/components/tvplanit/images/components/monochrome/readme.txt
@@ -0,0 +1,5 @@
+The images in this folder are created by Roland Hahn.
+
+License: 
+Creative Commons CC0 1.0 Universal
+(freely available, no restrictions in usage)
diff --git a/components/tvplanit/images/components/old/VpAlarmClock24.png b/components/tvplanit/images/components/old/VpAlarmClock24.png
new file mode 100644
index 000000000..dc4065a18
Binary files /dev/null and b/components/tvplanit/images/components/old/VpAlarmClock24.png differ
diff --git a/components/tvplanit/images/components/old/VpAlarmClock32.png b/components/tvplanit/images/components/old/VpAlarmClock32.png
new file mode 100644
index 000000000..ab7e8df10
Binary files /dev/null and b/components/tvplanit/images/components/old/VpAlarmClock32.png differ
diff --git a/components/tvplanit/images/components/old/VpAlarmClock48.png b/components/tvplanit/images/components/old/VpAlarmClock48.png
new file mode 100644
index 000000000..802cf36e4
Binary files /dev/null and b/components/tvplanit/images/components/old/VpAlarmClock48.png differ
diff --git a/components/tvplanit/images/components/VpDateEdit16.png b/components/tvplanit/images/components/old/VpDateEdit16.png
similarity index 100%
rename from components/tvplanit/images/components/VpDateEdit16.png
rename to components/tvplanit/images/components/old/VpDateEdit16.png
diff --git a/components/tvplanit/images/components/VpDateEdit24.png b/components/tvplanit/images/components/old/VpDateEdit24.png
similarity index 100%
rename from components/tvplanit/images/components/VpDateEdit24.png
rename to components/tvplanit/images/components/old/VpDateEdit24.png
diff --git a/components/tvplanit/images/components/VpDateEdit32.png b/components/tvplanit/images/components/old/VpDateEdit32.png
similarity index 100%
rename from components/tvplanit/images/components/VpDateEdit32.png
rename to components/tvplanit/images/components/old/VpDateEdit32.png
diff --git a/components/tvplanit/images/components/VpDateTime24.png b/components/tvplanit/images/components/old/VpDateTime24.png
similarity index 100%
rename from components/tvplanit/images/components/VpDateTime24.png
rename to components/tvplanit/images/components/old/VpDateTime24.png
diff --git a/components/tvplanit/images/components/VpDateTime32.png b/components/tvplanit/images/components/old/VpDateTime32.png
similarity index 100%
rename from components/tvplanit/images/components/VpDateTime32.png
rename to components/tvplanit/images/components/old/VpDateTime32.png
diff --git a/components/tvplanit/images/components/VpDateTime48.png b/components/tvplanit/images/components/old/VpDateTime48.png
similarity index 100%
rename from components/tvplanit/images/components/VpDateTime48.png
rename to components/tvplanit/images/components/old/VpDateTime48.png
diff --git a/components/tvplanit/images/components/VpDownArrow.png b/components/tvplanit/images/components/old/VpDownArrow.png
similarity index 100%
rename from components/tvplanit/images/components/VpDownArrow.png
rename to components/tvplanit/images/components/old/VpDownArrow.png
diff --git a/components/tvplanit/images/components/VpDownArrow150.png b/components/tvplanit/images/components/old/VpDownArrow150.png
similarity index 100%
rename from components/tvplanit/images/components/VpDownArrow150.png
rename to components/tvplanit/images/components/old/VpDownArrow150.png
diff --git a/components/tvplanit/images/components/VpDownArrow200.png b/components/tvplanit/images/components/old/VpDownArrow200.png
similarity index 100%
rename from components/tvplanit/images/components/VpDownArrow200.png
rename to components/tvplanit/images/components/old/VpDownArrow200.png
diff --git a/components/tvplanit/images/components/VpFinished24.png b/components/tvplanit/images/components/old/VpFinished24.png
similarity index 100%
rename from components/tvplanit/images/components/VpFinished24.png
rename to components/tvplanit/images/components/old/VpFinished24.png
diff --git a/components/tvplanit/images/components/VpFinished32.png b/components/tvplanit/images/components/old/VpFinished32.png
similarity index 100%
rename from components/tvplanit/images/components/VpFinished32.png
rename to components/tvplanit/images/components/old/VpFinished32.png
diff --git a/components/tvplanit/images/components/VpFinished48.png b/components/tvplanit/images/components/old/VpFinished48.png
similarity index 100%
rename from components/tvplanit/images/components/VpFinished48.png
rename to components/tvplanit/images/components/old/VpFinished48.png
diff --git a/components/tvplanit/images/components/VpLArrow16.png b/components/tvplanit/images/components/old/VpLArrow16.png
similarity index 100%
rename from components/tvplanit/images/components/VpLArrow16.png
rename to components/tvplanit/images/components/old/VpLArrow16.png
diff --git a/components/tvplanit/images/components/VpLArrow24.png b/components/tvplanit/images/components/old/VpLArrow24.png
similarity index 100%
rename from components/tvplanit/images/components/VpLArrow24.png
rename to components/tvplanit/images/components/old/VpLArrow24.png
diff --git a/components/tvplanit/images/components/VpLArrow32.png b/components/tvplanit/images/components/old/VpLArrow32.png
similarity index 100%
rename from components/tvplanit/images/components/VpLArrow32.png
rename to components/tvplanit/images/components/old/VpLArrow32.png
diff --git a/components/tvplanit/images/components/VpLArrows16.png b/components/tvplanit/images/components/old/VpLArrows16.png
similarity index 100%
rename from components/tvplanit/images/components/VpLArrows16.png
rename to components/tvplanit/images/components/old/VpLArrows16.png
diff --git a/components/tvplanit/images/components/VpLArrows24.png b/components/tvplanit/images/components/old/VpLArrows24.png
similarity index 100%
rename from components/tvplanit/images/components/VpLArrows24.png
rename to components/tvplanit/images/components/old/VpLArrows24.png
diff --git a/components/tvplanit/images/components/VpLArrows32.png b/components/tvplanit/images/components/old/VpLArrows32.png
similarity index 100%
rename from components/tvplanit/images/components/VpLArrows32.png
rename to components/tvplanit/images/components/old/VpLArrows32.png
diff --git a/components/tvplanit/images/components/VpPersons32.png b/components/tvplanit/images/components/old/VpPersons32.png
similarity index 100%
rename from components/tvplanit/images/components/VpPersons32.png
rename to components/tvplanit/images/components/old/VpPersons32.png
diff --git a/components/tvplanit/images/components/VpPersons48.png b/components/tvplanit/images/components/old/VpPersons48.png
similarity index 100%
rename from components/tvplanit/images/components/VpPersons48.png
rename to components/tvplanit/images/components/old/VpPersons48.png
diff --git a/components/tvplanit/images/components/VpPersons64.png b/components/tvplanit/images/components/old/VpPersons64.png
similarity index 100%
rename from components/tvplanit/images/components/VpPersons64.png
rename to components/tvplanit/images/components/old/VpPersons64.png
diff --git a/components/tvplanit/images/components/VpRArrow16.png b/components/tvplanit/images/components/old/VpRArrow16.png
similarity index 100%
rename from components/tvplanit/images/components/VpRArrow16.png
rename to components/tvplanit/images/components/old/VpRArrow16.png
diff --git a/components/tvplanit/images/components/VpRArrow24.png b/components/tvplanit/images/components/old/VpRArrow24.png
similarity index 100%
rename from components/tvplanit/images/components/VpRArrow24.png
rename to components/tvplanit/images/components/old/VpRArrow24.png
diff --git a/components/tvplanit/images/components/VpRArrow32.png b/components/tvplanit/images/components/old/VpRArrow32.png
similarity index 100%
rename from components/tvplanit/images/components/VpRArrow32.png
rename to components/tvplanit/images/components/old/VpRArrow32.png
diff --git a/components/tvplanit/images/components/VpRArrows16.png b/components/tvplanit/images/components/old/VpRArrows16.png
similarity index 100%
rename from components/tvplanit/images/components/VpRArrows16.png
rename to components/tvplanit/images/components/old/VpRArrows16.png
diff --git a/components/tvplanit/images/components/VpRArrows24.png b/components/tvplanit/images/components/old/VpRArrows24.png
similarity index 100%
rename from components/tvplanit/images/components/VpRArrows24.png
rename to components/tvplanit/images/components/old/VpRArrows24.png
diff --git a/components/tvplanit/images/components/VpRArrows32.png b/components/tvplanit/images/components/old/VpRArrows32.png
similarity index 100%
rename from components/tvplanit/images/components/VpRArrows32.png
rename to components/tvplanit/images/components/old/VpRArrows32.png
diff --git a/components/tvplanit/images/components/VpRecurringEvent24.png b/components/tvplanit/images/components/old/VpRecurringEvent24.png
similarity index 100%
rename from components/tvplanit/images/components/VpRecurringEvent24.png
rename to components/tvplanit/images/components/old/VpRecurringEvent24.png
diff --git a/components/tvplanit/images/components/VpRecurringEvent32.png b/components/tvplanit/images/components/old/VpRecurringEvent32.png
similarity index 100%
rename from components/tvplanit/images/components/VpRecurringEvent32.png
rename to components/tvplanit/images/components/old/VpRecurringEvent32.png
diff --git a/components/tvplanit/images/components/VpRecurringEvent48.png b/components/tvplanit/images/components/old/VpRecurringEvent48.png
similarity index 100%
rename from components/tvplanit/images/components/VpRecurringEvent48.png
rename to components/tvplanit/images/components/old/VpRecurringEvent48.png
diff --git a/components/tvplanit/images/components/VpReminder24.png b/components/tvplanit/images/components/old/VpReminder24.png
similarity index 100%
rename from components/tvplanit/images/components/VpReminder24.png
rename to components/tvplanit/images/components/old/VpReminder24.png
diff --git a/components/tvplanit/images/components/VpReminder32.png b/components/tvplanit/images/components/old/VpReminder32.png
similarity index 100%
rename from components/tvplanit/images/components/VpReminder32.png
rename to components/tvplanit/images/components/old/VpReminder32.png
diff --git a/components/tvplanit/images/components/VpReminder48.png b/components/tvplanit/images/components/old/VpReminder48.png
similarity index 100%
rename from components/tvplanit/images/components/VpReminder48.png
rename to components/tvplanit/images/components/old/VpReminder48.png
diff --git a/components/tvplanit/images/components/VpRevert16.png b/components/tvplanit/images/components/old/VpRevert16.png
similarity index 100%
rename from components/tvplanit/images/components/VpRevert16.png
rename to components/tvplanit/images/components/old/VpRevert16.png
diff --git a/components/tvplanit/images/components/VpRevert24.png b/components/tvplanit/images/components/old/VpRevert24.png
similarity index 100%
rename from components/tvplanit/images/components/VpRevert24.png
rename to components/tvplanit/images/components/old/VpRevert24.png
diff --git a/components/tvplanit/images/components/VpRevert32.png b/components/tvplanit/images/components/old/VpRevert32.png
similarity index 100%
rename from components/tvplanit/images/components/VpRevert32.png
rename to components/tvplanit/images/components/old/VpRevert32.png
diff --git a/components/tvplanit/images/components/VpSpeaker16.png b/components/tvplanit/images/components/old/VpSpeaker16.png
similarity index 100%
rename from components/tvplanit/images/components/VpSpeaker16.png
rename to components/tvplanit/images/components/old/VpSpeaker16.png
diff --git a/components/tvplanit/images/components/VpSpeaker24.png b/components/tvplanit/images/components/old/VpSpeaker24.png
similarity index 100%
rename from components/tvplanit/images/components/VpSpeaker24.png
rename to components/tvplanit/images/components/old/VpSpeaker24.png
diff --git a/components/tvplanit/images/components/VpSpeaker32.png b/components/tvplanit/images/components/old/VpSpeaker32.png
similarity index 100%
rename from components/tvplanit/images/components/VpSpeaker32.png
rename to components/tvplanit/images/components/old/VpSpeaker32.png
diff --git a/components/tvplanit/images/components/VpTasks16.png b/components/tvplanit/images/components/old/VpTasks16.png
similarity index 100%
rename from components/tvplanit/images/components/VpTasks16.png
rename to components/tvplanit/images/components/old/VpTasks16.png
diff --git a/components/tvplanit/images/components/VpTasks24.png b/components/tvplanit/images/components/old/VpTasks24.png
similarity index 100%
rename from components/tvplanit/images/components/VpTasks24.png
rename to components/tvplanit/images/components/old/VpTasks24.png
diff --git a/components/tvplanit/images/components/VpTasks32.png b/components/tvplanit/images/components/old/VpTasks32.png
similarity index 100%
rename from components/tvplanit/images/components/VpTasks32.png
rename to components/tvplanit/images/components/old/VpTasks32.png
diff --git a/components/tvplanit/images/components/VpTimeEdit16.png b/components/tvplanit/images/components/old/VpTimeEdit16.png
similarity index 100%
rename from components/tvplanit/images/components/VpTimeEdit16.png
rename to components/tvplanit/images/components/old/VpTimeEdit16.png
diff --git a/components/tvplanit/images/components/VpTimeEdit24.png b/components/tvplanit/images/components/old/VpTimeEdit24.png
similarity index 100%
rename from components/tvplanit/images/components/VpTimeEdit24.png
rename to components/tvplanit/images/components/old/VpTimeEdit24.png
diff --git a/components/tvplanit/images/components/VpTimeEdit32.png b/components/tvplanit/images/components/old/VpTimeEdit32.png
similarity index 100%
rename from components/tvplanit/images/components/VpTimeEdit32.png
rename to components/tvplanit/images/components/old/VpTimeEdit32.png
diff --git a/components/tvplanit/images/components/VpToday16.png b/components/tvplanit/images/components/old/VpToday16.png
similarity index 100%
rename from components/tvplanit/images/components/VpToday16.png
rename to components/tvplanit/images/components/old/VpToday16.png
diff --git a/components/tvplanit/images/components/VpToday24.png b/components/tvplanit/images/components/old/VpToday24.png
similarity index 100%
rename from components/tvplanit/images/components/VpToday24.png
rename to components/tvplanit/images/components/old/VpToday24.png
diff --git a/components/tvplanit/images/components/VpToday32.png b/components/tvplanit/images/components/old/VpToday32.png
similarity index 100%
rename from components/tvplanit/images/components/VpToday32.png
rename to components/tvplanit/images/components/old/VpToday32.png
diff --git a/components/tvplanit/images/components/VpUpArrow.png b/components/tvplanit/images/components/old/VpUpArrow.png
similarity index 100%
rename from components/tvplanit/images/components/VpUpArrow.png
rename to components/tvplanit/images/components/old/VpUpArrow.png
diff --git a/components/tvplanit/images/components/VpUpArrow150.png b/components/tvplanit/images/components/old/VpUpArrow150.png
similarity index 100%
rename from components/tvplanit/images/components/VpUpArrow150.png
rename to components/tvplanit/images/components/old/VpUpArrow150.png
diff --git a/components/tvplanit/images/components/VpUpArrow200.png b/components/tvplanit/images/components/old/VpUpArrow200.png
similarity index 100%
rename from components/tvplanit/images/components/VpUpArrow200.png
rename to components/tvplanit/images/components/old/VpUpArrow200.png
diff --git a/components/tvplanit/images/components/readme.txt b/components/tvplanit/images/components/old/readme.txt
similarity index 100%
rename from components/tvplanit/images/components/readme.txt
rename to components/tvplanit/images/components/old/readme.txt
diff --git a/components/tvplanit/images/components/regbasepng_files.txt b/components/tvplanit/images/components/regbasepng_files.txt
new file mode 100644
index 000000000..eb24fbb39
--- /dev/null
+++ b/components/tvplanit/images/components/regbasepng_files.txt
@@ -0,0 +1,71 @@
+VpAlarmClock24.png
+VpAlarmClock32.png
+VpAlarmClock48.png
+
+VpDateEdit16.png
+VpDateEdit24.png
+VpDateEdit32.png
+
+VpDateTime24.png
+VpDateTime32.png
+VpDateTime48.png
+
+VpFinished24.png
+VpFinished32.png
+VpFinished48.png
+
+VpPersons32.png
+VpPersons48.png
+VpPersons64.png
+
+VpRecurringEvent24.png
+VpRecurringEvent32.png
+VpRecurringEvent48.png
+
+VpReminder24.png
+VpReminder32.png
+VpReminder48.png
+
+VpSpeaker16.png
+VpSpeaker24.png
+VpSpeaker32.png
+
+VpTasks16.png
+VpTasks24.png
+VpTasks32.png
+
+VpTimeEdit16.png
+VpTimeEdit24.png
+VpTimeEdit32.png
+
+VpLArrows16.png
+VpLArrows24.png
+VpLArrows32.png
+
+VpLArrow16.png
+VpLArrow24.png
+VpLArrow32.png
+
+VpRArrow16.png
+VpRArrow24.png
+VpRArrow32.png
+
+VpRArrows16.png
+VpRArrows24.png
+VpRArrows32.png
+
+VpRevert16.png
+VpRevert24.png
+VpRevert32.png
+
+VpToday16.png
+VpToday24.png
+VpToday32.png
+
+VpUpArrow.png
+VpUpArrow150.png
+VpUpArrow200.png
+
+VpDownArrow.png
+VpDownArrow150.png
+VpdownArrow200.png
diff --git a/components/tvplanit/images/components/twocolor/VpAlarmClock24.png b/components/tvplanit/images/components/twocolor/VpAlarmClock24.png
new file mode 100644
index 000000000..4af6d1842
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpAlarmClock24.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpAlarmClock32.png b/components/tvplanit/images/components/twocolor/VpAlarmClock32.png
new file mode 100644
index 000000000..b258d3888
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpAlarmClock32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpAlarmClock48.png b/components/tvplanit/images/components/twocolor/VpAlarmClock48.png
new file mode 100644
index 000000000..e3ab5f77e
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpAlarmClock48.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpDateEdit16.png b/components/tvplanit/images/components/twocolor/VpDateEdit16.png
new file mode 100644
index 000000000..ff0124d43
Binary files /dev/null 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
new file mode 100644
index 000000000..9706023c8
Binary files /dev/null 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
new file mode 100644
index 000000000..ed30de7c7
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpDateEdit32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpDateTime24.png b/components/tvplanit/images/components/twocolor/VpDateTime24.png
new file mode 100644
index 000000000..97fc5b8be
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpDateTime24.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpDateTime32.png b/components/tvplanit/images/components/twocolor/VpDateTime32.png
new file mode 100644
index 000000000..ea77693ae
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpDateTime32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpDateTime48.png b/components/tvplanit/images/components/twocolor/VpDateTime48.png
new file mode 100644
index 000000000..8c43865b8
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpDateTime48.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpDownArrow.png b/components/tvplanit/images/components/twocolor/VpDownArrow.png
new file mode 100644
index 000000000..9b7b5e0bd
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpDownArrow.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpDownArrow150.png b/components/tvplanit/images/components/twocolor/VpDownArrow150.png
new file mode 100644
index 000000000..632663c0b
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpDownArrow150.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpDownArrow200.png b/components/tvplanit/images/components/twocolor/VpDownArrow200.png
new file mode 100644
index 000000000..905cab3de
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpDownArrow200.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpFinished24.png b/components/tvplanit/images/components/twocolor/VpFinished24.png
new file mode 100644
index 000000000..653dbca53
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpFinished24.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpFinished32.png b/components/tvplanit/images/components/twocolor/VpFinished32.png
new file mode 100644
index 000000000..5a1366ef2
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpFinished32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpFinished48.png b/components/tvplanit/images/components/twocolor/VpFinished48.png
new file mode 100644
index 000000000..8fc7fd580
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpFinished48.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpLArrow16.png b/components/tvplanit/images/components/twocolor/VpLArrow16.png
new file mode 100644
index 000000000..124184775
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpLArrow16.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpLArrow24.png b/components/tvplanit/images/components/twocolor/VpLArrow24.png
new file mode 100644
index 000000000..fda51835f
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpLArrow24.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpLArrow32.png b/components/tvplanit/images/components/twocolor/VpLArrow32.png
new file mode 100644
index 000000000..6821754e8
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpLArrow32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpLArrows16.png b/components/tvplanit/images/components/twocolor/VpLArrows16.png
new file mode 100644
index 000000000..e284a724f
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpLArrows16.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpLArrows24.png b/components/tvplanit/images/components/twocolor/VpLArrows24.png
new file mode 100644
index 000000000..186b2c7e0
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpLArrows24.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpLArrows32.png b/components/tvplanit/images/components/twocolor/VpLArrows32.png
new file mode 100644
index 000000000..2f2e09013
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpLArrows32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpPersons32.png b/components/tvplanit/images/components/twocolor/VpPersons32.png
new file mode 100644
index 000000000..f04008282
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpPersons32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpPersons48.png b/components/tvplanit/images/components/twocolor/VpPersons48.png
new file mode 100644
index 000000000..879e0bf6c
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpPersons48.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpPersons64.png b/components/tvplanit/images/components/twocolor/VpPersons64.png
new file mode 100644
index 000000000..913e6284d
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpPersons64.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpRArrow16.png b/components/tvplanit/images/components/twocolor/VpRArrow16.png
new file mode 100644
index 000000000..0b5d050a0
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpRArrow16.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpRArrow24.png b/components/tvplanit/images/components/twocolor/VpRArrow24.png
new file mode 100644
index 000000000..35e47b77e
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpRArrow24.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpRArrow32.png b/components/tvplanit/images/components/twocolor/VpRArrow32.png
new file mode 100644
index 000000000..9f61e3071
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpRArrow32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpRArrows16.png b/components/tvplanit/images/components/twocolor/VpRArrows16.png
new file mode 100644
index 000000000..3619dfdbe
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpRArrows16.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpRArrows24.png b/components/tvplanit/images/components/twocolor/VpRArrows24.png
new file mode 100644
index 000000000..8279ce229
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpRArrows24.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpRArrows32.png b/components/tvplanit/images/components/twocolor/VpRArrows32.png
new file mode 100644
index 000000000..ba92ee6ce
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpRArrows32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpRecurringEvent24.png b/components/tvplanit/images/components/twocolor/VpRecurringEvent24.png
new file mode 100644
index 000000000..290e2f9db
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpRecurringEvent24.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpRecurringEvent32.png b/components/tvplanit/images/components/twocolor/VpRecurringEvent32.png
new file mode 100644
index 000000000..254bb96cd
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpRecurringEvent32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpRecurringEvent48.png b/components/tvplanit/images/components/twocolor/VpRecurringEvent48.png
new file mode 100644
index 000000000..015816e8e
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpRecurringEvent48.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpReminder24.png b/components/tvplanit/images/components/twocolor/VpReminder24.png
new file mode 100644
index 000000000..13b4de3b0
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpReminder24.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpReminder32.png b/components/tvplanit/images/components/twocolor/VpReminder32.png
new file mode 100644
index 000000000..73f842356
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpReminder32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpReminder48.png b/components/tvplanit/images/components/twocolor/VpReminder48.png
new file mode 100644
index 000000000..718925e46
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpReminder48.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpRevert16.png b/components/tvplanit/images/components/twocolor/VpRevert16.png
new file mode 100644
index 000000000..4a4f0fa89
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpRevert16.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpRevert24.png b/components/tvplanit/images/components/twocolor/VpRevert24.png
new file mode 100644
index 000000000..2fce28e67
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpRevert24.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpRevert32.png b/components/tvplanit/images/components/twocolor/VpRevert32.png
new file mode 100644
index 000000000..dc7857fe8
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpRevert32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpSpeaker16.png b/components/tvplanit/images/components/twocolor/VpSpeaker16.png
new file mode 100644
index 000000000..2d40d5d2c
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpSpeaker16.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpSpeaker24.png b/components/tvplanit/images/components/twocolor/VpSpeaker24.png
new file mode 100644
index 000000000..9f27224af
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpSpeaker24.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpSpeaker32.png b/components/tvplanit/images/components/twocolor/VpSpeaker32.png
new file mode 100644
index 000000000..3e0d7dddb
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpSpeaker32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpTasks16.png b/components/tvplanit/images/components/twocolor/VpTasks16.png
new file mode 100644
index 000000000..a4fe23676
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpTasks16.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpTasks24.png b/components/tvplanit/images/components/twocolor/VpTasks24.png
new file mode 100644
index 000000000..f4fe2e3b0
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpTasks24.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpTasks32.png b/components/tvplanit/images/components/twocolor/VpTasks32.png
new file mode 100644
index 000000000..c1af04822
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpTasks32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpTimeEdit16.png b/components/tvplanit/images/components/twocolor/VpTimeEdit16.png
new file mode 100644
index 000000000..da6d92eed
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpTimeEdit16.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpTimeEdit24.png b/components/tvplanit/images/components/twocolor/VpTimeEdit24.png
new file mode 100644
index 000000000..5959da798
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpTimeEdit24.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpTimeEdit32.png b/components/tvplanit/images/components/twocolor/VpTimeEdit32.png
new file mode 100644
index 000000000..1bf1e09ea
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpTimeEdit32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpToday16.png b/components/tvplanit/images/components/twocolor/VpToday16.png
new file mode 100644
index 000000000..b06fac535
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpToday16.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpToday24.png b/components/tvplanit/images/components/twocolor/VpToday24.png
new file mode 100644
index 000000000..a3b2642c8
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpToday24.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpToday32.png b/components/tvplanit/images/components/twocolor/VpToday32.png
new file mode 100644
index 000000000..cfae1f52a
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpToday32.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpUpArrow.png b/components/tvplanit/images/components/twocolor/VpUpArrow.png
new file mode 100644
index 000000000..e8b761681
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpUpArrow.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpUpArrow150.png b/components/tvplanit/images/components/twocolor/VpUpArrow150.png
new file mode 100644
index 000000000..9502c6a1d
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpUpArrow150.png differ
diff --git a/components/tvplanit/images/components/twocolor/VpUpArrow200.png b/components/tvplanit/images/components/twocolor/VpUpArrow200.png
new file mode 100644
index 000000000..5032a56ba
Binary files /dev/null and b/components/tvplanit/images/components/twocolor/VpUpArrow200.png differ
diff --git a/components/tvplanit/images/components/twocolor/readme.txt b/components/tvplanit/images/components/twocolor/readme.txt
new file mode 100644
index 000000000..6ee5d18d7
--- /dev/null
+++ b/components/tvplanit/images/components/twocolor/readme.txt
@@ -0,0 +1,5 @@
+The images in this folder are created by Roland Hahn.
+
+License: 
+Creative Commons CC0 1.0 Universal
+(freely available, no restrictions in usage)
diff --git a/components/tvplanit/images/make_res_mono.bat b/components/tvplanit/images/make_res_mono.bat
new file mode 100644
index 000000000..1572cbba1
--- /dev/null
+++ b/components/tvplanit/images/make_res_mono.bat
@@ -0,0 +1,7 @@
+lazres ..\source\design\vpreg.res @reg_palette_list.txt
+lazres ..\source\addons\zeos\design\vpregzeos.res @reg_palette_zeos_list.txt
+
+pushd .
+cd components\monochrome
+lazres ..\..\..\source\vpbasepng.res @..\regbasepng_files.txt
+popd
diff --git a/components/tvplanit/images/make_res.bat b/components/tvplanit/images/make_res_old.bat
similarity index 59%
rename from components/tvplanit/images/make_res.bat
rename to components/tvplanit/images/make_res_old.bat
index 7f24eb2e0..36c74057d 100644
--- a/components/tvplanit/images/make_res.bat
+++ b/components/tvplanit/images/make_res_old.bat
@@ -1,5 +1,7 @@
 lazres ..\source\design\vpreg.res @reg_palette_list.txt
 lazres ..\source\addons\zeos\design\vpregzeos.res @reg_palette_zeos_list.txt
-lazres ..\source\vpbasepng.res @regbasepng_files.txt
 
-:end
\ No newline at end of file
+pushd .
+cd components\old
+lazres ..\..\..\source\vpbasepng.res @..\regbasepng_files.txt
+popd
\ No newline at end of file
diff --git a/components/tvplanit/images/make_res_twocolor.bat b/components/tvplanit/images/make_res_twocolor.bat
new file mode 100644
index 000000000..39b234e90
--- /dev/null
+++ b/components/tvplanit/images/make_res_twocolor.bat
@@ -0,0 +1,7 @@
+lazres ..\source\design\vpreg.res @reg_palette_list.txt
+lazres ..\source\addons\zeos\design\vpregzeos.res @reg_palette_zeos_list.txt
+
+pushd .
+cd components\twocolor
+lazres ..\..\..\source\vpbasepng.res @..\regbasepng_files.txt
+popd
diff --git a/components/tvplanit/images/readme.txt b/components/tvplanit/images/readme.txt
index 24877ca7d..d9fd89727 100644
--- a/components/tvplanit/images/readme.txt
+++ b/components/tvplanit/images/readme.txt
@@ -8,10 +8,11 @@ TurboPower VisualPlanIt components:
 
 See these subfolders for details on the origin of the images.
 
-In order to create the .res files for the package, run the batch file 
-"make_res.bat". Adapt it such that the lazres program can be found. The sources
+In order to create the .res files for the package, run one of the batch files 
+"make_res_*.bat"; each one uses a different set of images. 
+Adapt the batch files such that the lazres program can be found. The sources
 of lazres are in the folder "tools" of the Lazarus installation; compile it 
 if not yet done.
 
-The batch file, obviously, is for Windows only, but a Linux shell script can be
+The batch files, obviously, is for Windows only, but a Linux shell script can be
 written accordingly. 
diff --git a/components/tvplanit/images/regbasepng_files.txt b/components/tvplanit/images/regbasepng_files.txt
deleted file mode 100644
index 71448d3b6..000000000
--- a/components/tvplanit/images/regbasepng_files.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-components/VpAlarmClock24.png
-components/VpAlarmClock32.png
-components/VpAlarmClock48.png
-
-components/VpDateTime24.png
-components/VpDateTime32.png
-components/VpDateTime48.png
-
-components/VpFinished24.png
-components/VpFinished32.png
-components/VpFinished48.png
-
-components/VpPersons32.png
-components/VpPersons48.png
-components/VpPersons64.png
-
-components/VpRecurringEvent24.png
-components/VpRecurringEvent32.png
-components/VpRecurringEvent48.png
-
-components/VpReminder24.png
-components/VpReminder32.png
-components/VpReminder48.png
-
-components/VpDateEdit16.png
-components/VpDateEdit24.png
-components/VpDateEdit32.png
-
-components/VpSpeaker16.png
-components/VpSpeaker24.png
-components/VpSpeaker32.png
-
-components/VpTasks16.png
-components/VpTasks24.png
-components/VpTasks32.png
-
-components/VpTimeEdit16.png
-components/VpTimeEdit24.png
-components/VpTimeEdit32.png
-
-components/VpLArrows16.png
-components/VpLArrows24.png
-components/VpLArrows32.png
-
-components/VpLArrow16.png
-components/VpLArrow24.png
-components/VpLArrow32.png
-
-components/VpRArrow16.png
-components/VpRArrow24.png
-components/VpRArrow32.png
-
-components/VpRArrows16.png
-components/VpRArrows24.png
-components/VpRArrows32.png
-
-components/VpRevert16.png
-components/VpRevert24.png
-components/VpRevert32.png
-
-components/VpToday16.png
-components/VpToday24.png
-components/VpToday32.png
-
-components/VpUpArrow.png
-components/VpUpArrow150.png
-components/VpUpArrow200.png
-
-components/VpDownArrow.png
-components/VpDownArrow150.png
-components/VpdownArrow200.png
diff --git a/components/tvplanit/source/vpbasepng.res b/components/tvplanit/source/vpbasepng.res
index 5a60b7c41..4153df2cd 100644
Binary files a/components/tvplanit/source/vpbasepng.res and b/components/tvplanit/source/vpbasepng.res differ
diff --git a/components/tvplanit/source/vpdayviewpainter.pas b/components/tvplanit/source/vpdayviewpainter.pas
index 84a01d1ef..edff173e1 100644
--- a/components/tvplanit/source/vpdayviewpainter.pas
+++ b/components/tvplanit/source/vpdayviewpainter.pas
@@ -1547,7 +1547,7 @@ begin
   inc(Result, RenderCanvas.TextWidth('33'));
   with TVpDayViewOpener(FDayView) do
     Result := Max(Result, dvDayUpBtn.Glyph.Width + dvDayDownBtn.Glyph.Width +
-      dvWeekUpBtn.Glyph.Width + dvWeekDownBtn.Glyph.Width);
+      dvWeekUpBtn.Glyph.Width + dvWeekDownBtn.Glyph.Width + 3*Scale96ToFont(4));
 end;
 
 procedure TVpDayViewPainter.FixFontHeights;
diff --git a/components/tvplanit/source/vpedfmtlst.lfm b/components/tvplanit/source/vpedfmtlst.lfm
index 2a810f1dc..2ac0ec432 100644
--- a/components/tvplanit/source/vpedfmtlst.lfm
+++ b/components/tvplanit/source/vpedfmtlst.lfm
@@ -11,7 +11,6 @@ object frmPrnFormat: TfrmPrnFormat
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '1.6.4.0'
   object LblFormats: TLabel
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
@@ -22,6 +21,7 @@ object frmPrnFormat: TfrmPrnFormat
     BorderSpacing.Left = 6
     BorderSpacing.Top = 8
     Caption = '&Formats:'
+    Color = clDefault
     FocusControl = lbFormats
     ParentColor = False
   end
@@ -35,6 +35,7 @@ object frmPrnFormat: TfrmPrnFormat
     Width = 51
     BorderSpacing.Top = 8
     Caption = 'Ele&ments:'
+    Color = clDefault
     FocusControl = lbElements
     ParentColor = False
   end
@@ -108,6 +109,7 @@ object frmPrnFormat: TfrmPrnFormat
     Alignment = taCenter
     Anchors = [akLeft, akBottom]
     Caption = 'Print Order'
+    Color = clDefault
     ParentColor = False
     WordWrap = True
   end
@@ -333,6 +335,7 @@ object frmPrnFormat: TfrmPrnFormat
     Width = 44
     BorderSpacing.Left = 4
     Caption = 'Preview:'
+    Color = clDefault
     ParentColor = False
   end
   object PrintPreview: TVpPrintPreview
@@ -360,8 +363,8 @@ object frmPrnFormat: TfrmPrnFormat
     DefaultExt = '.xml'
     FileName = '*.xml'
     Filter = 'Filter Files (.xml)|*.xml|All Files (*.*)|*.*'
-    left = 400
-    top = 128
+    Left = 400
+    Top = 128
   end
   object SaveDialog1: TSaveDialog
     Title = 'Save formats as'
@@ -369,7 +372,7 @@ object frmPrnFormat: TfrmPrnFormat
     FileName = '*.xml'
     Filter = 'Filter Files (.xml)|*.xml|All Files (*.*)|*.*'
     Options = [ofOverwritePrompt, ofHideReadOnly, ofEnableSizing]
-    left = 400
-    top = 200
+    Left = 400
+    Top = 200
   end
 end
diff --git a/components/tvplanit/source/vpevnteditdlg.lfm b/components/tvplanit/source/vpevnteditdlg.lfm
index 5c9341e14..85978c4db 100644
--- a/components/tvplanit/source/vpevnteditdlg.lfm
+++ b/components/tvplanit/source/vpevnteditdlg.lfm
@@ -223,92 +223,44 @@ object DlgEventEdit: TDlgEventEdit
         BorderSpacing.Left = 16
         BorderSpacing.Top = 12
         Picture.Data = {
-          1754506F727461626C654E6574776F726B477261706869639C0A000089504E47
+          1754506F727461626C654E6574776F726B477261706869638504000089504E47
           0D0A1A0A0000000D4948445200000020000000200806000000737A7AF4000000
-          1974455874536F6674776172650041646F626520496D616765526561647971C9
-          653C00000A3E4944415478DA9457797454E515FFBD6D32432624848449080944
-          2089464044C106414E45A06C42DD690B5AE8E160B12A4539078F52B7D65AC583
-          1BC72AE7543C50B7485864B51E15A580D402862504C2921066926126CB4C667B
-          4BEFFDDE4B98D0FED377CE376FE6BDFBFDEEBDBFBB7D23E1CA2537D7CC5A909D
-          A9AEA5EF19FCC08215387B295A3562FE9EB3E2E7FF7749B51F4C2E1D52E0DD27
-          41F239CF12ED517DC9C0395BDFA7EFA610725EA8C12D333FCD2A2BB9532B2E80
-          A428E2A1158DC2A8AB473CDAF2C7AC3BBE5E3577EE67531445FDB5692963E975
-          B1C53659368A6443354A300F7474A5DEFD74D9EAF1597D7DCF486565409F4C92
-          93601906528D7E749EBAB0396FF6B6BB495EE75DF2A9F55317159717BCE3BAA6
-          440891282489964AE81E1DFFD8E8D6576F9AD831BC3433F7F65B4B50599E8FD2
-          6237D2F48B8FB38D71D49E0C62F7DE26B4079BF19B072F60E28446F25B255C19
-          962503E45CB2E1021AEBFC8BCBE6EF7A8FF77ADA6B66B67BAE1BA6412101D384
-          2C5B50541DED9D1978E2D509F0F429C12FEF1A8EC1455938521747532085D636
-          FDBF38CFCF5151E4D330AADC8D738D116CA83E8578FC3C5E5EF62D72FA2660E8
-          6408C810C342ECF8E954F69C6DD92A1B404A352B9912DECB9229949FA8EB8F15
-          6F4DC23DB347E0B6AA62FCEB7817BE3C1416AE0A4FA07587BA273D0221132DE1
-          38FE7D3286B2C11958FEF08DF86A5F1EE6AF70E3ED277761D0804EE8BA064B56
-          D95106F0B0012AC8193D1A876C19C4908E0B4D5958FEE62C3CFDF868E8A682EA
-          3D61249312540AC9B0A20614FB2EA020274061A2C84B4CAD49CB82BFCD87C640
-          094E5F2C45DDD924CE5D4CA06AB40F2B1FCBC5E297BDF8CBC26A540CBE4C982E
-          C0B0738FCD1F10DE38EDA28BF85355036D511716BD350FCB978E271915076AE3
-          64AC8A9B2B4FE1FAD206628758D25C50335CD0DC2AD6ACDD8947974C432AAE43
-          4F2461A478C9A86D188AEF8F970987C65DEF86425EBEFAE677786FE946647B12
-          8805227ACE033B8B98CBD4EA4DA71759E110B444079ED9301B33A65420A1CBD8
-          FF6382D2C2C2FDD3FE89AA1BFD58BFE53B6417E42323CB2B8C90651731A0883B
-          FF7679BDC8CAEF8F759F7E839B4736E1BEA9FBA05032338E494C4D27DCA7095F
-          6D0BE095CFEA17B26E3620F6FC27A7BF3DDF78A966D7C161869C3904A347F870
-          E45482F83170CFD41F514876AEAB3E0C6F76215C19E48DAA4192B954997EC9A9
-          43852A4D8641215BF6E8CF9191ED45BECFC2DD538F42930D1C3A9610B84AE660
-          FCA166DC8E173E39F31DEB66148E86FEF6EE96C3EDDAB3BF983B6398BB392C21
-          D40ECC9E7C1E252509B83C2E1CF8FE3CBEFCE62482C1086EBDA58C8B0526E5DE
-          4FC656D0774E4C3643B68DE19AA7A5BA541059F0F649E16443369294E4E543DC
-          D8BDDF3BB0EECC863F9370A7ECA470ECF6F12F8D2C2ECCC8CEEDEF4673C0C0A0
-          C22E5494C5B1E6AF3BA87C643CB6E40E4C1A3F0C3BBF388AD7D6EE81C7E3A1F8
-          525999B6320E45F7A2622733786958F3EE0EDC30222AF018B75FAE07830A5C99
-          D326BD311942D2BEB41B2B173E3766744959C2CA445B2730B12A82BCFC4EDC72
-          D3B5C253935CBCB5AA027E7F08DBF71C464B6B07264EBC5E64BF284251115796
-          F82D4BC4D0B51429AA2ED98DBA7A6E5E16BC6E13979ABBDC274E5757AB8E0119
-          8AA48DC91B908960D48241757EDD7571E17937BD26C73A6EE0F78FCF816E98D8
-          B2FD7B18868E154FDE0B7425A8BE0D614CFAC58653858AE6C3789B774A688F9A
-          603DAC8FF5761BA0115D85DE4C171A439C1516C55D473CA2883A678718DC20C4
-          2495DB8A27EE21E5066AB6EEA7BB89952BE701D447D8885ED348927AEE8CC7B8
-          B104E5C4001787A790F5761BA0308F89A44E8A34E131A85B699A6DBD504E8A4C
-          CA3C8318D19306563EB500AA22E193EABDD46E1378F69905E471AA8705599629
-          47643B243CF8084F848B16EB719AA7A2F658CB2F1266DAD4D5B1F6BDED22A958
-          F99245339D82914482B1CDAAE6A67729F15E92545A57F62B54A66BDFDD268CB0
-          A8C32E7D64BAF3CED6233986AA6984D996C172BC50F0DBC57344DFEF6680BD11
-          9E7932F0DA6B1FE3B3CDDFE0CE3B2760D5AAC5D06331D1171CD60573BCDF4E4A
-          5318CF2D5B1C0A841EA9B70136038633D72D27892C41BBD53D7649B946B5BDE6
-          F51AECD87510B3665461C58A076126E322E1F87DF7C5F29C333CD6C574ED7153
-          B2F57487AA27638D64201C8AD2CEA4D8507F92EB5C719A8BDCABC64D029E72FB
-          4DA4FC2158290E017AC95C9195C57EC6613CC6859500EB617DE90C18C954676D
-          3818F3E5659201B4E1F8090DC32B6834B301862594767BF5F8237709066993CD
-          10ECBABFFA92A90F2894A8504D81272B8461A6100EC6C1FA18AE9B8154B0EDE4
-          A690BF13C9AE0ECA6EE0D02195269C0BEBDEFF9C125815C734EEFFDC0F743248
-          D72D272CCAFF5E24CFFB783FE3301EE3327EC8DF01D6C77ABBCDE64368F1BC9F
-          561F2B18DEDF9553E0A3438307E5C32DDCF7809D00866E27507AAFE184E424B3
-          9C5CB952FF4E6DABB260EAA3BF4BD40529FA660C6DFE00FCF597931BBFBCAB92
-          CF90DD0C2469B55FBCFCC39F424D517484C3449D85E3C7251C3A68D3AB688AE8
-          FD222FA839B172F6F06FEBB78BBB6D8C1D6F2147F2BC8FF7330EE3312EE3B31E
-          D6C77AE5B4A48D7C7DE4C50FDB42B140A82982B6E06564102F359B2DA24F1247
-          B00F36505F5028962A536C1FA654EE5650C56FFBB92DC7F2BC8FF7D30447A8A5
-          15971937140FB01ED6C77A95F4D6CD1F0FCD6C4F349D1B3539C6E39688C9CEF5
-          E2582D9DF5FCC0BCFB2BC580B1DBB32C2AA2B6B60E234754C09E3F76C58CACAC
-          C0471FA6B077AF41075A19AD9702B8EC8F20D112C1CD23DE79E18B4367F6F128
-          8618DCBDAFACCE9D771C684D0CBF76E9AA59C82E55D12FBF0F0A07F9A8D4A87E
-          E326C6DDA262E4480DA5D7A84E33917A3ADCD9061D478FA67060BF4E5ECB82F6
-          4B4D01845BBBD07ED6C0FBAF7C0CB7DE74226BDAEE718E01E865C0AF26170F7C
-          67F9988B9E51B9089FD6B0E4C99F41CAF620D3E7A2D19C8B2C3AE5A452540129
-          53D47E7A423203FC7F46D5A859D168EB6C8F20D81A42349084D51EC7DA973E47
-          BFA129C46A4358FCCA0F451F7CD1D89C7E1E103DA1E6A9B16B72CA07DEA0F4CD
-          82A75F1CD36FAAC5FEBD03C80305F164149D5D9D743296C504F17A332847245A
-          B2BDDC0A527A1CF15817FCCD7E7404DAD0D51C87CFD58A379EDB8ABE43B91F64
-          89DC18D35FCD5BB3A5611B873D6D16C09DE3921768430721597701F18600229D
-          91865115CF7FFCD6A61956456AC2323314CB68097641E2D3BC4BEEFD6F91B94C
-          52538AE93023D41D1366A2BE79EFEA29733F97DAEA8BEED5FD99D7B84B7D7095
-          0D42CE8F8D0B487A2927627A0872EB5EBF6D6B5EA65675EC6264FBFC378FBC7D
-          AE25167462C5D9953376E8C24903736E98EAD1FA95AB4A46FED506E846A23596
-          0AD735B71DDE75F0CCBAAFE8699B93DC59430678F2D62F1DF5706591777A309A
-          DA57FEBBAF67D1F350BA01CC4F092B724A24E4DC138E7F7D6865D3EAEB7CD7D2
-          6789A32845AB8B568753E75D4E8672A3F3B293CE9D0DBBC0CEA51B60FF4DB381
-          B931C5C5A1A037C92E074CBB2A7FBA2FC33122E1605857E1BB1D0C96E1F9ADFF
-          47800100EAB6B7AAC6FFDD6B0000000049454E44AE426082
+          097048597300000EC300000EC301C76FA8640000001974455874536F66747761
+          7265007777772E696E6B73636170652E6F72679BEE3C1A000004124944415458
+          85BD975B6C546510C77FF39D6DED25606B2590D2DA526291EED6A0A942828288
+          8F3C98DE15DF8CA0312AD4447DA2145FBC3CC883515063401253BB82C6F48980
+          D1A0165148A4BBAD9550B7DAB410AE054D5BD973C6873D7B69D96E7BB6E8976C
+          76E63B33F3FFEDE47CB3E788AA92D5EAA8DD843A7B0110B395F6DEEE6CCA98EC
+          D401740F501AFBE89E6CAB640FA0BA34ADFD7F0008882DE65CDC4FB53DD7F272
+          0F4867A81CCBBC0CDAB0E9FAA9B2BD231F00B0B5740BDD0BEE8F8004B1E41DAD
+          5F397ACB0124D8D706FA3A50304BE87584D7B4D1FFDE2D0390CFFBDE47F559D7
+          559023C0578813C111C1B01C95C741D7279294DDDAECDF3E6F00E90ABF8AF086
+          EB0E82F39436D5F6A48D0DF6AE077300288F6DB05D1BFDBBB3069083FD77E338
+          BDC06DC059A2BA569F089CCF58B073A0142BFA3D5009328E6507B4BE7670A6F8
+          CCA7C076B6C5C4C5C631CDB3890368EB8A118CB4020E683EB6F562A6F8CC00C2
+          06B7EC616D59796A36F1044443CD8F20475DF7D1EC01A0C22509CD553CB144DD
+          1CADC80A40F645F2881F39D54B9E0192390B25D897EB1980C2B192248D5EF40E
+          40123AEA147B07505F75D2B6E63CD9124BCC48C2CE31D53385CD0C20F2705C1E
+          99F8C93300933D40FC8C3FE41D00270ED0AF4DF75DF02AEFE60CC49C94093917
+          00E90C9583718F205F7B154F16227E14374AF097B47FD9E93B60640BA8E5DA1F
+          670D60F3A16BF950EB99B48CD347B17CDA5B4C8EF90DB813F8419BFC6BB30600
+          2418EA01590372811BF60A7DB2F64AEA75DF4D193EE970C569B976FC1376B6EC
+          07BD88120189606414DBB1B1ACB1448E6DE783938798228C2EC291A508772152
+          DC50DEB6FFE082D56B4017916BED045E9AB103F2596839467E8D81E9110DB57E
+          89E8BBF3E900C27352D3D5086C04A2387A8FB604CEA6EF80312F80FA406C8C6C
+          C37006CC283855A095602A8125A80A509422320E32017A15B80C3A0CFC81C310
+          A305DD04E4188E9E067C58F23CD0961E005DE77E7FA30DFE300D218043F3EA00
+          A0109660F85B60032AEBA6FCE669B18B63197A4E82276F9FAF707CC9BE481EAA
+          EE64D4C5A9D7A6DF84C34029229B216FB304C39780DF111D446518D5499031D0
+          71C44CA0CE558C18541602B9A816221480E4034B40CB80720A651988E5020C67
+          0090B7410F0079EE460950824A5DECB2C4E3883D1A8A3B6C35B94D8ACF745FC6
+          51F3E614C59BE6C0A1D36544ADD5885621A60AD52AA0CA85294A95C9B0FE022E
+          037F820CA37A064318637FA7F5F74EE980A7F70276041EF8C7B24E5C33F98375
+          956F3D36947B872147B5E2EF2BFAF3D02B470B9DC965F9D1893A76F59F9C6B49
+          6F00CD625153D30754837CC40D6707B98E806F17AA4F23324038ECA74BEDFF06
+          00A023F020AAC780A94F39C224E823B4F71DF752CEFBBB617BE804B65985C817
+          08A308E7410F81B5CAAB38C0BFC9869005A218A0020000000049454E44AE4260
+          82
         }
       end
       object CBAllDay: TCheckBox
@@ -487,59 +439,43 @@ object DlgEventEdit: TDlgEventEdit
         Width = 32
         BorderSpacing.Left = 16
         Picture.Data = {
-          1754506F727461626C654E6574776F726B477261706869638006000089504E47
+          1754506F727461626C654E6574776F726B477261706869638404000089504E47
           0D0A1A0A0000000D4948445200000020000000200806000000737A7AF4000000
-          1974455874536F6674776172650041646F626520496D616765526561647971C9
-          653C000006224944415478DABC576B4C145714FE666796055914C48A1A448D44
-          E2038C8FAA818AB6BC111FA4DA58FF4849DBB43669AA49AB6DB5491B31DA1FF2
-          A769629B1ADBA6C4681BB558542A3EB015ACD144D8161F288F15E4B1BC1658F6
-          39D37367EE2AE22EBB35A4935C76973B73CF77BE73CE77CE00637B85AC3D0825
-          F74B94D27729980774630C20DC23032B67212FBD08C7E8B7F87F03D03B3DC0AB
-          2B3E454A3CF2D38A703C1088403409597BB1461151A008C825E7C214856FF8B8
-          996D0D3900370CC858B485DC2BC9C75E1CAFD88D4DB4E5F92F0084CC2F902B18
-          F08B5E8221253E198BE296606ECC7CA800742206DDA5DCB9615068D3A3B82188
-          51A86D2941D6A202BAE548BE4020CEFB01E1CB1129E700CE0B2256652E4847C6
-          BC1C8814A876EB75586D4D18B03743A04D97D2EC97874159DB11E84F626C21CA
-          6B0FE3AA09A7CF7D827C30824661409F7D00CD91C68953DEC9781B311193D0D8
-          5506735705DC0A3F14C3A3AA3C4B1DFD4B17F204DA5DCB4F589EB00055B74D79
-          F4338C56BF3F0022C5FB5894316ACA87EB7641113AF157CB5ED81CBD10F4DCA6
-          A01DAC48FEE9F3C2523803B2E4C0B5072638ADB8CC1CF49703C2CB1F633D21DF
-          5090B911765D3D4C6DDF503C69C3401EE904841B6260108D147E113ABD0EBDF6
-          3AD5C0C84B26FADD4E7E38A16E7C085CB884CACA03789FFEE5F207C060988092
-          F4C5CB1011E1419DE50742AE79181E128DE871091818B2E3C6BD063CEA70A0BB
-          4F8721E7B30CB004755384B7BEA67D6FA234B9705135BE9DB65B5991F8022024
-          6F4372A841322C4E9C8EC6C133704A6E75677CC8344C352E456D7D23CE5DAD41
-          9F19A75B6FE2AC3E14C2DDDF71DB4712E8B3F7E38C7E1C505F0F54543C36CE32
-          B6C757153000FAF0186C4F4A88C520DDD7E779A4063C5467C4CCC85CDCBA67C2
-          A9F29A8E7F7EC6076D26D5A8959693D3298F382F4A64B49BC9F8D9C0C6BD0042
-          45D28DD8E93A589D0DD0B1C421BFA647A4C36997505A598DABC5D86CEF4303DD
-          DB4DCBCE0F937D950103505186EACB4118F70208A164324C9ADA43196FA564D0
-          00CC8ECAC4B12B87D0DF869364FC01DDF7887BAD8CA29CAE5F7760212F90D640
-          C61F27A1DB863FBFFDAE2745969F94D1516C53BDB136E3243FC819442F18A4D5
-          C4D9190A64DC5BCA11B4E2684DF2214CEC402A24740409E06939FF1CA9E2385C
-          72C95A55806B8328A869F65BD947D82071A4CDDCC8C8CA62B269F355BFC17446
-          727F6BFA9C446C5C5248E1B5D0E93ACA318AB7A4C77B47F7AC61CA287123FD23
-          257264A868C838214AC82BDD41AD2E0836A62EC404290C6FAC4CC886B9E71AEA
-          CC47D504677DA5C7A632E260FA13CC3C20B2E1820D191E2D47C20351BF7A2766
-          CDDD841B9B97E5C1181689264B196BA0D091BBE43C1E5221BB07F04730F380C8
-          860A365CB021A3E241117CE939339AB31FCB9C367848BA0BC9C8BB9B96AFC1D2
-          592FE24EEB8FB079AC10F56A0454BAEF77016DB7709831298D6A9CFAF84B7390
-          9F91B4451D32D8B0F1CA3EB4FBEA016CB69A3D733262A323B12A2113C6D030DC
-          6D2F81C57647F59C3DC37A83A9854078E0FCFB14AA99A6487E6927E329F3909F
-          9554805BCD47B03AE12B7CFDE65A8AA144992A3CD5FB6447925A79B2A8C0E5B1
-          A16BA00EF75B2AE8BB53F39C1927805692B01A2AD2F69BD8C515D5E57320C9DA
-          8713C90B9097995888DA8787D51252B84008A350A6E89ED43633EA5DCC783F19
-          2FBF4175DD8DCB178AF016DD62F6C7409840D9CE8608364CB059C06B540E9430
-          C393821E52B39E8919A949F94DA2DE852E32CE24BA9396037E265663DC72AC90
-          223A668E9FE0D1045FD062AC6360443FCB3BA488EAC8082A59C8F45C1D75902B
-          35946D03A829DF83D7B9E7BD5E7F7C01901A2A512DC762FEC41730237AA2462D
-          3B98B5596AC5900C3E56885652ECB3938EBF47D256554BD96E81CB5C85CFAE1D
-          C2416EBC7BF85C28F8E90F914C9E5377A2382D0DA933E2344ABFA7570D8967B4
-          3F6117B45C71D87B71DD7207E74C27709153DEC9C5CE1D682C77F3E603DECF8B
-          D3B3911A1F4F6D9342707617720248B3C2CF607DA48FAF7E1E7325D8F702CF70
-          10E455B1B49E1A8B16B006EFDE2897CCE5DAC13F95E77DD51279975C9CB61B55
-          EB0EAA074D1ECB7739214810948A98C63D3107C1C09802F0862A8CBFCC0E3DC7
-          6CE0F7FA5780010015A12AA4DE4975590000000049454E44AE426082
+          097048597300000EC300000EC301C76FA8640000001974455874536F66747761
+          7265007777772E696E6B73636170652E6F72679BEE3C1A000004114944415458
+          85C5975B681C6518869F6F76B709C5434D4A2AB598A205DBDDA44989568BA978
+          23280649B453D354AD22C4E0452E5AC11B21C62BC1A222B5A6E885D04368266C
+          2BF642BC10F180D09AD26EB2BB82458B4995A606ECC91C76673E2F76766793EC
+          642735D60F06F67FFFEFFFDE7766FFC3FB8BAAB2989023C377100ED763387538
+          DCEAC2D780143233A2E6A64B8BAA174480F48FAC224C3BC84EE08132E93F82F4
+          93750EEB8EBA8BFF4A8058A95B507D1D6137B0BCACD2D9711DE15D9685DFD1A7
+          EEBBBA6801620D6F8190057AD79CAE2960182481E89F00A8AC042706D20854CE
+          C91F05D9A666F464600162A55E04ED032A8AE05320FB995916D79DEBAE942C76
+          F8DC6D544CB7A2D20DDA54D4350DD2A566F4D35CFDE4B7006AC6B6CE132056AA
+          03F410202E348EC86EB6458F28049AB102C240B21DE10360A50B3BA8EED0ED75
+          036225D51520B304C840FA11C4F9D27B733D0D469B9AD1DF8210CF13124FD762
+          3BC7804D2E348DC863A87E334F809C185ACE64E530708F9B9C249269D6D6C6BF
+          4A56EFAD6F419D03B9C1C62BF40C9F2829C21ABA1D2ABF061A5DE83CB0362FC0
+          2864FE5DD9E391CB2542F6E3BEE4803B4756E71EEDF3CD329B2E43B6059870A1
+          B5C5FD06801CFBA91AA1DB839D3DFAF4C6317F72408B5687CE5B297344345C00
+          79AD545F1880ACB30B6FF99CC2AC3BB42079C070677BF34239EE5FA02F140DDB
+          1F74B62F4584DD4952EFB6334C65ADA52AAE666C6BB91C03A97890C297E08C3E
+          BFF1FA5209081206C8DD5E531237933C27C03B5201BD7CF3058878FBBD90F91F
+          04E09DD92AAB038F14B950F2F7A205E0FCEA35F5DEE043A50BF83DF748D78D0A
+          10E2676BC886FEC88921432453B3F016BCB46168DBC671D0BC598830136EF9AF
+          C86420F9B058C909B19269E91F590585F56F7CE665C91EF1BC807FF4449FA4B7
+          6E8C3763A3F4C49E284BDE8B81F0215005AC27CCA39E80B0F13190F76D8D0C26
+          9F2DFF3AD2E71E426B303850367FC34807D0E0B6AE42E6AB82006D5B3F81EABE
+          42B2F291C4D3B5658B060C89A76B1179BF08D99BB7EF9E1FC854BE0DFCE2B656
+          60DB71B15255BE55954E600C6114A4D397DC4A55613BC7816A173A4F45E8BD42
+          FF2C4B66A536837E07445CE82C21BBA5AC37F0238F27D66087BE00622E34054E
+          B39AF543F91CA37840CE3AEBCB20B60B3560871262A53A024DCC62F281E42EEC
+          50C223171BB4B3981CFC6CF960B21DE52079C3928B04E85E22D9CFFDF6899C2D
+          9F7906D56E3C0F08395BFE9C9AD1C179637C2F2647D30F6138078175737A6CE0
+          24700E75C61111846A940D204DA0A139A57E467949B7C7BE2FC953F66A26FA06
+          CAAB507C6A068A6BC03EB8F2969A5B267D39025D4E8F9F594136D2894A2BB0B9
+          C45BE6336DD0D3881C45273FC939E232B56FE87A1E91FB813B11A306471D0C26
+          70B848A6E207BF6B9B5FFC032D1B905F4C97C7260000000049454E44AE426082
         }
       end
       object RecurringLbl: TLabel
@@ -628,73 +564,49 @@ object DlgEventEdit: TDlgEventEdit
         BorderSpacing.Top = 12
         BorderSpacing.Bottom = 8
         Picture.Data = {
-          1754506F727461626C654E6574776F726B477261706869633E08000089504E47
+          1754506F727461626C654E6574776F726B477261706869633505000089504E47
           0D0A1A0A0000000D4948445200000020000000200806000000737A7AF4000000
-          1974455874536F6674776172650041646F626520496D616765526561647971C9
-          653C000007E04944415478DAC4576B8C5C65197ECE3973BFEDECCE4EF7D29669
-          0BDB6E29629A16114B09FCA83192188D26CA0FE01F3626266A888AF2871F2DFA
-          4381621B13909806636A822620B595082128599AD2B25BA5DBED65DBDDEEEECC
-          CEEEDC76E6DC2F3EDF9933EDBAB4B61288D3BC3DD3ED77BEE779DFF779DEEF5B
-          C9F33CFC3F3F21F19724499F368EF4FEEFBFF5A56C2A72B89370BD657E6DDB43
-          875E0D7D0A60CAC86F1ED81356BCEF8562D9A824C930B50A14B7E6E40A43E81A
-          CCC0AC3680F1DA9FB836F14912908EECBBF7AE5C5AFE63777F61F59AE17B1009
-          03AEDB82EC6A58983DAF9C3BF12FACD3D622978F019E5FF578E813034EC92F44
-          93E93BD76E7E00E9DE3E78560396A902FA341CA8C8E6A2886F2D60E2E4143C33
-          0F498EF812F8B804A4BF3CB763433A267F2516C19E48BC2B3EB0E97EF40EDE06
-          DBACC3156137E1A9E390080F250CC9B39148C551D8BC1A97CF95F1C2AB338F70
-          1F3B74D3593EB7737D2619FAAA2CD99F0F49EE8391642E91ED1B42AEB00DF174
-          1F41ABCCB802CF6EC1735578AD331477002E2B7E78928278320EDB32B0FFD0D8
-          08F755AF4740FAF32F770CADCA2A2FCA70B6B361F118DB168BBAE8D9B21BA9FC
-          10C2F12EB8060109ECE88B709D25C021B0C7683273C9267884C0B20F2E88989A
-          C9754EC7757C01C6B50848AF3FF385CF0DF67823B76C7F183D1B76716396539F
-          83553D0EB7F57748660A36FF78560D60AF3D0A0D226BCF20F8E920F3ABE09212
-          826351094D0DB174B243C065782B09C86F1ED8F9684F57F4A58D3BBF8B786E98
-          D995B8941B53B572E6B39093C3308B6F887711CEDFEB83921D49F0A99DFF0838
-          08EE51099AAAC3B63DB46A2A2CDB5BF88F417415FCBE4773D9C44B9BBEB807D1
-          44171C96D773743FE08AB0182622F9ED70B422CCB95710CADC4E906420383BE8
-          79002E87FCA75A6F519C0EC2D130AAA53A8E7D58F915F12CBFDC6232B124D28B
-          4F6EDF74D7E6AED31B773C8C6854215E195272089E92A1B0D8025B10D0982DAB
-          2188881638145C63CCFF2E29513FDB8EE0C090430AF496015D337C02FC21C64F
-          5D3C7FFFEEB71FE43FA6185AA702E1AD1B7BDE1E18886061F42066A61B887344
-          AC1A4CA167ED1094EC366E9A61D308CA0A50797E489E0B294592C63453C1B2CC
-          09AE28ECBB0BCB70E0D82E92D90C2E8C9EC32B6FCE3E45BC4521C0E52D48C8B2
-          B42A9D51F0EEDFE6E1EFC1113A35D5447CB48C4D779CC5E0E6BB2145D771A9C3
-          BE0B0216312D1262656451C5AB990B22E2A9EB3AC16D5F3F061D305FD1DE7FFE
-          0F67FF1138C0F5FB1E10F0C79263F9EDE0780A211491F954281860EC4411EF1D
-          390A7B7184C49A5CE312D3F2ABE13925129145FA57C065BE6F1A2635C40A382E
-          E299144A937378ED9DB967095365985784B7DC02E1583830A2875038847822DA
-          8E640CF5AA81770E1F4363E6045F62EF45F6F63CC1151F5C42FB44957CD5CB30
-          5493AA17E5777C1DD4EBADF97D87CEBECB252DDF422B5DE0D24FA62947BB7B23
-          3C4412E8CEA5B925D7F9ED90582F0FEA520BA3236771EB161D831B06FCF73C01
-          EE671F1CE9AECBB5322CFADE66EF0501D1EED397967EC72F8D8EFA5756C09D2E
-          A9872B8B3A0AB7AD429233DB751D88AD3CD7E3776EC9AAA4BB52286CE8477DBE
-          8166AD058955923BE03E1152A6AB84DD62A92447AE8904CB5F9929E3172F4FBC
-          2C46EFF2EC9713D07FB86FF467B59A89C1753D88C664BF0D6243A9BD37DA326F
-          BF9B4CC751992E41AD524B21F90AB8BF904FDBD0902059415E6BAA5055ABF4E1
-          64A3D451FE35094C4C2DCDCECCAB6F958B2AFA0A5DFE792D8ADADE53EAECCDA7
-          F8B98B546F3722F1302CAA5B963B22947DA2A66E41AF37782C67A1370D4CCEB5
-          5E179EF72D741D02B6E8CFF79FF9E0C9E26C1361DE2452DD3172703F0A4EEF47
-          D309E487EF44A4EF33309B35D83C600409A105430C1D5AC7D074CE2505A6AA61
-          EC5CFDE872E55F8B80F8A8672E2D5D3A3E5E7DFEE2850A06D7F72222AE347E2B
-          DAE0BECE482077CB6A20B30552FA56C4B279680BF3BEFA0DCE7B613FCBB46869
-          1BAD0A2F258685A77F7BFAD8B5CABF9280A842EDB1BDC77FBDB0A85D989DAE61
-          60A8DF0714BDF075863699486E40D88627E32CA4442FC2B24D3D54383B221CB9
-          3609B4A35AAE6149B5C783F2DB3722806061E9BE6FBFF55079AE014DB3B06A5D
-          BF38307CF1FA2DF0DDC6CB855186A77108698B905929BD5242249968DB8F5510
-          443C3A49513822DBE0DECD107003AF5E7EE2C0A9AF4F9D29F1E21143BED01FFC
-          37498438806B04D6993D6F401247B1A9DB98BE340F5B6DD082519804374DC31F
-          4EBAE1CE74C6EECD10403028168F8E144FBC71ACB867E2E44528BC0EF5AE1B08
-          F42063E1FC045AE56934AB554C8E5FC2E9D14968ECB5D5AAD3195156C082C9E9
-          27FAFF83673FF8E9CAE173230208145B7EFCB9D18347468A4F4F9CB840A52B18
-          18DEC87B82B8523B68968AB4DA2245A723918EA1BB274159386894AB307482F3
-          F87D62FFA96F8C9EAD5D1436BFEE6533B80F5C8F5C9231B0EBEEBEAD7B77DF71
-          70707D5F6470680D8C660346A3EE5B509CF952701467D7DF8EC9B1F39C9435FC
-          68FFA96FFE75A4F81EDF2F5ECF013722D0211167E419AB0FEDBDE727C385CC97
-          736BF2E8E9EF453CDFDD7689B08827A33A55C4C5B109FCF8C03F05F8B165E0DE
-          C72510CC60FFB8CE32FA0AFD89D54F3DB6E591A135A95DB1A89CBBB235572D36
-          CC53DFF9F9C9C7CF5D6E9E116EBA11F8CD12B8F23B9FB8B830320CA60ECE6B44
-          038208C66C23005E087474C35FBDFF1702CB89C402F0E5975A2FC858FB6FAA5F
-          F9F9B7000300BF7ACAD5D4ACB2C90000000049454E44AE426082
+          097048597300000EC300000EC301C76FA8640000001974455874536F66747761
+          7265007777772E696E6B73636170652E6F72679BEE3C1A000004C24944415458
+          85C5976B6C936514C77FA757940911E4BA0B0136D1764B144D0C37231225F1C2
+          06AC938060443E28104DCC6EC0665707C8C6C54443881ABC4490B04DD83E0089
+          4E1222424C20444601CD82289B0306096C2C59DBF53D7ED85BB2ADA52DB0847F
+          F2A64D9EE7FCCFEF797A9EE73D1555E541CAF240B303B63B0D48EDD9B1A89620
+          CC072600978006C2B64F74D194FF62C7FC918AD8D6A0CC03D2818B28F58854A9
+          C77539664CAC9F406AFCB3116A8191C031043FCA93C00CE0061699A50B5DFE7E
+          317BCF6563317E058603BF219C437103D381EB602C544FCE918400527B3613F4
+          244827B0483DAEA37DC066203482B441E039F53CDDDE1B736A14387F071D07C6
+          8BEAC939DEC76F26E85E90A158C3537541CE85BEF962D480AE03198AA1AFF64B
+          BEAF6912422530048C2E2CCED1B7438C2163C0E8EA1DB36C907D4D936EBB795C
+          47B1C86B400A61EBDA2476C0DF069C568F7B2E80F8B0E0F6BF8FB23E23D4E65C
+          DBFE65E38A1B75562B9A01A499612D61E4DFAF4614F46C1CB9E2A54BF6710184
+          32FCEECFD48B61FAFE0232453DAEB444004154776941F672F9B1E9090CCBCED4
+          D0D5E99B2F6FB9B6A8E3E008497C728C4329B36EAE1C5FF6E8457BEA312CC63B
+          BA30E7BCD4F8BF4328508FFBA10400672F805E03D907EA5DD0D168DDD352A40E
+          0D398020C27EA09E1E4ED14D0B004348C3C254843C200F70042DF6C01BE95BA4
+          3E658E01E203F24187ABC79D151FA0CE5F865209507175C7DFDEF6ED13E85D75
+          1D42095EED5744512A97C9D8D88C321F303E1AB5FA9FCAD1EF4E0440759D1664
+          6F8C0FB0BB79188EC099CAF6CF7F2ABBFAC5DB080A14E3D56D037349AD5F01D4
+          E3962810AF14216C02F08D7AEFEB8AD1ABE6127466EB92CC8EB80000C7376567
+          4EEBF69F0252500AF1E9D6588B8D0B00E09362942A84CEA3CE9CA766969E8EDA
+          BD980535ADDBBF064801EAEE943C2979B51AA847796466A0A934D69468009F64
+          20BC456FC195DC73F288842220082CC727690387A3010C7251AC08FB13165C32
+          F26A3342038A1583DCC400C22B2648C37D278F28E215F18E0B009966D0894104
+          3861024C4E06602C0036DA060DC0462B004A6AF4D02028721C07E8B07ADC73CC
+          EF91851A0327C5DA8148B3317E10D8228A78453532B176E002F03806CF007FC5
+          73BDE30514AD67FB78F753AC5370C0FCCC4BD23CB1D43C7E11EFB800211A10C2
+          401EE51255B577AD72C942C8057A08451FED6880F57A09E51BC0818DCDF7955C
+          44CC37A31D6127EBB5353100400F15089D28F3F14AD13D03545082928B709320
+          BE58536203F492BE0918089BEE1A4244F04929CA06C0C060091B34E6BD12DD0F
+          1C6A76D219F8186169E1F56F1FAEBEB27598A88AD90915E3D5E6B8C9CB250B2B
+          5B80792AA285638A3AB68D5CD685B20B9172F5B882F1016AFC550885A8EE0178
+          FDD691C5B52D1F869C46D0811002EA3168C0C249305BB21ED26FB764422E8ABD
+          5B1CC1FCF44FED07529EFFC1DC95C508D59AEF2E8D0F50EB6F45E4B0E6BB96F6
+          029DD935267C7DCEE53F5FA8015692F8F6341076A76535BEDCEA18F7735F1F44
+          66ABC7DDEF3A4EEABFE115DB630615FA01C24494D5088780F3C02DF3390F1C44
+          58450F19787559AB7D6C3819EFE8D508DFA35A2C35677A6F3991C54015005E6D
+          01B69B4F7CC5F3890B30D4E9A52B00C852D3A81A156F32ABB9179FFF01757EEC
+          0254F42D740000000049454E44AE426082
         }
       end
       object AlarmSet: TCheckBox
diff --git a/components/tvplanit/source/vpganttview.pas b/components/tvplanit/source/vpganttview.pas
index 9fdd77e77..4828a75a8 100644
--- a/components/tvplanit/source/vpganttview.pas
+++ b/components/tvplanit/source/vpganttview.pas
@@ -905,7 +905,6 @@ end;
   last Gantt event. }
 function TVpGanttView.GetNumMonths: Integer;
 var
-  dm1, dm2: Integer;
   y1, m1, d1: Word;
   y2, m2, d2: Word;
 begin
diff --git a/components/tvplanit/source/vpweekview.pas b/components/tvplanit/source/vpweekview.pas
index cdde859f1..152a425d2 100644
--- a/components/tvplanit/source/vpweekview.pas
+++ b/components/tvplanit/source/vpweekview.pas
@@ -60,7 +60,7 @@ uses
   Windows, Messages,
   {$ENDIF}
   Classes, Graphics, Controls, ComCtrls, ExtCtrls, StdCtrls, Buttons, Forms, Menus,
-  VpConst, VpBase, VpBaseDS, VpMisc, VpData, VpSR, VpDayView;
+  VpConst, VpBase, VpBaseDS, VpMisc, VpData, VpSR;
 
 type
   TVpWeekdayRec = packed record