Action icons & bug fix