Adding new SAP icon, refactoring Search