Consolidated the warning and ok icons. Didn't make sense to do the red remove button as we're not reusing it anywhere.