changing icons, updating upstream fork