DS-1596 fix for "Classic" theme