removing locked icons
Merge pull request #1958 from aleksandra-tarkowska/rebased/dev_5_0/icons_cleanup

Icons cleanup (rebased onto dev_5_0)