Small changes here and there, plus new icons