modified icons and improves search function