Add preliminar icon support