Fix scripts not being run if message is not shown
Merge branch 'feature-icon'