Small refactoring and improvements to code changing icon color