added proper icons
merge fix