Add some icons and improve the colors