implemented vector icons
manual merge