Baldur/icon usage refactor