Enhance icons and css