Move kind icons.
More polish.
In a known slightly buggy state.