Code clean up / adapt icon visibility on display property change