GCP-8366 fixes on icon alignment