issue #21679: Fine tuning on icons.