Fix title/icon blending bug
Merge branch 'dev' into stage