STK: Image/icon related fixes