Redrawed Icons, some fixes