Revert: switched back to old icon display references