removing locked icons
Merge pull request #1959 from aleksandra-tarkowska/rebased/dev_4_4/icons_cleanup

Icons cleanup (rebased onto dev_4_4)