Add margin for cluster icon
Merge branch 'icon_fix'