Theme picker indicator improved