MDL-40975 Course: Make spinner consistent across themes