DS-1485 fix for the Mirage theme

TODO: fixes for other themes (should be the same)