caligraphy tab icons
conflics fixed