Improved search and icons