New icon and circle behavior should now be working, needs tweaking