Fixed colours
Fixed icons