Merge branch 'tidy'
First symbol wasn't shown in notification
Merge branch 'fixes' into tiles