cleaned everything a bit, bugfixed problem with icon upload