Beautify / Change mouse to pointer over selection

Sorry I think I cocked up #1545 when I rolled back my master branch

@nightwing