Fixed Icon issues