More comment spacing, icon fixes and remove deprecation errors.