Merge proposals dependent on lp://staging/~edwin-grubbs/launchpad/bug-526608-milestone-ajax-plus-icon

1. bug-526608-milestone-ajax-plus-icon
2. Dependent merge proposals