fix & coding form + add tabIcon