DS-1596 fix for "mobile" theme