Add filled version of circle-o
Prevent inverted color changed outer scope color value
Fix transtion from circle-o to circle-o-filled