icon style and small bugs