Merge branch 'master' into dev
correct icons and colors
correct event color
Merge branch 'dev'