UI color fix and icon change