Merge "Set STK header if icon is null and selfexplanatory"