#26905 UI Polish.