Ticket #26020
- Visual polish