Merge pull request #8437 from lodr/bug-835928-cc-settings

Bug 835928 - Fixing height, border gaps, alignement, plantype selector and dates
Cause r+
Bug 847488 - Disposing the Internet tab properly