Rename and move our own icons to match icon naming/location standards