Adding support for round Service icons and Square service icons