Fixed a really dumb Label handling mistake, added handling for Icons