refs #6133. Use new icons.
refs #6133. Tweak layout positions.