Improved the icons used