better icon and style cleanup