rename source icons
cleanup formatting