Merge changes from topic "egg-finally" into sc-dev

* changes:
  Do you need paint chips?
  icon++