Rebasing icon and makefile patches on version 4.8.