Refactoring and small fix in constraint icon bounding boxes