Fix for circles drawing
Folder color mark layout fix