code cleaned, new icons