fix colors and icon bug