Added colored boxes for color picker instead of text and added icons