moved icons & improved Makefile;