Cleanups, icon modifications and alignment change