Proper icon buttons

This also adjusts the icon colours to make them contrast well with the backgrounds