Fixes #3106
Fixes #3118
Fixes #2921
Fixes #2421
Merge pull request #3113 from Zuhayr/master

Firesuit icon fix.