Moved icons into their own dir
Merged branch \'icons\'.