Ideally, give us two configurable options: which cooldown indicator we want on GCD skills and which cooldown indicator we want on off-GCD skills. (This new version wouldn't be so bad if it were limited to the later, which were the only ones that had a visibility issue before.)