Clean code
Fix owner formatting and icon associated to owner.