Icon Fixes v2

Fixes Icons removed by dev freeze>master merge, going to PR to both
master and dev this time.