Added more standard icons. Other minor tweaks