Custom icon fixes