[SQUAD-11][REFACTOR] Move class overlay to relevant element
[SQUAD-11][REFACTOR] Move class overlay to relevant element

tabanliviu/image-checker,nccgroup/image-checker,tabanliviu/image-checker,nccgroup/image-checker