edited icons and border colour