Fix colour picker icon + group indicator