table headers swapped in course/manage.php

In the latest 2.5 code, the two table headers "edit" and "move category to:" on the page course/manage.php in edit mode are swapped and therefore on the wrong columns.

There seems to be a similar confusion with the classnames attached to the columns, "actions" and "icons", which I assume are both referring to the row of actions/icons, rather than to the dropdown select with move targets.

Can I suggest while I'm here that "Move category to..." with an ellipsis might look better and make more sense than the current colon.