Adds missing pug icon states, adds some misc pug behaviour stuff

See commit log for detailed changes.