icon change and improved naming