Feature/icon mask

Feature/icon mask