Improved Toolbar graphic, thanks to blizzy78
CompatibilityChecker version 2
Keep old focus body if the new body given is null
Version 0.8.5
Merge branch 'hotfix-0.8.5'