Merge change 7723

* changes:
  More usability tweaks including turning the icons right side up.